From 8adf6830564ba15ba322bf7a687436fb917d144d Mon Sep 17 00:00:00 2001
From: Steve Richards <srichards@mirantis.com>
Date: Tue, 13 Oct 2020 16:55:21 +0100
Subject: [PATCH] Refactored to use observable field

Signed-off-by: Steve Richards <srichards@mirantis.com>
---
 src/renderer/components/+add-cluster/add-cluster.tsx     | 3 +--
 src/renderer/components/+workspaces/workspace-menu.tsx   | 2 +-
 .../components/cluster-manager/clusters-menu.tsx         | 9 +++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx
index 90a5372c8d..4d7c089523 100644
--- a/src/renderer/components/+add-cluster/add-cluster.tsx
+++ b/src/renderer/components/+add-cluster/add-cluster.tsx
@@ -146,9 +146,8 @@ export class AddCluster extends React.Component {
         clusterStore.addCluster(...newClusters);
         if (newClusters.length === 1) {
           const clusterId = newClusters[0].id;
-          const wsId = workspaceStore.currentWorkspace.id;
           clusterStore.setActive(clusterId);
-          workspaceStore.setLastActiveClusterId(wsId, clusterStore.activeClusterId);
+          workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, clusterStore.activeClusterId);
           navigate(clusterViewURL({ params: { clusterId } }));
         } else {
           Notifications.ok(
diff --git a/src/renderer/components/+workspaces/workspace-menu.tsx b/src/renderer/components/+workspaces/workspace-menu.tsx
index 7b2406a5bb..39eafaa199 100644
--- a/src/renderer/components/+workspaces/workspace-menu.tsx
+++ b/src/renderer/components/+workspaces/workspace-menu.tsx
@@ -20,7 +20,7 @@ export class WorkspaceMenu extends React.Component<Props> {
 
   activateWorkspace = (id: WorkspaceId) => {
     if (clusterStore.activeClusterId) {
-      workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspace.id, clusterStore.activeClusterId);
+      workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, clusterStore.activeClusterId);
     }
     workspaceStore.setActive(id);
   }
diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx
index 1f15ccb0e2..bf4c21a070 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.tsx
+++ b/src/renderer/components/cluster-manager/clusters-menu.tsx
@@ -29,9 +29,8 @@ interface Props {
 @observer
 export class ClustersMenu extends React.Component<Props> {
   showCluster = (clusterId: ClusterId) => {
-    const wsId = workspaceStore.currentWorkspace.id;
     if(clusterId) { 
-      workspaceStore.setLastActiveClusterId(wsId, clusterId);
+      workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, clusterId);
     }
     clusterStore.setActive(clusterId);
     navigate(clusterViewURL({ params: { clusterId } }));
@@ -61,11 +60,10 @@ export class ClustersMenu extends React.Component<Props> {
       menu.append(new MenuItem({
         label: _i18n._(t`Disconnect`),
         click: async () => {
-          const wsId = workspaceStore.currentWorkspace.id;
           const wsLastActiveClusterId = workspaceStore.currentWorkspace.lastActiveClusterId
           if (clusterStore.isActive(cluster.id)) {
             if (wsLastActiveClusterId === cluster.id) {
-              workspaceStore.setLastActiveClusterId(wsId, "");
+              workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, "");
             }            
             navigate(landingURL());
             clusterStore.setActive(null);
@@ -84,11 +82,10 @@ export class ClustersMenu extends React.Component<Props> {
             label: _i18n._(t`Remove`),
           },
           ok: () => {
-            const wsId = workspaceStore.currentWorkspace.id;
             const wsLastActiveClusterId = workspaceStore.currentWorkspace.lastActiveClusterId 
             
             if (wsLastActiveClusterId === cluster.id) {
-              workspaceStore.setLastActiveClusterId(wsId, "");
+              workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, "");
             }
             if (clusterStore.activeClusterId === cluster.id) {
               navigate(landingURL());