diff --git a/src/common/vars/application-information-injectable.ts b/src/common/vars/application-information-injectable.ts index c297f1a9bb..a73e311233 100644 --- a/src/common/vars/application-information-injectable.ts +++ b/src/common/vars/application-information-injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import packageJson from "../../../package.json"; -import applicationInformationToken from "./application-information-token"; +import applicationInformationToken from "../../common/vars/application-information-token"; const applicationInformationInjectable = getInjectable({ id: "application-information", diff --git a/src/common/vars/application-information-token.ts b/src/common/vars/application-information-token.ts index 816472831d..dcd56a3146 100644 --- a/src/common/vars/application-information-token.ts +++ b/src/common/vars/application-information-token.ts @@ -6,9 +6,8 @@ import { getInjectionToken } from "@ogre-tools/injectable"; import type packageJson from "../../../package.json"; -export type ApplicationInformation = Pick & { +export type ApplicationInformation = Pick & { build: Partial & { publish?: unknown[] }; - config: typeof packageJson["config"] & { extensions?: string[] }; }; const applicationInformationToken = getInjectionToken({ diff --git a/src/common/vars/application-information.injectable-for-testing.ts b/src/common/vars/application-information.injectable-for-testing.ts deleted file mode 100644 index 929f733062..0000000000 --- a/src/common/vars/application-information.injectable-for-testing.ts +++ /dev/null @@ -1,32 +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 applicationInformationToken from "./application-information-token"; - -const applicationInformationForTestingInjectable = getInjectable({ - id: "application-information-for-testing", - injectionToken: applicationInformationToken, - instantiate: () => ({ - name: "some-product-name", - productName: "some-product-name", - version: "6.0.0", - build: {}, - config: { - k8sProxyVersion: "0.2.1", - bundledKubectlVersion: "1.23.3", - bundledHelmVersion: "3.7.2", - sentryDsn: "", - contentSecurityPolicy: "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:", - welcomeRoute: "/welcome", - extensions: [], - }, - copyright: "some-copyright-information", - description: "some-descriptive-text", - }), - causesSideEffects: false, -}); - -export default applicationInformationForTestingInjectable; diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index ce497a9947..3e93d9d7b9 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -71,7 +71,7 @@ import kubectlDownloadingNormalizedArchInjectable from "./kubectl/normalized-arc import initializeClusterManagerInjectable from "./cluster/initialize-manager.injectable"; import addKubeconfigSyncAsEntitySourceInjectable from "./start-main-application/runnables/kube-config-sync/add-source.injectable"; import type { GlobalOverride } from "../common/test-utils/get-global-override"; -import applicationInformationForTestingInjectable from "../common/vars/application-information.injectable-for-testing"; +import applicationInformationInjectable from "../common/vars/application-information-injectable"; export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) { const { @@ -94,7 +94,7 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) runInAction(() => { registerMobX(di); - di.register(applicationInformationForTestingInjectable); + di.register(applicationInformationInjectable); chunk(100)(injectables).forEach(chunkInjectables => { di.register(...chunkInjectables); diff --git a/src/main/vars/application-information.global-override-for-injectable.ts b/src/main/vars/application-information.global-override-for-injectable.ts new file mode 100644 index 0000000000..acc47ce83d --- /dev/null +++ b/src/main/vars/application-information.global-override-for-injectable.ts @@ -0,0 +1,24 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { getGlobalOverride } from "../../common/test-utils/get-global-override"; +import applicationInformationInjectable from "../../common/vars/application-information-injectable"; + +export default getGlobalOverride(applicationInformationInjectable, () => ({ + name: "some-product-name", + productName: "some-product-name", + version: "6.0.0", + build: {} as any, + config: { + k8sProxyVersion: "0.2.1", + bundledKubectlVersion: "1.23.3", + bundledHelmVersion: "3.7.2", + sentryDsn: "", + contentSecurityPolicy: "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:", + welcomeRoute: "/welcome", + }, + copyright: "some-copyright-information", + description: "some-descriptive-text", +})); diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx index 7f62f251df..89f6fad2b3 100644 --- a/src/renderer/getDiForUnitTesting.tsx +++ b/src/renderer/getDiForUnitTesting.tsx @@ -41,7 +41,7 @@ import legacyOnChannelListenInjectable from "./ipc/legacy-channel-listen.injecta import storageSaveDelayInjectable from "./utils/create-storage/storage-save-delay.injectable"; import environmentVariablesInjectable from "../common/utils/environment-variables.injectable"; import type { GlobalOverride } from "../common/test-utils/get-global-override"; -import applicationInformationForTestingInjectable from "../common/vars/application-information.injectable-for-testing"; +import applicationInformationInjectable from "../common/vars/application-information-injectable"; export const getDiForUnitTesting = ( opts: { doGeneralOverrides?: boolean } = {}, @@ -64,8 +64,7 @@ export const getDiForUnitTesting = ( runInAction(() => { registerMobX(di); - - di.register(applicationInformationForTestingInjectable); + di.register(applicationInformationInjectable); chunk(100)(injectables).forEach((chunkInjectables) => { di.register(...chunkInjectables);