From 0a7aacd3f25cd73be1cc7d5a4d974034cb086f12 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Wed, 6 Jul 2022 11:15:36 +0300
Subject: [PATCH] Make MenuActions deterministic in unit tests

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 .../order-of-sidebar-items.test.tsx.snap      | 14 ++---
 ...-and-tab-navigation-for-core.test.tsx.snap | 54 +++++++++----------
 ...ab-navigation-for-extensions.test.tsx.snap | 16 +++---
 .../visibility-of-sidebar-items.test.tsx.snap | 14 ++---
 .../navigation-to-helm-charts.test.ts.snap    |  8 +--
 .../+catalog/catalog-entity-drawer-menu.tsx   |  1 +
 src/renderer/components/+catalog/catalog.tsx  |  2 +-
 .../+extensions/installed-extensions.tsx      |  5 +-
 .../+helm-releases/release-menu.tsx           |  1 +
 .../port-forward-menu.tsx                     |  9 ++--
 .../components/cluster-icon-settings.tsx      |  1 +
 src/renderer/components/dock/dock.tsx         |  1 +
 .../components/item-object-list/content.tsx   |  1 +
 .../kube-object-menu.test.tsx.snap            |  7 +++
 .../kube-object-menu/kube-object-menu.tsx     |  1 +
 src/renderer/components/menu/menu-actions.tsx | 15 +++---
 .../__snapshots__/cluster-frame.test.tsx.snap | 22 ++++----
 17 files changed, 94 insertions(+), 78 deletions(-)

diff --git a/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap b/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
index e1db29fca1..1d2b889363 100644
--- a/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
@@ -524,7 +524,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_15"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -538,7 +538,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_17"
+              id="tooltip_target_16"
               tabindex="0"
             >
               <span
@@ -551,7 +551,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_18"
+              id="tooltip_target_17"
               tabindex="0"
             >
               <span
@@ -1127,7 +1127,7 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
                     >
                       <i
                         class="Icon material interactive focusable small"
-                        id="tooltip_target_54"
+                        id="tooltip_target_52"
                         tabindex="0"
                       >
                         <span
@@ -1152,7 +1152,7 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_55"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -1166,7 +1166,7 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_57"
+              id="tooltip_target_54"
               tabindex="0"
             >
               <span
@@ -1179,7 +1179,7 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_58"
+              id="tooltip_target_55"
               tabindex="0"
             >
               <span
diff --git a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
index ba62a36e67..b6d4bc93a3 100644
--- a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
@@ -468,7 +468,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
-                        id="tooltip_target_186"
+                        id="tooltip_target_177"
                         tabindex="0"
                       >
                         <span
@@ -493,7 +493,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_187"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -507,7 +507,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_189"
+              id="tooltip_target_179"
               tabindex="0"
             >
               <span
@@ -520,7 +520,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_190"
+              id="tooltip_target_180"
               tabindex="0"
             >
               <span
@@ -1007,7 +1007,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
-                        id="tooltip_target_226"
+                        id="tooltip_target_215"
                         tabindex="0"
                       >
                         <span
@@ -1032,7 +1032,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_227"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -1046,7 +1046,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_229"
+              id="tooltip_target_217"
               tabindex="0"
             >
               <span
@@ -1059,7 +1059,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_230"
+              id="tooltip_target_218"
               tabindex="0"
             >
               <span
@@ -1568,7 +1568,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
-                        id="tooltip_target_286"
+                        id="tooltip_target_272"
                         tabindex="0"
                       >
                         <span
@@ -1593,7 +1593,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_287"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -1607,7 +1607,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_289"
+              id="tooltip_target_274"
               tabindex="0"
             >
               <span
@@ -1620,7 +1620,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_290"
+              id="tooltip_target_275"
               tabindex="0"
             >
               <span
@@ -2013,7 +2013,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
-                        id="tooltip_target_349"
+                        id="tooltip_target_332"
                         tabindex="0"
                       >
                         <span
@@ -2038,7 +2038,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_350"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -2052,7 +2052,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_352"
+              id="tooltip_target_334"
               tabindex="0"
             >
               <span
@@ -2065,7 +2065,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_353"
+              id="tooltip_target_335"
               tabindex="0"
             >
               <span
@@ -2460,7 +2460,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_15"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -2474,7 +2474,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_17"
+              id="tooltip_target_16"
               tabindex="0"
             >
               <span
@@ -2487,7 +2487,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_18"
+              id="tooltip_target_17"
               tabindex="0"
             >
               <span
@@ -2996,7 +2996,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
-                        id="tooltip_target_86"
+                        id="tooltip_target_82"
                         tabindex="0"
                       >
                         <span
@@ -3021,7 +3021,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_87"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -3035,7 +3035,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_89"
+              id="tooltip_target_84"
               tabindex="0"
             >
               <span
@@ -3048,7 +3048,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_90"
+              id="tooltip_target_85"
               tabindex="0"
             >
               <span
@@ -3535,7 +3535,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
-                        id="tooltip_target_146"
+                        id="tooltip_target_139"
                         tabindex="0"
                       >
                         <span
@@ -3560,7 +3560,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_147"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -3574,7 +3574,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_149"
+              id="tooltip_target_141"
               tabindex="0"
             >
               <span
@@ -3587,7 +3587,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_150"
+              id="tooltip_target_142"
               tabindex="0"
             >
               <span
diff --git a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
index 07d6f2e874..196a4c18a6 100644
--- a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
@@ -492,7 +492,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_10"
+                id="menu-actions-for-dock"
                 tabindex="0"
                 tooltip="New tab"
               >
@@ -1028,7 +1028,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_12"
+                id="menu-actions-for-dock"
                 tabindex="0"
                 tooltip="New tab"
               >
@@ -1604,7 +1604,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_15"
+                id="menu-actions-for-dock"
                 tabindex="0"
                 tooltip="New tab"
               >
@@ -2103,7 +2103,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_18"
+                id="menu-actions-for-dock"
                 tabindex="0"
                 tooltip="New tab"
               >
@@ -2602,7 +2602,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_27"
+                id="menu-actions-for-dock"
                 tabindex="0"
                 tooltip="New tab"
               >
@@ -3060,7 +3060,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_1"
+                id="menu-actions-for-dock"
                 tabindex="0"
                 tooltip="New tab"
               >
@@ -3636,7 +3636,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_5"
+                id="menu-actions-for-dock"
                 tabindex="0"
                 tooltip="New tab"
               >
@@ -4172,7 +4172,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_8"
+                id="menu-actions-for-dock"
                 tabindex="0"
                 tooltip="New tab"
               >
diff --git a/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap b/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
index 48ce69934a..cd7e67604d 100644
--- a/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
@@ -463,7 +463,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_14"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -477,7 +477,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_16"
+              id="tooltip_target_15"
               tabindex="0"
             >
               <span
@@ -490,7 +490,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_17"
+              id="tooltip_target_16"
               tabindex="0"
             >
               <span
@@ -991,7 +991,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
                     >
                       <i
                         class="Icon material interactive focusable small"
-                        id="tooltip_target_51"
+                        id="tooltip_target_49"
                         tabindex="0"
                       >
                         <span
@@ -1016,7 +1016,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_52"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -1030,7 +1030,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_54"
+              id="tooltip_target_51"
               tabindex="0"
             >
               <span
@@ -1043,7 +1043,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_55"
+              id="tooltip_target_52"
               tabindex="0"
             >
               <span
diff --git a/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
index 8fbc3d9a49..43fdf6fc54 100644
--- a/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
@@ -433,7 +433,7 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
                     >
                       <i
                         class="Icon material interactive focusable"
-                        id="menu_actions_27"
+                        id="menu-actions-for-item-object-list-content"
                         tabindex="0"
                       >
                         <span
@@ -541,7 +541,7 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_14"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -555,7 +555,7 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_16"
+              id="tooltip_target_15"
               tabindex="0"
             >
               <span
@@ -568,7 +568,7 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_17"
+              id="tooltip_target_16"
               tabindex="0"
             >
               <span
diff --git a/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx b/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
index 1cf39c4809..bc982379bc 100644
--- a/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
+++ b/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
@@ -95,6 +95,7 @@ class NonInjectedCatalogEntityDrawerMenu<T extends CatalogEntity> extends React.
 
     return (
       <MenuActions
+        id="menu-actions-for-catalog-entity-drawer-menu"
         className={cssNames("CatalogEntityDrawerMenu", className)}
         toolbar
         {...menuProps}
diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx
index 30a87f77a6..20088a73fc 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 onOpen={onOpen}>
+      <MenuActions id="menu-actions-for-catalog" 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 2de88642e2..e69c7c7205 100644
--- a/src/renderer/components/+extensions/installed-extensions.tsx
+++ b/src/renderer/components/+extensions/installed-extensions.tsx
@@ -102,7 +102,10 @@ const NonInjectedInstalledExtensions = observer(({ extensionDiscovery, extension
           </div>
         ),
         actions: (
-          <MenuActions usePortal toolbar={false}>
+          <MenuActions
+            id="menu-actions-for-installed-extensions"
+            usePortal
+            toolbar={false}>
             {isCompatible && (
               <>
                 {isEnabled ? (
diff --git a/src/renderer/components/+helm-releases/release-menu.tsx b/src/renderer/components/+helm-releases/release-menu.tsx
index 511b104600..c0366624c8 100644
--- a/src/renderer/components/+helm-releases/release-menu.tsx
+++ b/src/renderer/components/+helm-releases/release-menu.tsx
@@ -78,6 +78,7 @@ class NonInjectedHelmReleaseMenu extends React.Component<HelmReleaseMenuProps &
 
     return (
       <MenuActions
+        id="menu-actions-for-release-menu"
         {...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 5b89cdf886..fc01b63029 100644
--- a/src/renderer/components/+network-port-forwards/port-forward-menu.tsx
+++ b/src/renderer/components/+network-port-forwards/port-forward-menu.tsx
@@ -67,7 +67,7 @@ class NonInjectedPortForwardMenu<Props extends PortForwardMenuProps & Dependenci
           <Icon
             material="stop"
             tooltip="Stop port-forward"
-            interactive={toolbar} 
+            interactive={toolbar}
           />
           <span className="title">Stop</span>
         </MenuItem>
@@ -79,7 +79,7 @@ class NonInjectedPortForwardMenu<Props extends PortForwardMenuProps & Dependenci
         <Icon
           material="play_arrow"
           tooltip="Start port-forward"
-          interactive={toolbar} 
+          interactive={toolbar}
         />
         <span className="title">Start</span>
       </MenuItem>
@@ -98,7 +98,7 @@ class NonInjectedPortForwardMenu<Props extends PortForwardMenuProps & Dependenci
             <Icon
               material="open_in_browser"
               interactive={toolbar}
-              tooltip="Open in browser" 
+              tooltip="Open in browser"
             />
             <span className="title">Open</span>
           </MenuItem>
@@ -107,7 +107,7 @@ class NonInjectedPortForwardMenu<Props extends PortForwardMenuProps & Dependenci
           <Icon
             material="edit"
             tooltip="Change port or protocol"
-            interactive={toolbar} 
+            interactive={toolbar}
           />
           <span className="title">Edit</span>
         </MenuItem>
@@ -121,6 +121,7 @@ class NonInjectedPortForwardMenu<Props extends PortForwardMenuProps & Dependenci
 
     return (
       <MenuActions
+        id="menu-actions-for-port-forward-menu"
         {...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 6f0492ea0b..6807ff227b 100644
--- a/src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx
+++ b/src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx
@@ -89,6 +89,7 @@ export class ClusterIconSetting extends React.Component<ClusterIconSettingProps>
             />
           </div>
           <MenuActions
+            id="menu-actions-for-cluster-icon-settings"
             toolbar={false}
             autoCloseOnSelect={true}
             triggerIcon={{ material: "more_horiz" }}
diff --git a/src/renderer/components/dock/dock.tsx b/src/renderer/components/dock/dock.tsx
index 385d3e0fbc..2b3f24cf78 100644
--- a/src/renderer/components/dock/dock.tsx
+++ b/src/renderer/components/dock/dock.tsx
@@ -161,6 +161,7 @@ class NonInjectedDock extends React.Component<DockProps & Dependencies> {
           <div className={cssNames("toolbar flex gaps align-center box grow", { "pl-0": tabs.length == 0 })}>
             <div className="dock-menu box grow">
               <MenuActions
+                id="menu-actions-for-dock"
                 usePortal
                 triggerIcon={{ material: "add", className: "new-dock-tab", tooltip: "New tab" }}
                 closeOnScroll={false}
diff --git a/src/renderer/components/item-object-list/content.tsx b/src/renderer/components/item-object-list/content.tsx
index 3529b258c2..30ee1c4102 100644
--- a/src/renderer/components/item-object-list/content.tsx
+++ b/src/renderer/components/item-object-list/content.tsx
@@ -343,6 +343,7 @@ class NonInjectedItemListLayoutContent<
 
     return (
       <MenuActions
+        id="menu-actions-for-item-object-list-content"
         className="ItemListLayoutVisibilityMenu"
         toolbar={false}
         autoCloseOnSelect={false}
diff --git a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
index 976c92f3d9..799e841e5d 100644
--- a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
+++ b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`kube-object-menu given kube object renders 1`] = `
     <div>
       <ul
         class="Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+        id="menu-actions-for-kube-object-menu-for-some-uid"
       >
         <li>
           Some menu item
@@ -45,6 +46,7 @@ exports[`kube-object-menu given kube object when removing kube object renders 1`
     <div>
       <ul
         class="Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+        id="menu-actions-for-kube-object-menu-for-some-uid"
       >
         <li>
           Some menu item
@@ -136,6 +138,7 @@ exports[`kube-object-menu given kube object when rerendered with different kube
     <div>
       <ul
         class="Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+        id="menu-actions-for-kube-object-menu-for-some-other-uid"
       >
         <li
           class="MenuItem"
@@ -172,6 +175,7 @@ exports[`kube-object-menu given kube object when rerendered with different kube
     <div>
       <ul
         class="Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+        id="menu-actions-for-kube-object-menu-for-some-other-uid"
       >
         <li
           class="MenuItem"
@@ -260,6 +264,7 @@ exports[`kube-object-menu given kube object with namespace when removing kube ob
     <div>
       <ul
         class="Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+        id="menu-actions-for-kube-object-menu-for-some-uid"
       >
         <li>
           Some menu item
@@ -351,6 +356,7 @@ exports[`kube-object-menu given kube object without namespace when removing kube
     <div>
       <ul
         class="Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+        id="menu-actions-for-kube-object-menu-for-some-uid"
       >
         <li>
           Some menu item
@@ -441,6 +447,7 @@ exports[`kube-object-menu given no kube object, renders 1`] = `
   <div>
     <ul
       class="Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+      id="menu-actions-for-kube-object-menu-for-undefined"
     />
   </div>
 </body>
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 a69fded655..e78500d5ed 100644
--- a/src/renderer/components/kube-object-menu/kube-object-menu.tsx
+++ b/src/renderer/components/kube-object-menu/kube-object-menu.tsx
@@ -187,6 +187,7 @@ class NonInjectedKubeObjectMenu<Kube extends KubeObject> extends React.Component
 
     return (
       <MenuActions
+        id={`menu-actions-for-kube-object-menu-for-${object?.getId()}`}
         className={cssNames("KubeObjectMenu", className)}
         onOpen={object ? () => this.emitOnContextMenuOpen(object) : undefined}
         {...menuProps}
diff --git a/src/renderer/components/menu/menu-actions.tsx b/src/renderer/components/menu/menu-actions.tsx
index aa44d3634f..239ca46dd2 100644
--- a/src/renderer/components/menu/menu-actions.tsx
+++ b/src/renderer/components/menu/menu-actions.tsx
@@ -13,12 +13,12 @@ import type { IconProps } from "../icon";
 import { Icon } from "../icon";
 import type { MenuProps } from "./menu";
 import { Menu, MenuItem } from "./menu";
-import uniqueId from "lodash/uniqueId";
 import isString from "lodash/isString";
 import type { TooltipDecoratorProps } from "../tooltip";
 import type { OpenConfirmDialog } from "../confirm-dialog/open.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import openConfirmDialogInjectable from "../confirm-dialog/open.injectable";
+import getRandomIdInjectable from "../../../common/utils/get-random-id.injectable";
 
 export interface MenuActionsProps extends Partial<MenuProps> {
   className?: string;
@@ -38,6 +38,7 @@ export interface MenuActionsProps extends Partial<MenuProps> {
    */
   removeAction?: () => void | Promise<void>;
   onOpen?: () => void;
+  id?: string;
 }
 
 interface Dependencies {
@@ -50,9 +51,6 @@ class NonInjectedMenuActions extends React.Component<MenuActionsProps & Dependen
     removeConfirmationMessage: "Remove item?",
   };
 
-  // TODO: Make deterministic
-  public id = uniqueId("menu_actions_");
-
   @observable isOpen = !!this.props.toolbar;
 
   toggle = () => {
@@ -100,10 +98,10 @@ class NonInjectedMenuActions extends React.Component<MenuActionsProps & Dependen
     if (isValidElement<HTMLElement>(triggerIcon)) {
       className = cssNames(triggerIcon.props.className, { active: this.isOpen });
 
-      return React.cloneElement(triggerIcon, { id: this.id, className });
+      return React.cloneElement(triggerIcon, { id: this.props.id, className });
     }
     const iconProps: IconProps & TooltipDecoratorProps = {
-      id: this.id,
+      id: this.props.id,
       interactive: true,
       material: isString(triggerIcon) ? triggerIcon : undefined,
       active: this.isOpen,
@@ -131,7 +129,7 @@ class NonInjectedMenuActions extends React.Component<MenuActionsProps & Dependen
         {this.renderTriggerIcon()}
 
         <Menu
-          htmlFor={this.id}
+          htmlFor={this.props.id}
           isOpen={this.isOpen}
           open={this.toggle}
           close={this.toggle}
@@ -175,7 +173,8 @@ class NonInjectedMenuActions extends React.Component<MenuActionsProps & Dependen
 
 export const MenuActions = withInjectables<Dependencies, MenuActionsProps>(NonInjectedMenuActions, {
   getProps: (di, props) => ({
-    ...props,
+    id: di.inject(getRandomIdInjectable)(),
     openConfirmDialog: di.inject(openConfirmDialogInjectable),
+    ...props,
   }),
 });
diff --git a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
index 6be63e21d3..6b59eeb03e 100644
--- a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
+++ b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
@@ -402,7 +402,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
                     >
                       <i
                         class="Icon material interactive focusable small"
-                        id="tooltip_target_58"
+                        id="tooltip_target_56"
                         tabindex="0"
                       >
                         <span
@@ -427,7 +427,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_59"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -441,7 +441,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_61"
+              id="tooltip_target_58"
               tabindex="0"
             >
               <span
@@ -454,7 +454,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_62"
+              id="tooltip_target_59"
               tabindex="0"
             >
               <span
@@ -907,7 +907,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_17"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -921,7 +921,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_19"
+              id="tooltip_target_18"
               tabindex="0"
             >
               <span
@@ -934,7 +934,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_20"
+              id="tooltip_target_19"
               tabindex="0"
             >
               <span
@@ -1418,7 +1418,7 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
                     >
                       <i
                         class="Icon material interactive focusable small"
-                        id="tooltip_target_98"
+                        id="tooltip_target_94"
                         tabindex="0"
                       >
                         <span
@@ -1443,7 +1443,7 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
             >
               <i
                 class="Icon new-dock-tab material interactive focusable"
-                id="menu_actions_99"
+                id="menu-actions-for-dock"
                 tabindex="0"
               >
                 <span
@@ -1457,7 +1457,7 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
             </div>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_101"
+              id="tooltip_target_96"
               tabindex="0"
             >
               <span
@@ -1470,7 +1470,7 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
             </i>
             <i
               class="Icon material interactive focusable"
-              id="tooltip_target_102"
+              id="tooltip_target_97"
               tabindex="0"
             >
               <span