From 8a210c80a4ea07da84807079c9c7d324ad39bb5e Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Fri, 8 Jul 2022 13:59:37 +0300 Subject: [PATCH] Relocate stuff related to tray under behaviours Signed-off-by: Janne Savolainen --- ...ay-menu-item-originating-from-extension.test.ts | 2 +- .../electron-tray/electron-tray.injectable.ts | 8 ++++---- .../main}/electron-tray/start-tray.injectable.ts | 2 +- .../main}/electron-tray/stop-tray.injectable.ts | 2 +- .../menu-icon/get-tray-icon-path.injectable.ts | 8 ++++---- .../main}/menu-icon/normal-tray-icon.injectable.ts | 0 .../tray/main}/menu-icon/reactive.injectable.ts | 2 +- .../main}/menu-icon/start-reactivity.injectable.ts | 2 +- .../main}/menu-icon/stop-reactivity.injectable.ts | 2 +- .../main}/menu-icon/tray-icon-injection-token.ts | 0 .../tray/main}/menu-icon/tray-icon.injectable.ts | 0 .../main}/reactive-tray-menu-items/converters.ts | 0 .../reactive-tray-menu-items.injectable.ts | 2 +- .../start-reactive-tray-menu-items.injectable.ts | 2 +- .../stop-reactive-tray-menu-items.injectable.ts | 2 +- .../tray-menu-item-injection-token.ts | 0 .../tray-menu-item-registrator.injectable.ts | 14 +++++++------- .../tray-menu-item/tray-menu-items.injectable.ts | 0 .../tray/main}/tray-menu-registration.ts | 0 ...e-separators-originating-from-extension.test.ts | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) rename src/{main/tray => behaviours/tray/main}/electron-tray/electron-tray.injectable.ts (84%) rename src/{main/tray => behaviours/tray/main}/electron-tray/start-tray.injectable.ts (80%) rename src/{main/tray => behaviours/tray/main}/electron-tray/stop-tray.injectable.ts (83%) rename src/{main/tray => behaviours/tray/main}/menu-icon/get-tray-icon-path.injectable.ts (75%) rename src/{main/tray => behaviours/tray/main}/menu-icon/normal-tray-icon.injectable.ts (100%) rename src/{main/tray => behaviours/tray/main}/menu-icon/reactive.injectable.ts (91%) rename src/{main/tray => behaviours/tray/main}/menu-icon/start-reactivity.injectable.ts (84%) rename src/{main/tray => behaviours/tray/main}/menu-icon/stop-reactivity.injectable.ts (82%) rename src/{main/tray => behaviours/tray/main}/menu-icon/tray-icon-injection-token.ts (100%) rename src/{main/tray => behaviours/tray/main}/menu-icon/tray-icon.injectable.ts (100%) rename src/{main/tray => behaviours/tray/main}/reactive-tray-menu-items/converters.ts (100%) rename src/{main/tray => behaviours/tray/main}/reactive-tray-menu-items/reactive-tray-menu-items.injectable.ts (94%) rename src/{main/tray => behaviours/tray/main}/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts (84%) rename src/{main/tray => behaviours/tray/main}/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts (82%) rename src/{main/tray => behaviours/tray/main}/tray-menu-item/tray-menu-item-injection-token.ts (100%) rename src/{main/tray => behaviours/tray/main}/tray-menu-item/tray-menu-item-registrator.injectable.ts (82%) rename src/{main/tray => behaviours/tray/main}/tray-menu-item/tray-menu-items.injectable.ts (100%) rename src/{main/tray => behaviours/tray/main}/tray-menu-registration.ts (100%) diff --git a/src/behaviours/tray/clicking-tray-menu-item-originating-from-extension.test.ts b/src/behaviours/tray/clicking-tray-menu-item-originating-from-extension.test.ts index 006760f902..b1f126a45b 100644 --- a/src/behaviours/tray/clicking-tray-menu-item-originating-from-extension.test.ts +++ b/src/behaviours/tray/clicking-tray-menu-item-originating-from-extension.test.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { LensMainExtension } from "../../extensions/lens-main-extension"; -import type { TrayMenuRegistration } from "../../main/tray/tray-menu-registration"; +import type { TrayMenuRegistration } from "./main/tray-menu-registration"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import loggerInjectable from "../../common/logger.injectable"; diff --git a/src/main/tray/electron-tray/electron-tray.injectable.ts b/src/behaviours/tray/main/electron-tray/electron-tray.injectable.ts similarity index 84% rename from src/main/tray/electron-tray/electron-tray.injectable.ts rename to src/behaviours/tray/main/electron-tray/electron-tray.injectable.ts index d8b264060a..28a8798098 100644 --- a/src/main/tray/electron-tray/electron-tray.injectable.ts +++ b/src/behaviours/tray/main/electron-tray/electron-tray.injectable.ts @@ -4,10 +4,10 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { Menu, Tray } from "electron"; -import packageJsonInjectable from "../../../common/vars/package-json.injectable"; -import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable"; -import isWindowsInjectable from "../../../common/vars/is-windows.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import packageJsonInjectable from "../../../../common/vars/package-json.injectable"; +import showApplicationWindowInjectable from "../../../../main/start-main-application/lens-window/show-application-window.injectable"; +import isWindowsInjectable from "../../../../common/vars/is-windows.injectable"; +import loggerInjectable from "../../../../common/logger.injectable"; import { convertToElectronMenuTemplate } from "../reactive-tray-menu-items/converters"; import trayIconInjectable from "../menu-icon/tray-icon.injectable"; diff --git a/src/main/tray/electron-tray/start-tray.injectable.ts b/src/behaviours/tray/main/electron-tray/start-tray.injectable.ts similarity index 80% rename from src/main/tray/electron-tray/start-tray.injectable.ts rename to src/behaviours/tray/main/electron-tray/start-tray.injectable.ts index 1a223ac3a5..ee17ca42cd 100644 --- a/src/main/tray/electron-tray/start-tray.injectable.ts +++ b/src/behaviours/tray/main/electron-tray/start-tray.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 { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../../../main/start-main-application/runnable-tokens/on-load-of-application-injection-token"; import electronTrayInjectable from "./electron-tray.injectable"; const startTrayInjectable = getInjectable({ diff --git a/src/main/tray/electron-tray/stop-tray.injectable.ts b/src/behaviours/tray/main/electron-tray/stop-tray.injectable.ts similarity index 83% rename from src/main/tray/electron-tray/stop-tray.injectable.ts rename to src/behaviours/tray/main/electron-tray/stop-tray.injectable.ts index f66ffb3a64..e227da9ef9 100644 --- a/src/main/tray/electron-tray/stop-tray.injectable.ts +++ b/src/behaviours/tray/main/electron-tray/stop-tray.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import electronTrayInjectable from "./electron-tray.injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token"; +import { beforeQuitOfBackEndInjectionToken } from "../../../../main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token"; import stopReactiveTrayMenuItemsInjectable from "../reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable"; const stopTrayInjectable = getInjectable({ diff --git a/src/main/tray/menu-icon/get-tray-icon-path.injectable.ts b/src/behaviours/tray/main/menu-icon/get-tray-icon-path.injectable.ts similarity index 75% rename from src/main/tray/menu-icon/get-tray-icon-path.injectable.ts rename to src/behaviours/tray/main/menu-icon/get-tray-icon-path.injectable.ts index fe2746a2ab..657e2135d3 100644 --- a/src/main/tray/menu-icon/get-tray-icon-path.injectable.ts +++ b/src/behaviours/tray/main/menu-icon/get-tray-icon-path.injectable.ts @@ -3,10 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import getAbsolutePathInjectable from "../../../common/path/get-absolute-path.injectable"; -import staticFilesDirectoryInjectable from "../../../common/vars/static-files-directory.injectable"; -import isDevelopmentInjectable from "../../../common/vars/is-development.injectable"; -import isMacInjectable from "../../../common/vars/is-mac.injectable"; +import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable"; +import staticFilesDirectoryInjectable from "../../../../common/vars/static-files-directory.injectable"; +import isDevelopmentInjectable from "../../../../common/vars/is-development.injectable"; +import isMacInjectable from "../../../../common/vars/is-mac.injectable"; import { camelCase, flow, upperFirst } from "lodash/fp"; const upperCamelCase = flow(camelCase, upperFirst); diff --git a/src/main/tray/menu-icon/normal-tray-icon.injectable.ts b/src/behaviours/tray/main/menu-icon/normal-tray-icon.injectable.ts similarity index 100% rename from src/main/tray/menu-icon/normal-tray-icon.injectable.ts rename to src/behaviours/tray/main/menu-icon/normal-tray-icon.injectable.ts diff --git a/src/main/tray/menu-icon/reactive.injectable.ts b/src/behaviours/tray/main/menu-icon/reactive.injectable.ts similarity index 91% rename from src/main/tray/menu-icon/reactive.injectable.ts rename to src/behaviours/tray/main/menu-icon/reactive.injectable.ts index 8c6d358477..f36f1981f9 100644 --- a/src/main/tray/menu-icon/reactive.injectable.ts +++ b/src/behaviours/tray/main/menu-icon/reactive.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { reaction } from "mobx"; -import { getStartableStoppable } from "../../../common/utils/get-startable-stoppable"; +import { getStartableStoppable } from "../../../../common/utils/get-startable-stoppable"; import electronTrayInjectable from "../electron-tray/electron-tray.injectable"; import trayIconInjectable from "./tray-icon.injectable"; diff --git a/src/main/tray/menu-icon/start-reactivity.injectable.ts b/src/behaviours/tray/main/menu-icon/start-reactivity.injectable.ts similarity index 84% rename from src/main/tray/menu-icon/start-reactivity.injectable.ts rename to src/behaviours/tray/main/menu-icon/start-reactivity.injectable.ts index 373c3cf8fb..c18e7fc668 100644 --- a/src/main/tray/menu-icon/start-reactivity.injectable.ts +++ b/src/behaviours/tray/main/menu-icon/start-reactivity.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 { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../../../main/start-main-application/runnable-tokens/on-load-of-application-injection-token"; import startTrayInjectable from "../electron-tray/start-tray.injectable"; import reactiveTrayMenuIconInjectable from "./reactive.injectable"; diff --git a/src/main/tray/menu-icon/stop-reactivity.injectable.ts b/src/behaviours/tray/main/menu-icon/stop-reactivity.injectable.ts similarity index 82% rename from src/main/tray/menu-icon/stop-reactivity.injectable.ts rename to src/behaviours/tray/main/menu-icon/stop-reactivity.injectable.ts index 4b60aaaa54..71bc024b55 100644 --- a/src/main/tray/menu-icon/stop-reactivity.injectable.ts +++ b/src/behaviours/tray/main/menu-icon/stop-reactivity.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 { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token"; +import { beforeQuitOfBackEndInjectionToken } from "../../../../main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token"; import reactiveTrayMenuIconInjectable from "./reactive.injectable"; const stopReactiveTrayMenuIconInjectable = getInjectable({ diff --git a/src/main/tray/menu-icon/tray-icon-injection-token.ts b/src/behaviours/tray/main/menu-icon/tray-icon-injection-token.ts similarity index 100% rename from src/main/tray/menu-icon/tray-icon-injection-token.ts rename to src/behaviours/tray/main/menu-icon/tray-icon-injection-token.ts diff --git a/src/main/tray/menu-icon/tray-icon.injectable.ts b/src/behaviours/tray/main/menu-icon/tray-icon.injectable.ts similarity index 100% rename from src/main/tray/menu-icon/tray-icon.injectable.ts rename to src/behaviours/tray/main/menu-icon/tray-icon.injectable.ts diff --git a/src/main/tray/reactive-tray-menu-items/converters.ts b/src/behaviours/tray/main/reactive-tray-menu-items/converters.ts similarity index 100% rename from src/main/tray/reactive-tray-menu-items/converters.ts rename to src/behaviours/tray/main/reactive-tray-menu-items/converters.ts diff --git a/src/main/tray/reactive-tray-menu-items/reactive-tray-menu-items.injectable.ts b/src/behaviours/tray/main/reactive-tray-menu-items/reactive-tray-menu-items.injectable.ts similarity index 94% rename from src/main/tray/reactive-tray-menu-items/reactive-tray-menu-items.injectable.ts rename to src/behaviours/tray/main/reactive-tray-menu-items/reactive-tray-menu-items.injectable.ts index 145cc1e870..30ef4852dc 100644 --- a/src/main/tray/reactive-tray-menu-items/reactive-tray-menu-items.injectable.ts +++ b/src/behaviours/tray/main/reactive-tray-menu-items/reactive-tray-menu-items.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 { getStartableStoppable } from "../../../common/utils/get-startable-stoppable"; +import { getStartableStoppable } from "../../../../common/utils/get-startable-stoppable"; import { reaction } from "mobx"; import type { MinimalTrayMenuItem } from "../electron-tray/electron-tray.injectable"; import electronTrayInjectable from "../electron-tray/electron-tray.injectable"; diff --git a/src/main/tray/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts b/src/behaviours/tray/main/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts similarity index 84% rename from src/main/tray/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts rename to src/behaviours/tray/main/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts index 63025e6a9a..e370482991 100644 --- a/src/main/tray/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts +++ b/src/behaviours/tray/main/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import reactiveTrayMenuItemsInjectable from "./reactive-tray-menu-items.injectable"; -import { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../../../main/start-main-application/runnable-tokens/on-load-of-application-injection-token"; import startTrayInjectable from "../electron-tray/start-tray.injectable"; const startReactiveTrayMenuItemsInjectable = getInjectable({ diff --git a/src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts b/src/behaviours/tray/main/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts similarity index 82% rename from src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts rename to src/behaviours/tray/main/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts index 384cdc253a..c1dc5476a7 100644 --- a/src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts +++ b/src/behaviours/tray/main/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import reactiveTrayMenuItemsInjectable from "./reactive-tray-menu-items.injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token"; +import { beforeQuitOfBackEndInjectionToken } from "../../../../main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token"; const stopReactiveTrayMenuItemsInjectable = getInjectable({ id: "stop-reactive-tray-menu-items", diff --git a/src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts b/src/behaviours/tray/main/tray-menu-item/tray-menu-item-injection-token.ts similarity index 100% rename from src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts rename to src/behaviours/tray/main/tray-menu-item/tray-menu-item-injection-token.ts diff --git a/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts b/src/behaviours/tray/main/tray-menu-item/tray-menu-item-registrator.injectable.ts similarity index 82% rename from src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts rename to src/behaviours/tray/main/tray-menu-item/tray-menu-item-registrator.injectable.ts index 136f869b8f..6d27d1ed9a 100644 --- a/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts +++ b/src/behaviours/tray/main/tray-menu-item/tray-menu-item-registrator.injectable.ts @@ -7,16 +7,16 @@ import { kebabCase } from "lodash/fp"; import type { Injectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { extensionRegistratorInjectionToken } from "../../../extensions/extension-loader/extension-registrator-injection-token"; -import type { LensMainExtension } from "../../../extensions/lens-main-extension"; +import { extensionRegistratorInjectionToken } from "../../../../extensions/extension-loader/extension-registrator-injection-token"; +import type { LensMainExtension } from "../../../../extensions/lens-main-extension"; import type { TrayMenuItem } from "./tray-menu-item-injection-token"; import { trayMenuItemInjectionToken } from "./tray-menu-item-injection-token"; import type { TrayMenuRegistration } from "../tray-menu-registration"; -import { withErrorSuppression } from "../../../common/utils/with-error-suppression/with-error-suppression"; -import type { WithErrorLoggingFor } from "../../../common/utils/with-error-logging/with-error-logging.injectable"; -import withErrorLoggingInjectable from "../../../common/utils/with-error-logging/with-error-logging.injectable"; -import getRandomIdInjectable from "../../../common/utils/get-random-id.injectable"; -import { isBoolean } from "../../../common/utils"; +import { withErrorSuppression } from "../../../../common/utils/with-error-suppression/with-error-suppression"; +import type { WithErrorLoggingFor } from "../../../../common/utils/with-error-logging/with-error-logging.injectable"; +import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable"; +import getRandomIdInjectable from "../../../../common/utils/get-random-id.injectable"; +import { isBoolean } from "../../../../common/utils"; const trayMenuItemRegistratorInjectable = getInjectable({ id: "tray-menu-item-registrator", diff --git a/src/main/tray/tray-menu-item/tray-menu-items.injectable.ts b/src/behaviours/tray/main/tray-menu-item/tray-menu-items.injectable.ts similarity index 100% rename from src/main/tray/tray-menu-item/tray-menu-items.injectable.ts rename to src/behaviours/tray/main/tray-menu-item/tray-menu-items.injectable.ts diff --git a/src/main/tray/tray-menu-registration.ts b/src/behaviours/tray/main/tray-menu-registration.ts similarity index 100% rename from src/main/tray/tray-menu-registration.ts rename to src/behaviours/tray/main/tray-menu-registration.ts diff --git a/src/behaviours/tray/multiple-separators-originating-from-extension.test.ts b/src/behaviours/tray/multiple-separators-originating-from-extension.test.ts index 96b9f18198..6116a315dd 100644 --- a/src/behaviours/tray/multiple-separators-originating-from-extension.test.ts +++ b/src/behaviours/tray/multiple-separators-originating-from-extension.test.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { LensMainExtension } from "../../extensions/lens-main-extension"; -import type { TrayMenuRegistration } from "../../main/tray/tray-menu-registration"; +import type { TrayMenuRegistration } from "./main/tray-menu-registration"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import getRandomIdInjectable from "../../common/utils/get-random-id.injectable";