From fa60a445f7e3b0a4d5daa74a41cfd75f9960bc75 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Thu, 7 Jul 2022 12:52:28 +0300
Subject: [PATCH] Fix menu actions not opening in multiple places

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx | 2 +-
 src/renderer/components/+catalog/catalog.tsx                    | 2 +-
 src/renderer/components/+extensions/installed-extensions.tsx    | 2 +-
 src/renderer/components/+helm-releases/release-menu.tsx         | 2 +-
 .../components/+network-port-forwards/port-forward-menu.tsx     | 2 +-
 .../cluster-settings/components/cluster-icon-settings.tsx       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx b/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
index bc982379bc..089e0aa191 100644
--- a/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
+++ b/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
@@ -95,7 +95,7 @@ class NonInjectedCatalogEntityDrawerMenu<T extends CatalogEntity> extends React.
 
     return (
       <MenuActions
-        id="menu-actions-for-catalog-entity-drawer-menu"
+        id={`menu-actions-for-catalog-entity-drawer-menu-${entity.getId()}`}
         className={cssNames("CatalogEntityDrawerMenu", className)}
         toolbar
         {...menuProps}
diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx
index 20088a73fc..723c21da13 100644
--- a/src/renderer/components/+catalog/catalog.tsx
+++ b/src/renderer/components/+catalog/catalog.tsx
@@ -198,7 +198,7 @@ class NonInjectedCatalog extends React.Component<Dependencies> {
     };
 
     return (
-      <MenuActions id="menu-actions-for-catalog" onOpen={onOpen}>
+      <MenuActions id={`menu-actions-for-catalog-for-${entity.getId()}`} onOpen={onOpen}>
         <MenuItem
           key="open-details"
           onClick={() => this.props.catalogEntityStore.selectedItemId.set(entity.getId())}
diff --git a/src/renderer/components/+extensions/installed-extensions.tsx b/src/renderer/components/+extensions/installed-extensions.tsx
index e69c7c7205..a7fe14f35c 100644
--- a/src/renderer/components/+extensions/installed-extensions.tsx
+++ b/src/renderer/components/+extensions/installed-extensions.tsx
@@ -103,7 +103,7 @@ const NonInjectedInstalledExtensions = observer(({ extensionDiscovery, extension
         ),
         actions: (
           <MenuActions
-            id="menu-actions-for-installed-extensions"
+            id={`menu-actions-for-installed-extensions-for-${id}`}
             usePortal
             toolbar={false}>
             {isCompatible && (
diff --git a/src/renderer/components/+helm-releases/release-menu.tsx b/src/renderer/components/+helm-releases/release-menu.tsx
index c0366624c8..6974396dfb 100644
--- a/src/renderer/components/+helm-releases/release-menu.tsx
+++ b/src/renderer/components/+helm-releases/release-menu.tsx
@@ -78,7 +78,7 @@ class NonInjectedHelmReleaseMenu extends React.Component<HelmReleaseMenuProps &
 
     return (
       <MenuActions
-        id="menu-actions-for-release-menu"
+        id={`menu-actions-for-release-menu-for-${release.getId()}`}
         {...menuProps}
         className={cssNames("HelmReleaseMenu", className)}
         removeAction={this.remove}
diff --git a/src/renderer/components/+network-port-forwards/port-forward-menu.tsx b/src/renderer/components/+network-port-forwards/port-forward-menu.tsx
index fc01b63029..70b5a0278d 100644
--- a/src/renderer/components/+network-port-forwards/port-forward-menu.tsx
+++ b/src/renderer/components/+network-port-forwards/port-forward-menu.tsx
@@ -121,7 +121,7 @@ class NonInjectedPortForwardMenu<Props extends PortForwardMenuProps & Dependenci
 
     return (
       <MenuActions
-        id="menu-actions-for-port-forward-menu"
+        id={`menu-actions-for-port-forward-menu-for-${this.props.portForward.getId()}`}
         {...menuProps}
         className={cssNames("PortForwardMenu", className)}
         removeAction={this.remove}
diff --git a/src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx b/src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx
index 6807ff227b..4f5c6abd78 100644
--- a/src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx
+++ b/src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx
@@ -89,7 +89,7 @@ export class ClusterIconSetting extends React.Component<ClusterIconSettingProps>
             />
           </div>
           <MenuActions
-            id="menu-actions-for-cluster-icon-settings"
+            id={`menu-actions-for-cluster-icon-settings-for-${entity.getId()}`}
             toolbar={false}
             autoCloseOnSelect={true}
             triggerIcon={{ material: "more_horiz" }}