Simplify logic for injecting many instances which can reactively change e.g. based on extension being enabled or disabled (#5662)

* Reorganize stuff to prevent circular dependencies

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

* Install injectable extension to allow injecting reactively many implementations

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

* Switch to using computedInjectMany over filtering injectMany based on enabled extensions for simplicity

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

* Remove await for not being needed

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

* Sort dependencies alphabetically

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

src/main/getDi.ts

@@ -2,14 +2,16 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-
 import { createContainer } from "@ogre-tools/injectable";
 import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
+import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 
 export const getDi = () => {
   const di = createContainer();
 
+  registerMobX(di);
+
   autoRegister({
     di,
     requireContexts: [

src/main/getDiForUnitTesting.ts

@@ -98,6 +98,7 @@ import listHelmReleasesInjectable from "./helm/helm-service/list-helm-releases.i
 import rollbackHelmReleaseInjectable from "./helm/helm-service/rollback-helm-release.injectable";
 import updateHelmReleaseInjectable from "./helm/helm-service/update-helm-release.injectable";
 import waitUntilBundledExtensionsAreLoadedInjectable from "./start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable";
+import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
 
 export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) {
   const {
@@ -106,6 +107,8 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
 
   const di = createContainer();
 
+  registerMobX(di);
+
   setLegacyGlobalDiForExtensionApi(di, Environments.main);
 
   for (const filePath of getInjectableFilePaths()) {

src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts

@@ -4,7 +4,6 @@
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
 import type { IComputedValue } from "mobx";
-import type { LensMainExtension } from "../../../extensions/lens-main-extension";
 
 export interface TrayMenuItem {
   id: string;
@@ -17,7 +16,6 @@ export interface TrayMenuItem {
   click?: () => Promise<void> | void;
   tooltip?: string;
   separator?: boolean;
-  extension?: LensMainExtension;
 }
 
 export const trayMenuItemInjectionToken = getInjectionToken<TrayMenuItem>({

src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { pipeline } from "@ogre-tools/fp";
-import { flatMap, kebabCase } from "lodash/fp";
+import { kebabCase } from "lodash/fp";
 import type { Injectable } from "@ogre-tools/injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
@@ -20,17 +20,13 @@ import getRandomIdInjectable from "../../../common/utils/get-random-id.injectabl
 const trayMenuItemRegistratorInjectable = getInjectable({
   id: "tray-menu-item-registrator",
 
-  instantiate: (di) => (extension, installationCounter) => {
+  instantiate: (di) => (extension) => {
     const mainExtension = extension as LensMainExtension;
     const withErrorLoggingFor = di.inject(withErrorLoggingInjectable);
     const getRandomId = di.inject(getRandomIdInjectable);
 
-    pipeline(
-      mainExtension.trayMenus,
-
-      flatMap(toItemInjectablesFor(mainExtension, installationCounter, withErrorLoggingFor, getRandomId)),
-
-      (injectables) => di.register(...injectables),
+    return mainExtension.trayMenus.flatMap(
+      toItemInjectablesFor(mainExtension, withErrorLoggingFor, getRandomId),
     );
   },
 
@@ -39,10 +35,10 @@ const trayMenuItemRegistratorInjectable = getInjectable({
 
 export default trayMenuItemRegistratorInjectable;
 
-const toItemInjectablesFor = (extension: LensMainExtension, installationCounter: number, withErrorLoggingFor: WithErrorLoggingFor, getRandomId: () => string) => {
+const toItemInjectablesFor = (extension: LensMainExtension, withErrorLoggingFor: WithErrorLoggingFor, getRandomId: () => string) => {
   const _toItemInjectables = (parentId: string | null) => (registration: TrayMenuRegistration): Injectable<TrayMenuItem, TrayMenuItem, void>[] => {
     const trayItemId = registration.id || kebabCase(registration.label || getRandomId());
-    const id = `${trayItemId}-tray-menu-item-for-extension-${extension.sanitizedExtensionId}-instance-${installationCounter}`;
+    const id = `${trayItemId}-tray-menu-item-for-extension-${extension.sanitizedExtensionId}`;
 
     const parentInjectable = getInjectable({
       id,
@@ -76,8 +72,6 @@ const toItemInjectablesFor = (extension: LensMainExtension, installationCounter:
 
         enabled: computed(() => registration.enabled ?? true),
         visible: computed(() => true),
-
-        extension,
       }),
 
       injectionToken: trayMenuItemInjectionToken,

src/main/tray/tray-menu-item/tray-menu-items.injectable.ts

@@ -3,47 +3,30 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
 import { computed } from "mobx";
-
-
-import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable";
-import type { TrayMenuItem } from "./tray-menu-item-injection-token";
 import { trayMenuItemInjectionToken } from "./tray-menu-item-injection-token";
 import { pipeline } from "@ogre-tools/fp";
-import { filter, overSome, sortBy } from "lodash/fp";
-import type { LensMainExtension } from "../../../extensions/lens-main-extension";
+import { filter, sortBy } from "lodash/fp";
 
 const trayMenuItemsInjectable = getInjectable({
   id: "tray-menu-items",
 
   instantiate: (di) => {
-    const extensions = di.inject(mainExtensionsInjectable);
+    const computedInjectMany = di.inject(
+      computedInjectManyInjectable,
+    );
 
-    return computed(() => {
-      const enabledExtensions = extensions.get();
+    const reactiveMenuItems = computedInjectMany(trayMenuItemInjectionToken);
 
-      return pipeline(
-        di.injectMany(trayMenuItemInjectionToken),
-
-        filter((item) =>
-          overSome([
-            isNonExtensionItem,
-            isEnabledExtensionItemFor(enabledExtensions),
-          ])(item),
-        ),
-
-        filter(item => item.visible.get()),
-        items => sortBy("orderNumber", items),
-      );
-    });
+    return computed(() =>
+      pipeline(
+        reactiveMenuItems.get(),
+        filter((item) => item.visible.get()),
+        (items) => sortBy("orderNumber", items),
+      ),
+    );
   },
 });
 
-const isNonExtensionItem = (item: TrayMenuItem) => !item.extension;
-
-const isEnabledExtensionItemFor =
-  (enabledExtensions: LensMainExtension[]) => (item: TrayMenuItem) =>
-    !!enabledExtensions.find((extension) => extension === item.extension);
-
-
 export default trayMenuItemsInjectable;