From 5e7379f1872130bf52f76f222232bb5824d51d35 Mon Sep 17 00:00:00 2001
From: Jim Ehrismann <jehrismann@mirantis.com>
Date: Thu, 4 Feb 2021 17:58:31 -0500
Subject: [PATCH] address review comments

Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
---
 .../+landing-page/workspace-cluster-menu.tsx  | 10 +++----
 .../+landing-page/workspace-cluster.store.ts  | 29 +++++++------------
 .../+landing-page/workspace-overview.tsx      |  6 ++--
 3 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/renderer/components/+landing-page/workspace-cluster-menu.tsx b/src/renderer/components/+landing-page/workspace-cluster-menu.tsx
index 83d542f258..29b108cba4 100644
--- a/src/renderer/components/+landing-page/workspace-cluster-menu.tsx
+++ b/src/renderer/components/+landing-page/workspace-cluster-menu.tsx
@@ -49,12 +49,10 @@ export class WorkspaceClusterMenu extends React.Component<Props> {
 
     return (
       <>
-        {
-          <MenuItem onClick={this.settings}>
-            <Icon material="settings" interactive={toolbar} title={`Settings`}/>
-            <span className="title">Settings</span>
-          </MenuItem>
-        }
+        <MenuItem onClick={this.settings}>
+          <Icon material="settings" interactive={toolbar} title="Settings"/>
+          <span className="title">Settings</span>
+        </MenuItem>
       </>
     );
   }
diff --git a/src/renderer/components/+landing-page/workspace-cluster.store.ts b/src/renderer/components/+landing-page/workspace-cluster.store.ts
index 810683e128..a6260f3d2a 100644
--- a/src/renderer/components/+landing-page/workspace-cluster.store.ts
+++ b/src/renderer/components/+landing-page/workspace-cluster.store.ts
@@ -5,8 +5,8 @@ import { ItemObject, ItemStore } from "../../item.store";
 import { autobind } from "../../utils";
 
 export class ClusterItem implements ItemObject {
-  cluster: Cluster;
-
+  constructor(public cluster: Cluster) {}
+  
   getName() {
     return this.cluster.name;
   }
@@ -28,13 +28,13 @@ export class WorkspaceClusterStore extends ItemStore<ClusterItem> {
   }
 
   loadAll() {
-    return this.loadItems(() => clusterStore.getByWorkspaceId(this.workspaceId).map(cluster => {
-      const clusterItem = new ClusterItem();
-
-      clusterItem.cluster = cluster;
-
-      return clusterItem;
-    }));
+    return this.loadItems(
+      () => (
+        clusterStore
+          .getByWorkspaceId(this.workspaceId)
+          .map(cluster => new ClusterItem(cluster))
+      )
+    );
   }
 
   async remove(clusterItem: ClusterItem) {
@@ -46,19 +46,10 @@ export class WorkspaceClusterStore extends ItemStore<ClusterItem> {
 
     const clusterId = cluster.id;
 
-    return super.removeItem(clusterItem, async () => {
-      if (clusterStore.activeClusterId === clusterId) {
-        clusterStore.setActive(null);
-      }
-      clusterStore.removeById(clusterId);
-    });
+    return super.removeItem(clusterItem, async () => clusterStore.removeById(clusterId));
   }
   
   async removeSelectedItems() {
-    if (!this.selectedItems.length) {
-      return;
-    }
-    
     return Promise.all(this.selectedItems.map(this.remove));
   }
 }
diff --git a/src/renderer/components/+landing-page/workspace-overview.tsx b/src/renderer/components/+landing-page/workspace-overview.tsx
index d6bca05d49..2d3130c0bf 100644
--- a/src/renderer/components/+landing-page/workspace-overview.tsx
+++ b/src/renderer/components/+landing-page/workspace-overview.tsx
@@ -60,9 +60,9 @@ export class WorkspaceOverview extends Component<Props> {
           item.cluster.online ? "online" : "offline"
         ]}
         onDetails={this.showCluster}
-        renderItemMenu={(clusterItem: ClusterItem) => {
-          return <WorkspaceClusterMenu clusterItem={clusterItem} workspace={workspace} workspaceClusterStore={workspaceClusterStore}/>;
-        }}
+        renderItemMenu={(clusterItem: ClusterItem) => (
+          <WorkspaceClusterMenu clusterItem={clusterItem} workspace={workspace} workspaceClusterStore={workspaceClusterStore}/>
+        )}
       />
     );
   }