Add ability to hide KubeObjectMenu Edit and Remove buttons in extensions (#5107)

src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx

@@ -7,24 +7,32 @@ import React from "react";
 import { cssNames } from "../../utils";
 import type { MenuActionsProps } from "../menu/menu-actions";
 import { MenuActions } from "../menu/menu-actions";
-import type { CatalogEntity, CatalogEntityContextMenu, CatalogEntityContextMenuContext } from "../../api/catalog-entity";
+import type { CatalogEntity, CatalogEntityContextMenuContext } from "../../api/catalog-entity";
 import { observer } from "mobx-react";
 import { makeObservable, observable } from "mobx";
-import { navigate } from "../../navigation";
 import { MenuItem } from "../menu";
-import { ConfirmDialog } from "../confirm-dialog";
 import { Icon } from "../icon";
 import { HotbarToggleMenuItem } from "./hotbar-toggle-menu-item";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { Navigate } from "../../navigation/navigate.injectable";
+import navigateInjectable from "../../navigation/navigate.injectable";
+import type { NormalizeCatalogEntityContextMenu } from "../../catalog/normalize-menu-item.injectable";
+import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable";
 
 export interface CatalogEntityDrawerMenuProps<T extends CatalogEntity> extends MenuActionsProps {
   entity: T;
 }
 
+interface Dependencies {
+  normalizeMenuItem: NormalizeCatalogEntityContextMenu;
+  navigate: Navigate;
+}
+
 @observer
-export class CatalogEntityDrawerMenu<T extends CatalogEntity> extends React.Component<CatalogEntityDrawerMenuProps<T>> {
+class NonInjectedCatalogEntityDrawerMenu<T extends CatalogEntity> extends React.Component<CatalogEntityDrawerMenuProps<T> & Dependencies> {
   @observable private contextMenu: CatalogEntityContextMenuContext;
 
-  constructor(props: CatalogEntityDrawerMenuProps<T>) {
+  constructor(props: CatalogEntityDrawerMenuProps<T> & Dependencies) {
     super(props);
     makeObservable(this);
   }
@@ -32,52 +40,28 @@ export class CatalogEntityDrawerMenu<T extends CatalogEntity> extends React.Comp
   componentDidMount() {
     this.contextMenu = {
       menuItems: [],
-      navigate: (url: string) => navigate(url),
+      navigate: this.props.navigate,
     };
     this.props.entity?.onContextMenuOpen(this.contextMenu);
   }
 
-  onMenuItemClick(menuItem: CatalogEntityContextMenu) {
-    if (menuItem.confirm) {
-      ConfirmDialog.open({
-        okButtonProps: {
-          primary: false,
-          accent: true,
-        },
-        ok: () => {
-          menuItem.onClick();
-        },
-        message: menuItem.confirm.message,
-      });
-    } else {
-      menuItem.onClick();
-    }
-  }
-
   getMenuItems(entity: T): React.ReactChild[] {
     if (!entity) {
       return [];
     }
 
-    const items: React.ReactChild[] = [];
-
-    for (const menuItem of this.contextMenu.menuItems) {
-      if (!menuItem.icon) {
-        continue;
-      }
-
-      const key = Icon.isSvg(menuItem.icon) ? "svg" : "material";
-
-      items.push(
-        <MenuItem key={menuItem.title} onClick={() => this.onMenuItemClick(menuItem)}>
+    const items = this.contextMenu.menuItems
+      .filter(menuItem => menuItem.icon)
+      .map(this.props.normalizeMenuItem)
+      .map(menuItem => (
+        <MenuItem key={menuItem.title} onClick={menuItem.onClick}>
           <Icon
             interactive
             tooltip={menuItem.title}
-            {...{ [key]: menuItem.icon }}
+            {...{ [Icon.isSvg(menuItem.icon) ? "svg" : "material"]: menuItem.icon }}
           />
-        </MenuItem>,
-      );
-    }
+        </MenuItem>
+      ));
 
     items.push(
       <HotbarToggleMenuItem
@@ -109,3 +93,11 @@ export class CatalogEntityDrawerMenu<T extends CatalogEntity> extends React.Comp
     );
   }
 }
+
+export const CatalogEntityDrawerMenu = withInjectables<Dependencies, CatalogEntityDrawerMenuProps<CatalogEntity>>(NonInjectedCatalogEntityDrawerMenu, {
+  getProps: (di, props) => ({
+    ...props,
+    normalizeMenuItem: di.inject(normalizeCatalogEntityContextMenuInjectable),
+    navigate: di.inject(navigateInjectable),
+  }),
+}) as <Entity extends CatalogEntity>(props: CatalogEntityDrawerMenuProps<Entity>) => React.ReactElement;

src/renderer/components/+catalog/catalog.tsx

@@ -11,10 +11,9 @@ import { ItemListLayout } from "../item-object-list";
 import type { IComputedValue } from "mobx";
 import { action, computed, makeObservable, observable, reaction, runInAction, when } from "mobx";
 import type { CatalogEntityStore } from "./catalog-entity-store/catalog-entity.store";
-import { navigate } from "../../navigation";
 import { MenuItem, MenuActions } from "../menu";
-import type { CatalogEntityContextMenu, CatalogEntityContextMenuContext } from "../../api/catalog-entity";
-import { ConfirmDialog } from "../confirm-dialog";
+import type { CatalogEntityContextMenuContext } from "../../api/catalog-entity";
+import type { HotbarStore } from "../../../common/hotbar-store";
 import type { CatalogEntity } from "../../../common/catalog";
 import { catalogCategoryRegistry } from "../../../common/catalog";
 import { CatalogAddButton } from "./catalog-add-button";
@@ -42,7 +41,10 @@ import { browseCatalogTab } from "./catalog-browse-tab";
 import type { AppEvent } from "../../../common/app-event-bus/event-bus";
 import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable";
 import hotbarStoreInjectable from "../../../common/hotbar-store.injectable";
-import type { HotbarStore } from "../../../common/hotbar-store";
+import type { Navigate } from "../../navigation/navigate.injectable";
+import navigateInjectable from "../../navigation/navigate.injectable";
+import type { NormalizeCatalogEntityContextMenu } from "../../catalog/normalize-menu-item.injectable";
+import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable";
 
 interface Dependencies {
   catalogPreviousActiveTabStorage: { set: (value: string ) => void; get: () => string };
@@ -50,14 +52,14 @@ interface Dependencies {
   getCategoryColumns: (params: GetCategoryColumnsParams) => CategoryColumns;
   customCategoryViews: IComputedValue<Map<string, Map<string, RegisteredCustomCategoryViewDecl>>>;
   emitEvent: (event: AppEvent) => void;
-
   routeParameters: {
     group: IComputedValue<string>;
     kind: IComputedValue<string>;
   };
-
   navigateToCatalog: NavigateToCatalog;
   hotbarStore: HotbarStore;
+  navigate: Navigate;
+  normalizeMenuItem: NormalizeCatalogEntityContextMenu;
 }
 
 @observer
@@ -93,7 +95,7 @@ class NonInjectedCatalog extends React.Component<Dependencies> {
   async componentDidMount() {
     this.contextMenu = {
       menuItems: observable.array([]),
-      navigate: (url: string) => navigate(url),
+      navigate: this.props.navigate,
     };
     disposeOnUnmount(this, [
       this.props.catalogEntityStore.watch(),
@@ -149,23 +151,6 @@ class NonInjectedCatalog extends React.Component<Dependencies> {
     }
   };
 
-  onMenuItemClick(menuItem: CatalogEntityContextMenu) {
-    if (menuItem.confirm) {
-      ConfirmDialog.open({
-        okButtonProps: {
-          primary: false,
-          accent: true,
-        },
-        ok: () => {
-          menuItem.onClick();
-        },
-        message: menuItem.confirm.message,
-      });
-    } else {
-      menuItem.onClick();
-    }
-  }
-
   get categories() {
     return catalogCategoryRegistry.items;
   }
@@ -209,11 +194,13 @@ class NonInjectedCatalog extends React.Component<Dependencies> {
           View Details
         </MenuItem>
         {
-          this.contextMenu.menuItems.map((menuItem, index) => (
-            <MenuItem key={index} onClick={() => this.onMenuItemClick(menuItem)}>
-              {menuItem.title}
-            </MenuItem>
-          ))
+          this.contextMenu.menuItems
+            .map(this.props.normalizeMenuItem)
+            .map((menuItem, index) => (
+              <MenuItem key={index} onClick={menuItem.onClick}>
+                {menuItem.title}
+              </MenuItem>
+            ))
         }
         <HotbarToggleMenuItem
           key="hotbar-toggle"
@@ -342,8 +329,9 @@ class NonInjectedCatalog extends React.Component<Dependencies> {
   }
 }
 
-export const Catalog = withInjectables<Dependencies>( NonInjectedCatalog, {
-  getProps: (di) => ({
+export const Catalog = withInjectables<Dependencies>(NonInjectedCatalog, {
+  getProps: (di, props) => ({
+    ...props,
     catalogEntityStore: di.inject(catalogEntityStoreInjectable),
     catalogPreviousActiveTabStorage: di.inject(catalogPreviousActiveTabStorageInjectable),
     getCategoryColumns: di.inject(getCategoryColumnsInjectable),
@@ -352,5 +340,7 @@ export const Catalog = withInjectables<Dependencies>( NonInjectedCatalog, {
     navigateToCatalog: di.inject(navigateToCatalogInjectable),
     emitEvent: di.inject(appEventBusInjectable).emit,
     hotbarStore: di.inject(hotbarStoreInjectable),
+    navigate: di.inject(navigateInjectable),
+    normalizeMenuItem: di.inject(normalizeCatalogEntityContextMenuInjectable),
   }),
 });