Consolidate event naming

Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>

src/main/catalog-sync-to-renderer/stop-catalog-sync-when-application-is-closed.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import catalogSyncToRendererInjectable from "./catalog-sync-to-renderer.injectable";
-import { onApplicationCloseInjectionToken } from "../start-main-application/on-application-close/on-application-close-injection-token";
+import { onApplicationSoftQuitInjectionToken } from "../start-main-application/on-application-soft-quit/on-application-soft-quit-injection-token";
 
 const stopCatalogSyncWhenApplicationIsClosedInjectable = getInjectable({
   id: "stop-catalog-sync-when-application-is-closed",
@@ -19,7 +19,7 @@ const stopCatalogSyncWhenApplicationIsClosedInjectable = getInjectable({
     };
   },
 
-  injectionToken: onApplicationCloseInjectionToken,
+  injectionToken: onApplicationSoftQuitInjectionToken,
 });
 
 export default stopCatalogSyncWhenApplicationIsClosedInjectable;

src/main/menu/cleanup-application-menu-when-application-is-quit.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import applicationMenuInitializerInjectable from "./application-menu-initializer.injectable";
-import { onApplicationQuitInjectionToken } from "../start-main-application/on-application-quit/on-application-quit-injection-token";
+import { onApplicationHardQuitInjectionToken } from "../start-main-application/on-application-hard-quit/on-application-hard-quit-injection-token";
 
 const cleanupApplicationMenuWhenApplicationIsQuitInjectable = getInjectable({
   id: "cleanup-application-menu-when-application-is-quit",
@@ -21,7 +21,7 @@ const cleanupApplicationMenuWhenApplicationIsQuitInjectable = getInjectable({
     };
   },
 
-  injectionToken: onApplicationQuitInjectionToken,
+  injectionToken: onApplicationHardQuitInjectionToken,
 });
 
 export default cleanupApplicationMenuWhenApplicationIsQuitInjectable;

src/main/start-main-application/before-application-is-ready/implementations/setup-closing-of-application.injectable.ts

@@ -5,7 +5,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-injection-token";
-import { onApplicationCloseInjectionToken } from "../../on-application-close/on-application-close-injection-token";
+import { onApplicationSoftQuitInjectionToken } from "../../on-application-soft-quit/on-application-soft-quit-injection-token";
 import { runManyFor } from "../../run-many-for";
 
 const setupClosingOfApplicationInjectable = getInjectable({
@@ -15,7 +15,7 @@ const setupClosingOfApplicationInjectable = getInjectable({
     const app = di.inject(electronAppInjectable);
 
     const runManyForApplicationClose = runManyFor(di)(
-      onApplicationCloseInjectionToken,
+      onApplicationSoftQuitInjectionToken,
     );
 
     return {

src/main/start-main-application/on-application-close/implementations/quit-application.injectable.ts

@@ -1,37 +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 { onApplicationQuitInjectionToken } from "../../on-application-quit/on-application-quit-injection-token";
-import { isIntegrationTesting } from "../../../../common/vars";
-import { runManyFor } from "../../run-many-for";
-import { onApplicationCloseInjectionToken } from "../on-application-close-injection-token";
-
-const quitApplicationInjectable = getInjectable({
-  id: "prevent-application-from-closing-involuntarily",
-
-  instantiate: (di) => {
-    const runMany = runManyFor(di);
-    const runOnApplicationQuit = runMany(onApplicationQuitInjectionToken);
-
-    return {
-      run: async ({ event }) => {
-        if (!isIntegrationTesting) {
-          // &&!autoUpdateIsRunning) {
-          event.preventDefault();
-
-          return;
-        }
-
-        await runOnApplicationQuit({ event });
-      },
-    };
-  },
-
-  causesSideEffects: true,
-
-  injectionToken: onApplicationCloseInjectionToken,
-});
-
-export default quitApplicationInjectable;

src/main/start-main-application/on-application-hard-quit/implementations/clean-up-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 { onApplicationQuitInjectionToken } from "../on-application-quit-injection-token";
+import { onApplicationHardQuitInjectionToken } from "../on-application-hard-quit-injection-token";
 import lensProtocolRouterMainInjectable from "../../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable";
 
 const cleanUpProtocolRouterMainInjectable = getInjectable({
@@ -19,7 +19,7 @@ const cleanUpProtocolRouterMainInjectable = getInjectable({
     };
   },
 
-  injectionToken: onApplicationQuitInjectionToken,
+  injectionToken: onApplicationHardQuitInjectionToken,
 });
 
 export default cleanUpProtocolRouterMainInjectable;

src/main/start-main-application/on-application-hard-quit/implementations/clean-up-shell-sessions.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 { onApplicationQuitInjectionToken } from "../on-application-quit-injection-token";
+import { onApplicationHardQuitInjectionToken } from "../on-application-hard-quit-injection-token";
 import { ShellSession } from "../../../shell-session/shell-session";
 
 const cleanUpShellSessionsInjectable = getInjectable({
@@ -15,7 +15,7 @@ const cleanUpShellSessionsInjectable = getInjectable({
     },
   }),
 
-  injectionToken: onApplicationQuitInjectionToken,
+  injectionToken: onApplicationHardQuitInjectionToken,
 });
 
 export default cleanUpShellSessionsInjectable;

src/main/start-main-application/on-application-hard-quit/on-application-hard-quit-injection-token.ts

@@ -6,8 +6,8 @@ import { getInjectionToken } from "@ogre-tools/injectable";
 import type { Runnable } from "../run-many-for";
 import type { Event } from "electron";
 
-export const onApplicationCloseInjectionToken = getInjectionToken<
+export const onApplicationHardQuitInjectionToken = getInjectionToken<
   Runnable<{ event: Event }>
 >({
-  id: "on-application-close",
+  id: "on-application-hard-quit",
 });

src/main/start-main-application/on-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 { onApplicationCloseInjectionToken } from "../on-application-close-injection-token";
+import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token";
 
 const emitCloseToCommandBusInjectable = getInjectable({
   id: "emit-close-to-command-bus",
@@ -19,7 +19,7 @@ const emitCloseToCommandBusInjectable = getInjectable({
     };
   },
 
-  injectionToken: onApplicationCloseInjectionToken,
+  injectionToken: onApplicationSoftQuitInjectionToken,
 });
 
 export default emitCloseToCommandBusInjectable;

src/main/start-main-application/on-application-soft-quit/implementations/make-protocol-router-not-have-loaded-renderer.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import lensProtocolRouterMainInjectable  from "../../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable";
-import { onApplicationCloseInjectionToken } from "../on-application-close-injection-token";
+import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token";
 
 const makeProtocolRouterNotHaveLoadedRendererInjectable = getInjectable({
   id: "make-protocol-router-not-have-loaded-renderer",
@@ -21,7 +21,7 @@ const makeProtocolRouterNotHaveLoadedRendererInjectable = getInjectable({
     };
   },
 
-  injectionToken: onApplicationCloseInjectionToken,
+  injectionToken: onApplicationSoftQuitInjectionToken,
 });
 
 export default makeProtocolRouterNotHaveLoadedRendererInjectable;

src/main/start-main-application/on-application-soft-quit/implementations/quit-application.injectable.ts

@@ -0,0 +1,38 @@
+/**
+ * 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 { onApplicationHardQuitInjectionToken } from "../../on-application-hard-quit/on-application-hard-quit-injection-token";
+import { runManyFor } from "../../run-many-for";
+import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token";
+import isIntegrationTestingInjectable from "../../../../common/vars/is-integration-testing.injectable";
+
+const quitApplicationInjectable = getInjectable({
+  id: "prevent-application-from-closing-involuntarily",
+
+  instantiate: (di) => {
+    const runMany = runManyFor(di);
+    const runOnApplicationQuit = runMany(onApplicationHardQuitInjectionToken);
+    const isIntegrationTesting = di.inject(isIntegrationTestingInjectable);
+
+    return {
+      run: async (runParameter) => {
+        if (!isIntegrationTesting) {
+          // &&!autoUpdateIsRunning) {
+          runParameter.cancel();
+
+          return;
+        }
+
+        await runOnApplicationQuit(runParameter);
+      },
+    };
+  },
+
+  causesSideEffects: true,
+
+  injectionToken: onApplicationSoftQuitInjectionToken,
+});
+
+export default quitApplicationInjectable;

src/main/start-main-application/on-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 { onApplicationCloseInjectionToken } from "../on-application-close-injection-token";
+import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token";
 
 const stopClusterManagerInjectable = getInjectable({
   id: "stop-cluster-manager",
@@ -19,7 +19,7 @@ const stopClusterManagerInjectable = getInjectable({
     };
   },
 
-  injectionToken: onApplicationCloseInjectionToken,
+  injectionToken: onApplicationSoftQuitInjectionToken,
 
   causesSideEffects: true,
 });

src/main/start-main-application/on-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 { onApplicationCloseInjectionToken } from "../on-application-close-injection-token";
+import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token";
 
 const stopKubeConfigSyncInjectable = getInjectable({
   id: "stop-kube-config-sync",
@@ -19,7 +19,7 @@ const stopKubeConfigSyncInjectable = getInjectable({
     };
   },
 
-  injectionToken: onApplicationCloseInjectionToken,
+  injectionToken: onApplicationSoftQuitInjectionToken,
 });
 
 export default stopKubeConfigSyncInjectable;

src/main/start-main-application/on-application-soft-quit/on-application-soft-quit-injection-token.ts

@@ -6,8 +6,8 @@ import { getInjectionToken } from "@ogre-tools/injectable";
 import type { Runnable } from "../run-many-for";
 import type { Event } from "electron";
 
-export const onApplicationQuitInjectionToken = getInjectionToken<
+export const onApplicationSoftQuitInjectionToken = getInjectionToken<
   Runnable<{ event: Event }>
 >({
-  id: "on-application-quit",
+  id: "on-application-soft-quit",
 });

src/main/tray/cleanup-tray-when-application-is-quit.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import trayInitializerInjectable from "./tray-initializer.injectable";
-import { onApplicationQuitInjectionToken } from "../start-main-application/on-application-quit/on-application-quit-injection-token";
+import { onApplicationHardQuitInjectionToken } from "../start-main-application/on-application-hard-quit/on-application-hard-quit-injection-token";
 
 const setupTrayWhenApplicationIsQuitInjectable = getInjectable({
   id: "setup-tray-when-application-is-quit",
@@ -19,7 +19,7 @@ const setupTrayWhenApplicationIsQuitInjectable = getInjectable({
     };
   },
 
-  injectionToken: onApplicationQuitInjectionToken,
+  injectionToken: onApplicationHardQuitInjectionToken,
 });
 
 export default setupTrayWhenApplicationIsQuitInjectable;