From e6d32a14681d6dc6ab1265bdd73571080320d597 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Tue, 1 Oct 2019 10:27:06 +0200
Subject: [PATCH] Replace hard reload with refresh

---
 .../admin/plugins/components/MultiPluginAction.js    |  4 +++-
 .../plugins/components/MultiPluginActionModal.js     | 12 +++++++-----
 .../src/admin/plugins/containers/PluginsOverview.js  |  3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/scm-ui/src/admin/plugins/components/MultiPluginAction.js b/scm-ui/src/admin/plugins/components/MultiPluginAction.js
index 2fe3ae6985..7f37a0d7cf 100644
--- a/scm-ui/src/admin/plugins/components/MultiPluginAction.js
+++ b/scm-ui/src/admin/plugins/components/MultiPluginAction.js
@@ -15,6 +15,7 @@ type Props = {
   actionType: string,
   pendingPlugins?: PendingPlugins,
   installedPlugins?: PluginCollection,
+  refresh: () => void,
 
   // context props
   t: (key: string, params?: Object) => string
@@ -57,7 +58,7 @@ class MultiPluginAction extends React.Component<Props, State> {
 
   renderModal = () => {
     const { showModal } = this.state;
-    const { pendingPlugins, installedPlugins, actionType } = this.props;
+    const { pendingPlugins, installedPlugins, actionType, refresh } = this.props;
     if (showModal) {
       return (
         <MultiPluginActionModal
@@ -72,6 +73,7 @@ class MultiPluginAction extends React.Component<Props, State> {
               : installedPlugins
           }
           onClose={this.toggleModal}
+          refresh={refresh}
           actionType={actionType}
         />
       );
diff --git a/scm-ui/src/admin/plugins/components/MultiPluginActionModal.js b/scm-ui/src/admin/plugins/components/MultiPluginActionModal.js
index 394b7e48c9..b9c9aa9b8e 100644
--- a/scm-ui/src/admin/plugins/components/MultiPluginActionModal.js
+++ b/scm-ui/src/admin/plugins/components/MultiPluginActionModal.js
@@ -19,6 +19,7 @@ type Props = {
   actionType: string,
   pendingPlugins?: PendingPlugins,
   installedPlugins?: PluginCollection,
+  refresh: () => void,
 
   // context props
   t: string => string
@@ -99,7 +100,7 @@ class MultiPluginActionModal extends React.Component<Props, State> {
 
     apiClient
       .post(pendingPlugins._links.cancel.href)
-      .then(() => this.reload())
+      .then(() => this.refresh())
       .catch(error => {
         this.setState({
           success: false,
@@ -117,18 +118,19 @@ class MultiPluginActionModal extends React.Component<Props, State> {
 
     apiClient
       .post(installedPlugins._links.update.href)
-      .then(() => this.reload());
+      .then(() => this.refresh());
   };
 
-  reload = () => {
-    window.location.reload(true);
+  refresh = () => {
+    this.props.refresh();
+    this.props.onClose();
   };
 
   renderModalContent = () => {
     const { actionType } = this.props;
 
     if (actionType === MultiPluginActionType.UPDATE_ALL) {
-      return <>{this.renderUpdatable()}</>;
+      return this.renderUpdatable();
     } else {
       return (
         <>
diff --git a/scm-ui/src/admin/plugins/containers/PluginsOverview.js b/scm-ui/src/admin/plugins/containers/PluginsOverview.js
index f13ce852cd..e5cd4aca7b 100644
--- a/scm-ui/src/admin/plugins/containers/PluginsOverview.js
+++ b/scm-ui/src/admin/plugins/containers/PluginsOverview.js
@@ -124,6 +124,7 @@ class PluginsOverview extends React.Component<Props> {
         <MultiPluginAction
           key={MultiPluginActionType.EXECUTE_PENDING}
           pendingPlugins={pendingPlugins}
+          refresh={this.fetchPlugins}
           actionType={MultiPluginActionType.EXECUTE_PENDING}
         />
       );
@@ -138,6 +139,7 @@ class PluginsOverview extends React.Component<Props> {
         <MultiPluginAction
           key={MultiPluginActionType.CANCEL_PENDING}
           pendingPlugins={pendingPlugins}
+          refresh={this.fetchPlugins}
           actionType={MultiPluginActionType.CANCEL_PENDING}
         />
       );
@@ -148,6 +150,7 @@ class PluginsOverview extends React.Component<Props> {
         <MultiPluginAction
           key={MultiPluginActionType.UPDATE_ALL}
           installedPlugins={collection}
+          refresh={this.fetchPlugins}
           actionType={MultiPluginActionType.UPDATE_ALL}
         />
       );