From ea70e7decc9fc8c2546d761c6a5182a9732f3b3f Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 15 Sep 2022 09:56:20 -0400 Subject: [PATCH] Switch to using applicationInformationInjectable Signed-off-by: Sebastian Malton --- ...-route-config.global-override-for-injectable.ts | 8 -------- .../welcome/welcome-route-config.injectable.ts | 8 ++------ ...n-information.global-override-for-injectable.ts | 1 + src/common/vars/package-json.injectable.ts | 14 -------------- 4 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 src/common/front-end-routing/routes/welcome/welcome-route-config.global-override-for-injectable.ts delete mode 100644 src/common/vars/package-json.injectable.ts diff --git a/src/common/front-end-routing/routes/welcome/welcome-route-config.global-override-for-injectable.ts b/src/common/front-end-routing/routes/welcome/welcome-route-config.global-override-for-injectable.ts deleted file mode 100644 index 703c0798a2..0000000000 --- a/src/common/front-end-routing/routes/welcome/welcome-route-config.global-override-for-injectable.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getGlobalOverride } from "../../../test-utils/get-global-override"; -import welcomeRouteConfig from "./welcome-route-config.injectable"; - -export default getGlobalOverride(welcomeRouteConfig, () => "/welcome"); diff --git a/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts b/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts index 53a61ab99f..4e16df5bb4 100644 --- a/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts +++ b/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts @@ -3,16 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import packageJsonInjectable from "../../../vars/package-json.injectable"; +import applicationInformationInjectable from "../../../vars/application-information.injectable"; const welcomeRouteConfigInjectable = getInjectable({ id: "welcome-route-config", - instantiate: (di) => { - const packageJson = di.inject(packageJsonInjectable); - - return packageJson.config.welcomeRoute; - }, + instantiate: (di) => di.inject(applicationInformationInjectable).config.welcomeRoute, }); export default welcomeRouteConfigInjectable; diff --git a/src/common/vars/application-information.global-override-for-injectable.ts b/src/common/vars/application-information.global-override-for-injectable.ts index f845bcbc71..ac53b9f341 100644 --- a/src/common/vars/application-information.global-override-for-injectable.ts +++ b/src/common/vars/application-information.global-override-for-injectable.ts @@ -16,6 +16,7 @@ export default getGlobalOverride(applicationInformationInjectable, () => ({ 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/common/vars/package-json.injectable.ts b/src/common/vars/package-json.injectable.ts deleted file mode 100644 index fa132be518..0000000000 --- a/src/common/vars/package-json.injectable.ts +++ /dev/null @@ -1,14 +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 packageJson from "../../../package.json"; - -const packageJsonInjectable = getInjectable({ - id: "package-json", - instantiate: () => packageJson, - causesSideEffects: true, -}); - -export default packageJsonInjectable;