From de1fa12ba61735adc9a654f8f3cace3bbecabe56 Mon Sep 17 00:00:00 2001
From: Alex Culliere <alozhkin@mirantis.com>
Date: Mon, 8 Mar 2021 20:34:32 +0200
Subject: [PATCH] Move cluster deactivation logic to cluster store

Signed-off-by: Alex Culliere <alozhkin@mirantis.com>
---
 src/common/cluster-store.ts                         |  6 ++++++
 .../components/cluster-manager/cluster-actions.tsx  | 13 ++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/common/cluster-store.ts b/src/common/cluster-store.ts
index 7ae402eefe..d1006f0a3d 100644
--- a/src/common/cluster-store.ts
+++ b/src/common/cluster-store.ts
@@ -225,6 +225,12 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
     workspaceStore.setLastActiveClusterId(clusterId);
   }
 
+  deactivate(id: ClusterId) {
+    if (this.isActive(id)) {
+      this.setActive(null);
+    }
+  }
+
   @action
   swapIconOrders(workspace: WorkspaceId, from: number, to: number) {
     const clusters = this.getByWorkspaceId(workspace);
diff --git a/src/renderer/components/cluster-manager/cluster-actions.tsx b/src/renderer/components/cluster-manager/cluster-actions.tsx
index fb92178255..bfaa278fad 100644
--- a/src/renderer/components/cluster-manager/cluster-actions.tsx
+++ b/src/renderer/components/cluster-manager/cluster-actions.tsx
@@ -11,13 +11,6 @@ import { Cluster } from "../../../main/cluster";
 const navigate = (route: string) =>
   broadcastMessage("renderer:navigate", route);
 
-const deactivateCluster = (clusterId: string) => {
-  if (clusterStore.isActive(clusterId)) {
-    clusterStore.setActive(null);
-  }
-  navigate(landingURL());
-};
-
 /**
  * Creates handlers for high-level actions
  * that could be performed on an individual cluster
@@ -28,7 +21,8 @@ export const ClusterActions = (cluster: Cluster) => ({
     params: { clusterId: cluster.id }
   })),
   disconnect: async () => {
-    deactivateCluster(cluster.id);
+    clusterStore.deactivate(cluster.id);
+    navigate(landingURL());
     await requestMain(clusterDisconnectHandler, cluster.id);
   },
   remove: () => ConfirmDialog.open({
@@ -38,8 +32,9 @@ export const ClusterActions = (cluster: Cluster) => ({
       label: "Remove"
     },
     ok: () => {
-      deactivateCluster(cluster.id);
+      clusterStore.deactivate(cluster.id);
       clusterStore.removeById(cluster.id);
+      navigate(landingURL());
     },
     message: <p>Are you sure want to remove cluster <b title={cluster.id}>{cluster.contextName}</b>?</p>,
   })