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

src/renderer/components/hotbar/hotbar-icon.tsx

@@ -9,13 +9,15 @@ import React, { useState } from "react";
 
 import type { CatalogEntityContextMenu } from "../../../common/catalog";
 import { cssNames } from "../../utils";
-import { ConfirmDialog } from "../confirm-dialog";
 import { Menu, MenuItem } from "../menu";
 import { observer } from "mobx-react";
 import type { AvatarProps } from "../avatar";
 import { Avatar } from "../avatar";
 import { Icon } from "../icon";
 import { Tooltip } from "../tooltip";
+import type { NormalizeCatalogEntityContextMenu } from "../../catalog/normalize-menu-item.injectable";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable";
 
 export interface HotbarIconProps extends AvatarProps {
   uid: string;
@@ -28,24 +30,17 @@ export interface HotbarIconProps extends AvatarProps {
   tooltip?: string;
 }
 
-function onMenuItemClick(menuItem: CatalogEntityContextMenu) {
-  if (menuItem.confirm) {
-    ConfirmDialog.open({
-      okButtonProps: {
-        primary: false,
-        accent: true,
-      },
-      ok: () => {
-        menuItem.onClick();
-      },
-      message: menuItem.confirm.message,
-    });
-  } else {
-    menuItem.onClick();
-  }
+interface Dependencies {
+  normalizeMenuItem: NormalizeCatalogEntityContextMenu;
 }
 
-export const HotbarIcon = observer(({ menuItems = [], size = 40, tooltip, ...props }: HotbarIconProps) => {
+const NonInjectedHotbarIcon = observer(({
+  menuItems = [],
+  size = 40,
+  tooltip,
+  normalizeMenuItem,
+  ...props
+}: HotbarIconProps & Dependencies) => {
   const { uid, title, src, material, active, className, source, disabled, onMenuOpen, onClick, children, ...rest } = props;
   const id = `hotbarIcon-${uid}`;
   const [menuOpen, setMenuOpen] = useState(false);
@@ -83,13 +78,22 @@ export const HotbarIcon = observer(({ menuItems = [], size = 40, tooltip, ...pro
         }}
         close={() => toggleMenu()}>
         {
-          menuItems.map((menuItem) => (
-            <MenuItem key={menuItem.title} onClick={() => onMenuItemClick(menuItem)}>
-              {menuItem.title}
-            </MenuItem>
-          ))
+          menuItems
+            .map(normalizeMenuItem)
+            .map((menuItem) => (
+              <MenuItem key={menuItem.title} onClick={menuItem.onClick}>
+                {menuItem.title}
+              </MenuItem>
+            ))
         }
       </Menu>
     </div>
   );
 });
+
+export const HotbarIcon = withInjectables<Dependencies, HotbarIconProps>(NonInjectedHotbarIcon, {
+  getProps: (di, props) => ({
+    ...props,
+    normalizeMenuItem: di.inject(normalizeCatalogEntityContextMenuInjectable),
+  }),
+});

src/renderer/components/hotbar/hotbar-remove-command.tsx

@@ -7,13 +7,15 @@ import React from "react";
 import { observer } from "mobx-react";
 import { Select } from "../select";
 import hotbarStoreInjectable from "../../../common/hotbar-store.injectable";
-import { ConfirmDialog } from "../confirm-dialog";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import commandOverlayInjectable from "../command-palette/command-overlay.injectable";
 import type { Hotbar } from "../../../common/hotbar-types";
+import type { OpenConfirmDialog } from "../confirm-dialog/open.injectable";
+import openConfirmDialogInjectable from "../confirm-dialog/open.injectable";
 
 interface Dependencies {
   closeCommandOverlay: () => void;
+  openConfirmDialog: OpenConfirmDialog;
   hotbarStore: {
     hotbars: Hotbar[];
     getById: (id: string) => Hotbar | undefined;
@@ -22,7 +24,11 @@ interface Dependencies {
   };
 }
 
-const NonInjectedHotbarRemoveCommand = observer(({ closeCommandOverlay, hotbarStore }: Dependencies) => {
+const NonInjectedHotbarRemoveCommand = observer(({
+  closeCommandOverlay,
+  hotbarStore,
+  openConfirmDialog,
+}: Dependencies) => {
   const options = hotbarStore.hotbars.map(hotbar => ({
     value: hotbar.id,
     label: hotbarStore.getDisplayLabel(hotbar),
@@ -36,8 +42,7 @@ const NonInjectedHotbarRemoveCommand = observer(({ closeCommandOverlay, hotbarSt
     }
 
     closeCommandOverlay();
-    // TODO: make confirm dialog injectable
-    ConfirmDialog.open({
+    openConfirmDialog({
       okButtonProps: {
         label: "Remove Hotbar",
         primary: false,
@@ -71,8 +76,9 @@ const NonInjectedHotbarRemoveCommand = observer(({ closeCommandOverlay, hotbarSt
 
 export const HotbarRemoveCommand = withInjectables<Dependencies>(NonInjectedHotbarRemoveCommand, {
   getProps: (di, props) => ({
+    ...props,
     closeCommandOverlay: di.inject(commandOverlayInjectable).close,
     hotbarStore: di.inject(hotbarStoreInjectable),
-    ...props,
+    openConfirmDialog: di.inject(openConfirmDialogInjectable),
   }),
 });