mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
chore: Simplify extension dependency injection
- Has better typing
- Removes use of unnusual unique symbol
- Fix welcome banner tests
- Update associated snapshots
- Start converting custom column tests to use ApplicationBuilder
- Remove old and unnused RecursiveTreeView
- Introduce new TreeView for use in CatalogMenu to fix tests
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
1 parent
5db8fc1342
commit
82bf67cc9e
70 files changed
+7110
-2945
No files matched your search
@@ -53,7 +53,7 @@ import { applicationWindowInjectionToken } from "../../../main/start-main-applic
|
||||
import closeAllWindowsInjectable from "../../../main/start-main-application/lens-window/hide-all-windows/close-all-windows.injectable";
|
||||
import type { LensWindow } from "../../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
|
||||
import type { FakeExtensionOptions } from "./get-extension-fake";
|
||||
import { getMainExtensionFakeWith, getRendererExtensionFakeWith } from "./get-extension-fake";
|
||||
import { getExtensionFakeForMain, getExtensionFakeForRenderer } from "./get-extension-fake";
|
||||
import namespaceApiInjectable from "../../../common/k8s-api/endpoints/namespace.api.injectable";
|
||||
import { Namespace } from "../../../common/k8s-api/endpoints";
|
||||
import { getOverrideFsWithFakes } from "../../../test-utils/override-fs-with-fakes";
|
||||
@@ -594,13 +594,13 @@ export const getApplicationBuilder = () => {
|
||||
enable: (...extensions) => {
|
||||
builder.afterWindowStart(action(({ windowDi }) => {
|
||||
extensions
|
||||
.map(getRendererExtensionFakeWith(windowDi))
|
||||
.map(getExtensionFakeForRenderer)
|
||||
.forEach(enableExtensionFor(windowDi, rendererExtensionsStateInjectable));
|
||||
}));
|
||||
|
||||
builder.afterApplicationStart(action(({ mainDi }) => {
|
||||
extensions
|
||||
.map(getMainExtensionFakeWith(mainDi))
|
||||
.map(getExtensionFakeForMain)
|
||||
.forEach(enableExtensionFor(mainDi, mainExtensionsStateInjectable));
|
||||
}));
|
||||
},
|
||||
|
||||
@@ -2,20 +2,8 @@
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import type { Writable } from "type-fest";
|
||||
import { lensExtensionDependencies } from "../../../extensions/lens-extension";
|
||||
import { LensMainExtension } from "../../../extensions/lens-main-extension";
|
||||
import navigateForExtensionInjectable from "../../../main/start-main-application/lens-window/navigate-for-extension.injectable";
|
||||
import { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
|
||||
import catalogCategoryRegistryInjectable from "../../../common/catalog/category-registry.injectable";
|
||||
import getExtensionPageParametersInjectable from "../../routes/get-extension-page-parameters.injectable";
|
||||
import navigateToRouteInjectable from "../../routes/navigate-to-route.injectable";
|
||||
import routesInjectable from "../../routes/routes.injectable";
|
||||
import catalogEntityRegistryForMainInjectable from "../../../main/catalog/entity-registry.injectable";
|
||||
import catalogEntityRegistryForRendererInjectable from "../../api/catalog/entity/registry.injectable";
|
||||
import type { DiContainer } from "@ogre-tools/injectable";
|
||||
import loggerInjectable from "../../../common/logger.injectable";
|
||||
import ensureHashedDirectoryForExtensionInjectable from "../../../extensions/extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.injectable";
|
||||
|
||||
export class TestExtensionMain extends LensMainExtension {}
|
||||
export class TestExtensionRenderer extends LensRendererExtension {}
|
||||
@@ -27,63 +15,44 @@ export interface FakeExtensionOptions {
|
||||
mainOptions?: Partial<LensMainExtension>;
|
||||
}
|
||||
|
||||
export const getMainExtensionFakeWith = (di: DiContainer) => ({ id, name, mainOptions = {}}: FakeExtensionOptions) => {
|
||||
const instance = new TestExtensionMain({
|
||||
id,
|
||||
absolutePath: "irrelevant",
|
||||
isBundled: false,
|
||||
isCompatible: false,
|
||||
isEnabled: false,
|
||||
manifest: {
|
||||
name,
|
||||
version: "1.0.0",
|
||||
engines: {
|
||||
lens: "^5.5.0",
|
||||
export const getExtensionFakeForMain = ({ id, name, mainOptions = {}}: FakeExtensionOptions) => (
|
||||
Object.assign(
|
||||
new TestExtensionMain({
|
||||
id,
|
||||
absolutePath: "irrelevant",
|
||||
isBundled: false,
|
||||
isCompatible: false,
|
||||
isEnabled: false,
|
||||
manifest: {
|
||||
name,
|
||||
version: "1.0.0",
|
||||
engines: {
|
||||
lens: "^5.5.0",
|
||||
},
|
||||
},
|
||||
},
|
||||
manifestPath: "irrelevant",
|
||||
});
|
||||
manifestPath: "irrelevant",
|
||||
}),
|
||||
mainOptions,
|
||||
)
|
||||
);
|
||||
|
||||
Object.assign(instance, mainOptions);
|
||||
|
||||
(instance as Writable<LensMainExtension>)[lensExtensionDependencies] = {
|
||||
ensureHashedDirectoryForExtension: di.inject(ensureHashedDirectoryForExtensionInjectable),
|
||||
entityRegistry: di.inject(catalogEntityRegistryForMainInjectable),
|
||||
navigate: di.inject(navigateForExtensionInjectable),
|
||||
logger: di.inject(loggerInjectable),
|
||||
};
|
||||
|
||||
return instance;
|
||||
};
|
||||
|
||||
export const getRendererExtensionFakeWith = (di: DiContainer) => ({ id, name, rendererOptions = {}}: FakeExtensionOptions) => {
|
||||
const instance = new TestExtensionRenderer({
|
||||
id,
|
||||
absolutePath: "irrelevant",
|
||||
isBundled: false,
|
||||
isCompatible: false,
|
||||
isEnabled: false,
|
||||
manifest: {
|
||||
name,
|
||||
version: "1.0.0",
|
||||
engines: {
|
||||
lens: "^5.5.0",
|
||||
export const getExtensionFakeForRenderer = ({ id, name, rendererOptions = {}}: FakeExtensionOptions) => (
|
||||
Object.assign(
|
||||
new TestExtensionRenderer({
|
||||
id,
|
||||
absolutePath: "irrelevant",
|
||||
isBundled: false,
|
||||
isCompatible: false,
|
||||
isEnabled: false,
|
||||
manifest: {
|
||||
name,
|
||||
version: "1.0.0",
|
||||
engines: {
|
||||
lens: "^5.5.0",
|
||||
},
|
||||
},
|
||||
},
|
||||
manifestPath: "irrelevant",
|
||||
});
|
||||
|
||||
Object.assign(instance, rendererOptions);
|
||||
|
||||
(instance as Writable<LensRendererExtension>)[lensExtensionDependencies] = {
|
||||
categoryRegistry: di.inject(catalogCategoryRegistryInjectable),
|
||||
entityRegistry: di.inject(catalogEntityRegistryForRendererInjectable),
|
||||
ensureHashedDirectoryForExtension: di.inject(ensureHashedDirectoryForExtensionInjectable),
|
||||
getExtensionPageParameters: di.inject(getExtensionPageParametersInjectable),
|
||||
navigateToRoute: di.inject(navigateToRouteInjectable),
|
||||
routes: di.inject(routesInjectable),
|
||||
logger: di.inject(loggerInjectable),
|
||||
};
|
||||
|
||||
return instance;
|
||||
};
|
||||
manifestPath: "irrelevant",
|
||||
}),
|
||||
rendererOptions,
|
||||
)
|
||||
);
|
||||
Reference in new issue
Block a user