diff --git a/src/extensions/extension-loader/extension-installation-counter.injectable.ts b/src/extensions/extension-loader/extension-installation-counter.injectable.ts deleted file mode 100644 index 2510a679dc..0000000000 --- a/src/extensions/extension-loader/extension-installation-counter.injectable.ts +++ /dev/null @@ -1,12 +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"; - -const extensionInstallationCounterInjectable = getInjectable({ - id: "extension-installation-counter", - instantiate: () => new Map(), -}); - -export default extensionInstallationCounterInjectable; diff --git a/src/extensions/extension-loader/extension-loader.injectable.ts b/src/extensions/extension-loader/extension-loader.injectable.ts index a1c592ffdd..7fe1cd5421 100644 --- a/src/extensions/extension-loader/extension-loader.injectable.ts +++ b/src/extensions/extension-loader/extension-loader.injectable.ts @@ -5,7 +5,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { ExtensionLoader } from "./extension-loader"; import updateExtensionsStateInjectable from "./update-extensions-state/update-extensions-state.injectable"; -import extensionInstallationCounterInjectable from "./extension-installation-counter.injectable"; import { createExtensionInstanceInjectionToken } from "./create-extension-instance.token"; import extensionInstancesInjectable from "./extension-instances.injectable"; import type { LensExtension } from "../lens-extension"; @@ -17,7 +16,6 @@ const extensionLoaderInjectable = getInjectable({ instantiate: (di) => new ExtensionLoader({ updateExtensionsState: di.inject(updateExtensionsStateInjectable), createExtensionInstance: di.inject(createExtensionInstanceInjectionToken), - extensionInstallationCounter: di.inject(extensionInstallationCounterInjectable), extensionInstances: di.inject(extensionInstancesInjectable), getExtension: (instance: LensExtension) => di.inject(extensionInjectable, instance), }), diff --git a/src/extensions/extension-loader/extension-loader.ts b/src/extensions/extension-loader/extension-loader.ts index 9ed691002d..68399dc6ad 100644 --- a/src/extensions/extension-loader/extension-loader.ts +++ b/src/extensions/extension-loader/extension-loader.ts @@ -30,7 +30,6 @@ const logModule = "[EXTENSIONS-LOADER]"; interface Dependencies { updateExtensionsState: (extensionsState: Record) => void; createExtensionInstance: CreateExtensionInstance; - readonly extensionInstallationCounter: Map; readonly extensionInstances: ObservableMap; getExtension: (instance: LensExtension) => Extension; } @@ -171,9 +170,9 @@ export class ExtensionLoader { try { instance.disable(); - const registeredExtension = this.dependencies.getExtension(instance); + const extension = this.dependencies.getExtension(instance); - registeredExtension.deregister(); + extension.deregister(); this.onRemoveExtensionId.emit(instance.id); this.dependencies.extensionInstances.delete(lensExtensionId); @@ -360,9 +359,9 @@ export class ExtensionLoader { ); extensions.forEach(({ instance }) => { - const getExtension = this.dependencies.getExtension(instance); + const extension = this.dependencies.getExtension(instance); - getExtension.register(); + extension.register(); }); // Return ExtensionLoading[] diff --git a/src/extensions/extension-loader/extension/extension.injectable.ts b/src/extensions/extension-loader/extension/extension.injectable.ts index 1473c8db12..ba1bb6aea8 100644 --- a/src/extensions/extension-loader/extension/extension.injectable.ts +++ b/src/extensions/extension-loader/extension/extension.injectable.ts @@ -43,7 +43,7 @@ const extensionInjectable = getInjectable({ }, lifecycle: lifecycleEnum.keyedSingleton({ - getInstanceKey: (di, extension: LensExtension) => extension, + getInstanceKey: (di, instance: LensExtension) => instance, }), }); diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 32a4bba41f..ae54d4f71c 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -543,9 +543,9 @@ const disableExtensionsFor = ( extensionInstances.forEach((instance) => { const extension = getExtension(instance); - extension.deregister(); - runInAction(() => { + extension.deregister(); + extensionState.delete(extension); }); });