Make registrations specify MobX-transaction explicitly

This is a new requirement from injectable-extension-for-mobx, as otherwise registrations could surprisingly cause untimely, and too numerous observations by computedInjectMany. The bad thing is the duplication, but I do currently consider this as favorable, as now a dev will always know that registrations of injectables with tokens may cause triggering of observations.

Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>

src/common/utils/channel/channel.test.ts

@@ -18,6 +18,7 @@ import { requestChannelListenerInjectionToken } from "./request-channel-listener
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import { getPromiseStatus } from "../../test-utils/get-promise-status";
+import { runInAction } from "mobx";
 
 type TestMessageChannel = MessageChannel<string>;
 type TestRequestChannel = RequestChannel<string, string>;
@@ -47,13 +48,17 @@ describe("channel", () => {
       });
 
       builder.beforeApplicationStart((mainDi) => {
+        runInAction(() => {
           mainDi.register(testMessageChannelInjectable);
         });
+      });
 
       builder.beforeWindowStart((windowDi) => {
+        runInAction(() => {
           windowDi.register(testChannelListenerInTestWindowInjectable);
           windowDi.register(testMessageChannelInjectable);
         });
+      });
 
       mainDi = builder.mainDi;
 
@@ -126,13 +131,17 @@ describe("channel", () => {
       });
 
       applicationBuilder.beforeApplicationStart((mainDi) => {
+        runInAction(() => {
           mainDi.register(testChannelListenerInMainInjectable);
           mainDi.register(testMessageChannelInjectable);
         });
+      });
 
       applicationBuilder.beforeWindowStart((windowDi) => {
+        runInAction(() => {
           windowDi.register(testMessageChannelInjectable);
         });
+      });
 
       await applicationBuilder.render();
 
@@ -172,13 +181,17 @@ describe("channel", () => {
       });
 
       applicationBuilder.beforeApplicationStart((mainDi) => {
+        runInAction(() => {
           mainDi.register(testChannelListenerInMainInjectable);
           mainDi.register(testRequestChannelInjectable);
         });
+      });
 
       applicationBuilder.beforeWindowStart((windowDi) => {
+        runInAction(() => {
           windowDi.register(testRequestChannelInjectable);
         });
+      });
 
       await applicationBuilder.render();
 

src/common/utils/sync-box/sync-box.test.ts

@@ -18,13 +18,17 @@ describe("sync-box", () => {
     applicationBuilder = getApplicationBuilder();
 
     applicationBuilder.beforeApplicationStart(mainDi => {
+      runInAction(() => {
         mainDi.register(someInjectable);
       });
+    });
 
     applicationBuilder.beforeWindowStart((windowDi) => {
+      runInAction(() => {
         windowDi.register(someInjectable);
       });
     });
+  });
 
   describe("given application is started, when value is set in main", () => {
     let valueInMain: string;

src/extensions/extension-loader/extension/extension.injectable.ts

@@ -3,6 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { runInAction } from "mobx";
 import type { LensExtension } from "../../lens-extension";
 import { extensionRegistratorInjectionToken } from "../extension-registrator-injection-token";
 
@@ -27,17 +28,23 @@ const extensionInjectable = getInjectable({
               getInjectablesOfExtension(instance),
             );
 
+            runInAction(() => {
               childDi.register(...injectables);
+            });
           },
 
           deregister: () => {
+            runInAction(() => {
               parentDi.deregister(extensionInjectable);
+            });
           },
         };
       },
     });
 
+    runInAction(() => {
       parentDi.register(extensionInjectable);
+    });
 
     return parentDi.inject(extensionInjectable);
   },

src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx

@@ -10,7 +10,7 @@ import type { KubernetesCluster } from "../../../../common/catalog-entities";
 import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
 import { getInjectable } from "@ogre-tools/injectable";
 import { frontEndRouteInjectionToken } from "../../../../common/front-end-routing/front-end-route-injection-token";
-import { computed } from "mobx";
+import { computed, runInAction } from "mobx";
 import React from "react";
 import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token";
 import { routeSpecificComponentInjectionToken } from "../../../../renderer/routes/route-specific-component-injection-token";
@@ -45,8 +45,10 @@ describe("disable kube object detail items when cluster is not relevant", () =>
 
       windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
 
+      runInAction(() => {
         windowDi.register(testRouteInjectable, testRouteComponentInjectable);
       });
+    });
 
     isEnabledForClusterMock = asyncFn();
 

src/features/cluster/kube-object-details/extension-api/reactively-hide-kube-object-detail-item.test.tsx

@@ -39,8 +39,10 @@ describe("reactively hide kube object detail item", () => {
           } as unknown as ApiManager),
       );
 
+      runInAction(() => {
         windowDi.register(testRouteInjectable, testRouteComponentInjectable);
       });
+    });
 
     someObservable = observable.box(false);
 

src/features/cluster/kube-object-menu/extension-api/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx

@@ -10,7 +10,7 @@ import type { KubernetesCluster } from "../../../../common/catalog-entities";
 import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
 import { getInjectable } from "@ogre-tools/injectable";
 import { frontEndRouteInjectionToken } from "../../../../common/front-end-routing/front-end-route-injection-token";
-import { computed } from "mobx";
+import { computed, runInAction } from "mobx";
 import React from "react";
 import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token";
 import { routeSpecificComponentInjectionToken } from "../../../../renderer/routes/route-specific-component-injection-token";
@@ -32,8 +32,11 @@ describe("disable kube object menu items when cluster is not relevant", () => {
 
     builder.beforeWindowStart((windowDi) => {
       windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
+
+      runInAction(() => {
         windowDi.register(testRouteInjectable, testRouteComponentInjectable);
       });
+    });
 
     isEnabledForClusterMock = asyncFn();
 

src/features/cluster/kube-object-menu/extension-api/reactively-hide-kube-object-menu-item.test.tsx

@@ -26,8 +26,10 @@ describe("reactively hide kube object menu item", () => {
     builder.setEnvironmentToClusterFrame();
 
     builder.beforeWindowStart((windowDi) => {
+      runInAction(() => {
         windowDi.register(testRouteInjectable, testRouteComponentInjectable);
       });
+    });
 
     someObservable = observable.box(false);
 

src/features/cluster/kube-object-status-icon/extension-api/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx

@@ -10,7 +10,7 @@ import type { KubernetesCluster } from "../../../../common/catalog-entities";
 import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
 import { getInjectable } from "@ogre-tools/injectable";
 import { frontEndRouteInjectionToken } from "../../../../common/front-end-routing/front-end-route-injection-token";
-import { computed } from "mobx";
+import { computed, runInAction } from "mobx";
 import React from "react";
 import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token";
 import { routeSpecificComponentInjectionToken } from "../../../../renderer/routes/route-specific-component-injection-token";
@@ -33,8 +33,11 @@ describe("disable kube object statuses when cluster is not relevant", () => {
 
     builder.beforeWindowStart((windowDi) => {
       windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
+
+      runInAction(() => {
         windowDi.register(testRouteInjectable, testRouteComponentInjectable);
       });
+    });
 
     isEnabledForClusterMock = asyncFn();
 

src/features/cluster/kube-object-status-icon/extension-api/reactively-hide-kube-object-status.test.tsx

@@ -29,8 +29,11 @@ describe("reactively hide kube object status", () => {
 
     builder.beforeWindowStart((windowDi) => {
       windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
+
+      runInAction(() => {
         windowDi.register(testRouteInjectable, testRouteComponentInjectable);
       });
+    });
 
     someObservable = observable.box(false);
 

src/features/cluster/kube-object-status-icon/show-status-for-a-kube-object.test.tsx

@@ -9,7 +9,7 @@ import { useFakeTime } from "../../../common/test-utils/use-fake-time";
 import type { DiContainer } from "@ogre-tools/injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import type { IAtom } from "mobx";
-import { createAtom, computed } from "mobx";
+import { runInAction, createAtom, computed } from "mobx";
 import { frontEndRouteInjectionToken } from "../../../common/front-end-routing/front-end-route-injection-token";
 import { routeSpecificComponentInjectionToken } from "../../../renderer/routes/route-specific-component-injection-token";
 import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
@@ -94,6 +94,7 @@ describe("show status for a kube object", () => {
     });
 
     builder.beforeWindowStart((windowDi) => {
+      runInAction(() => {
         windowDi.register(
           testRouteInjectable,
           testRouteComponentInjectable,
@@ -102,6 +103,8 @@ describe("show status for a kube object", () => {
           criticalStatusInjectable,
           someAtomInjectable,
         );
+
+      });
     });
 
     builder.setEnvironmentToClusterFrame();
@@ -141,7 +144,9 @@ describe("show status for a kube object", () => {
 
     describe("when status for irrelevant kube object kind emerges", () => {
       beforeEach(() => {
+        runInAction(() => {
           windowDi.register(statusForIrrelevantKubeObjectKindInjectable);
+        });
 
         rerenderParent();
       });
@@ -161,7 +166,9 @@ describe("show status for a kube object", () => {
 
     describe("when status for irrelevant kube object api version emerges", () => {
       beforeEach(() => {
+        runInAction(() => {
           windowDi.register(statusForIrrelevantKubeObjectApiVersionInjectable);
+        });
 
         rerenderParent();
       });

src/features/cluster/order-of-sidebar-items.test.tsx

@@ -7,7 +7,7 @@ import type { RenderResult } from "@testing-library/react";
 import { fireEvent } from "@testing-library/react";
 import type { SidebarItemRegistration } from "../../renderer/components/layout/sidebar-items.injectable";
 import { sidebarItemsInjectionToken } from "../../renderer/components/layout/sidebar-items.injectable";
-import { computed } from "mobx";
+import { computed, runInAction } from "mobx";
 import { noop } from "lodash/fp";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
@@ -22,9 +22,11 @@ describe("cluster - order of sidebar items", () => {
     builder.setEnvironmentToClusterFrame();
 
     builder.beforeWindowStart((windowDi) => {
+      runInAction(() => {
         windowDi.register(testSidebarItemsInjectable);
       });
     });
+  });
 
   describe("when rendered", () => {
     beforeEach(async () => {

src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx

@@ -11,7 +11,7 @@ import directoryForLensLocalStorageInjectable from "../../common/directory-for-l
 import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token";
 import type { SidebarItemRegistration } from "../../renderer/components/layout/sidebar-items.injectable";
 import { sidebarItemsInjectionToken } from "../../renderer/components/layout/sidebar-items.injectable";
-import { computed } from "mobx";
+import { computed, runInAction } from "mobx";
 import { noop } from "lodash/fp";
 import routeIsActiveInjectable from "../../renderer/routes/route-is-active.injectable";
 import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token";
@@ -51,11 +51,13 @@ describe("cluster - sidebar and tab navigation for core", () => {
   describe("given core registrations", () => {
     beforeEach(() => {
       builder.beforeWindowStart((windowDi) => {
+        runInAction(() => {
           windowDi.register(testRouteInjectable);
           windowDi.register(testRouteComponentInjectable);
           windowDi.register(testSidebarItemsInjectable);
         });
       });
+    });
 
     describe("given no state for expanded sidebar items exists, and navigated to child sidebar item, when rendered", () => {
       beforeEach(async () => {

src/features/cluster/visibility-of-sidebar-items.test.tsx

@@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import type { RenderResult } from "@testing-library/react";
 import type { SidebarItemRegistration } from "../../renderer/components/layout/sidebar-items.injectable";
 import { sidebarItemsInjectionToken } from "../../renderer/components/layout/sidebar-items.injectable";
-import { computed } from "mobx";
+import { computed, runInAction } from "mobx";
 import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token";
 import React from "react";
 import isAllowedResourceInjectable from "../../common/utils/is-allowed-resource.injectable";
@@ -25,11 +25,13 @@ describe("cluster - visibility of sidebar items", () => {
     builder.setEnvironmentToClusterFrame();
 
     builder.beforeWindowStart((windowDi) => {
+      runInAction(() => {
         windowDi.register(testRouteInjectable);
         windowDi.register(testRouteComponentInjectable);
         windowDi.register(testSidebarItemsInjectable);
       });
     });
+  });
 
   describe("given kube resource for route is not allowed", () => {
     beforeEach(async () => {

src/features/cluster/workloads/overview/extension-api/order-of-workload-overview-details.test.tsx

@@ -8,7 +8,7 @@ import React from "react";
 import getRandomIdInjectable from "../../../../../common/utils/get-random-id.injectable";
 import { workloadOverviewDetailInjectionToken } from "../../../../../renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-injection-token";
 import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
+import { computed, runInAction } from "mobx";
 
 describe("order of workload overview details", () => {
   let rendered: RenderResult;
@@ -20,12 +20,14 @@ describe("order of workload overview details", () => {
       windowDi.unoverride(getRandomIdInjectable);
       windowDi.permitSideEffects(getRandomIdInjectable);
 
+      runInAction(() => {
         windowDi.register(
           someCoreItemWithLowOrderNumberInjectable,
           someCoreItemWithHighOrderNumberInjectable,
           someCoreItemWithDefaultOrderNumberInjectable,
         );
       });
+    });
 
     builder.setEnvironmentToClusterFrame();
 

src/features/navigating-between-routes.test.tsx

@@ -5,7 +5,7 @@
 import type { DiContainer } from "@ogre-tools/injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import React from "react";
-import { computed } from "mobx";
+import { computed, runInAction } from "mobx";
 import type { RenderResult } from "@testing-library/react";
 import { routeSpecificComponentInjectionToken } from "../renderer/routes/route-specific-component-injection-token";
 import { observer } from "mobx-react";
@@ -32,9 +32,11 @@ describe("navigating between routes", () => {
 
     beforeEach(async () => {
       builder.beforeWindowStart((windowDi) => {
+        runInAction(() => {
           windowDi.register(testRouteWithoutPathParametersInjectable);
           windowDi.register(testRouteWithoutPathParametersComponentInjectable);
         });
+      });
 
       rendered = await builder.render();
 
@@ -106,9 +108,11 @@ describe("navigating between routes", () => {
 
     beforeEach(async () => {
       builder.beforeWindowStart((windowDi) => {
+        runInAction(() => {
           windowDi.register(routeWithOptionalPathParametersInjectable);
           windowDi.register(routeWithOptionalPathParametersComponentInjectable);
         });
+      });
 
       rendered = await builder.render();
 

src/features/preferences/closing-preferences.test.tsx

@@ -9,7 +9,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import currentPathInjectable from "../../renderer/routes/current-path.injectable";
 import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token";
-import { computed } from "mobx";
+import { computed, runInAction } from "mobx";
 import { preferenceNavigationItemInjectionToken } from "../../renderer/components/+preferences/preferences-navigation/preference-navigation-items.injectable";
 import routeIsActiveInjectable from "../../renderer/routes/route-is-active.injectable";
 import { Preferences } from "../../renderer/components/+preferences";
@@ -30,11 +30,13 @@ describe("preferences - closing-preferences", () => {
     builder = getApplicationBuilder();
 
     builder.beforeWindowStart((windowDi) => {
+      runInAction(() => {
         windowDi.register(testPreferencesRouteInjectable);
         windowDi.register(testPreferencesRouteComponentInjectable);
         windowDi.register(testFrontPageRouteInjectable);
         windowDi.register(testFrontPageRouteComponentInjectable);
         windowDi.register(testNavigationItemInjectable);
+      });
 
       windowDi.override(navigateToFrontPageInjectable, (di) => {
         const navigateToRoute = di.inject(navigateToRouteInjectionToken);

src/features/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts

@@ -13,6 +13,7 @@ import focusApplicationInjectable from "../../main/electron-app/features/focus-a
 import type { CreateElectronWindow } from "../../main/start-main-application/lens-window/application-window/create-electron-window.injectable";
 import createElectronWindowInjectable from "../../main/start-main-application/lens-window/application-window/create-electron-window.injectable";
 import splashWindowInjectable from "../../main/start-main-application/lens-window/splash-window/splash-window.injectable";
+import { runInAction } from "mobx";
 
 describe("opening application window using tray", () => {
   describe("given application has started", () => {
@@ -61,10 +62,12 @@ describe("opening application window using tray", () => {
           return browserWindow;
         });
 
+        runInAction(() => {
           (mainDi as any).decorateFunction(
             createElectronWindowInjectable,
             createElectronWindowMock,
           );
+        });
 
         expectWindowsToBeOpen = expectWindowsToBeOpenFor(builder);
       });

src/main/getDi.ts

@@ -5,11 +5,15 @@
 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 { runInAction } from "mobx";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 
 export const getDi = () => {
   const di = createContainer("main");
 
+  setLegacyGlobalDiForExtensionApi(di, Environments.main);
+
+  runInAction(() => {
     registerMobX(di);
 
     autoRegister({
@@ -21,8 +25,7 @@ export const getDi = () => {
         require.context("../features", true, /.*\/(main|common)\/.*\.injectable\.(ts|tsx)$/),
       ],
     });
-
+  });
-  setLegacyGlobalDiForExtensionApi(di, Environments.main);
 
   return di;
 };

src/main/getDiForUnitTesting.ts

@@ -55,7 +55,7 @@ import setupRunnablesBeforeClosingOfApplicationInjectable from "./electron-app/r
 import showMessagePopupInjectable from "./electron-app/features/show-message-popup.injectable";
 import clusterFramesInjectable from "../common/cluster-frames.injectable";
 import type { ClusterFrameInfo } from "../common/cluster-frames";
-import { observable } from "mobx";
+import { observable, runInAction } from "mobx";
 import waitForElectronToBeReadyInjectable from "./electron-app/features/wait-for-electron-to-be-ready.injectable";
 import setupListenerForCurrentClusterFrameInjectable from "./start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable";
 import setupRunnablesAfterWindowIsOpenedInjectable from "./electron-app/runnables/setup-runnables-after-window-is-opened.injectable";
@@ -103,19 +103,21 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
 
   const di = createContainer("main");
 
-  registerMobX(di);
-
   setLegacyGlobalDiForExtensionApi(di, Environments.main);
 
+  di.preventSideEffects();
+
   const injectables: Injectable<any, any, any>[] = (global as any).mainInjectablePaths.map(
     (filePath: string) => require(filePath).default,
   );
 
+  runInAction(() => {
+    registerMobX(di);
+
     chunk(100)(injectables).forEach(chunkInjectables => {
       di.register(...chunkInjectables);
     });
-
+  });
-  di.preventSideEffects();
 
   if (doGeneralOverrides) {
     const globalOverrides: GlobalOverride[] = (global as any).mainGlobalOverridePaths.map(

src/main/router/router.test.ts

@@ -20,6 +20,7 @@ import type { SetRequired } from "type-fest";
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
 import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable";
 import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-arch.injectable";
+import { runInAction } from "mobx";
 
 describe("router", () => {
   let router: Router;
@@ -53,7 +54,9 @@ describe("router", () => {
       injectionToken: routeInjectionToken,
     });
 
+    runInAction(() => {
       di.register(injectable);
+    });
 
     router = di.inject(routerInjectable);
   });

src/main/start-main-application/lens-window/application-window/create-application-window.injectable.ts

@@ -10,6 +10,7 @@ import appNameInjectable from "../../../app-paths/app-name/app-name.injectable";
 import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
 import waitUntilBundledExtensionsAreLoadedInjectable from "./wait-until-bundled-extensions-are-loaded.injectable";
 import { applicationWindowInjectionToken } from "./application-window-injection-token";
+import { runInAction } from "mobx";
 
 const createApplicationWindowInjectable = getInjectable({
   id: "create-application-window",
@@ -49,7 +50,9 @@ const createApplicationWindowInjectable = getInjectable({
           },
 
           onClose: () => {
+            runInAction(() => {
               parentDi.deregister(windowInjectable);
+            });
           },
 
           beforeOpen: waitUntilBundledExtensionsAreLoaded,
@@ -59,7 +62,9 @@ const createApplicationWindowInjectable = getInjectable({
       injectionToken: applicationWindowInjectionToken,
     });
 
+    runInAction(() => {
       parentDi.register(windowInjectable);
+    });
 
     return parentDi.inject(windowInjectable);
   },

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

@@ -14,7 +14,7 @@ import { ConfirmDialog } from "../confirm-dialog";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import { computed } from "mobx";
+import { computed, runInAction } from "mobx";
 import clusterInjectable from "./dependencies/cluster.injectable";
 import type { DiRender } from "../test-utils/renderFor";
 import { renderFor } from "../test-utils/renderFor";
@@ -34,11 +34,13 @@ describe("kube-object-menu", () => {
   beforeEach(() => {
     di = getDiForUnitTesting({ doGeneralOverrides: true });
 
+    runInAction(() => {
       di.register(
         someMenuItemInjectable,
         someOtherMenuItemInjectable,
         someAnotherMenuItemInjectable,
       );
+    });
 
     render = renderFor(di);
 

src/renderer/components/test-utils/get-application-builder.tsx

@@ -143,7 +143,9 @@ export const getApplicationBuilder = () => {
     doGeneralOverrides: true,
   });
 
+  runInAction(() => {
     mainDi.register(mainExtensionsStateInjectable);
+  });
 
   const overrideChannelsForWindow = overrideChannels(mainDi);
 
@@ -184,7 +186,9 @@ export const getApplicationBuilder = () => {
 
     overrideChannelsForWindow(windowDi, windowId);
 
+    runInAction(() => {
       windowDi.register(rendererExtensionsStateInjectable);
+    });
 
     windowDi.override(
       currentlyInClusterFrameInjectable,
@@ -552,10 +556,12 @@ export const getApplicationBuilder = () => {
             getExtensionFakeForMain(mainDi, extension.id, extension.name, extension.mainOptions || {}),
           );
 
+          runInAction(() => {
             mainExtensionInstances.forEach(
               enableExtensionFor(mainDi, mainExtensionsStateInjectable),
             );
           });
+        });
       },
 
       disable: (...extensions) => {

src/renderer/getDi.tsx

@@ -6,11 +6,15 @@
 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 { runInAction } from "mobx";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 
 export const getDi = () => {
   const di = createContainer("renderer");
 
+  setLegacyGlobalDiForExtensionApi(di, Environments.renderer);
+
+  runInAction(() => {
     registerMobX(di);
 
     autoRegister({
@@ -22,8 +26,7 @@ export const getDi = () => {
         require.context("../features", true, /.*\/(renderer|common)\/.*\.injectable\.(ts|tsx)$/),
       ],
     });
-
+  });
-  setLegacyGlobalDiForExtensionApi(di, Environments.renderer);
 
   return di;
 };

src/renderer/getDiForUnitTesting.tsx

@@ -33,7 +33,7 @@ import lensResourcesDirInjectable from "../common/vars/lens-resources-dir.inject
 import broadcastMessageInjectable from "../common/ipc/broadcast-message.injectable";
 import apiManagerInjectable from "../common/k8s-api/api-manager/manager.injectable";
 import setupOnApiErrorListenersInjectable from "./api/setup-on-api-errors.injectable";
-import { observable, computed } from "mobx";
+import { observable, computed, runInAction } from "mobx";
 import defaultShellInjectable from "./components/+preferences/default-shell.injectable";
 import appVersionInjectable from "../common/vars/app-version.injectable";
 import requestAnimationFrameInjectable from "./components/animate/request-animation-frame.injectable";
@@ -68,26 +68,30 @@ import getEntitySettingCommandsInjectable from "./components/command-palette/reg
 import storageSaveDelayInjectable from "./utils/create-storage/storage-save-delay.injectable";
 import type { GlobalOverride } from "../common/test-utils/get-global-override";
 
-export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {}) => {
+export const getDiForUnitTesting = (
-  const {
+  opts: { doGeneralOverrides?: boolean } = {},
-    doGeneralOverrides = false,
+) => {
-  } = opts;
+  const { doGeneralOverrides = false } = opts;
 
   const di = createContainer("renderer");
 
-  registerMobX(di);
+  di.preventSideEffects();
 
   setLegacyGlobalDiForExtensionApi(di, Environments.renderer);
 
-  const injectables: Injectable<any, any, any>[] = (global as any).rendererInjectablePaths.map(
+  const injectables: Injectable<any, any, any>[] = (
+      global as any
+  ).rendererInjectablePaths.map(
     (filePath: string) => require(filePath).default,
   );
 
-  chunk(100)(injectables).forEach(chunkInjectables => {
+  runInAction(() => {
+    registerMobX(di);
+
+    chunk(100)(injectables).forEach((chunkInjectables) => {
       di.register(...chunkInjectables);
     });
-
+  });
-  di.preventSideEffects();
 
   if (doGeneralOverrides) {
     const globalOverrides: GlobalOverride[] = (global as any).rendererGlobalOverridePaths.map(

src/renderer/utils/create-storage/storages-are-ready.ts

@@ -3,6 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { DiContainer } from "@ogre-tools/injectable";
+import { runInAction } from "mobx";
 import type { CreateStorage } from "./create-storage";
 import createStorageInjectable from "./create-storage.injectable";
 
@@ -19,8 +20,10 @@ export const controlWhenStoragesAreReady = (di: DiContainer) => {
             return storage;
           };
 
+  runInAction(() => {
     // TODO: Remove when typing is added to the library
     (di as any).decorateFunction(createStorageInjectable, decorated);
+  });
 
   return async () => {
     await Promise.all(storagesAreReady);