From 54c8f29df359c79aec6b888da52a5175916c5f45 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Wed, 8 Sep 2021 12:14:34 +0300
Subject: [PATCH] simplify

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/common/ipc/index.ts                    |  1 -
 src/main/catalog-pusher.ts                 |  4 ++--
 src/main/initializers/ipc.ts               | 11 ++++-------
 src/renderer/components/app.tsx            | 13 ++++++++++---
 src/renderer/components/layout/sidebar.tsx |  3 +--
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/common/ipc/index.ts b/src/common/ipc/index.ts
index 6d94619dc5..ad1cf2a76c 100644
--- a/src/common/ipc/index.ts
+++ b/src/common/ipc/index.ts
@@ -20,7 +20,6 @@
  */
 
 export const dialogShowOpenDialogHandler = "dialog:show-open-dialog";
-export const catalogBroadcastHandler = "catalog:broadcast-items";
 
 export * from "./ipc";
 export * from "./invalid-kubeconfig";
diff --git a/src/main/catalog-pusher.ts b/src/main/catalog-pusher.ts
index 91d6021bf1..b662c36f69 100644
--- a/src/main/catalog-pusher.ts
+++ b/src/main/catalog-pusher.ts
@@ -28,13 +28,13 @@ import { debounce } from "lodash";
 import type { CatalogEntity } from "../common/catalog";
 
 
-export const catalogBroadcaster = debounce((items: CatalogEntity[]) => {
+const broadcaster = debounce((items: CatalogEntity[]) => {
   broadcastMessage("catalog:items", items);
 }, 1_000, { leading: true, trailing: true });
 
 export function pushCatalogToRenderer(catalog: CatalogEntityRegistry) {
   return reaction(() => toJS(catalog.items), (items) => {
-    catalogBroadcaster(items);
+    broadcaster(items);
   }, {
     fireImmediately: true,
   });
diff --git a/src/main/initializers/ipc.ts b/src/main/initializers/ipc.ts
index f2e145b7d5..53d6b5b055 100644
--- a/src/main/initializers/ipc.ts
+++ b/src/main/initializers/ipc.ts
@@ -26,9 +26,9 @@ import { clusterActivateHandler, clusterSetFrameIdHandler, clusterVisibilityHand
 import { ClusterStore } from "../../common/cluster-store";
 import type { ClusterId } from "../../common/cluster-types";
 import { appEventBus } from "../../common/event-bus";
-import { catalogBroadcastHandler, dialogShowOpenDialogHandler, ipcMainHandle } from "../../common/ipc";
+import { dialogShowOpenDialogHandler, ipcMainHandle } from "../../common/ipc";
 import { catalogEntityRegistry } from "../catalog";
-import { catalogBroadcaster } from "../catalog-pusher";
+import { pushCatalogToRenderer } from "../catalog-pusher";
 import { ClusterManager } from "../cluster-manager";
 import { bundledKubectlPath } from "../kubectl";
 import logger from "../logger";
@@ -49,6 +49,8 @@ export function initIpcMainHandlers() {
     if (cluster) {
       clusterFrameMap.set(cluster.id, { frameId: event.frameId, processId: event.processId });
       cluster.pushState();
+
+      pushCatalogToRenderer(catalogEntityRegistry);
     }
   });
 
@@ -146,9 +148,4 @@ export function initIpcMainHandlers() {
 
     return dialog.showOpenDialog(BrowserWindow.getFocusedWindow(), dialogOpts);
   });
-
-
-  ipcMainHandle(catalogBroadcastHandler, async () => {
-    catalogBroadcaster(catalogEntityRegistry.items);
-  });
 }
diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx
index 93afc61b43..3f8dbf7d8b 100755
--- a/src/renderer/components/app.tsx
+++ b/src/renderer/components/app.tsx
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 import React from "react";
-import { observable, makeObservable } from "mobx";
+import { observable, makeObservable, reaction } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { Redirect, Route, Router, Switch } from "react-router";
 import { history } from "../navigation";
@@ -37,7 +37,7 @@ import { webFrame } from "electron";
 import { ClusterPageRegistry, getExtensionPageUrl } from "../../extensions/registries/page-registry";
 import { ExtensionLoader } from "../../extensions/extension-loader";
 import { appEventBus } from "../../common/event-bus";
-import { catalogBroadcastHandler, requestMain } from "../../common/ipc";
+import { requestMain } from "../../common/ipc";
 import whatInput from "what-input";
 import { clusterSetFrameIdHandler } from "../../common/cluster-ipc";
 import { ClusterPageMenuRegistration, ClusterPageMenuRegistry } from "../../extensions/registries";
@@ -92,12 +92,19 @@ export class App extends React.Component {
     logger.info(`[APP]: Init dashboard, clusterId=${App.clusterId}, frameId=${frameId}`);
     await Terminal.preloadFonts();
     await requestMain(clusterSetFrameIdHandler, App.clusterId);
-    await requestMain(catalogBroadcastHandler);
 
     const cluster = ClusterStore.getInstance().getById(App.clusterId);
 
     await cluster.whenReady; // cluster.activate() is done at this point
 
+    const activeEntityDisposer = reaction(() => catalogEntityRegistry.getById(App.clusterId), (entity) => {
+      if (!entity) {
+        return;
+      }
+      catalogEntityRegistry.activeEntity = entity;
+      activeEntityDisposer();
+    }, {fireImmediately: true});
+
     ExtensionLoader.getInstance().loadOnClusterRenderer();
     setTimeout(() => {
       appEventBus.emit({
diff --git a/src/renderer/components/layout/sidebar.tsx b/src/renderer/components/layout/sidebar.tsx
index ddfe9f2efd..1f584d176f 100644
--- a/src/renderer/components/layout/sidebar.tsx
+++ b/src/renderer/components/layout/sidebar.tsx
@@ -40,7 +40,6 @@ import { SidebarItem } from "./sidebar-item";
 import { Apps } from "../+apps";
 import * as routes from "../../../common/routes";
 import { Config } from "../+config";
-import { App } from "../app";
 import { catalogEntityRegistry } from "../../api/catalog-entity-registry";
 
 interface Props {
@@ -179,7 +178,7 @@ export class Sidebar extends React.Component<Props> {
   }
 
   get clusterEntity() {
-    return catalogEntityRegistry.getById(App.clusterId);
+    return catalogEntityRegistry.activeEntity;
   }
 
   render() {