From b7ac22b8f5af61447767a30c9f8f9caae18be682 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Fri, 8 Jul 2022 13:59:48 +0300 Subject: [PATCH] Relocate stuff related to tray under behaviours - stuff that are breaking the rules Signed-off-by: Janne Savolainen --- src/extensions/common-api/registrations.ts | 2 +- src/extensions/lens-main-extension.ts | 2 +- .../check-for-updates-tray-item.injectable.ts | 2 +- ...nstall-application-update-tray-item.injectable.ts | 2 +- .../checking-for-updates-tray-icon.injectable.ts | 4 ++-- ...-is-ready-to-be-installed-tray-icon.injectable.ts | 4 ++-- .../about-app-tray-item.injectable.ts | 12 ++++++------ .../open-app-tray-item.injectable.ts | 10 +++++----- .../open-preferences-tray-item.injectable.ts | 8 ++++---- .../quit-app-separator-tray-item.injectable.ts | 2 +- .../quit-app-tray-item.injectable.ts | 8 ++++---- .../test-utils/get-application-builder.tsx | 4 ++-- 12 files changed, 30 insertions(+), 30 deletions(-) rename src/main/tray/{tray-menu-item/implementations => }/about-app-tray-item.injectable.ts (69%) rename src/main/tray/{tray-menu-item/implementations => }/open-app-tray-item.injectable.ts (70%) rename src/main/tray/{tray-menu-item/implementations => }/open-preferences-tray-item.injectable.ts (72%) rename src/main/tray/{tray-menu-item/implementations => }/quit-app-separator-tray-item.injectable.ts (84%) rename src/main/tray/{tray-menu-item/implementations => }/quit-app-tray-item.injectable.ts (73%) diff --git a/src/extensions/common-api/registrations.ts b/src/extensions/common-api/registrations.ts index acb78ad2c9..acf213bc2d 100644 --- a/src/extensions/common-api/registrations.ts +++ b/src/extensions/common-api/registrations.ts @@ -13,4 +13,4 @@ export type { ProtocolHandlerRegistration, RouteParams as ProtocolRouteParams, R export type { CustomCategoryViewProps, CustomCategoryViewComponents, CustomCategoryViewRegistration } from "../../renderer/components/+catalog/custom-views"; export type { ShellEnvModifier, ShellEnvContext } from "../../main/shell-session/shell-env-modifier/shell-env-modifier-registration"; export type { KubeObjectContextMenuItem, KubeObjectOnContextMenuOpenContext, KubeObjectOnContextMenuOpen, KubeObjectHandlers, KubeObjectHandlerRegistration } from "../../renderer/kube-object/handler"; -export type { TrayMenuRegistration } from "../../main/tray/tray-menu-registration"; +export type { TrayMenuRegistration } from "../../behaviours/tray/main/tray-menu-registration"; diff --git a/src/extensions/lens-main-extension.ts b/src/extensions/lens-main-extension.ts index accc87989c..c5f296e2e8 100644 --- a/src/extensions/lens-main-extension.ts +++ b/src/extensions/lens-main-extension.ts @@ -7,7 +7,7 @@ import { LensExtension, lensExtensionDependencies } from "./lens-extension"; import type { CatalogEntity } from "../common/catalog"; import type { IObservableArray } from "mobx"; import type { MenuRegistration } from "../main/menu/menu-registration"; -import type { TrayMenuRegistration } from "../main/tray/tray-menu-registration"; +import type { TrayMenuRegistration } from "../behaviours/tray/main/tray-menu-registration"; import type { ShellEnvModifier } from "../main/shell-session/shell-env-modifier/shell-env-modifier-registration"; import type { LensMainExtensionDependencies } from "./lens-extension-set-dependencies"; diff --git a/src/main/application-update/check-for-updates-tray-item.injectable.ts b/src/main/application-update/check-for-updates-tray-item.injectable.ts index 29f39fa9d5..984bfce378 100644 --- a/src/main/application-update/check-for-updates-tray-item.injectable.ts +++ b/src/main/application-update/check-for-updates-tray-item.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import updatingIsEnabledInjectable from "./updating-is-enabled.injectable"; -import { trayMenuItemInjectionToken } from "../tray/tray-menu-item/tray-menu-item-injection-token"; +import { trayMenuItemInjectionToken } from "../../behaviours/tray/main/tray-menu-item/tray-menu-item-injection-token"; import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable"; import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable"; import updateIsBeingDownloadedInjectable from "../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable"; diff --git a/src/main/application-update/install-application-update-tray-item.injectable.ts b/src/main/application-update/install-application-update-tray-item.injectable.ts index ba71d5cfe7..e4ddb69218 100644 --- a/src/main/application-update/install-application-update-tray-item.injectable.ts +++ b/src/main/application-update/install-application-update-tray-item.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { trayMenuItemInjectionToken } from "../tray/tray-menu-item/tray-menu-item-injection-token"; +import { trayMenuItemInjectionToken } from "../../behaviours/tray/main/tray-menu-item/tray-menu-item-injection-token"; import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable"; import { withErrorSuppression } from "../../common/utils/with-error-suppression/with-error-suppression"; import { pipeline } from "@ogre-tools/fp"; diff --git a/src/main/application-update/tray-icons/checking-for-updates-tray-icon.injectable.ts b/src/main/application-update/tray-icons/checking-for-updates-tray-icon.injectable.ts index 5d22c98bba..38d9865240 100644 --- a/src/main/application-update/tray-icons/checking-for-updates-tray-icon.injectable.ts +++ b/src/main/application-update/tray-icons/checking-for-updates-tray-icon.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import getTrayIconPathInjectable from "../../tray/menu-icon/get-tray-icon-path.injectable"; -import { trayIconInjectionToken } from "../../tray/menu-icon/tray-icon-injection-token"; +import getTrayIconPathInjectable from "../../../behaviours/tray/main/menu-icon/get-tray-icon-path.injectable"; +import { trayIconInjectionToken } from "../../../behaviours/tray/main/menu-icon/tray-icon-injection-token"; import updatesAreBeingDiscoveredInjectable from "../../../common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable"; import updateIsBeingDownloadedInjectable from "../../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable"; diff --git a/src/main/application-update/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts b/src/main/application-update/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts index 7f097c0cbb..14ac269353 100644 --- a/src/main/application-update/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts +++ b/src/main/application-update/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import getTrayIconPathInjectable from "../../tray/menu-icon/get-tray-icon-path.injectable"; -import { trayIconInjectionToken } from "../../tray/menu-icon/tray-icon-injection-token"; +import getTrayIconPathInjectable from "../../../behaviours/tray/main/menu-icon/get-tray-icon-path.injectable"; +import { trayIconInjectionToken } from "../../../behaviours/tray/main/menu-icon/tray-icon-injection-token"; import updateIsReadyToBeInstalledInjectable from "../update-is-ready-to-be-installed.injectable"; const updateIsReadyToBeInstalledTrayIconInjectable = getInjectable({ diff --git a/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts b/src/main/tray/about-app-tray-item.injectable.ts similarity index 69% rename from src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts rename to src/main/tray/about-app-tray-item.injectable.ts index 5fb1a9f34f..bd18795ccb 100644 --- a/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts +++ b/src/main/tray/about-app-tray-item.injectable.ts @@ -3,13 +3,13 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import productNameInjectable from "../../../app-paths/app-name/product-name.injectable"; -import showApplicationWindowInjectable from "../../../start-main-application/lens-window/show-application-window.injectable"; -import showAboutInjectable from "../../../menu/show-about.injectable"; -import { trayMenuItemInjectionToken } from "../tray-menu-item-injection-token"; +import productNameInjectable from "../app-paths/app-name/product-name.injectable"; +import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable"; +import showAboutInjectable from "../menu/show-about.injectable"; +import { trayMenuItemInjectionToken } from "../../behaviours/tray/main/tray-menu-item/tray-menu-item-injection-token"; import { computed } from "mobx"; -import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable"; -import { withErrorSuppression } from "../../../../common/utils/with-error-suppression/with-error-suppression"; +import withErrorLoggingInjectable from "../../common/utils/with-error-logging/with-error-logging.injectable"; +import { withErrorSuppression } from "../../common/utils/with-error-suppression/with-error-suppression"; import { pipeline } from "@ogre-tools/fp"; const aboutAppTrayItemInjectable = getInjectable({ diff --git a/src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts b/src/main/tray/open-app-tray-item.injectable.ts similarity index 70% rename from src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts rename to src/main/tray/open-app-tray-item.injectable.ts index ff19d7718a..ce7b6c74dd 100644 --- a/src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts +++ b/src/main/tray/open-app-tray-item.injectable.ts @@ -3,12 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { trayMenuItemInjectionToken } from "../tray-menu-item-injection-token"; -import productNameInjectable from "../../../app-paths/app-name/product-name.injectable"; -import showApplicationWindowInjectable from "../../../start-main-application/lens-window/show-application-window.injectable"; +import { trayMenuItemInjectionToken } from "../../behaviours/tray/main/tray-menu-item/tray-menu-item-injection-token"; +import productNameInjectable from "../app-paths/app-name/product-name.injectable"; +import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable"; import { computed } from "mobx"; -import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable"; -import { withErrorSuppression } from "../../../../common/utils/with-error-suppression/with-error-suppression"; +import withErrorLoggingInjectable from "../../common/utils/with-error-logging/with-error-logging.injectable"; +import { withErrorSuppression } from "../../common/utils/with-error-suppression/with-error-suppression"; import { pipeline } from "@ogre-tools/fp"; const openAppTrayItemInjectable = getInjectable({ diff --git a/src/main/tray/tray-menu-item/implementations/open-preferences-tray-item.injectable.ts b/src/main/tray/open-preferences-tray-item.injectable.ts similarity index 72% rename from src/main/tray/tray-menu-item/implementations/open-preferences-tray-item.injectable.ts rename to src/main/tray/open-preferences-tray-item.injectable.ts index 8c062f6a29..de8ec26c39 100644 --- a/src/main/tray/tray-menu-item/implementations/open-preferences-tray-item.injectable.ts +++ b/src/main/tray/open-preferences-tray-item.injectable.ts @@ -3,12 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { trayMenuItemInjectionToken } from "../tray-menu-item-injection-token"; -import navigateToPreferencesInjectable from "../../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable"; +import { trayMenuItemInjectionToken } from "../../behaviours/tray/main/tray-menu-item/tray-menu-item-injection-token"; +import navigateToPreferencesInjectable from "../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable"; import { computed } from "mobx"; -import { withErrorSuppression } from "../../../../common/utils/with-error-suppression/with-error-suppression"; +import { withErrorSuppression } from "../../common/utils/with-error-suppression/with-error-suppression"; import { pipeline } from "@ogre-tools/fp"; -import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable"; +import withErrorLoggingInjectable from "../../common/utils/with-error-logging/with-error-logging.injectable"; const openPreferencesTrayItemInjectable = getInjectable({ id: "open-preferences-tray-item", diff --git a/src/main/tray/tray-menu-item/implementations/quit-app-separator-tray-item.injectable.ts b/src/main/tray/quit-app-separator-tray-item.injectable.ts similarity index 84% rename from src/main/tray/tray-menu-item/implementations/quit-app-separator-tray-item.injectable.ts rename to src/main/tray/quit-app-separator-tray-item.injectable.ts index de83a92fe6..d5e82de199 100644 --- a/src/main/tray/tray-menu-item/implementations/quit-app-separator-tray-item.injectable.ts +++ b/src/main/tray/quit-app-separator-tray-item.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 { trayMenuItemInjectionToken } from "../tray-menu-item-injection-token"; +import { trayMenuItemInjectionToken } from "../../behaviours/tray/main/tray-menu-item/tray-menu-item-injection-token"; import { computed } from "mobx"; const quitAppSeparatorTrayItemInjectable = getInjectable({ diff --git a/src/main/tray/tray-menu-item/implementations/quit-app-tray-item.injectable.ts b/src/main/tray/quit-app-tray-item.injectable.ts similarity index 73% rename from src/main/tray/tray-menu-item/implementations/quit-app-tray-item.injectable.ts rename to src/main/tray/quit-app-tray-item.injectable.ts index 894a823511..388d4663fb 100644 --- a/src/main/tray/tray-menu-item/implementations/quit-app-tray-item.injectable.ts +++ b/src/main/tray/quit-app-tray-item.injectable.ts @@ -3,12 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { trayMenuItemInjectionToken } from "../tray-menu-item-injection-token"; +import { trayMenuItemInjectionToken } from "../../behaviours/tray/main/tray-menu-item/tray-menu-item-injection-token"; import { computed } from "mobx"; -import stopServicesAndExitAppInjectable from "../../../stop-services-and-exit-app.injectable"; -import { withErrorSuppression } from "../../../../common/utils/with-error-suppression/with-error-suppression"; +import stopServicesAndExitAppInjectable from "../stop-services-and-exit-app.injectable"; +import { withErrorSuppression } from "../../common/utils/with-error-suppression/with-error-suppression"; import { pipeline } from "@ogre-tools/fp"; -import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable"; +import withErrorLoggingInjectable from "../../common/utils/with-error-logging/with-error-logging.injectable"; const quitAppTrayItemInjectable = getInjectable({ id: "quit-app-tray-item", diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 174686bbdc..b9abdfcab3 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -37,8 +37,8 @@ import startFrameInjectable from "../../start-frame/start-frame.injectable"; import type { NamespaceStore } from "../+namespaces/store"; import namespaceStoreInjectable from "../+namespaces/store.injectable"; import historyInjectable from "../../navigation/history.injectable"; -import type { MinimalTrayMenuItem } from "../../../main/tray/electron-tray/electron-tray.injectable"; -import electronTrayInjectable from "../../../main/tray/electron-tray/electron-tray.injectable"; +import type { MinimalTrayMenuItem } from "../../../behaviours/tray/main/electron-tray/electron-tray.injectable"; +import electronTrayInjectable from "../../../behaviours/tray/main/electron-tray/electron-tray.injectable"; import applicationWindowInjectable from "../../../main/start-main-application/lens-window/application-window/application-window.injectable"; import { getDiForUnitTesting as getRendererDi } from "../../getDiForUnitTesting"; import { getDiForUnitTesting as getMainDi } from "../../../main/getDiForUnitTesting";