diff --git a/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts b/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts index 40504f6987..407c1eba8c 100644 --- a/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts +++ b/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import catalogSyncToRendererInjectable from "./catalog-sync-to-renderer.injectable"; -import { onApplicationSoftQuitInjectionToken } from "../start-main-application/on-application-soft-quit/on-application-soft-quit-injection-token"; +import { beforeApplicationSoftQuitInjectionToken } from "../start-main-application/before-application-soft-quit/before-application-soft-quit-injection-token"; const stopCatalogSyncInjectable = getInjectable({ id: "stop-catalog-sync", @@ -19,7 +19,7 @@ const stopCatalogSyncInjectable = getInjectable({ }; }, - injectionToken: onApplicationSoftQuitInjectionToken, + injectionToken: beforeApplicationSoftQuitInjectionToken, }); export default stopCatalogSyncInjectable; diff --git a/src/main/start-main-application/before-application-is-ready/implementations/setup-closing-of-application.injectable.ts b/src/main/start-main-application/before-application-is-ready/implementations/setup-closing-of-application.injectable.ts index 8453c7f8ef..1467082505 100644 --- a/src/main/start-main-application/before-application-is-ready/implementations/setup-closing-of-application.injectable.ts +++ b/src/main/start-main-application/before-application-is-ready/implementations/setup-closing-of-application.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { beforeApplicationIsReadyInjectionToken } from "../before-application-is-ready-injection-token"; -import { onApplicationSoftQuitInjectionToken } from "../../on-application-soft-quit/on-application-soft-quit-injection-token"; +import { beforeApplicationSoftQuitInjectionToken } from "../../before-application-soft-quit/before-application-soft-quit-injection-token"; import { runManyFor } from "../../run-many-for"; import whenApplicationWillQuitInjectable from "../../../electron-app/when-application-will-quit.injectable"; @@ -15,7 +15,7 @@ const setupClosingOfApplicationInjectable = getInjectable({ const whenApplicationWillQuit = di.inject(whenApplicationWillQuitInjectable); const runManyForApplicationClose = runManyFor(di)( - onApplicationSoftQuitInjectionToken, + beforeApplicationSoftQuitInjectionToken, ); return { diff --git a/src/main/start-main-application/on-application-soft-quit/on-application-soft-quit-injection-token.ts b/src/main/start-main-application/before-application-soft-quit/before-application-soft-quit-injection-token.ts similarity index 72% rename from src/main/start-main-application/on-application-soft-quit/on-application-soft-quit-injection-token.ts rename to src/main/start-main-application/before-application-soft-quit/before-application-soft-quit-injection-token.ts index b58b9d4cc2..83055d0036 100644 --- a/src/main/start-main-application/on-application-soft-quit/on-application-soft-quit-injection-token.ts +++ b/src/main/start-main-application/before-application-soft-quit/before-application-soft-quit-injection-token.ts @@ -5,8 +5,8 @@ import { getInjectionToken } from "@ogre-tools/injectable"; import type { Runnable } from "../run-many-for"; -export const onApplicationSoftQuitInjectionToken = getInjectionToken< +export const beforeApplicationSoftQuitInjectionToken = getInjectionToken< Runnable<{ cancel: () => void }> >({ - id: "on-application-soft-quit", + id: "before-application-soft-quit", }); diff --git a/src/main/start-main-application/on-application-soft-quit/implementations/emit-close-to-command-bus.injectable.ts b/src/main/start-main-application/before-application-soft-quit/implementations/emit-close-to-command-bus.injectable.ts similarity index 79% rename from src/main/start-main-application/on-application-soft-quit/implementations/emit-close-to-command-bus.injectable.ts rename to src/main/start-main-application/before-application-soft-quit/implementations/emit-close-to-command-bus.injectable.ts index 1e5d9c4eca..de7edf5f85 100644 --- a/src/main/start-main-application/on-application-soft-quit/implementations/emit-close-to-command-bus.injectable.ts +++ b/src/main/start-main-application/before-application-soft-quit/implementations/emit-close-to-command-bus.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable"; -import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token"; +import { beforeApplicationSoftQuitInjectionToken } from "../before-application-soft-quit-injection-token"; const emitCloseToCommandBusInjectable = getInjectable({ id: "emit-close-to-command-bus", @@ -19,7 +19,7 @@ const emitCloseToCommandBusInjectable = getInjectable({ }; }, - injectionToken: onApplicationSoftQuitInjectionToken, + injectionToken: beforeApplicationSoftQuitInjectionToken, }); export default emitCloseToCommandBusInjectable; diff --git a/src/main/start-main-application/on-application-soft-quit/implementations/flag-renderer-as-not-loaded.ts b/src/main/start-main-application/before-application-soft-quit/implementations/flag-renderer-as-not-loaded.ts similarity index 83% rename from src/main/start-main-application/on-application-soft-quit/implementations/flag-renderer-as-not-loaded.ts rename to src/main/start-main-application/before-application-soft-quit/implementations/flag-renderer-as-not-loaded.ts index 1b7564c0e8..47b8d5d2e7 100644 --- a/src/main/start-main-application/on-application-soft-quit/implementations/flag-renderer-as-not-loaded.ts +++ b/src/main/start-main-application/before-application-soft-quit/implementations/flag-renderer-as-not-loaded.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { runInAction } from "mobx"; import lensProtocolRouterMainInjectable from "../../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable"; -import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token"; +import { beforeApplicationSoftQuitInjectionToken } from "../before-application-soft-quit-injection-token"; const flagRendererAsNotLoaded = getInjectable({ id: "stop-deep-linking", @@ -23,7 +23,7 @@ const flagRendererAsNotLoaded = getInjectable({ }; }, - injectionToken: onApplicationSoftQuitInjectionToken, + injectionToken: beforeApplicationSoftQuitInjectionToken, }); export default flagRendererAsNotLoaded; diff --git a/src/main/start-main-application/on-application-soft-quit/implementations/quit-application.injectable.ts b/src/main/start-main-application/before-application-soft-quit/implementations/quit-application.injectable.ts similarity index 87% rename from src/main/start-main-application/on-application-soft-quit/implementations/quit-application.injectable.ts rename to src/main/start-main-application/before-application-soft-quit/implementations/quit-application.injectable.ts index 908491de06..4c5075c6d4 100644 --- a/src/main/start-main-application/on-application-soft-quit/implementations/quit-application.injectable.ts +++ b/src/main/start-main-application/before-application-soft-quit/implementations/quit-application.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { beforeApplicationHardQuitInjectionToken } from "../../before-application-hard-quit/before-application-hard-quit-injection-token"; import { runManyFor } from "../../run-many-for"; -import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token"; +import { beforeApplicationSoftQuitInjectionToken } from "../before-application-soft-quit-injection-token"; import isIntegrationTestingInjectable from "../../../../common/vars/is-integration-testing.injectable"; const quitApplicationInjectable = getInjectable({ @@ -32,7 +32,7 @@ const quitApplicationInjectable = getInjectable({ causesSideEffects: true, - injectionToken: onApplicationSoftQuitInjectionToken, + injectionToken: beforeApplicationSoftQuitInjectionToken, }); export default quitApplicationInjectable; diff --git a/src/main/start-main-application/on-application-soft-quit/implementations/stop-cluster-manager.injectable.ts b/src/main/start-main-application/before-application-soft-quit/implementations/stop-cluster-manager.injectable.ts similarity index 79% rename from src/main/start-main-application/on-application-soft-quit/implementations/stop-cluster-manager.injectable.ts rename to src/main/start-main-application/before-application-soft-quit/implementations/stop-cluster-manager.injectable.ts index 1a877b1ae5..9c303fd76e 100644 --- a/src/main/start-main-application/on-application-soft-quit/implementations/stop-cluster-manager.injectable.ts +++ b/src/main/start-main-application/before-application-soft-quit/implementations/stop-cluster-manager.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import clusterManagerInjectable from "../../../cluster-manager.injectable"; -import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token"; +import { beforeApplicationSoftQuitInjectionToken } from "../before-application-soft-quit-injection-token"; const stopClusterManagerInjectable = getInjectable({ id: "stop-cluster-manager", @@ -19,7 +19,7 @@ const stopClusterManagerInjectable = getInjectable({ }; }, - injectionToken: onApplicationSoftQuitInjectionToken, + injectionToken: beforeApplicationSoftQuitInjectionToken, causesSideEffects: true, }); diff --git a/src/main/start-main-application/on-application-soft-quit/implementations/stop-kube-config-sync.injectable.ts b/src/main/start-main-application/before-application-soft-quit/implementations/stop-kube-config-sync.injectable.ts similarity index 80% rename from src/main/start-main-application/on-application-soft-quit/implementations/stop-kube-config-sync.injectable.ts rename to src/main/start-main-application/before-application-soft-quit/implementations/stop-kube-config-sync.injectable.ts index bf0a1c39fe..c1deb186ae 100644 --- a/src/main/start-main-application/on-application-soft-quit/implementations/stop-kube-config-sync.injectable.ts +++ b/src/main/start-main-application/before-application-soft-quit/implementations/stop-kube-config-sync.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import kubeconfigSyncManagerInjectable from "../../../catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.injectable"; -import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token"; +import { beforeApplicationSoftQuitInjectionToken } from "../before-application-soft-quit-injection-token"; const stopKubeConfigSyncInjectable = getInjectable({ id: "stop-kube-config-sync", @@ -19,7 +19,7 @@ const stopKubeConfigSyncInjectable = getInjectable({ }; }, - injectionToken: onApplicationSoftQuitInjectionToken, + injectionToken: beforeApplicationSoftQuitInjectionToken, }); export default stopKubeConfigSyncInjectable;