hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Trivial tweaks accidentally left from other PR (#5679)

Browse Source 
Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>
This commit is contained in:
Janne Savolainen 2022-06-20 18:49:59 +03:00 committed by GitHub
parent 78d985024d
commit f8b008612f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/extensions/extension-loader/extension-installation-counter.injectable.ts
View File

@ -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<string, number>(),
});
export default extensionInstallationCounterInjectable;

2
src/extensions/extension-loader/extension-loader.injectable.ts
View File

@ -5,7 +5,6 @@
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { ExtensionLoader } from "./extension-loader"; import { ExtensionLoader } from "./extension-loader";
import updateExtensionsStateInjectable from "./update-extensions-state/update-extensions-state.injectable"; 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 { createExtensionInstanceInjectionToken } from "./create-extension-instance.token";
import extensionInstancesInjectable from "./extension-instances.injectable"; import extensionInstancesInjectable from "./extension-instances.injectable";
import type { LensExtension } from "../lens-extension"; import type { LensExtension } from "../lens-extension";
@ -17,7 +16,6 @@ const extensionLoaderInjectable = getInjectable({
instantiate: (di) => new ExtensionLoader({ instantiate: (di) => new ExtensionLoader({
updateExtensionsState: di.inject(updateExtensionsStateInjectable), updateExtensionsState: di.inject(updateExtensionsStateInjectable),
createExtensionInstance: di.inject(createExtensionInstanceInjectionToken), createExtensionInstance: di.inject(createExtensionInstanceInjectionToken),
extensionInstallationCounter: di.inject(extensionInstallationCounterInjectable),
extensionInstances: di.inject(extensionInstancesInjectable), extensionInstances: di.inject(extensionInstancesInjectable),
getExtension: (instance: LensExtension) => di.inject(extensionInjectable, instance), getExtension: (instance: LensExtension) => di.inject(extensionInjectable, instance),
}), }),

9
src/extensions/extension-loader/extension-loader.ts
View File

@ -30,7 +30,6 @@ const logModule = "[EXTENSIONS-LOADER]";
interface Dependencies { interface Dependencies {
updateExtensionsState: (extensionsState: Record<LensExtensionId, LensExtensionState>) => void; updateExtensionsState: (extensionsState: Record<LensExtensionId, LensExtensionState>) => void;
createExtensionInstance: CreateExtensionInstance; createExtensionInstance: CreateExtensionInstance;
readonly extensionInstallationCounter: Map<string, number>;
readonly extensionInstances: ObservableMap<LensExtensionId, LensExtension>; readonly extensionInstances: ObservableMap<LensExtensionId, LensExtension>;
getExtension: (instance: LensExtension) => Extension; getExtension: (instance: LensExtension) => Extension;
} }
@ -171,9 +170,9 @@ export class ExtensionLoader {
try { try {
instance.disable(); instance.disable();
const registeredExtension = this.dependencies.getExtension(instance); const extension = this.dependencies.getExtension(instance);
registeredExtension.deregister(); extension.deregister();
this.onRemoveExtensionId.emit(instance.id); this.onRemoveExtensionId.emit(instance.id);
this.dependencies.extensionInstances.delete(lensExtensionId); this.dependencies.extensionInstances.delete(lensExtensionId);
@ -360,9 +359,9 @@ export class ExtensionLoader {
); );
extensions.forEach(({ instance }) => { extensions.forEach(({ instance }) => {
const getExtension = this.dependencies.getExtension(instance); const extension = this.dependencies.getExtension(instance);
getExtension.register(); extension.register();
}); });
// Return ExtensionLoading[] // Return ExtensionLoading[]

2
src/extensions/extension-loader/extension/extension.injectable.ts
View File

@ -43,7 +43,7 @@ const extensionInjectable = getInjectable({
}, },
lifecycle: lifecycleEnum.keyedSingleton({ lifecycle: lifecycleEnum.keyedSingleton({
getInstanceKey: (di, extension: LensExtension) => extension, getInstanceKey: (di, instance: LensExtension) => instance,
}), }),
}); });

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

@ -543,9 +543,9 @@ const disableExtensionsFor = <T extends ObservableSet>(
extensionInstances.forEach((instance) => { extensionInstances.forEach((instance) => {
const extension = getExtension(instance); const extension = getExtension(instance);
extension.deregister();
runInAction(() => { runInAction(() => {
extension.deregister();
extensionState.delete(extension); extensionState.delete(extension);
}); });
}); });