Turn on strict mode in tsconfig.json, some helpful lints, and required cleanup where strictness necessitates it (#5195)

* Turn on strict mode in tsconfig.json - Add route, clusterRoute, and payloadValidatedClusterRoute helper functions to improve types with backend routes - Turn on the following new lints: - react/jsx-first-prop-new-line - react/jsx-wrap-multilines - react/jsx-one-expression-per-line - react/jsx-max-props-per-line - react/jsx-indent - react/jsx-indent-props Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix build Signed-off-by: Sebastian Malton <sebastian@malton.name> * Replace KubeObject scope strings with enum Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert package.json version changes Signed-off-by: Sebastian Malton <sebastian@malton.name> * revert move hostedCluster(Id) Signed-off-by: Sebastian Malton <sebastian@malton.name> * change some type param names to be not single letters Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove copy-extension-themes Signed-off-by: Sebastian Malton <sebastian@malton.name> * add new make clean action Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix build to not use webpack for generating types Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object-menu.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * revert move fileNameMigration to index Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix ref logic error Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix log-resource-selector.test.tsx tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-store.test.ts test by overriding createStorage to not touch file system Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster.test.ts tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube=api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fixed hotbar-store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kubeconfig-manager.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster-role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pods.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix delete-cluster-dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix daemonset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix replicaset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix statefulsets/dialog/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix replicasets/scale-dialog/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployments.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployments/scale/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cronjob.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix stateful-set.api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployment.api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix api-manager.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix statefulset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix job.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pods.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix scroll-spy.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix hotbar-remove-command.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog-entity-registry.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix welcome.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix verify-that-all-routes-have-route-component.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pod-tolerations.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * better fix for previous 3 fixes, plus also select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object-menu.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix app-paths.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-tabs.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix isReactNode typing Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sub-title.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix drawer.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix list-layout.tsx and header.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix error-boundary.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix upgrade-chart/store.ts and dock-tab.store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix install-chart/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix edit-resource/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix create-resource/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix namespace-select.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix namespace-select-filter.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix crd-list.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix wrong types for extensions Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix circular dependency Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix circular dependency on catalogCategoryRegistry Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix api-kube Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type errors, most <Select /> errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * fixing more type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * some more fixing type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * convert all KubeApis to injectable with legacy global backups Signed-off-by: Sebastian Malton <sebastian@malton.name> * factor out into a common file all the exports Signed-off-by: Sebastian Malton <sebastian@malton.name> * convert all KubeObjectStores to injectable with legacy global backups Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unused legacy KubeApi globals Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix bad previous commit Signed-off-by: Sebastian Malton <sebastian@malton.name> * more crash fixing Signed-off-by: Sebastian Malton <sebastian@malton.name> * try and fix behavioural tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sidebar-and-tab-navigation-for-core.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sidebar-and-tab-navigation-for-extensions.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make ThemeStore non-singleton and fix navigation-to-terminal-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * extensions.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog-entity-registry.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix log-resource-selector.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-tabs.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix delete-cluster-dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-kubernetes-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-editor-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-proxy-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-application-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix hotbar-remove-command.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster-role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-extension-specific-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-telemetry-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix closing-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-editor-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-proxy-preferences.test.ts - Fix other type errors too Signed-off-by: Sebastian Malton <sebastian@malton.name> * final tweaks Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add more tsconfig files, fix bug in <Catalog> - Make all of history, navigation injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Convert all of kube-details-params/ and navigate/ to injectable - This fixes a runtime error that was encountered during testing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix runtime errors on renderer - remove all static uses of `createPageParam` (and then removed the legacy global) - Made LensRendererExtension and LensMainExtension just used dependencies and not the getLegacyDi - Fixed circular dep in extension-loader Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move registerStore calls to after injectMany Signed-off-by: Sebastian Malton <sebastian@malton.name> * replace all the rest of the legacy uses of apiManager Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix stack overflow and cycles in DI Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix NamespaceSelectFilter not opening Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix WizardStep and AddNamespaceDialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix KubeApi's not being registered Signed-off-by: Sebastian Malton <sebastian@malton.name> * cleanup WindowManager Signed-off-by: Sebastian Malton <sebastian@malton.name> * Proper fix for Wizard, fix NamespaceStore.subscribe Signed-off-by: Sebastian Malton <sebastian@malton.name> * Rewrite withTooltip to be more type correct - Fixes mobx related "too many recursive actions" error - Change all the uses of withTooltips to be functional components Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add e2e test to cover kube api registration Signed-off-by: Sebastian Malton <sebastian@malton.name> * cleanup internal-commands Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove cast in <Animate> Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix command-palette e2e test Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix type error after rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix test name Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix code to help CodeQL scanner Signed-off-by: Sebastian Malton <sebastian@malton.name> * update intree extension lock files Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix build-extensions picking wrong @types/react Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix tests from rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type error Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make KubeconfigSyncManager more injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix crash in test mode for Dialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * make Select snapshots deterministic Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix new type error Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object.store.test.ts typing Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix merge build issues Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix snapshots after merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint after merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * reexport BaseKubeJsonApiObjectMetadata Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typo in terminalSpawningPool Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove duplicate license header Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typo to waitUntilDefined Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove iter use from getLegacyGlobalDiForExtensionApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove complex createStorage override Signed-off-by: Sebastian Malton <sebastian@malton.name> * override logger with mocks only when needed for tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove specialized overrideStore flags for getDiForUnitTesting Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unnecessary | undefined types from the exactOptionalFieldTypes experiment Signed-off-by: Sebastian Malton <sebastian@malton.name> * use more descriptive name for local test mocks Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unnecessary addition to 'make clean' target Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove oddity of KubeObjectStore.getById(undefined) being allowed Signed-off-by: Sebastian Malton <sebastian@malton.name> * rename KubeObject.getDescriptor in favour of name without fundemental JS meaning Signed-off-by: Sebastian Malton <sebastian@malton.name> * Simplify legacyRegisterApi when working in behaviour unit tests - Don't emit within main environment as there should be no auto registering there Signed-off-by: Sebastian Malton <sebastian@malton.name> * change confusing variable name in ReactiveDuration Signed-off-by: Sebastian Malton <sebastian@malton.name> * make visitor pattern more explicit for Entity contextMenuOpen Signed-off-by: Sebastian Malton <sebastian@malton.name> * toggleDetails -> toggleKubeDetailsPane is more specific Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove outdated comment Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix bug where LensExtension dependencies are not set Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests from the revert of react 18 Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix more tests from merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typings with new is-compatible-extension tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * more type fixing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert in-tree extension versions Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve name of guarding injectable for stores and apis - New name better implies that it is just a guard state and does not do anything Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add helper for <Select>.isMulti for storing in a Set<Value> Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix is-compatible-extension.test.ts types Signed-off-by: Sebastian Malton <sebastian@malton.name>
2025-05-20 05:10:56 +00:00 · 2022-05-16 07:17:57 -04:00
1 parent 381d77c633
commit dfcb7c3330
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { InstalledExtension } from "../extension-discovery/extension-discovery";
+import type { LensExtension, LensExtensionConstructor } from "../lens-extension";
+
+export type CreateExtensionInstance = (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension) => LensExtension;
+
+export const createExtensionInstanceInjectionToken = getInjectionToken<CreateExtensionInstance>({
+  id: "create-extension-instance-token",
+});
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { createExtensionInstance } from "./create-extension-instance";
-import fileSystemProvisionerStoreInjectable from "./file-system-provisioner-store/file-system-provisioner-store.injectable";
-
-const createExtensionInstanceInjectable = getInjectable({
-  id: "create-extension-instance",
-
-  instantiate: (di) => createExtensionInstance({
-    fileSystemProvisionerStore: di.inject(fileSystemProvisionerStoreInjectable),
-  }),
-});
-
-export default createExtensionInstanceInjectable;
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { LensExtensionConstructor } from "../../lens-extension";
-import type { InstalledExtension } from "../../extension-discovery/extension-discovery";
-import type {
-  LensExtensionDependencies } from "../../lens-extension-set-dependencies";
-import {
-  setLensExtensionDependencies,
-} from "../../lens-extension-set-dependencies";
-
-export const createExtensionInstance =
-  (dependencies: LensExtensionDependencies) =>
-    (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension) => {
-      const instance = new ExtensionClass(extension);
-
-      instance[setLensExtensionDependencies](dependencies);
-
-      return instance;
-    };
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { observable } from "mobx";
+import type { LensExtensionId, LensExtension } from "../lens-extension";
+
+const extensionInstancesInjectable = getInjectable({
+  id: "extension-instances",
+  instantiate: () => observable.map<LensExtensionId, LensExtension>(),
+});
+
+export default extensionInstancesInjectable;
@@ -5,20 +5,21 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { ExtensionLoader } from "./extension-loader";
 import updateExtensionsStateInjectable from "./update-extensions-state/update-extensions-state.injectable";
-import createExtensionInstanceInjectable from "./create-extension-instance/create-extension-instance.injectable";
 import { extensionRegistratorInjectionToken } from "./extension-registrator-injection-token";
 import extensionInstallationCounterInjectable from "./extension-installation-counter.injectable";
+import { createExtensionInstanceInjectionToken } from "./create-extension-instance.token";
+import extensionInstancesInjectable from "./extension-instances.injectable";

 const extensionLoaderInjectable = getInjectable({
  id: "extension-loader",

-  instantiate: (di) =>
-    new ExtensionLoader({
-      updateExtensionsState: di.inject(updateExtensionsStateInjectable),
-      createExtensionInstance: di.inject(createExtensionInstanceInjectable),
-      extensionRegistrators: di.injectMany(extensionRegistratorInjectionToken),
-      extensionInstallationCounter: di.inject(extensionInstallationCounterInjectable),
-    }),
+  instantiate: (di) => new ExtensionLoader({
+    updateExtensionsState: di.inject(updateExtensionsStateInjectable),
+    createExtensionInstance: di.inject(createExtensionInstanceInjectionToken),
+    extensionRegistrators: di.injectMany(extensionRegistratorInjectionToken),
+    extensionInstallationCounter: di.inject(extensionInstallationCounterInjectable),
+    extensionInstances: di.inject(extensionInstancesInjectable),
+  }),
 });

 export default extensionLoaderInjectable;
@@ -4,15 +4,15 @@
 */

 import { ipcRenderer } from "electron";
-import { EventEmitter } from "events";
 import { isEqual } from "lodash";
+import type { ObservableMap } from "mobx";
 import { action, computed, makeObservable, observable, observe, reaction, when } from "mobx";
 import path from "path";
 import { broadcastMessage, ipcMainOn, ipcRendererOn, ipcMainHandle } from "../../common/ipc";
 import type { Disposer } from "../../common/utils";
-import { toJS } from "../../common/utils";
+import { isDefined, toJS } from "../../common/utils";
 import logger from "../../main/logger";
-import type { KubernetesCluster } from "../common-api/catalog";
+import type { CatalogEntity, KubernetesCluster } from "../common-api/catalog";
 import type { InstalledExtension } from "../extension-discovery/extension-discovery";
 import type { LensExtension, LensExtensionConstructor, LensExtensionId } from "../lens-extension";
 import type { LensRendererExtension } from "../lens-renderer-extension";
@@ -20,14 +20,18 @@ import * as registries from "../registries";
 import type { LensExtensionState } from "../extensions-store/extensions-store";
 import { extensionLoaderFromMainChannel, extensionLoaderFromRendererChannel } from "../../common/ipc/extension-handling";
 import { requestExtensionLoaderInitialState } from "../../renderer/ipc";
+import assert from "assert";
+import { EventEmitter } from "../../common/event-emitter";
+import type { CreateExtensionInstance } from "./create-extension-instance.token";

 const logModule = "[EXTENSIONS-LOADER]";

 interface Dependencies {
  updateExtensionsState: (extensionsState: Record<LensExtensionId, LensExtensionState>) => void;
-  createExtensionInstance: (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension) => LensExtension;
-  extensionRegistrators: ((extension: LensExtension, extensionInstallationCount: number) => void)[];
-  extensionInstallationCounter: Map<string, number>;
+  createExtensionInstance: CreateExtensionInstance;
+  readonly extensionRegistrators: ((extension: LensExtension, extensionInstallationCount: number) => void)[];
+  readonly extensionInstallationCounter: Map<string, number>;
+  readonly extensionInstances: ObservableMap<LensExtensionId, LensExtension>;
 }

 export interface ExtensionLoading {
@@ -39,23 +43,21 @@ export interface ExtensionLoading {
 * Loads installed extensions to the Lens application
 */
 export class ExtensionLoader {
-  protected extensions = observable.map<LensExtensionId, InstalledExtension>();
-  protected instances = observable.map<LensExtensionId, LensExtension>();
+  protected readonly extensions = observable.map<LensExtensionId, InstalledExtension>();

  /**
   * This is the set of extensions that don't come with either
   * - Main.LensExtension when running in the main process
   * - Renderer.LensExtension when running in the renderer process
   */
-  protected nonInstancesByName = observable.set<string>();
+  protected readonly nonInstancesByName = observable.set<string>();

  /**
   * This is updated by the `observe` in the constructor. DO NOT write directly to it
   */
-  protected instancesByName = observable.map<string, LensExtension>();
+  protected readonly instancesByName = observable.map<string, LensExtension>();

-  // emits event "remove" of type LensExtension when the extension is removed
-  private events = new EventEmitter();
+  private readonly onRemoveExtensionId = new EventEmitter<[string]>();

  @observable isLoaded = false;

@@ -63,10 +65,10 @@ export class ExtensionLoader {
    return when(() => this.isLoaded);
  }

-  constructor(protected dependencies : Dependencies) {
+  constructor(protected readonly dependencies: Dependencies) {
    makeObservable(this);

-    observe(this.instances, change => {
+    observe(this.dependencies.extensionInstances, change => {
      switch (change.type) {
        case "add":
          if (this.instancesByName.has(change.newValue.name)) {
@@ -84,10 +86,6 @@ export class ExtensionLoader {
    });
  }

-  @computed get enabledExtensionInstances() : LensExtension[] {
-    return [...this.instances.values()].filter(extension => extension.isEnabled);
-  }
-
  @computed get userExtensions(): Map<LensExtensionId, InstalledExtension> {
    const extensions = this.toJSON();

@@ -152,7 +150,7 @@ export class ExtensionLoader {
    );
  }

-  initExtensions(extensions?: Map<LensExtensionId, InstalledExtension>) {
+  initExtensions(extensions: Map<LensExtensionId, InstalledExtension>) {
    this.extensions.replace(extensions);
  }

@@ -163,7 +161,7 @@ export class ExtensionLoader {
  @action
  removeInstance(lensExtensionId: LensExtensionId) {
    logger.info(`${logModule} deleting extension instance ${lensExtensionId}`);
-    const instance = this.instances.get(lensExtensionId);
+    const instance = this.dependencies.extensionInstances.get(lensExtensionId);

    if (!instance) {
      return;
@@ -171,8 +169,8 @@ export class ExtensionLoader {

    try {
      instance.disable();
-      this.events.emit("remove", instance);
-      this.instances.delete(lensExtensionId);
+      this.onRemoveExtensionId.emit(instance.id);
+      this.dependencies.extensionInstances.delete(lensExtensionId);
      this.nonInstancesByName.delete(instance.name);
    } catch (error) {
      logger.error(`${logModule}: deactivation extension error`, { lensExtensionId, error });
@@ -188,7 +186,11 @@ export class ExtensionLoader {
  }

  setIsEnabled(lensExtensionId: LensExtensionId, isEnabled: boolean) {
-    this.extensions.get(lensExtensionId).isEnabled = isEnabled;
+    const extension = this.extensions.get(lensExtensionId);
+
+    assert(extension, `Must register extension ${lensExtensionId} with before enabling it`);
+
+    extension.isEnabled = isEnabled;
  }

  protected async initMain() {
@@ -248,14 +250,15 @@ export class ExtensionLoader {
  loadOnClusterManagerRenderer = () => {
    logger.debug(`${logModule}: load on main renderer (cluster manager)`);

-    return this.autoInitExtensions(async (extension: LensRendererExtension) => {
+    return this.autoInitExtensions(async (ext) => {
+      const extension = ext as LensRendererExtension;
      const removeItems = [
        registries.EntitySettingRegistry.getInstance().add(extension.entitySettings),
        registries.CatalogEntityDetailRegistry.getInstance().add(extension.catalogEntityDetailItems),
      ];

-      this.events.on("remove", (removedExtension: LensRendererExtension) => {
-        if (removedExtension.id === extension.id) {
+      this.onRemoveExtensionId.addListener((removedExtensionId) => {
+        if (removedExtensionId === extension.id) {
          removeItems.forEach(remove => {
            remove();
          });
@@ -266,12 +269,15 @@ export class ExtensionLoader {
    });
  };

-  loadOnClusterRenderer = (getCluster: () => KubernetesCluster) => {
+  loadOnClusterRenderer = (getCluster: () => CatalogEntity) => {
    logger.debug(`${logModule}: load on cluster renderer (dashboard)`);

-    this.autoInitExtensions(async (extension: LensRendererExtension) => {
+    this.autoInitExtensions(async (ext) => {
+      const entity = getCluster() as KubernetesCluster;
+      const extension = ext as LensRendererExtension;
+
      // getCluster must be a callback, as the entity might be available only after an extension has been loaded
-      if ((await extension.isEnabledForCluster(getCluster())) === false) {
+      if ((await extension.isEnabledForCluster(entity)) === false) {
        return [];
      }

@@ -279,8 +285,8 @@ export class ExtensionLoader {
        registries.KubeObjectDetailRegistry.getInstance().add(extension.kubeObjectDetailItems),
      ];

-      this.events.on("remove", (removedExtension: LensRendererExtension) => {
-        if (removedExtension.id === extension.id) {
+      this.onRemoveExtensionId.addListener((removedExtensionId) => {
+        if (removedExtensionId === extension.id) {
          removeItems.forEach(remove => {
            remove();
          });
@@ -300,7 +306,7 @@ export class ExtensionLoader {

    const extensions = [...installedExtensions.entries()]
      .map(([extId, extension]) => {
-        const alreadyInit = this.instances.has(extId) || this.nonInstancesByName.has(extension.manifest.name);
+        const alreadyInit = this.dependencies.extensionInstances.has(extId) || this.nonInstancesByName.has(extension.manifest.name);

        if (extension.isCompatible && extension.isEnabled && !alreadyInit) {
          try {
@@ -317,7 +323,7 @@ export class ExtensionLoader {
              extension,
            );

-            this.instances.set(extId, instance);
+            this.dependencies.extensionInstances.set(extId, instance);

            return {
              instance,
@@ -332,7 +338,9 @@ export class ExtensionLoader {
        }

        return null;
-      }).filter(extension => Boolean(extension));
+      })
+      // Remove null values
+      .filter(isDefined);

    // We first need to wait until each extension's `onActivate` is resolved or rejected,
    // as this might register new catalog categories. Afterwards we can safely .enable the extension.
@@ -346,7 +354,7 @@ export class ExtensionLoader {
    );

    extensions.forEach(({ instance }) => {
-      const installationCount = (this.dependencies.extensionInstallationCounter.get(instance.sanitizedExtensionId) | 0) + 1;
+      const installationCount = (this.dependencies.extensionInstallationCounter.get(instance.sanitizedExtensionId) ?? 0) + 1;

      this.dependencies.extensionInstallationCounter.set(instance.sanitizedExtensionId, installationCount);

@@ -389,7 +397,7 @@ export class ExtensionLoader {
    try {
      return __non_webpack_require__(extAbsolutePath).default;
    } catch (error) {
-      if (ipcRenderer) {
+      if (window && error instanceof window.Error) {
        console.error(`${logModule}: can't load ${entryPointName} for "${extension.manifest.name}": ${error.stack || error}`, extension);
      } else {
        logger.error(`${logModule}: can't load ${entryPointName} for "${extension.manifest.name}": ${error}`, { extension });
@@ -399,12 +407,12 @@ export class ExtensionLoader {
    return null;
  }

-  getExtension(extId: LensExtensionId): InstalledExtension {
+  getExtension(extId: LensExtensionId) {
    return this.extensions.get(extId);
  }

-  getInstanceById<E extends LensExtension>(extId: LensExtensionId): E {
-    return this.instances.get(extId) as E;
+  getInstanceById(extId: LensExtensionId) {
+    return this.dependencies.extensionInstances.get(extId);
  }

  toJSON(): Map<LensExtensionId, InstalledExtension> {
@@ -3,8 +3,8 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { getInjectable } from "@ogre-tools/injectable";
-import directoryForUserDataInjectable from "../../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import getAbsolutePathInjectable from "../../../../../common/path/get-absolute-path.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import getAbsolutePathInjectable from "../../../common/path/get-absolute-path.injectable";

 const directoryForExtensionDataInjectable = getInjectable({
  id: "directory-for-extension-data",
@@ -4,17 +4,18 @@
 */
 import { getInjectable } from "@ogre-tools/injectable";
 import { FileSystemProvisionerStore } from "./file-system-provisioner-store";
-import directoryForExtensionDataInjectable from "./directory-for-extension-data/directory-for-extension-data.injectable";
+import directoryForExtensionDataInjectable from "./directory-for-extension-data.injectable";

 const fileSystemProvisionerStoreInjectable = getInjectable({
  id: "file-system-provisioner-store",

-  instantiate: (di) =>
-    FileSystemProvisionerStore.createInstance({
-      directoryForExtensionData: di.inject(
-        directoryForExtensionDataInjectable,
-      ),
-    }),
+  instantiate: (di) => {
+    FileSystemProvisionerStore.resetInstance();
+
+    return FileSystemProvisionerStore.createInstance({
+      directoryForExtensionData: di.inject(directoryForExtensionDataInjectable),
+    });
+  },

  causesSideEffects: true,
 });
@@ -8,9 +8,9 @@ import { SHA256 } from "crypto-js";
 import fse from "fs-extra";
 import { action, makeObservable, observable } from "mobx";
 import path from "path";
-import { BaseStore } from "../../../../common/base-store";
-import type { LensExtensionId } from "../../../lens-extension";
-import { toJS } from "../../../../common/utils";
+import { BaseStore } from "../../../common/base-store";
+import type { LensExtensionId } from "../../lens-extension";
+import { getOrInsertWith, toJS } from "../../../common/utils";

 interface FSProvisionModel {
  extensions: Record<string, string>; // extension names to paths
@@ -41,16 +41,12 @@ export class FileSystemProvisionerStore extends BaseStore<FSProvisionModel> {
   * @returns path to the folder that the extension can safely write files to.
   */
  async requestDirectory(extensionName: string): Promise<string> {
-    if (!this.registeredExtensions.has(extensionName)) {
+    const dirPath = getOrInsertWith(this.registeredExtensions, extensionName, () => {
      const salt = randomBytes(32).toString("hex");
      const hashedName = SHA256(`${extensionName}/${salt}`).toString();

-      const dirPath = path.resolve(this.dependencies.directoryForExtensionData, hashedName);
-
-      this.registeredExtensions.set(extensionName, dirPath);
-    }
-
-    const dirPath = this.registeredExtensions.get(extensionName);
+      return path.resolve(this.dependencies.directoryForExtensionData, hashedName);
+    });

    await fse.ensureDir(dirPath);