From 81eeb33e81967749dd9b58c2032f516cf4a7dacc Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Mon, 11 Apr 2022 12:37:48 +0300 Subject: [PATCH] Consolidate naming of event timing window Co-authored-by: Janne Savolainen Signed-off-by: Iku-turso --- src/common/setupable-injection-token/run-setups.ts | 4 ++-- ...p-application-menu-when-application-is-ready.injectable.ts | 4 ++-- .../after-application-is-ready-injection-token.ts} | 4 ++-- .../emit-service-start-to-command-bus.injectable.ts | 4 ++-- .../implementations/initialize-extensions.injectable.ts | 4 ++-- .../implementations/setup-deep-linking.injectable.ts | 4 ++-- .../implementations/setup-detector-registry.injectable.ts | 4 ++-- ...p-developer-tools-in-development-environment.injectable.ts | 4 ++-- .../implementations/setup-file-protocol.injectable.ts | 4 ++-- .../implementations/setup-hardware-acceleration.injectable.ts | 4 ++-- .../setup-ipc-main-handlers.injectable.ts | 4 ++-- .../setup-ipc-main-handlers/setup-ipc-main-handlers.ts | 0 .../implementations/setup-lens-proxy.injectable.ts | 4 ++-- ...-listener-for-initial-state-of-cluster-store.injectable.ts | 4 ++-- .../setup-listener-for-root-frame-rendering.injectable.ts | 4 ++-- .../implementations/setup-os-theme-updates.injectable.ts | 4 ++-- .../implementations/setup-prometheus-registry.injectable.ts | 4 ++-- .../implementations/setup-protocol-router-main.injectable.ts | 4 ++-- .../setup-reactions-in-user-store.injectable.ts | 4 ++-- .../implementations/setup-sentry.injectable.ts | 4 ++-- .../implementations/setup-shell.injectable.ts | 4 ++-- .../setup-syncing-of-general-catalog-entities.injectable.ts | 4 ++-- .../implementations/setup-syncing-of-weblinks.injectable.ts | 4 ++-- .../implementations/start-main-window.injectable.ts | 4 ++-- .../start-main-application.injectable.ts | 4 ++-- .../tray/setup-tray-when-application-is-ready.injectable.ts | 4 ++-- src/renderer/app-paths/setup-app-paths.injectable.ts | 4 ++-- .../register-ipc-channel-listeners.injectable.ts | 4 ++-- 28 files changed, 54 insertions(+), 54 deletions(-) rename src/main/start-main-application/{on-application-is-ready/on-application-is-ready-injection-token.ts => after-application-is-ready/after-application-is-ready-injection-token.ts} (68%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/emit-service-start-to-command-bus.injectable.ts (80%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/initialize-extensions.injectable.ts (93%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-deep-linking.injectable.ts (89%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-detector-registry.injectable.ts (88%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-developer-tools-in-development-environment.injectable.ts (87%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-file-protocol.injectable.ts (79%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-hardware-acceleration.injectable.ts (82%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts (90%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.ts (100%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-lens-proxy.injectable.ts (94%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-listener-for-initial-state-of-cluster-store.injectable.ts (81%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-listener-for-root-frame-rendering.injectable.ts (89%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-os-theme-updates.injectable.ts (78%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-prometheus-registry.injectable.ts (87%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-protocol-router-main.injectable.ts (91%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-reactions-in-user-store.injectable.ts (79%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-sentry.injectable.ts (74%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-shell.injectable.ts (80%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-syncing-of-general-catalog-entities.injectable.ts (82%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/setup-syncing-of-weblinks.injectable.ts (80%) rename src/main/start-main-application/{on-application-is-ready => after-application-is-ready}/implementations/start-main-window.injectable.ts (89%) diff --git a/src/common/setupable-injection-token/run-setups.ts b/src/common/setupable-injection-token/run-setups.ts index b6ecbac9cf..246b06b165 100644 --- a/src/common/setupable-injection-token/run-setups.ts +++ b/src/common/setupable-injection-token/run-setups.ts @@ -4,7 +4,7 @@ */ import type { DiContainer } from "@ogre-tools/injectable"; import { beforeApplicationIsReadyInjectionToken } from "../../main/start-main-application/before-application-is-ready/before-application-is-ready-injection-token"; -import { onApplicationIsReadyInjectionToken } from "../../main/start-main-application/on-application-is-ready/on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../../main/start-main-application/after-application-is-ready/after-application-is-ready-injection-token"; export const runSetups = async (di: DiContainer) => { await Promise.all( @@ -15,7 +15,7 @@ export const runSetups = async (di: DiContainer) => { await Promise.all( di - .injectMany(onApplicationIsReadyInjectionToken) + .injectMany(afterApplicationIsReadyInjectionToken) .map((setupable) => setupable.run()), ); }; diff --git a/src/main/menu/setup-application-menu-when-application-is-ready.injectable.ts b/src/main/menu/setup-application-menu-when-application-is-ready.injectable.ts index fe96a9ce85..71f25ba1f7 100644 --- a/src/main/menu/setup-application-menu-when-application-is-ready.injectable.ts +++ b/src/main/menu/setup-application-menu-when-application-is-ready.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../start-main-application/on-application-is-ready/on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../start-main-application/after-application-is-ready/after-application-is-ready-injection-token"; import applicationMenuInitializerInjectable from "./application-menu-initializer.injectable"; const setupApplicationMenuWhenApplicationIsReadyInjectable = getInjectable({ @@ -21,7 +21,7 @@ const setupApplicationMenuWhenApplicationIsReadyInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupApplicationMenuWhenApplicationIsReadyInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/on-application-is-ready-injection-token.ts b/src/main/start-main-application/after-application-is-ready/after-application-is-ready-injection-token.ts similarity index 68% rename from src/main/start-main-application/on-application-is-ready/on-application-is-ready-injection-token.ts rename to src/main/start-main-application/after-application-is-ready/after-application-is-ready-injection-token.ts index 5d4e7e20ce..7478c0ec76 100644 --- a/src/main/start-main-application/on-application-is-ready/on-application-is-ready-injection-token.ts +++ b/src/main/start-main-application/after-application-is-ready/after-application-is-ready-injection-token.ts @@ -5,6 +5,6 @@ import { getInjectionToken } from "@ogre-tools/injectable"; import type { Runnable } from "../run-many-for"; -export const onApplicationIsReadyInjectionToken = getInjectionToken({ - id: "on-application-is-ready", +export const afterApplicationIsReadyInjectionToken = getInjectionToken({ + id: "after-application-is-ready", }); diff --git a/src/main/start-main-application/on-application-is-ready/implementations/emit-service-start-to-command-bus.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/emit-service-start-to-command-bus.injectable.ts similarity index 80% rename from src/main/start-main-application/on-application-is-ready/implementations/emit-service-start-to-command-bus.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/emit-service-start-to-command-bus.injectable.ts index 3aab82fe05..6ca1d95de7 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/emit-service-start-to-command-bus.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/emit-service-start-to-command-bus.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable"; const emitServiceStartToCommandBusInjectable = getInjectable({ @@ -19,7 +19,7 @@ const emitServiceStartToCommandBusInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default emitServiceStartToCommandBusInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/initialize-extensions.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/initialize-extensions.injectable.ts similarity index 93% rename from src/main/start-main-application/on-application-is-ready/implementations/initialize-extensions.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/initialize-extensions.injectable.ts index d8cee1927c..9dfaad2ed1 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/initialize-extensions.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/initialize-extensions.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import type { InstalledExtension } from "../../../../extensions/extension-discovery/extension-discovery"; import type { LensExtensionId } from "../../../../extensions/lens-extension"; import loggerInjectable from "../../../../common/logger.injectable"; @@ -56,7 +56,7 @@ const initializeExtensionsInjectable = getInjectable({ causesSideEffects: true, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default initializeExtensionsInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-deep-linking.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-deep-linking.injectable.ts similarity index 89% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-deep-linking.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-deep-linking.injectable.ts index 57a5b32823..03586d9e0a 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-deep-linking.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-deep-linking.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import lensProtocolRouterMainInjectable from "../../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable"; import windowManagerInjectable from "../../../window-manager.injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import electronAppInjectable from "../../../app-paths/get-electron-app-path/electron-app/electron-app.injectable"; const setupDeepLinking = getInjectable({ @@ -37,7 +37,7 @@ const setupDeepLinking = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupDeepLinking; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-detector-registry.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-detector-registry.injectable.ts similarity index 88% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-detector-registry.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-detector-registry.injectable.ts index f52372c5b1..05de0548d5 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-detector-registry.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-detector-registry.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import { ClusterIdDetector } from "../../../cluster-detectors/cluster-id-detector"; import { LastSeenDetector } from "../../../cluster-detectors/last-seen-detector"; import { VersionDetector } from "../../../cluster-detectors/version-detector"; @@ -29,7 +29,7 @@ const setupDetectorRegistryInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupDetectorRegistryInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-developer-tools-in-development-environment.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-developer-tools-in-development-environment.injectable.ts similarity index 87% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-developer-tools-in-development-environment.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-developer-tools-in-development-environment.injectable.ts index 331237192a..0cc0a6383c 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-developer-tools-in-development-environment.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-developer-tools-in-development-environment.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import loggerInjectable from "../../../../common/logger.injectable"; const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({ @@ -34,7 +34,7 @@ const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupDeveloperToolsInDevelopmentEnvironmentInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-file-protocol.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-file-protocol.injectable.ts similarity index 79% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-file-protocol.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-file-protocol.injectable.ts index 858cafd69e..f2b4d83b63 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-file-protocol.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-file-protocol.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import { registerFileProtocol } from "../../../../common/register-protocol"; // TODO: Remove side effect on import defining __static @@ -21,7 +21,7 @@ const setupFileProtocolInjectable = getInjectable({ causesSideEffects: true, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupFileProtocolInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts similarity index 82% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts index 5bd357de29..738d2f5eeb 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import electronAppInjectable from "../../../app-paths/get-electron-app-path/electron-app/electron-app.injectable"; const setupHardwareAccelerationInjectable = getInjectable({ @@ -23,7 +23,7 @@ const setupHardwareAccelerationInjectable = getInjectable({ causesSideEffects: true, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupHardwareAccelerationInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts similarity index 90% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts index 11a330aa39..2c5ba0a23a 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts @@ -9,7 +9,7 @@ import loggerInjectable from "../../../../../common/logger.injectable"; import clusterManagerInjectable from "../../../../cluster-manager.injectable"; import applicationMenuItemsInjectable from "../../../../menu/application-menu-items.injectable"; import getAbsolutePathInjectable from "../../../../../common/path/get-absolute-path.injectable"; -import { onApplicationIsReadyInjectionToken } from "../../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../../after-application-is-ready-injection-token"; const setupIpcMainHandlersInjectable = getInjectable({ id: "setup-ipc-main-handlers", @@ -39,7 +39,7 @@ const setupIpcMainHandlersInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupIpcMainHandlersInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.ts similarity index 100% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-ipc-main-handlers/setup-ipc-main-handlers.ts diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-lens-proxy.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-lens-proxy.injectable.ts similarity index 94% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-lens-proxy.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-lens-proxy.injectable.ts index ae0d897c34..fea40b1e1b 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-lens-proxy.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-lens-proxy.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import { getAppVersion, getAppVersionFromProxyServer, @@ -73,7 +73,7 @@ const setupLensProxyInjectable = getInjectable({ causesSideEffects: true, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupLensProxyInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-listener-for-initial-state-of-cluster-store.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-listener-for-initial-state-of-cluster-store.injectable.ts similarity index 81% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-listener-for-initial-state-of-cluster-store.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-listener-for-initial-state-of-cluster-store.injectable.ts index 1294e726a1..68d7502ec3 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-listener-for-initial-state-of-cluster-store.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-listener-for-initial-state-of-cluster-store.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import clusterStoreInjectable from "../../../../common/cluster-store/cluster-store.injectable"; const setupListenerForInitialStateOfClusterStoreInjectable = getInjectable({ @@ -19,7 +19,7 @@ const setupListenerForInitialStateOfClusterStoreInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupListenerForInitialStateOfClusterStoreInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-listener-for-root-frame-rendering.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-listener-for-root-frame-rendering.injectable.ts similarity index 89% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-listener-for-root-frame-rendering.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-listener-for-root-frame-rendering.injectable.ts index 15ac3a009d..9229d4ad51 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-listener-for-root-frame-rendering.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-listener-for-root-frame-rendering.injectable.ts @@ -7,7 +7,7 @@ import { ipcMainOn } from "../../../../common/ipc"; import { IpcRendererNavigationEvents } from "../../../../renderer/navigation/events"; import lensProtocolRouterMainInjectable from "../../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable"; import { onRootFrameRenderInjectionToken } from "../../on-root-frame-render/on-root-frame-render-injection-token"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import { runManyFor } from "../../run-many-for"; const setupListenerForRootFrameRenderingInjectable = getInjectable({ @@ -36,7 +36,7 @@ const setupListenerForRootFrameRenderingInjectable = getInjectable({ // Direct usage of IPC causesSideEffects: true, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupListenerForRootFrameRenderingInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-os-theme-updates.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-os-theme-updates.injectable.ts similarity index 78% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-os-theme-updates.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-os-theme-updates.injectable.ts index 00dfd5a94c..2d8da2dd29 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-os-theme-updates.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-os-theme-updates.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { broadcastNativeThemeOnUpdate } from "../../../native-theme"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; const setupOsThemeUpdatesInjectable = getInjectable({ id: "setup-os-theme-updates", @@ -18,7 +18,7 @@ const setupOsThemeUpdatesInjectable = getInjectable({ // Todo: remove explicit usage of IPC to get rid of this. causesSideEffects: true, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupOsThemeUpdatesInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-prometheus-registry.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-prometheus-registry.injectable.ts similarity index 87% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-prometheus-registry.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-prometheus-registry.injectable.ts index 0486b002f2..4d3b7e6b7d 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-prometheus-registry.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-prometheus-registry.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import { PrometheusLens } from "../../../prometheus/lens"; import { PrometheusHelm } from "../../../prometheus/helm"; import { PrometheusOperator } from "../../../prometheus/operator"; @@ -27,7 +27,7 @@ const setupPrometheusRegistryInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupPrometheusRegistryInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-protocol-router-main.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-protocol-router-main.injectable.ts similarity index 91% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-protocol-router-main.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-protocol-router-main.injectable.ts index 5355a9eb26..20453b8870 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-protocol-router-main.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-protocol-router-main.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import { productName } from "../../../../common/vars"; import loggerInjectable from "../../../../common/logger.injectable"; import electronAppInjectable from "../../../app-paths/get-electron-app-path/electron-app/electron-app.injectable"; @@ -47,7 +47,7 @@ const setupProtocolRouterMainInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupProtocolRouterMainInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-reactions-in-user-store.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-reactions-in-user-store.injectable.ts similarity index 79% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-reactions-in-user-store.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-reactions-in-user-store.injectable.ts index 1dde6988e6..bda8962b60 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-reactions-in-user-store.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-reactions-in-user-store.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import userStoreInjectable from "../../../../common/user-store/user-store.injectable"; const setupReactionsInUserStoreInjectable = getInjectable({ @@ -19,7 +19,7 @@ const setupReactionsInUserStoreInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupReactionsInUserStoreInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-sentry.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-sentry.injectable.ts similarity index 74% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-sentry.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-sentry.injectable.ts index 679e251e33..a9ac6153c2 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-sentry.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-sentry.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import { SentryInit } from "../../../../common/sentry"; const setupSentryInjectable = getInjectable({ @@ -17,7 +17,7 @@ const setupSentryInjectable = getInjectable({ causesSideEffects: true, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupSentryInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-shell.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-shell.injectable.ts similarity index 80% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-shell.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-shell.injectable.ts index aa8b318bd5..362bafd859 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-shell.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-shell.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import { shellSync } from "../../../shell-sync"; import loggerInjectable from "../../../../common/logger.injectable"; @@ -22,7 +22,7 @@ const setupShellInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, causesSideEffects: true, }); diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-syncing-of-general-catalog-entities.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-syncing-of-general-catalog-entities.injectable.ts similarity index 82% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-syncing-of-general-catalog-entities.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-syncing-of-general-catalog-entities.injectable.ts index 34218e649a..9278c19f00 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-syncing-of-general-catalog-entities.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-syncing-of-general-catalog-entities.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import syncGeneralCatalogEntitiesInjectable from "../../../catalog-sources/sync-general-catalog-entities.injectable"; const setupSyncingOfGeneralCatalogEntitiesInjectable = getInjectable({ @@ -21,7 +21,7 @@ const setupSyncingOfGeneralCatalogEntitiesInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupSyncingOfGeneralCatalogEntitiesInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/setup-syncing-of-weblinks.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-syncing-of-weblinks.injectable.ts similarity index 80% rename from src/main/start-main-application/on-application-is-ready/implementations/setup-syncing-of-weblinks.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-syncing-of-weblinks.injectable.ts index 9a45d5ea72..4417ffe9db 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/setup-syncing-of-weblinks.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-syncing-of-weblinks.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import { syncWeblinks } from "../../../catalog-sources"; import weblinkStoreInjectable from "../../../../common/weblink-store.injectable"; @@ -20,7 +20,7 @@ const setupSyncingOfWeblinksInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupSyncingOfWeblinksInjectable; diff --git a/src/main/start-main-application/on-application-is-ready/implementations/start-main-window.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/start-main-window.injectable.ts similarity index 89% rename from src/main/start-main-application/on-application-is-ready/implementations/start-main-window.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/start-main-window.injectable.ts index 41db28c798..5482103447 100644 --- a/src/main/start-main-application/on-application-is-ready/implementations/start-main-window.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/start-main-window.injectable.ts @@ -7,7 +7,7 @@ import windowManagerInjectable from "../../../window-manager.injectable"; import electronAppInjectable from "../../../app-paths/get-electron-app-path/electron-app/electron-app.injectable"; import loggerInjectable from "../../../../common/logger.injectable"; import isMacInjectable from "../../../../common/vars/is-mac.injectable"; -import { onApplicationIsReadyInjectionToken } from "../on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; const startMainWindowInjectable = getInjectable({ id: "start-main-window", @@ -35,7 +35,7 @@ const startMainWindowInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default startMainWindowInjectable; diff --git a/src/main/start-main-application/start-main-application.injectable.ts b/src/main/start-main-application/start-main-application.injectable.ts index fde50c9510..3f2cac0439 100644 --- a/src/main/start-main-application/start-main-application.injectable.ts +++ b/src/main/start-main-application/start-main-application.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import electronAppInjectable from "../app-paths/get-electron-app-path/electron-app/electron-app.injectable"; import { beforeApplicationIsReadyInjectionToken } from "./before-application-is-ready/before-application-is-ready-injection-token"; -import { onApplicationIsReadyInjectionToken } from "./on-application-is-ready/on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "./after-application-is-ready/after-application-is-ready-injection-token"; import { runManyFor } from "./run-many-for"; const startMainApplicationInjectable = getInjectable({ @@ -21,7 +21,7 @@ const startMainApplicationInjectable = getInjectable({ await app.whenReady(); - await runMany(onApplicationIsReadyInjectionToken)(); + await runMany(afterApplicationIsReadyInjectionToken)(); }; }, }); diff --git a/src/main/tray/setup-tray-when-application-is-ready.injectable.ts b/src/main/tray/setup-tray-when-application-is-ready.injectable.ts index f6260e4e8e..63f7929c21 100644 --- a/src/main/tray/setup-tray-when-application-is-ready.injectable.ts +++ b/src/main/tray/setup-tray-when-application-is-ready.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationIsReadyInjectionToken } from "../start-main-application/on-application-is-ready/on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../start-main-application/after-application-is-ready/after-application-is-ready-injection-token"; import trayInitializerInjectable from "./tray-initializer.injectable"; const setupTrayWhenApplicationIsReadyInjectable = getInjectable({ @@ -19,7 +19,7 @@ const setupTrayWhenApplicationIsReadyInjectable = getInjectable({ }; }, - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupTrayWhenApplicationIsReadyInjectable; diff --git a/src/renderer/app-paths/setup-app-paths.injectable.ts b/src/renderer/app-paths/setup-app-paths.injectable.ts index 8581aba206..4d40889b38 100644 --- a/src/renderer/app-paths/setup-app-paths.injectable.ts +++ b/src/renderer/app-paths/setup-app-paths.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { AppPaths, appPathsIpcChannel } from "../../common/app-paths/app-path-injection-token"; import getValueFromRegisteredChannelInjectable from "./get-value-from-registered-channel/get-value-from-registered-channel.injectable"; import appPathsStateInjectable from "../../common/app-paths/app-paths-state.injectable"; -import { onApplicationIsReadyInjectionToken } from "../../main/start-main-application/on-application-is-ready/on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../../main/start-main-application/after-application-is-ready/after-application-is-ready-injection-token"; let syncAppPaths: AppPaths; @@ -27,7 +27,7 @@ const setupAppPathsInjectable = getInjectable({ }, }), - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupAppPathsInjectable; diff --git a/src/renderer/ipc-channel-listeners/register-ipc-channel-listeners.injectable.ts b/src/renderer/ipc-channel-listeners/register-ipc-channel-listeners.injectable.ts index c18d9e20fe..9470f51632 100644 --- a/src/renderer/ipc-channel-listeners/register-ipc-channel-listeners.injectable.ts +++ b/src/renderer/ipc-channel-listeners/register-ipc-channel-listeners.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { ipcChannelListenerInjectionToken } from "./ipc-channel-listener-injection-token"; import registerIpcChannelListenerInjectable from "../app-paths/get-value-from-registered-channel/register-ipc-channel-listener.injectable"; -import { onApplicationIsReadyInjectionToken } from "../../main/start-main-application/on-application-is-ready/on-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../../main/start-main-application/after-application-is-ready/after-application-is-ready-injection-token"; const registerIpcChannelListenersInjectable = getInjectable({ id: "register-ipc-channel-listeners", @@ -22,7 +22,7 @@ const registerIpcChannelListenersInjectable = getInjectable({ }, }), - injectionToken: onApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default registerIpcChannelListenersInjectable;