Cascade different refactorings to eliminate global shared state from app paths

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap

@@ -2,6 +2,10 @@
 
 exports[`kube-object-menu given kube object renders 1`] = `
 <body>
+  <div
+    class="terminal-init"
+    style="position: absolute; top: 0px; left: 0px; height: 0px; visibility: hidden; overflow: hidden;"
+  />
   <div>
     <div>
       <ul
@@ -18,7 +22,7 @@ exports[`kube-object-menu given kube object renders 1`] = `
         >
           <i
             class="Icon material interactive focusable"
-            id="tooltip_target_4"
+            id="tooltip_target_2"
             tabindex="0"
           >
             <span
@@ -52,6 +56,10 @@ exports[`kube-object-menu given kube object renders 1`] = `
 
 exports[`kube-object-menu given kube object when removing kube object renders 1`] = `
 <body>
+  <div
+    class="terminal-init"
+    style="position: absolute; top: 0px; left: 0px; height: 0px; visibility: hidden; overflow: hidden;"
+  />
   <div>
     <div>
       <ul
@@ -68,7 +76,7 @@ exports[`kube-object-menu given kube object when removing kube object renders 1`
         >
           <i
             class="Icon material interactive focusable"
-            id="tooltip_target_8"
+            id="tooltip_target_4"
             tabindex="0"
           >
             <span
@@ -155,6 +163,10 @@ exports[`kube-object-menu given kube object when removing kube object renders 1`
 
 exports[`kube-object-menu given kube object with namespace when removing kube object, renders confirmation dialog with namespace 1`] = `
 <body>
+  <div
+    class="terminal-init"
+    style="position: absolute; top: 0px; left: 0px; height: 0px; visibility: hidden; overflow: hidden;"
+  />
   <div>
     <div>
       <ul
@@ -171,7 +183,7 @@ exports[`kube-object-menu given kube object with namespace when removing kube ob
         >
           <i
             class="Icon material interactive focusable"
-            id="tooltip_target_33"
+            id="tooltip_target_12"
             tabindex="0"
           >
             <span
@@ -258,6 +270,10 @@ exports[`kube-object-menu given kube object with namespace when removing kube ob
 
 exports[`kube-object-menu given kube object without namespace when removing kube object, renders confirmation dialog without namespace 1`] = `
 <body>
+  <div
+    class="terminal-init"
+    style="position: absolute; top: 0px; left: 0px; height: 0px; visibility: hidden; overflow: hidden;"
+  />
   <div>
     <div>
       <ul
@@ -274,7 +290,7 @@ exports[`kube-object-menu given kube object without namespace when removing kube
         >
           <i
             class="Icon material interactive focusable"
-            id="tooltip_target_41"
+            id="tooltip_target_17"
             tabindex="0"
           >
             <span
@@ -361,6 +377,10 @@ exports[`kube-object-menu given kube object without namespace when removing kube
 
 exports[`kube-object-menu given no kube object, renders 1`] = `
 <body>
+  <div
+    class="terminal-init"
+    style="position: absolute; top: 0px; left: 0px; height: 0px; visibility: hidden; overflow: hidden;"
+  />
   <div>
     <ul
       class="Animate opacity Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"

src/renderer/components/kube-object-menu/dependencies/edit-resource-tab.injectable.ts

@@ -1,29 +0,0 @@
-/**
- * Copyright (c) 2021 OpenLens Authors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-import { editResourceTab } from "../../dock/edit-resource.store";
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
-
-const editResourceTabInjectable = getInjectable({
-  instantiate: () => editResourceTab,
-  lifecycle: lifecycleEnum.singleton,
-});
-
-export default editResourceTabInjectable;

src/renderer/components/kube-object-menu/kube-object-menu.test.tsx

@@ -33,11 +33,11 @@ import { getDiForUnitTesting } from "../getDiForUnitTesting";
 
 import clusterInjectable from "./dependencies/cluster.injectable";
 import hideDetailsInjectable from "./dependencies/hide-details.injectable";
-import editResourceTabInjectable from "./dependencies/edit-resource-tab.injectable";
-import { TabKind } from "../dock/dock.store";
+import editResourceTabInjectable from "../dock/edit-resource-tab/edit-resource-tab.injectable";
+import { TabKind } from "../dock/dock-store/dock.store";
 import kubeObjectMenuRegistryInjectable from "./dependencies/kube-object-menu-items/kube-object-menu-registry.injectable";
 import { DiRender, renderFor } from "../test-utils/renderFor";
-import type { Cluster } from "../../../main/cluster";
+import type { Cluster } from "../../../common/cluster/cluster";
 import type { ApiManager } from "../../../common/k8s-api/api-manager";
 import apiManagerInjectable from "./dependencies/api-manager.injectable";
 import { KubeObjectMenu } from "./index";
@@ -46,8 +46,10 @@ describe("kube-object-menu", () => {
   let di: ConfigurableDependencyInjectionContainer;
   let render: DiRender;
 
-  beforeEach(() => {
-    di = getDiForUnitTesting();
+  beforeEach(async () => {
+    di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    await di.runSetups();
 
     // TODO: Remove global shared state
     KubeObjectMenuRegistry.resetInstance();
@@ -64,7 +66,8 @@ describe("kube-object-menu", () => {
       getStore: api => undefined,
     }) as ApiManager);
 
-    di.override(hideDetailsInjectable, () => () => {});
+    di.override(hideDetailsInjectable, () => () => {
+    });
 
     di.override(editResourceTabInjectable, () => () => ({
       id: "irrelevant",

src/renderer/components/kube-object-menu/kube-object-menu.tsx

@@ -27,7 +27,7 @@ import identity from "lodash/identity";
 import type { ApiManager } from "../../../common/k8s-api/api-manager";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import clusterNameInjectable from "./dependencies/cluster-name.injectable";
-import editResourceTabInjectable from "./dependencies/edit-resource-tab.injectable";
+import editResourceTabInjectable from "../dock/edit-resource-tab/edit-resource-tab.injectable";
 import hideDetailsInjectable from "./dependencies/hide-details.injectable";
 import kubeObjectMenuItemsInjectable from "./dependencies/kube-object-menu-items/kube-object-menu-items.injectable";
 import apiManagerInjectable from "./dependencies/api-manager.injectable";