From 16825f151ca85fbaf41b4de7fa6560890da00d12 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Fri, 28 May 2021 14:26:43 +0300
Subject: [PATCH] Using getActiveClusterEntity() for searching

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../cluster-manager/cluster-manager.tsx       | 20 ++-----------------
 .../cluster-manager/cluster-view.tsx          |  1 -
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/renderer/components/cluster-manager/cluster-manager.tsx b/src/renderer/components/cluster-manager/cluster-manager.tsx
index be445d213f..7590f1f9ab 100644
--- a/src/renderer/components/cluster-manager/cluster-manager.tsx
+++ b/src/renderer/components/cluster-manager/cluster-manager.tsx
@@ -36,16 +36,16 @@ import { HotbarMenu } from "../hotbar/hotbar-menu";
 import { EntitySettings, entitySettingsRoute } from "../+entity-settings";
 import { Welcome, welcomeRoute, welcomeURL } from "../+welcome";
 import { TopBar } from "../layout/topbar";
-import { ClusterStore } from "../../../common/cluster-store";
 import { hasLoadedView } from "./lens-views";
 import { navigate } from "../../navigation";
 import { Icon } from "../icon";
 import { MaterialTooltip } from "../material-tooltip/material-tooltip";
+import { getActiveClusterEntity } from "../../api/catalog-entity-registry";
 
 @observer
 export class ClusterManager extends React.Component {
   render() {
-    const cluster = ClusterStore.getInstance().active;
+    const cluster = getActiveClusterEntity();
     const isClusterVisible = cluster?.available && cluster?.ready && hasLoadedView(cluster.id);
 
     return (
@@ -89,19 +89,3 @@ export class ClusterManager extends React.Component {
     );
   }
 }
-
-// const ClusterTopBar = observer(() => {
-//   const cluster = ClusterStore.getInstance().activeCluster;
-  
-//   // console.log(cluster)
-  
-//   // if (!cluster) {
-//   //   return null;
-//   // }
-
-//   return (
-//     <TopBar sidebar={<div>Lens</div>}>
-//       {cluster}
-//     </TopBar>
-//   );
-// });
diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx
index efd162ee06..af719107e0 100644
--- a/src/renderer/components/cluster-manager/cluster-view.tsx
+++ b/src/renderer/components/cluster-manager/cluster-view.tsx
@@ -67,7 +67,6 @@ export class ClusterView extends React.Component {
         initView(clusterId); // init cluster-view (iframe), requires parent container #lens-views to be in DOM
         requestMain(clusterActivateHandler, clusterId, false); // activate and fetch cluster's state from main
         catalogEntityRegistry.activeEntity = catalogEntityRegistry.getById(clusterId);
-        ClusterStore.getInstance().setActive(clusterId);
       }, {
         fireImmediately: true,
       }),