From d35fe49043df68dc62d37f62ff6048e2441453c7 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Fri, 27 Sep 2019 13:30:04 +0200 Subject: [PATCH] Fetch pending plugins only if permitted (link available) --- .../admin/plugins/containers/PluginsOverview.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/scm-ui/src/admin/plugins/containers/PluginsOverview.js b/scm-ui/src/admin/plugins/containers/PluginsOverview.js index d4bd0e5129..530c272210 100644 --- a/scm-ui/src/admin/plugins/containers/PluginsOverview.js +++ b/scm-ui/src/admin/plugins/containers/PluginsOverview.js @@ -50,16 +50,7 @@ type Props = { class PluginsOverview extends React.Component { componentDidMount() { - const { - installed, - fetchPluginsByLink, - availablePluginsLink, - installedPluginsLink, - pendingPluginsLink, - fetchPendingPlugins - } = this.props; - fetchPluginsByLink(installed ? installedPluginsLink : availablePluginsLink); - fetchPendingPlugins(pendingPluginsLink); + this.fetchPlugins(); } componentDidUpdate(prevProps) { @@ -79,7 +70,9 @@ class PluginsOverview extends React.Component { fetchPendingPlugins } = this.props; fetchPluginsByLink(installed ? installedPluginsLink : availablePluginsLink); - fetchPendingPlugins(pendingPluginsLink); + if (pendingPluginsLink) { + fetchPendingPlugins(pendingPluginsLink); + } }; renderHeader = (actions: React.Node) => {