Remove BaseStore<T> and replace with composition of dependencies (#7002)

* Rename ExtensionStore -> BaseExtensionStore - The name was too close to ExtensionsStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move ExtensionsStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move ClusterStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move UserStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Cleanup types to remove multiple cast locations Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move HotbarStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move WeblinkStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move FileSystemProvisionerStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> * Clean up impl and rename to better describe intent Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix remaining type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fully split apart the enabled extensions storage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fully split apart the clusters storage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fully split apart the hotbar storage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fully split apart the weblinks storage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fully split apart the user preferences storage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix crashing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests and snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix integration test failures Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve typing to prevent errors in the future. Signed-off-by: Sebastian Malton <sebastian@malton.name> * Cleanup @k8slens/messaging and friends - To fix type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint issue Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix global override not being complete enough causing tests to fail Signed-off-by: Sebastian Malton <sebastian@malton.name> * Bump memory for unit tests on CI Signed-off-by: Sebastian Malton <sebastian@malton.name> * Attempt to fix memory issue on CI again Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fixup test because of new injectables Signed-off-by: Sebastian Malton <sebastian@malton.name> * Upgrade Jest Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix unit tests falling over Signed-off-by: Sebastian Malton <sebastian@malton.name> * Back out jest config change Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove console log Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshot Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests by matching equality instead of snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests by forcing specific snapshot style - Ubuntu CI seems to format arrays in snapshots differently than macOS locally 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-28 17:54:25 +03:00
1 parent ba4a283af9
commit 49f0a1af9c
@@ -5,14 +5,16 @@

 import type { ExtensionLoader } from "../extension-loader";
 import extensionLoaderInjectable from "../extension-loader/extension-loader.injectable";
+import type { ObservableMap } from "mobx";
 import { runInAction } from "mobx";
-import updateExtensionsStateInjectable from "../extension-loader/update-extensions-state/update-extensions-state.injectable";
 import { delay } from "@k8slens/utilities";
 import { getDiForUnitTesting } from "../../renderer/getDiForUnitTesting";
 import ipcRendererInjectable from "../../renderer/utils/channel/ipc-renderer.injectable";
 import type { IpcRenderer } from "electron";
 import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import currentlyInClusterFrameInjectable from "../../renderer/routes/currently-in-cluster-frame.injectable";
+import type { LensExtensionState } from "../../features/extensions/enabled/common/state.injectable";
+import enabledExtensionsStateInjectable from "../../features/extensions/enabled/common/state.injectable";

 const manifestPath = "manifest/path";
 const manifestPath2 = "manifest/path2";
@@ -20,7 +22,7 @@ const manifestPath3 = "manifest/path3";

 describe("ExtensionLoader", () => {
  let extensionLoader: ExtensionLoader;
-  let updateExtensionStateMock: jest.Mock;
+  let enabledExtensionsState: ObservableMap<string, LensExtensionState>;

  beforeEach(() => {
    const di = getDiForUnitTesting();
@@ -106,69 +108,60 @@ describe("ExtensionLoader", () => {
      },
    }) as unknown as IpcRenderer);

-    updateExtensionStateMock = jest.fn();
-
-    di.override(updateExtensionsStateInjectable, () => updateExtensionStateMock);
-
    extensionLoader = di.inject(extensionLoaderInjectable);
+    enabledExtensionsState = di.inject(enabledExtensionsStateInjectable);
  });

  it("renderer updates extension after ipc broadcast", async () => {
-    expect(extensionLoader.userExtensions).toMatchInlineSnapshot(`Map {}`);
+    expect(extensionLoader.userExtensions).toEqual(new Map());

    await extensionLoader.init();
    await delay(10);

    // Assert the extensions after the extension broadcast event
-    expect(extensionLoader.userExtensions).toMatchInlineSnapshot(`
-      Map {
-        "manifest/path" => Object {
-          "absolutePath": "/test/1",
-          "id": "manifest/path",
-          "isBundled": false,
-          "isEnabled": true,
-          "manifest": Object {
-            "name": "TestExtension",
-            "version": "1.0.0",
+    expect(extensionLoader.userExtensions).toEqual(
+      new Map([
+        ["manifest/path", {
+          absolutePath: "/test/1",
+          id: "manifest/path",
+          isBundled: false,
+          isEnabled: true,
+          manifest: {
+            name: "TestExtension",
+            version: "1.0.0",
          },
-          "manifestPath": "manifest/path",
-        },
-        "manifest/path3" => Object {
-          "absolutePath": "/test/3",
-          "id": "manifest/path3",
-          "isBundled": false,
-          "isEnabled": true,
-          "manifest": Object {
-            "name": "TestExtension3",
-            "version": "3.0.0",
+          manifestPath: "manifest/path",
+        }],
+        ["manifest/path3", {
+          absolutePath: "/test/3",
+          id: "manifest/path3",
+          isBundled: false,
+          isEnabled: true,
+          manifest: {
+            name: "TestExtension3",
+            version: "3.0.0",
          },
-          "manifestPath": "manifest/path3",
-        },
-      }
-    `);
+          manifestPath: "manifest/path3",
+        }],
+      ]),
+    );
  });

  it("updates ExtensionsStore after isEnabled is changed", async () => {
    await extensionLoader.init();

-    expect(updateExtensionStateMock).not.toHaveBeenCalled();
-
    runInAction(() => {
      extensionLoader.setIsEnabled("manifest/path", false);
    });

-    expect(updateExtensionStateMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        "manifest/path": {
-          enabled: false,
-          name: "TestExtension",
-        },
-
-        "manifest/path2": {
-          enabled: true,
-          name: "TestExtension2",
-        },
-      }),
-    );
+    expect(enabledExtensionsState.size).toBe(2);
+    expect(enabledExtensionsState.get("manifest/path")).toMatchObject({
+      enabled: false,
+      name: "TestExtension",
+    });
+    expect(enabledExtensionsState.get("manifest/path2")).toMatchObject({
+      enabled: true,
+      name: "TestExtension2",
+    });
  });
 });
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import * as path from "path";
+import type { LensExtension } from "./lens-extension";
+import type { StaticThis } from "../common/utils/singleton";
+import { getOrInsertWith } from "@k8slens/utilities";
+import { getLegacyGlobalDiForExtensionApi } from "./as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
+import type { PersistentStorage, PersistentStorageParams } from "../common/persistent-storage/create.injectable";
+import createPersistentStorageInjectable from "../common/persistent-storage/create.injectable";
+import directoryForUserDataInjectable from "../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import assert from "assert";
+import type { Options } from "conf";
+import type { Migrations } from "../common/persistent-storage/migrations.injectable";
+
+export interface ExtensionStoreParams<T extends object> extends Omit<PersistentStorageParams<T>, "migrations" | "cwd" | "fromStore" | "toJSON"> {
+  migrations?: Options<T>["migrations"];
+  cwd?: string;
+}
+
+export abstract class BaseExtensionStore<T extends object> {
+  private static readonly instances = new WeakMap<object, any>();
+
+  /**
+   * @deprecated This is a form of global shared state. Just call `new Store(...)`
+   */
+  static createInstance<T, R extends any[]>(this: StaticThis<T, R>, ...args: R): T {
+    return getOrInsertWith(BaseExtensionStore.instances, this, () =>  new this(...args)) as T;
+  }
+
+  /**
+   * @deprecated This is a form of global shared state. Just call `new Store(...)`
+   */
+  static getInstance<T, R extends any[]>(this: StaticThis<T, R>, strict?: true): T;
+  static getInstance<T, R extends any[]>(this: StaticThis<T, R>, strict: false): T | undefined;
+  static getInstance<T, R extends any[]>(this: StaticThis<T, R>, strict = true): T | undefined {
+    if (!BaseExtensionStore.instances.has(this) && strict) {
+      throw new TypeError(`instance of ${this.name} is not created`);
+    }
+
+    return BaseExtensionStore.instances.get(this) as (T | undefined);
+  }
+
+  protected persistentStorage?: PersistentStorage;
+  private readonly dependencies = (() => {
+    const di = getLegacyGlobalDiForExtensionApi();
+
+    return {
+      createPersistentStorage: di.inject(createPersistentStorageInjectable),
+      directoryForUserData: di.inject(directoryForUserDataInjectable),
+    } as const;
+  })();
+
+  constructor(protected readonly rawParams: ExtensionStoreParams<T>) { }
+
+  /**
+   * @deprecated This is a form of global shared state. Just call `new Store(...)`
+   */
+  static resetInstance() {
+    BaseExtensionStore.instances.delete(this);
+  }
+
+  protected extension?: LensExtension;
+
+  loadExtension(extension: LensExtension) {
+    this.extension = extension;
+    const {
+      projectVersion = this.extension.version,
+      cwd: _cwd, // This is ignored to maintain backwards compatibility
+      migrations = {},
+      ...params
+    } = this.rawParams;
+
+    this.persistentStorage = this.dependencies.createPersistentStorage({
+      ...params,
+      cwd: this.cwd(),
+      projectVersion,
+      migrations: migrations as Migrations,
+      fromStore: (data) => this.fromStore(data),
+      toJSON: () => this.toJSON(),
+    });
+
+    this.persistentStorage.loadAndStartSyncing();
+  }
+
+  /**
+   * @deprecated Never use this method. Instead call {@link BaseExtensionStore.loadExtension}
+   */
+  load() {
+    this.persistentStorage?.loadAndStartSyncing();
+  }
+
+  protected cwd() {
+    assert(this.extension, "cwd can only be called in loadExtension");
+
+    return this.rawParams.cwd ?? path.join(this.dependencies.directoryForUserData, "extension-store", this.extension.storeName);
+  }
+
+  abstract fromStore(data: Partial<T>): void;
+  abstract toJSON(): T;
+}
@@ -8,21 +8,21 @@ import isLinuxInjectable from "../../common/vars/is-linux.injectable";
 import isMacInjectable from "../../common/vars/is-mac.injectable";
 import isSnapPackageInjectable from "../../common/vars/is-snap-package.injectable";
 import isWindowsInjectable from "../../common/vars/is-windows.injectable";
-import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
 import { getLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import getEnabledExtensionsInjectable from "./get-enabled-extensions/get-enabled-extensions.injectable";
 import { issuesTrackerUrl } from "../../common/vars";
 import { buildVersionInjectionToken } from "../../common/vars/build-semantic-version.injectable";
 import { asLegacyGlobalForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
-import userStoreInjectable from "../../common/user-store/user-store.injectable";
+import enabledExtensionsInjectable from "../../features/extensions/enabled/common/enabled-extensions.injectable";
+import userPreferencesStateInjectable from "../../features/user-preferences/common/state.injectable";

-const userStore = asLegacyGlobalForExtensionApi(userStoreInjectable);
+const userStore = asLegacyGlobalForExtensionApi(userPreferencesStateInjectable);
+const enabledExtensions = asLegacyGlobalForExtensionApi(enabledExtensionsInjectable);

 export const App = {
  Preferences: {
    getKubectlPath: () => userStore.kubectlBinariesPath,
  },
-  getEnabledExtensions: asLegacyGlobalFunctionForExtensionApi(getEnabledExtensionsInjectable),
+  getEnabledExtensions: () => enabledExtensions.get(),
  get version() {
    const di = getLegacyGlobalDiForExtensionApi();

@@ -54,7 +54,7 @@ export const App = {
    return di.inject(isLinuxInjectable);
  },
  /**
-   * @deprecated This value is now `""` and is left here for backwards compatability.
+   * @deprecated This value is now `""` and is left here for backwards compatibility.
   */
  slackUrl: "",
  issuesTrackerUrl,
@@ -1,15 +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 extensionsStoreInjectable from "../../extensions-store/extensions-store.injectable";
-
-const getEnabledExtensionsInjectable = getInjectable({
-  id: "get-enabled-extensions",
-
-  instantiate: (di) => () =>
-    di.inject(extensionsStoreInjectable).enabledExtensions,
-});
-
-export default getEnabledExtensionsInjectable;
@@ -3,10 +3,13 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */

-import type { BaseStoreParams } from "../../common/base-store/base-store";
-import { ExtensionStore } from "../extension-store";
+import type { PersistentStorageParams } from "../../common/persistent-storage/create.injectable";
+import type { ExtensionStoreParams } from "../base-extension-store";
+import { BaseExtensionStore as ExtensionStore } from "../base-extension-store";

-export {
-  BaseStoreParams,
-  ExtensionStore,
+export type {
+  ExtensionStoreParams,
+  PersistentStorageParams,
 };
+
+export { ExtensionStore };
@@ -6,7 +6,6 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { ExtensionDiscovery } from "./extension-discovery";
 import extensionLoaderInjectable from "../extension-loader/extension-loader.injectable";
 import isCompatibleExtensionInjectable from "./is-compatible-extension/is-compatible-extension.injectable";
-import extensionsStoreInjectable from "../extensions-store/extensions-store.injectable";
 import extensionInstallationStateStoreInjectable from "../extension-installation-state-store/extension-installation-state-store.injectable";
 import installExtensionInjectable from "../install-extension/install-extension.injectable";
 import extensionPackageRootDirectoryInjectable from "../install-extension/extension-package-root-directory.injectable";
@@ -28,13 +27,14 @@ import joinPathsInjectable from "../../common/path/join-paths.injectable";
 import removePathInjectable from "../../common/fs/remove.injectable";
 import homeDirectoryPathInjectable from "../../common/os/home-directory-path.injectable";
 import lensResourcesDirInjectable from "../../common/vars/lens-resources-dir.injectable";
+import isExtensionEnabledInjectable from "../../features/extensions/enabled/common/is-enabled.injectable";

 const extensionDiscoveryInjectable = getInjectable({
  id: "extension-discovery",

  instantiate: (di) => new ExtensionDiscovery({
    extensionLoader: di.inject(extensionLoaderInjectable),
-    extensionsStore: di.inject(extensionsStoreInjectable),
+    isExtensionEnabled: di.inject(isExtensionEnabledInjectable),
    extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
    isCompatibleExtension: di.inject(isCompatibleExtensionInjectable),
    installExtension: di.inject(installExtensionInjectable),
@@ -9,7 +9,6 @@ import { makeObservable, observable, reaction, when } from "mobx";
 import { broadcastMessage, ipcMainHandle, ipcRendererOn } from "../../common/ipc";
 import { toJS } from "../../common/utils";
 import { isErrnoException } from "@k8slens/utilities";
-import type { ExtensionsStore } from "../extensions-store/extensions-store";
 import type { ExtensionLoader } from "../extension-loader";
 import type { InstalledExtension, LensExtensionId, LensExtensionManifest } from "@k8slens/legacy-extensions";
 import type { ExtensionInstallationStateStore } from "../extension-installation-state-store/extension-installation-state-store";
@@ -31,10 +30,10 @@ import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable"
 import type { GetRelativePath } from "../../common/path/get-relative-path.injectable";
 import type { RemovePath } from "../../common/fs/remove.injectable";
 import type TypedEventEmitter from "typed-emitter";
+import type { IsExtensionEnabled } from "../../features/extensions/enabled/common/is-enabled.injectable";

 interface Dependencies {
  readonly extensionLoader: ExtensionLoader;
-  readonly extensionsStore: ExtensionsStore;
  readonly extensionInstallationStateStore: ExtensionInstallationStateStore;
  readonly extensionPackageRootDirectory: string;
  readonly resourcesDirectory: string;
@@ -42,6 +41,7 @@ interface Dependencies {
  readonly isProduction: boolean;
  readonly fileSystemSeparator: string;
  readonly homeDirectoryPath: string;
+  isExtensionEnabled: IsExtensionEnabled;
  isCompatibleExtension: (manifest: LensExtensionManifest) => boolean;
  installExtension: (name: string) => Promise<void>;
  readJsonFile: ReadJson;
@@ -334,7 +334,7 @@ export class ExtensionDiscovery {
    try {
      const manifest = await this.dependencies.readJsonFile(manifestPath) as unknown as LensExtensionManifest;
      const id = isBundled ? manifestPath : this.getInstalledManifestPath(manifest.name);
-      const isEnabled = this.dependencies.extensionsStore.isEnabled({ id, isBundled });
+      const isEnabled = this.dependencies.isExtensionEnabled({ id, isBundled });
      const extensionDir = this.dependencies.getDirnameOfPath(manifestPath);
      const npmPackage = this.dependencies.joinPaths(extensionDir, `${manifest.name}-${manifest.version}.tgz`);
      const absolutePath = this.dependencies.isProduction && await this.dependencies.pathExists(npmPackage)
@@ -4,7 +4,6 @@
 */
 import { getInjectable } from "@ogre-tools/injectable";
 import { ExtensionLoader } from "./extension-loader";
-import updateExtensionsStateInjectable from "./update-extensions-state/update-extensions-state.injectable";
 import { createExtensionInstanceInjectionToken } from "./create-extension-instance.token";
 import extensionInstancesInjectable from "./extension-instances.injectable";
 import type { LensExtension } from "../lens-extension";
@@ -14,6 +13,7 @@ import joinPathsInjectable from "../../common/path/join-paths.injectable";
 import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable";
 import { bundledExtensionInjectionToken } from "@k8slens/legacy-extensions";
 import { extensionEntryPointNameInjectionToken } from "./entry-point-name";
+import updateExtensionsStateInjectable from "../../features/extensions/enabled/common/update-state.injectable";

 const extensionLoaderInjectable = getInjectable({
  id: "extension-loader",
@@ -10,7 +10,6 @@ import { action, computed, makeObservable, toJS, observable, observe, reaction,
 import { broadcastMessage, ipcMainOn, ipcRendererOn, ipcMainHandle } from "../../common/ipc";
 import { isDefined } from "@k8slens/utilities";
 import type { LensExtension } from "../lens-extension";
-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";
@@ -21,6 +20,7 @@ import type { Logger } from "../../common/logger";
 import type { JoinPaths } from "../../common/path/join-paths.injectable";
 import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable";
 import type { LensExtensionId, BundledExtension, InstalledExtension, LensExtensionConstructor } from "@k8slens/legacy-extensions";
+import type { UpdateExtensionsState } from "../../features/extensions/enabled/common/update-state.injectable";

 const logModule = "[EXTENSIONS-LOADER]";

@@ -29,7 +29,7 @@ interface Dependencies {
  readonly bundledExtensions: BundledExtension[];
  readonly logger: Logger;
  readonly extensionEntryPointName: "main" | "renderer";
-  updateExtensionsState: (extensionsState: Record<LensExtensionId, LensExtensionState>) => void;
+  updateExtensionsState: UpdateExtensionsState;
  createExtensionInstance: CreateExtensionInstance;
  getExtension: (instance: LensExtension) => Extension;
  joinPaths: JoinPaths;
@@ -125,13 +125,11 @@ export class ExtensionLoader {

  // Transform userExtensions to a state object for storing into ExtensionsStore
  @computed get storeState() {
-    return Object.fromEntries(
-      Array.from(this.userExtensions)
-        .map(([extId, extension]) => [extId, {
-          enabled: extension.isEnabled,
-          name: extension.manifest.name,
-        }]),
-    );
+    return Array.from(this.userExtensions)
+      .map(([extId, extension]) => [extId, {
+        enabled: extension.isEnabled,
+        name: extension.manifest.name,
+      }] as const);
  }

  @action
@@ -3,8 +3,8 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { MigrationDeclaration } from "../../../common/base-store/migrations.injectable";
+import type { MigrationDeclaration } from "../../../common/persistent-storage/migrations.injectable";

-export const fileSystemProvisionerStoreInjectionToken = getInjectionToken<MigrationDeclaration>({
-  id: "file-system-provisioner-store-injection-token",
+export const fileSystemProvisionerStoreMigrationDeclarationInjectionToken = getInjectionToken<MigrationDeclaration>({
+  id: "file-system-provisioner-store-migration-declaration",
 });
@@ -3,36 +3,36 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { getInjectable } from "@ogre-tools/injectable";
-import { FileSystemProvisionerStore } from "./file-system-provisioner-store";
-import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
-import loggerInjectable from "../../../common/logger.injectable";
-import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable";
-import { baseStoreIpcChannelPrefixesInjectionToken } from "../../../common/base-store/channel-prefix";
-import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../../../common/base-store/disable-sync";
-import { persistStateToConfigInjectionToken } from "../../../common/base-store/save-to-file";
-import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
-import { enlistMessageChannelListenerInjectionToken } from "@k8slens/messaging";
-import ensureHashedDirectoryForExtensionInjectable from "./ensure-hashed-directory-for-extension.injectable";
 import { registeredExtensionsInjectable } from "./registered-extensions.injectable";
+import createPersistentStorageInjectable from "../../../common/persistent-storage/create.injectable";
+import { action } from "mobx";
+import { object } from "@k8slens/utilities";
+import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable";

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

-  instantiate: (di) => new FileSystemProvisionerStore({
-    directoryForUserData: di.inject(directoryForUserDataInjectable),
-    getConfigurationFileModel: di.inject(getConfigurationFileModelInjectable),
-    logger: di.inject(loggerInjectable),
-    storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
-    migrations: {},
-    getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
-    ipcChannelPrefixes: di.inject(baseStoreIpcChannelPrefixesInjectionToken),
-    persistStateToConfig: di.inject(persistStateToConfigInjectionToken),
-    enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
-    shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),
-    ensureHashedDirectoryForExtension: di.inject(ensureHashedDirectoryForExtensionInjectable),
-    registeredExtensions: di.inject(registeredExtensionsInjectable),
-  }),
+  instantiate: (di) => {
+    const registeredExtensions = di.inject(registeredExtensionsInjectable);
+    const createPersistentStorage = di.inject(createPersistentStorageInjectable);
+    const storeMigrationVersion = di.inject(storeMigrationVersionInjectable);
+
+    const store = createPersistentStorage({
+      configName: "lens-filesystem-provisioner-store",
+      accessPropertiesByDotNotation: false, // To make dots safe in cluster context names
+      projectVersion: storeMigrationVersion,
+      fromStore: action(({ extensions = {}}) => {
+        registeredExtensions.replace(object.entries(extensions));
+      }),
+      toJSON: () => ({
+        extensions: Object.fromEntries(registeredExtensions),
+      }),
+    });
+
+    return {
+      load: () => store.loadAndStartSyncing(),
+    };
+  },
 });

 export default fileSystemProvisionerStoreInjectable;
@@ -1,52 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { LensExtensionId } from "@k8slens/legacy-extensions";
-import type { ObservableMap } from "mobx";
-import { action, makeObservable } from "mobx";
-import type { BaseStoreDependencies } from "../../../common/base-store/base-store";
-import { BaseStore } from "../../../common/base-store/base-store";
-import type { EnsureHashedDirectoryForExtension } from "./ensure-hashed-directory-for-extension.injectable";
-
-interface FSProvisionModel {
-  extensions: Record<string, string>; // extension names to paths
-}
-
-interface Dependencies extends BaseStoreDependencies {
-  ensureHashedDirectoryForExtension: EnsureHashedDirectoryForExtension;
-  registeredExtensions: ObservableMap<LensExtensionId, string>;
-}
-
-export class FileSystemProvisionerStore extends BaseStore<FSProvisionModel> {
-  constructor(protected readonly dependencies: Dependencies) {
-    super(dependencies, {
-      configName: "lens-filesystem-provisioner-store",
-      accessPropertiesByDotNotation: false, // To make dots safe in cluster context names
-    });
-
-    makeObservable(this);
-  }
-
-  /**
-   * This function retrieves the saved path to the folder which the extension
-   * can saves files to. If the folder is not present then it is created.
-   * @param extensionName the name of the extension requesting the path
-   * @returns path to the folder that the extension can safely write files to.
-   */
-  async requestDirectory(extensionName: string): Promise<string> {
-    return this.dependencies.ensureHashedDirectoryForExtension(extensionName);
-  }
-
-  @action
-  protected fromStore({ extensions }: FSProvisionModel = { extensions: {}}): void {
-    this.dependencies.registeredExtensions.merge(extensions);
-  }
-
-  toJSON(): FSProvisionModel {
-    return {
-      extensions: Object.fromEntries(this.dependencies.registeredExtensions.toJSON()),
-    };
-  }
-}
@@ -1,13 +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 extensionsStoreInjectable from "../../extensions-store/extensions-store.injectable";
-
-const updateExtensionsStateInjectable = getInjectable({
-  id: "update-extensions-state",
-  instantiate: (di) => di.inject(extensionsStoreInjectable).mergeState,
-});
-
-export default updateExtensionsStateInjectable;
@@ -1,97 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { BaseStoreParams } from "../common/base-store/base-store";
-import { BaseStore } from "../common/base-store/base-store";
-import * as path from "path";
-import type { LensExtension } from "./lens-extension";
-import assert from "assert";
-import type { StaticThis } from "../common/utils/singleton";
-import { getOrInsertWith } from "@k8slens/utilities";
-import { getLegacyGlobalDiForExtensionApi } from "./as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import directoryForUserDataInjectable from "../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import getConfigurationFileModelInjectable from "../common/get-configuration-file-model/get-configuration-file-model.injectable";
-import loggerInjectable from "../common/logger.injectable";
-import storeMigrationVersionInjectable from "../common/vars/store-migration-version.injectable";
-import type { Migrations } from "conf/dist/source/types";
-import { baseStoreIpcChannelPrefixesInjectionToken } from "../common/base-store/channel-prefix";
-import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../common/base-store/disable-sync";
-import { persistStateToConfigInjectionToken } from "../common/base-store/save-to-file";
-import getBasenameOfPathInjectable from "../common/path/get-basename.injectable";
-import { enlistMessageChannelListenerInjectionToken } from "@k8slens/messaging";
-
-export interface ExtensionStoreParams<T extends object> extends BaseStoreParams<T> {
-  migrations?: Migrations<T>;
-}
-
-export abstract class ExtensionStore<T extends object> extends BaseStore<T> {
-  private static readonly instances = new WeakMap<object, any>();
-
-  /**
-   * @deprecated This is a form of global shared state. Just call `new Store(...)`
-   */
-  static createInstance<T, R extends any[]>(this: StaticThis<T, R>, ...args: R): T {
-    return getOrInsertWith(ExtensionStore.instances, this, () =>  new this(...args)) as T;
-  }
-
-  /**
-   * @deprecated This is a form of global shared state. Just call `new Store(...)`
-   */
-  static getInstance<T, R extends any[]>(this: StaticThis<T, R>, strict?: true): T;
-  static getInstance<T, R extends any[]>(this: StaticThis<T, R>, strict: false): T | undefined;
-  static getInstance<T, R extends any[]>(this: StaticThis<T, R>, strict = true): T | undefined {
-    if (!ExtensionStore.instances.has(this) && strict) {
-      throw new TypeError(`instance of ${this.name} is not created`);
-    }
-
-    return ExtensionStore.instances.get(this) as (T | undefined);
-  }
-
-  constructor({ migrations, ...params }: ExtensionStoreParams<T>) {
-    const di = getLegacyGlobalDiForExtensionApi();
-
-    super({
-      directoryForUserData: di.inject(directoryForUserDataInjectable),
-      getConfigurationFileModel: di.inject(getConfigurationFileModelInjectable),
-      logger: di.inject(loggerInjectable),
-      storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
-      migrations: migrations as Migrations<Record<string, unknown>>,
-      getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
-      ipcChannelPrefixes: di.inject(baseStoreIpcChannelPrefixesInjectionToken),
-      persistStateToConfig: di.inject(persistStateToConfigInjectionToken),
-      enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
-      shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),
-    }, params);
-  }
-
-  /**
-   * @deprecated This is a form of global shared state. Just call `new Store(...)`
-   */
-  static resetInstance() {
-    ExtensionStore.instances.delete(this);
-  }
-
-  protected extension?: LensExtension;
-
-  loadExtension(extension: LensExtension) {
-    this.extension = extension;
-
-    this.params.projectVersion ??= this.extension.version;
-
-    return super.load();
-  }
-
-  load() {
-    if (!this.extension) { return; }
-
-    return super.load();
-  }
-
-  protected cwd() {
-    assert(this.extension, "must call this.load() first");
-
-    return path.join(super.cwd(), "extension-store", this.extension.storeName);
-  }
-}
@@ -1,33 +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 directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import { baseStoreIpcChannelPrefixesInjectionToken } from "../../common/base-store/channel-prefix";
-import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../../common/base-store/disable-sync";
-import { persistStateToConfigInjectionToken } from "../../common/base-store/save-to-file";
-import getConfigurationFileModelInjectable from "../../common/get-configuration-file-model/get-configuration-file-model.injectable";
-import loggerInjectable from "../../common/logger.injectable";
-import getBasenameOfPathInjectable from "../../common/path/get-basename.injectable";
-import { enlistMessageChannelListenerInjectionToken } from "@k8slens/messaging";
-import storeMigrationVersionInjectable from "../../common/vars/store-migration-version.injectable";
-import { ExtensionsStore } from "./extensions-store";
-
-const extensionsStoreInjectable = getInjectable({
-  id: "extensions-store",
-  instantiate: (di) => new ExtensionsStore({
-    directoryForUserData: di.inject(directoryForUserDataInjectable),
-    getConfigurationFileModel: di.inject(getConfigurationFileModelInjectable),
-    logger: di.inject(loggerInjectable),
-    storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
-    migrations: {},
-    getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
-    ipcChannelPrefixes: di.inject(baseStoreIpcChannelPrefixesInjectionToken),
-    persistStateToConfig: di.inject(persistStateToConfigInjectionToken),
-    enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
-    shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),
-  }),
-});
-
-export default extensionsStoreInjectable;
@@ -1,63 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { LensExtensionId } from "@k8slens/legacy-extensions";
-import { action, computed, makeObservable, observable } from "mobx";
-import type { BaseStoreDependencies } from "../../common/base-store/base-store";
-import { BaseStore } from "../../common/base-store/base-store";
-
-export interface LensExtensionsStoreModel {
-  extensions: Record<LensExtensionId, LensExtensionState>;
-}
-
-export interface LensExtensionState {
-  enabled?: boolean;
-  name: string;
-}
-
-export interface IsEnabledExtensionDescriptor {
-  id: string;
-  isBundled: boolean;
-}
-
-export class ExtensionsStore extends BaseStore<LensExtensionsStoreModel> {
-  constructor(deps: BaseStoreDependencies) {
-    super(deps, {
-      configName: "lens-extensions",
-    });
-    makeObservable(this);
-    this.load();
-  }
-
-  @computed
-  get enabledExtensions() {
-    return Array.from(this.state.values())
-      .filter(({ enabled }) => enabled)
-      .map(({ name }) => name);
-  }
-
-  protected state = observable.map<LensExtensionId, LensExtensionState>();
-
-  isEnabled({ id, isBundled }: IsEnabledExtensionDescriptor): boolean {
-    // By default false, so that copied extensions are disabled by default.
-    // If user installs the extension from the UI, the Extensions component will specifically enable it.
-    return isBundled || Boolean(this.state.get(id)?.enabled);
-  }
-
-  mergeState = action((extensionsState: Record<LensExtensionId, LensExtensionState> | [LensExtensionId, LensExtensionState][]) => {
-    this.state.merge(extensionsState);
-  });
-
-  @action
-  protected fromStore({ extensions }: LensExtensionsStoreModel) {
-    this.state.merge(extensions);
-  }
-
-  toJSON(): LensExtensionsStoreModel {
-    return {
-      extensions: Object.fromEntries(this.state.toJSON()),
-    };
-  }
-}
@@ -10,13 +10,13 @@ import type { Route } from "../common/front-end-routing/front-end-route-injectio
 import type { CatalogEntityRegistry as MainCatalogEntityRegistry } from "../main/catalog";
 import type { CatalogEntityRegistry as RendererCatalogEntityRegistry } from "../renderer/api/catalog/entity/registry";
 import type { GetExtensionPageParameters } from "../renderer/routes/get-extension-page-parameters.injectable";
-import type { FileSystemProvisionerStore } from "./extension-loader/file-system-provisioner-store/file-system-provisioner-store";
 import type { NavigateForExtension } from "../main/start-main-application/lens-window/navigate-for-extension.injectable";
 import type { Logger } from "../common/logger";
+import type { EnsureHashedDirectoryForExtension } from "./extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.injectable";

 export interface LensExtensionDependencies {
-  readonly fileSystemProvisionerStore: FileSystemProvisionerStore;
  readonly logger: Logger;
+  ensureHashedDirectoryForExtension: EnsureHashedDirectoryForExtension;
 }

 export interface LensMainExtensionDependencies extends LensExtensionDependencies {
@@ -83,7 +83,7 @@ export class LensExtension<
   */
  async getExtensionFileFolder(): Promise<string> {
    // storeName is read from the manifest and has a fallback to the manifest name, which equals id
-    return this[lensExtensionDependencies].fileSystemProvisionerStore.requestDirectory(this.storeName);
+    return this[lensExtensionDependencies].ensureHashedDirectoryForExtension(this.storeName);
  }

  @action
@@ -37,7 +37,7 @@ import namespaceApiInjectable from "../../common/k8s-api/endpoints/namespace.api
 import kubeEventApiInjectable from "../../common/k8s-api/endpoints/events.api.injectable";
 import roleBindingApiInjectable from "../../common/k8s-api/endpoints/role-binding.api.injectable";
 import customResourceDefinitionApiInjectable from "../../common/k8s-api/endpoints/custom-resource-definition.api.injectable";
-import { shouldShowResourceInjectionToken } from "../../common/cluster-store/allowed-resources-injection-token";
+import { shouldShowResourceInjectionToken } from "../../features/cluster/showing-kube-resources/common/allowed-resources-injection-token";
 import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
 import requestMetricsInjectable from "../../common/k8s-api/endpoints/metrics.api/request-metrics.injectable";