From d9e8821d331c449294b1d7290054572000f0c9e7 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@houston-inc.com>
Date: Thu, 4 Nov 2021 10:27:13 +0200
Subject: [PATCH] Simplify a way of getting cluster name

Signed-off-by: Janne Savolainen <janne.savolainen@houston-inc.com>
---
 .../inject-naive/inject-naive.tsx                 |  7 ++++---
 .../kube-object-menu/kube-object-menu.tsx         | 15 ++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/renderer/components/kube-object-menu/inject-naive/inject-naive.tsx b/src/renderer/components/kube-object-menu/inject-naive/inject-naive.tsx
index 91d97d25ea..29082bd729 100644
--- a/src/renderer/components/kube-object-menu/inject-naive/inject-naive.tsx
+++ b/src/renderer/components/kube-object-menu/inject-naive/inject-naive.tsx
@@ -24,7 +24,7 @@ import { editResourceTab } from "../../dock/edit-resource.store";
 import { hideDetails } from "../../kube-detail-params";
 import { apiManager } from "../../../../common/k8s-api/api-manager";
 import { KubeObjectMenuRegistry } from "../../../../extensions/registries";
-import { catalogEntityRegistry } from "../../../api/catalog-entity-registry";
+import { getActiveClusterEntity } from "../../../api/catalog-entity-registry";
 
 
 interface Props {
@@ -34,13 +34,14 @@ interface Props {
 
 export const InjectNaive = ({ Component, ...props }: Props) => {
   const kubeObjectMenuRegistry = KubeObjectMenuRegistry.getInstance();
-  
+  const cluster = getActiveClusterEntity();
+
   return (
     <Component
       editResourceTab={editResourceTab}
       hideDetails={hideDetails}
       apiManager={apiManager}
       kubeObjectMenuRegistry={kubeObjectMenuRegistry}
-      catalogEntityRegistry={catalogEntityRegistry}
+      cluster={cluster}
       {...props} />);
 };
diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.tsx
index 1c21e92844..40f7c10d8f 100644
--- a/src/renderer/components/kube-object-menu/kube-object-menu.tsx
+++ b/src/renderer/components/kube-object-menu/kube-object-menu.tsx
@@ -25,12 +25,9 @@ import type { KubeObject } from "../../../common/k8s-api/kube-object";
 import { MenuActions, MenuActionsProps } from "../menu/menu-actions";
 import identity from "lodash/identity";
 
-import type {
-  IHasGettableItemsForKind,
-} from "../../../extensions/registries";
-
-import type { CatalogEntityRegistry } from "../../api/catalog-entity-registry";
+import type { IHasGettableItemsForKind } from "../../../extensions/registries";
 import type { IGettableStore } from "../../../common/k8s-api/api-manager";
+import type { Cluster } from "../../../main/cluster";
 
 
 export interface KubeObjectMenuProps<T> extends MenuActionsProps {
@@ -42,9 +39,9 @@ export interface KubeObjectMenuProps<T> extends MenuActionsProps {
 interface KubeObjectMenuDependencies<T> extends KubeObjectMenuProps<T>{
   apiManager: IGettableStore,
   kubeObjectMenuRegistry: IHasGettableItemsForKind
+  cluster: Cluster,
   hideDetails: Function,
   editResourceTab: Function,
-  catalogEntityRegistry: CatalogEntityRegistry,
 }
 
 export class KubeObjectMenu<T extends KubeObject> extends React.Component<KubeObjectMenuDependencies<T>> {
@@ -53,7 +50,7 @@ export class KubeObjectMenu<T extends KubeObject> extends React.Component<KubeOb
       apiManager,
       hideDetails,
       editResourceTab,
-      catalogEntityRegistry,
+      cluster,
       kubeObjectMenuRegistry,
     } = this.props;
 
@@ -62,7 +59,7 @@ export class KubeObjectMenu<T extends KubeObject> extends React.Component<KubeOb
       editResourceTab,
       hideDetails,
       kubeObjectMenuRegistry,
-      catalogEntityRegistry,
+      cluster,
     };
   }
 
@@ -106,7 +103,7 @@ export class KubeObjectMenu<T extends KubeObject> extends React.Component<KubeOb
     }
 
     const breadcrumbParts = [
-      this.dependencies.catalogEntityRegistry.activeEntity?.metadata?.name,
+      this.dependencies.cluster?.name,
       object.getNs(),
       object.kind,
       object.getName(),