Convert runMany and runManySync to use injectManyWithMeta + move to seperate package (#7244)

* Convert runMany and runManySync to use injectManyWithMeta Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fixup type errors due to new Runnable requirements Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add documentation for verifyRunnablesAreDAG Signed-off-by: Sebastian Malton <sebastian@malton.name> * Simplify convertToWithIdWith Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move all utility functions to separate package Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move testing utilities to separate package Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move run-many and run-many-sync to separate package Signed-off-by: Sebastian Malton <sebastian@malton.name> * Replace all internal uses of utilities with new packages Signed-off-by: Sebastian Malton <sebastian@malton.name> * Use new @k8slens/run-many package in core Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add dep to open-lens Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fixup type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fixup uses of @k8slens/test-utils Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fixup getGlobalOverride Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move tests to new package too Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fixup uses of AsyncResult and autoBind Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fixup remaining import issues Signed-off-by: Sebastian Malton <sebastian@malton.name> * Finial fixups to fix build Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert moving "testUsingFakeTime" to separate package - This fixes tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix integration tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix unit test failing due to spelling fix Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name>
2025-05-20 05:10:56 +00:00 · 2023-03-10 10:07:28 +02:00
1 parent ad9bafe2a5
commit 2789bcebcb
@@ -9,16 +9,13 @@ import electronTrayInjectable from "./electron-tray.injectable";
 const startTrayInjectable = getInjectable({
  id: "start-tray",

-  instantiate: (di) => {
-    const electronTray = di.inject(electronTrayInjectable);
+  instantiate: (di) => ({
+    run: () => {
+      const electronTray = di.inject(electronTrayInjectable);

-    return {
-      id: "start-tray",
-      run: () => {
-        electronTray.start();
-      },
-    };
-  },
+      electronTray.start();
+    },
+  }),

  injectionToken: onLoadOfApplicationInjectionToken,
 });
@@ -4,21 +4,22 @@
 */
 import { getInjectable } from "@ogre-tools/injectable";
 import electronTrayInjectable from "./electron-tray.injectable";
-import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
+import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases";
 import stopReactiveTrayMenuItemsInjectable from "../reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable";

 const stopTrayInjectable = getInjectable({
  id: "stop-tray",

-  instantiate: (di) => {
-    const electronTray = di.inject(electronTrayInjectable);
+  instantiate: (di) => ({
+    run: () => {
+      const electronTray = di.inject(electronTrayInjectable);

-    return {
-      id: "stop-tray",
-      run: () => void electronTray.stop(),
-      runAfter: di.inject(stopReactiveTrayMenuItemsInjectable),
-    };
-  },
+      electronTray.stop();
+
+      return undefined;
+    },
+    runAfter: stopReactiveTrayMenuItemsInjectable,
+  }),

  injectionToken: beforeQuitOfBackEndInjectionToken,
 });
@@ -10,18 +10,15 @@ import reactiveTrayMenuIconInjectable from "./reactive.injectable";
 const startReactiveTrayMenuIconInjectable = getInjectable({
  id: "start-reactive-tray-menu-icon",

-  instantiate: (di) => {
-    const reactiveTrayMenuIcon = di.inject(reactiveTrayMenuIconInjectable);
+  instantiate: (di) => ({
+    run: () => {
+      const reactiveTrayMenuIcon = di.inject(reactiveTrayMenuIconInjectable);

-    return {
-      id: "start-reactive-tray-menu-icon",
-      run: () => {
-        reactiveTrayMenuIcon.start();
-      },
+      reactiveTrayMenuIcon.start();
+    },

-      runAfter: di.inject(startTrayInjectable),
-    };
-  },
+    runAfter: startTrayInjectable,
+  }),

  injectionToken: onLoadOfApplicationInjectionToken,
 });
@@ -3,20 +3,21 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { getInjectable } from "@ogre-tools/injectable";
-import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
+import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases";
 import reactiveTrayMenuIconInjectable from "./reactive.injectable";

 const stopReactiveTrayMenuIconInjectable = getInjectable({
  id: "stop-reactive-tray-menu-icon",

-  instantiate: (di) => {
-    const reactiveTrayMenuIcon = di.inject(reactiveTrayMenuIconInjectable);
+  instantiate: (di) => ({
+    run: () => {
+      const reactiveTrayMenuIcon = di.inject(reactiveTrayMenuIconInjectable);

-    return {
-      id: "stop-reactive-tray-menu-icon",
-      run: () => void reactiveTrayMenuIcon.stop(),
-    };
-  },
+      reactiveTrayMenuIcon.stop();
+
+      return undefined;
+    },
+  }),

  injectionToken: beforeQuitOfBackEndInjectionToken,
 });
@@ -10,18 +10,14 @@ import startTrayInjectable from "../electron-tray/start-tray.injectable";
 const startReactiveTrayMenuItemsInjectable = getInjectable({
  id: "start-reactive-tray-menu-items",

-  instantiate: (di) => {
-    const reactiveTrayMenuItems = di.inject(reactiveTrayMenuItemsInjectable);
+  instantiate: (di) => ({
+    run: () => {
+      const reactiveTrayMenuItems = di.inject(reactiveTrayMenuItemsInjectable);

-    return {
-      id: "start-reactive-tray-menu-items",
-      run: () => {
-        reactiveTrayMenuItems.start();
-      },
-
-      runAfter: di.inject(startTrayInjectable),
-    };
-  },
+      reactiveTrayMenuItems.start();
+    },
+    runAfter: startTrayInjectable,
+  }),

  injectionToken: onLoadOfApplicationInjectionToken,
 });
@@ -4,19 +4,20 @@
 */
 import { getInjectable } from "@ogre-tools/injectable";
 import reactiveTrayMenuItemsInjectable from "./reactive-tray-menu-items.injectable";
-import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
+import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases";

 const stopReactiveTrayMenuItemsInjectable = getInjectable({
  id: "stop-reactive-tray-menu-items",

-  instantiate: (di) => {
-    const reactiveTrayMenuItems = di.inject(reactiveTrayMenuItemsInjectable);
+  instantiate: (di) => ({
+    run: () => {
+      const reactiveTrayMenuItems = di.inject(reactiveTrayMenuItemsInjectable);

-    return {
-      id: "stop-reactive-tray-menu-items",
-      run: () => void reactiveTrayMenuItems.stop(),
-    };
-  },
+      reactiveTrayMenuItems.stop();
+
+      return undefined;
+    },
+  }),

  injectionToken: beforeQuitOfBackEndInjectionToken,
 });
@@ -15,7 +15,7 @@ import { withErrorSuppression } from "../../../common/utils/with-error-suppressi
 import type { WithErrorLoggingFor } from "../../../common/utils/with-error-logging/with-error-logging.injectable";
 import withErrorLoggingInjectable from "../../../common/utils/with-error-logging/with-error-logging.injectable";
 import getRandomIdInjectable from "../../../common/utils/get-random-id.injectable";
-import { isBoolean, isString } from "../../../common/utils";
+import { isBoolean, isString } from "@k8slens/utilities";

 const trayMenuItemRegistratorInjectable = getInjectable({
  id: "tray-menu-item-registrator",