From 439f3bf5c7d931e9da6b21e8d46919872a1ad158 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 14 Sep 2022 15:13:56 -0400 Subject: [PATCH] Fix tests by converting BuildSemanticVersion and DefaultUpdateChannel to LazyInitializableState Signed-off-by: Sebastian Malton --- .../vars/build-semantic-version.injectable.ts | 4 ++-- .../default-update-channel.injectable.ts | 4 ++-- .../default-update-channel/init.injectable.ts | 24 ------------------- .../semantic-build-version/init.injectable.ts | 24 ------------------- .../default-update-channel/init.injectable.ts | 24 ------------------- .../semantic-build-version/init.injectable.ts | 24 ------------------- 6 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 src/main/vars/default-update-channel/init.injectable.ts delete mode 100644 src/main/vars/semantic-build-version/init.injectable.ts delete mode 100644 src/renderer/vars/default-update-channel/init.injectable.ts delete mode 100644 src/renderer/vars/semantic-build-version/init.injectable.ts diff --git a/src/common/vars/build-semantic-version.injectable.ts b/src/common/vars/build-semantic-version.injectable.ts index 2a49327480..7af7e05e0a 100644 --- a/src/common/vars/build-semantic-version.injectable.ts +++ b/src/common/vars/build-semantic-version.injectable.ts @@ -6,7 +6,7 @@ import { getInjectionToken } from "@ogre-tools/injectable"; import { SemVer } from "semver"; import type { InitializableState } from "../initializable-state/create"; -import { createInitializableState } from "../initializable-state/create"; +import { createLazyInitializableState } from "../initializable-state/create-lazy"; import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token"; export const buildVersionInjectionToken = getInjectionToken>({ @@ -17,7 +17,7 @@ export const buildVersionChannel: RequestChannel = { id: "build-version", }; -const buildSemanticVersionInjectable = createInitializableState({ +const buildSemanticVersionInjectable = createLazyInitializableState({ id: "build-semantic-version", init: (di) => { const buildVersion = di.inject(buildVersionInjectionToken); diff --git a/src/features/application-update/common/selected-update-channel/default-update-channel.injectable.ts b/src/features/application-update/common/selected-update-channel/default-update-channel.injectable.ts index 0be5adca42..0898d8efaa 100644 --- a/src/features/application-update/common/selected-update-channel/default-update-channel.injectable.ts +++ b/src/features/application-update/common/selected-update-channel/default-update-channel.injectable.ts @@ -2,11 +2,11 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { createLazyInitializableState } from "../../../../common/initializable-state/create-lazy"; import releaseChannelInjectable from "../../../../common/vars/release-channel.injectable"; import { updateChannels } from "../update-channels"; -import { createInitializableState } from "../../../../common/initializable-state/create"; -const defaultUpdateChannelInjectable = createInitializableState({ +const defaultUpdateChannelInjectable = createLazyInitializableState({ id: "default-update-channel", init: (di) => updateChannels[di.inject(releaseChannelInjectable).get()], }); diff --git a/src/main/vars/default-update-channel/init.injectable.ts b/src/main/vars/default-update-channel/init.injectable.ts deleted file mode 100644 index 56e90252f3..0000000000 --- a/src/main/vars/default-update-channel/init.injectable.ts +++ /dev/null @@ -1,24 +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 { beforeApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/before-application-is-loading-injection-token"; -import initReleaseChannelInjectable from "../release-channel/init.injectable"; -import defaultUpdateChannelInjectable from "../../../features/application-update/common/selected-update-channel/default-update-channel.injectable"; - -const initDefaultUpdateChannelInjectable = getInjectable({ - id: "init-default-update-channel", - instantiate: (di) => { - const defaultUpdateChannel = di.inject(defaultUpdateChannelInjectable); - - return { - id: "init-default-update-channel", - run: () => defaultUpdateChannel.init(), - runAfter: di.inject(initReleaseChannelInjectable), - }; - }, - injectionToken: beforeApplicationIsLoadingInjectionToken, -}); - -export default initDefaultUpdateChannelInjectable; diff --git a/src/main/vars/semantic-build-version/init.injectable.ts b/src/main/vars/semantic-build-version/init.injectable.ts deleted file mode 100644 index ee822a8796..0000000000 --- a/src/main/vars/semantic-build-version/init.injectable.ts +++ /dev/null @@ -1,24 +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 buildSemanticVersionInjectable from "../../../common/vars/build-semantic-version.injectable"; -import { beforeApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/before-application-is-loading-injection-token"; -import initializeBuildVersionInjectable from "../build-version/init.injectable"; - -const initSemanticBuildVersionInjectable = getInjectable({ - id: "init-semantic-build-version", - instantiate: (di) => { - const buildSemanticVersion = di.inject(buildSemanticVersionInjectable); - - return { - id: "init-semantic-build-version", - run: () => buildSemanticVersion.init(), - runAfter: di.inject(initializeBuildVersionInjectable), - }; - }, - injectionToken: beforeApplicationIsLoadingInjectionToken, -}); - -export default initSemanticBuildVersionInjectable; diff --git a/src/renderer/vars/default-update-channel/init.injectable.ts b/src/renderer/vars/default-update-channel/init.injectable.ts deleted file mode 100644 index be59abd536..0000000000 --- a/src/renderer/vars/default-update-channel/init.injectable.ts +++ /dev/null @@ -1,24 +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 { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token"; -import initReleaseChannelInjectable from "../release-channel/init.injectable"; -import defaultUpdateChannelInjectable from "../../../features/application-update/common/selected-update-channel/default-update-channel.injectable"; - -const initDefaultUpdateChannelInjectable = getInjectable({ - id: "init-default-update-channel", - instantiate: (di) => { - const defaultUpdateChannel = di.inject(defaultUpdateChannelInjectable); - - return { - id: "init-default-update-channel", - run: () => defaultUpdateChannel.init(), - runAfter: di.inject(initReleaseChannelInjectable), - }; - }, - injectionToken: beforeFrameStartsInjectionToken, -}); - -export default initDefaultUpdateChannelInjectable; diff --git a/src/renderer/vars/semantic-build-version/init.injectable.ts b/src/renderer/vars/semantic-build-version/init.injectable.ts deleted file mode 100644 index 393143219f..0000000000 --- a/src/renderer/vars/semantic-build-version/init.injectable.ts +++ /dev/null @@ -1,24 +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 buildSemanticVersionInjectable from "../../../common/vars/build-semantic-version.injectable"; -import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token"; -import initializeBuildVersionInjectable from "../build-version/init.injectable"; - -const initSemanticBuildVersionInjectable = getInjectable({ - id: "init-semantic-build-version", - instantiate: (di) => { - const buildSemanticVersion = di.inject(buildSemanticVersionInjectable); - - return { - id: "init-semantic-build-version", - run: () => buildSemanticVersion.init(), - runAfter: di.inject(initializeBuildVersionInjectable), - }; - }, - injectionToken: beforeFrameStartsInjectionToken, -}); - -export default initSemanticBuildVersionInjectable;