diff --git a/src/features/application-update/analytics-for-installing-update.test.ts b/src/features/application-update/analytics-for-installing-update.test.ts index 6600248517..501516bf6e 100644 --- a/src/features/application-update/analytics-for-installing-update.test.ts +++ b/src/features/application-update/analytics-for-installing-update.test.ts @@ -5,18 +5,18 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable"; -import publishIsConfiguredInjectable from "./main/publish-is-configured.injectable"; +import publishIsConfiguredInjectable from "./main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { CheckForPlatformUpdates } from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; +import type { CheckForPlatformUpdates } from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; import appEventBusInjectable from "../../common/app-event-bus/app-event-bus.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; -import processCheckingForUpdatesInjectable from "./main/check-for-updates/process-checking-for-updates.injectable"; -import type { DownloadPlatformUpdate } from "./main/download-platform-update/download-platform-update.injectable"; -import downloadPlatformUpdateInjectable from "./main/download-platform-update/download-platform-update.injectable"; +import processCheckingForUpdatesInjectable from "./main/process-checking-for-updates.injectable"; +import type { DownloadPlatformUpdate } from "./main/download-update/download-platform-update/download-platform-update.injectable"; +import downloadPlatformUpdateInjectable from "./main/download-update/download-platform-update/download-platform-update.injectable"; import quitAndInstallUpdateInjectable from "./main/quit-and-install-update.injectable"; -import periodicalCheckForUpdatesInjectable from "./main/periodical-check-for-updates/periodical-check-for-updates.injectable"; +import periodicalCheckForUpdatesInjectable from "./child-features/periodical-checking-of-updates/main/periodical-check-for-updates.injectable"; import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time"; import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable"; import getBuildVersionInjectable from "../../main/vars/build-version/get-build-version.injectable"; diff --git a/src/features/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap b/src/features/application-update/child-features/application-update-using-top-bar/__snapshots__/installing-update-using-topbar-button.test.tsx.snap similarity index 100% rename from src/features/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap rename to src/features/application-update/child-features/application-update-using-top-bar/__snapshots__/installing-update-using-topbar-button.test.tsx.snap diff --git a/src/features/application-update/installing-update-using-topbar-button.test.tsx b/src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx similarity index 81% rename from src/features/application-update/installing-update-using-topbar-button.test.tsx rename to src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx index 935c3b4899..88f59a720c 100644 --- a/src/features/application-update/installing-update-using-topbar-button.test.tsx +++ b/src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx @@ -6,17 +6,17 @@ import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import type { RenderResult } from "@testing-library/react"; import { act } from "@testing-library/react"; -import type { CheckForPlatformUpdates } from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; -import type { DownloadPlatformUpdate } from "./main/download-platform-update/download-platform-update.injectable"; -import downloadPlatformUpdateInjectable from "./main/download-platform-update/download-platform-update.injectable"; -import publishIsConfiguredInjectable from "./main/publish-is-configured.injectable"; -import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable"; -import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import processCheckingForUpdatesInjectable from "./main/check-for-updates/process-checking-for-updates.injectable"; -import quitAndInstallUpdateInjectable from "./main/quit-and-install-update.injectable"; -import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time"; +import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; +import type { DownloadPlatformUpdate } from "../../main/download-update/download-platform-update/download-platform-update.injectable"; +import downloadPlatformUpdateInjectable from "../../main/download-update/download-platform-update/download-platform-update.injectable"; +import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable"; +import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable"; +import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable"; +import quitAndInstallUpdateInjectable from "../../main/quit-and-install-update.injectable"; +import { advanceFakeTime, useFakeTime } from "../../../../common/test-utils/use-fake-time"; function daysToMilliseconds(days: number) { return Math.round(days * 24 * 60 * 60 * 1000); diff --git a/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-button/update-button.tsx b/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-button/update-button.tsx index 12556b6a84..9825ab257e 100644 --- a/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-button/update-button.tsx +++ b/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-button/update-button.tsx @@ -14,7 +14,7 @@ import { Icon } from "../../../../../../renderer/components/icon"; import { withInjectables } from "@ogre-tools/injectable-react"; import { observer } from "mobx-react"; import type { IComputedValue } from "mobx"; -import restartAndInstallUpdateInjectable from "./restart-and-install-update.injectable"; +import restartAndInstallUpdateInjectable from "../../../../renderer/restart-and-install-update.injectable"; import updateWarningLevelInjectable from "./update-warning-level.injectable"; interface UpdateButtonProps extends HTMLAttributes {} diff --git a/src/features/application-update/__snapshots__/installing-update-using-tray.test.ts.snap b/src/features/application-update/child-features/application-update-using-tray/__snapshots__/installing-update-using-tray.test.ts.snap similarity index 100% rename from src/features/application-update/__snapshots__/installing-update-using-tray.test.ts.snap rename to src/features/application-update/child-features/application-update-using-tray/__snapshots__/installing-update-using-tray.test.ts.snap diff --git a/src/features/application-update/installing-update-using-tray.test.ts b/src/features/application-update/child-features/application-update-using-tray/installing-update-using-tray.test.ts similarity index 86% rename from src/features/application-update/installing-update-using-tray.test.ts rename to src/features/application-update/child-features/application-update-using-tray/installing-update-using-tray.test.ts index b5dbf3b902..af38da12b7 100644 --- a/src/features/application-update/installing-update-using-tray.test.ts +++ b/src/features/application-update/child-features/application-update-using-tray/installing-update-using-tray.test.ts @@ -2,19 +2,19 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; import type { RenderResult } from "@testing-library/react"; -import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable"; -import publishIsConfiguredInjectable from "./main/publish-is-configured.injectable"; -import type { CheckForPlatformUpdates } from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; +import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable"; +import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable"; +import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable"; -import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable"; -import type { LensWindow } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable"; -import getCurrentApplicationWindowInjectable from "../../main/start-main-application/lens-window/application-window/get-current-application-window.injectable"; +import type { DownloadPlatformUpdate } from "../../main/download-update/download-platform-update/download-platform-update.injectable"; +import downloadPlatformUpdateInjectable from "../../main/download-update/download-platform-update/download-platform-update.injectable"; +import type { LensWindow } from "../../../../main/start-main-application/lens-window/application-window/create-lens-window.injectable"; +import getCurrentApplicationWindowInjectable from "../../../../main/start-main-application/lens-window/application-window/get-current-application-window.injectable"; describe("installing update using tray", () => { let builder: ApplicationBuilder; diff --git a/src/features/application-update/child-features/application-update-using-tray/main/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts b/src/features/application-update/child-features/application-update-using-tray/main/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts index ebbb8c449a..19d0495c38 100644 --- a/src/features/application-update/child-features/application-update-using-tray/main/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts +++ b/src/features/application-update/child-features/application-update-using-tray/main/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import getTrayIconPathInjectable from "../../../../../../main/tray/menu-icon/get-tray-icon-path.injectable"; import { trayIconInjectionToken } from "../../../../../../main/tray/menu-icon/tray-icon-injection-token"; -import updateIsReadyToBeInstalledInjectable from "../../../../main/update-is-ready-to-be-installed.injectable"; +import updateIsReadyToBeInstalledInjectable from "../update-is-ready-to-be-installed.injectable"; const updateIsReadyToBeInstalledTrayIconInjectable = getInjectable({ id: "update-is-ready-to-be-installed-tray-icon", diff --git a/src/features/application-update/child-features/application-update-using-tray/main/tray-items/check-for-updates-tray-item.injectable.ts b/src/features/application-update/child-features/application-update-using-tray/main/tray-items/check-for-updates-tray-item.injectable.ts index 22c9a85741..e904abaa99 100644 --- a/src/features/application-update/child-features/application-update-using-tray/main/tray-items/check-for-updates-tray-item.injectable.ts +++ b/src/features/application-update/child-features/application-update-using-tray/main/tray-items/check-for-updates-tray-item.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import updatingIsEnabledInjectable from "../../../../main/updating-is-enabled.injectable"; +import updatingIsEnabledInjectable from "../../../../main/updating-is-enabled/updating-is-enabled.injectable"; import { trayMenuItemInjectionToken } from "../../../../../../main/tray/tray-menu-item/tray-menu-item-injection-token"; import showApplicationWindowInjectable from "../../../../../../main/start-main-application/lens-window/show-application-window.injectable"; import discoveredUpdateVersionInjectable from "../../../../common/discovered-update-version/discovered-update-version.injectable"; @@ -12,7 +12,7 @@ import updateIsBeingDownloadedInjectable from "../../../../common/update-is-bein import updatesAreBeingDiscoveredInjectable from "../../../../common/updates-are-being-discovered/updates-are-being-discovered.injectable"; import progressOfUpdateDownloadInjectable from "../../../../common/progress-of-update-download/progress-of-update-download.injectable"; import assert from "assert"; -import processCheckingForUpdatesInjectable from "../../../../main/check-for-updates/process-checking-for-updates.injectable"; +import processCheckingForUpdatesInjectable from "../../../../main/process-checking-for-updates.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"; diff --git a/src/features/application-update/child-features/application-update-using-tray/main/tray-items/install-application-update-tray-item.injectable.ts b/src/features/application-update/child-features/application-update-using-tray/main/tray-items/install-application-update-tray-item.injectable.ts index fb8042b74b..86ae7d676f 100644 --- a/src/features/application-update/child-features/application-update-using-tray/main/tray-items/install-application-update-tray-item.injectable.ts +++ b/src/features/application-update/child-features/application-update-using-tray/main/tray-items/install-application-update-tray-item.injectable.ts @@ -10,7 +10,7 @@ import { withErrorSuppression } from "../../../../../../common/utils/with-error- import { pipeline } from "@ogre-tools/fp"; import withErrorLoggingInjectable from "../../../../../../common/utils/with-error-logging/with-error-logging.injectable"; import quitAndInstallUpdateInjectable from "../../../../main/quit-and-install-update.injectable"; -import updateIsReadyToBeInstalledInjectable from "../../../../main/update-is-ready-to-be-installed.injectable"; +import updateIsReadyToBeInstalledInjectable from "../update-is-ready-to-be-installed.injectable"; const installApplicationUpdateTrayItemInjectable = getInjectable({ id: "install-update-tray-item", diff --git a/src/features/application-update/main/update-is-ready-to-be-installed.injectable.ts b/src/features/application-update/child-features/application-update-using-tray/main/update-is-ready-to-be-installed.injectable.ts similarity index 73% rename from src/features/application-update/main/update-is-ready-to-be-installed.injectable.ts rename to src/features/application-update/child-features/application-update-using-tray/main/update-is-ready-to-be-installed.injectable.ts index ef875f65a7..39e23f51e6 100644 --- a/src/features/application-update/main/update-is-ready-to-be-installed.injectable.ts +++ b/src/features/application-update/child-features/application-update-using-tray/main/update-is-ready-to-be-installed.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import discoveredUpdateVersionInjectable from "../common/discovered-update-version/discovered-update-version.injectable"; -import updateIsBeingDownloadedInjectable from "../common/update-is-being-downloaded/update-is-being-downloaded.injectable"; +import discoveredUpdateVersionInjectable from "../../../common/discovered-update-version/discovered-update-version.injectable"; +import updateIsBeingDownloadedInjectable from "../../../common/update-is-being-downloaded/update-is-being-downloaded.injectable"; const updateIsReadyToBeInstalledInjectable = getInjectable({ id: "update-is-ready-to-be-installed", diff --git a/src/features/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap similarity index 100% rename from src/features/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap diff --git a/src/features/application-update/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts similarity index 83% rename from src/features/application-update/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts index f7e13d5b91..b5a333d24e 100644 --- a/src/features/application-update/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts +++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts @@ -2,20 +2,20 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import type { CheckForPlatformUpdates } from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; -import type { DownloadPlatformUpdate } from "./main/download-platform-update/download-platform-update.injectable"; -import downloadPlatformUpdateInjectable from "./main/download-platform-update/download-platform-update.injectable"; +import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; +import type { DownloadPlatformUpdate } from "../../main/download-update/download-platform-update/download-platform-update.injectable"; +import downloadPlatformUpdateInjectable from "../../main/download-update/download-platform-update/download-platform-update.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import type { DiContainer } from "@ogre-tools/injectable"; -import processCheckingForUpdatesInjectable from "./main/check-for-updates/process-checking-for-updates.injectable"; +import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable"; import type { RenderResult } from "@testing-library/react"; import { fireEvent } from "@testing-library/react"; -import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time"; -import quitAndInstallUpdateInjectable from "./main/quit-and-install-update.injectable"; +import { advanceFakeTime, useFakeTime } from "../../../../common/test-utils/use-fake-time"; +import quitAndInstallUpdateInjectable from "../../main/quit-and-install-update.injectable"; import timeAfterUpdateMustBeInstalledInjectable from "./renderer/force-update-modal/time-after-update-must-be-installed.injectable"; import secondsAfterInstallStartsInjectable from "./renderer/force-update-modal/seconds-after-install-starts.injectable"; import forceUpdateModalRootFrameComponentInjectable from "./renderer/force-update-modal/force-update-modal-root-frame-component.injectable"; diff --git a/src/features/application-update/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts similarity index 84% rename from src/features/application-update/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts index 0ddd46f64d..49c4be5075 100644 --- a/src/features/application-update/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts +++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { computed } from "mobx"; -import { getGlobalOverride } from "../../../../common/test-utils/get-global-override"; +import { getGlobalOverride } from "../../../../../../common/test-utils/get-global-override"; import forceUpdateModalRootFrameComponentInjectable from "./force-update-modal-root-frame-component.injectable"; export default getGlobalOverride( diff --git a/src/features/application-update/renderer/force-update-modal/force-update-modal-root-frame-component.injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.injectable.ts similarity index 87% rename from src/features/application-update/renderer/force-update-modal/force-update-modal-root-frame-component.injectable.ts rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.injectable.ts index 76c78fa1f4..9109f4bfe3 100644 --- a/src/features/application-update/renderer/force-update-modal/force-update-modal-root-frame-component.injectable.ts +++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.injectable.ts @@ -4,10 +4,10 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { rootFrameChildComponentInjectionToken } from "../../../../renderer/frames/root-frame/root-frame-child-component-injection-token"; +import { rootFrameChildComponentInjectionToken } from "../../../../../../renderer/frames/root-frame/root-frame-child-component-injection-token"; import { ForceUpdateModal } from "./force-update-modal"; import timeSinceUpdateWasDownloadedInjectable from "./time-since-update-was-downloaded.injectable"; -import updateDownloadedDateTimeInjectable from "../../common/update-downloaded-date-time/update-downloaded-date-time.injectable"; +import updateDownloadedDateTimeInjectable from "../../../../common/update-downloaded-date-time/update-downloaded-date-time.injectable"; import timeAfterUpdateMustBeInstalledInjectable from "./time-after-update-must-be-installed.injectable"; const forceUpdateModalRootFrameComponentInjectable = getInjectable({ diff --git a/src/features/application-update/renderer/force-update-modal/force-update-modal.module.scss b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal.module.scss similarity index 100% rename from src/features/application-update/renderer/force-update-modal/force-update-modal.module.scss rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal.module.scss diff --git a/src/features/application-update/renderer/force-update-modal/force-update-modal.tsx b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal.tsx similarity index 83% rename from src/features/application-update/renderer/force-update-modal/force-update-modal.tsx rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal.tsx index 617555e465..83daa606e3 100644 --- a/src/features/application-update/renderer/force-update-modal/force-update-modal.tsx +++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal.tsx @@ -4,13 +4,13 @@ */ import { withInjectables } from "@ogre-tools/injectable-react"; import React from "react"; -import restartAndInstallUpdateInjectable from "../../child-features/application-update-using-top-bar/renderer/update-button/restart-and-install-update.injectable"; -import { Countdown } from "../../../../renderer/components/countdown/countdown"; +import restartAndInstallUpdateInjectable from "../../../../renderer/restart-and-install-update.injectable"; +import { Countdown } from "../../../../../../renderer/components/countdown/countdown"; import type { IComputedValue } from "mobx"; import { observer } from "mobx-react"; import installUpdateCountdownInjectable from "./install-update-countdown.injectable"; -import { Dialog } from "../../../../renderer/components/dialog"; -import { Button } from "../../../../renderer/components/button"; +import { Dialog } from "../../../../../../renderer/components/dialog"; +import { Button } from "../../../../../../renderer/components/button"; import styles from "./force-update-modal.module.scss"; interface Dependencies { diff --git a/src/features/application-update/renderer/force-update-modal/install-update-countdown.injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/install-update-countdown.injectable.ts similarity index 74% rename from src/features/application-update/renderer/force-update-modal/install-update-countdown.injectable.ts rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/install-update-countdown.injectable.ts index 730a4b0c13..f8e99b9ac1 100644 --- a/src/features/application-update/renderer/force-update-modal/install-update-countdown.injectable.ts +++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/install-update-countdown.injectable.ts @@ -3,9 +3,9 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import countdownStateInjectable from "../../../../renderer/components/countdown/countdown-state.injectable"; +import countdownStateInjectable from "../../../../../../renderer/components/countdown/countdown-state.injectable"; import secondsAfterInstallStartsInjectable from "./seconds-after-install-starts.injectable"; -import restartAndInstallUpdateInjectable from "../../child-features/application-update-using-top-bar/renderer/update-button/restart-and-install-update.injectable"; +import restartAndInstallUpdateInjectable from "../../../../renderer/restart-and-install-update.injectable"; const installUpdateCountdownInjectable = getInjectable({ id: "install-update-countdown", diff --git a/src/features/application-update/renderer/force-update-modal/seconds-after-install-starts.injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/seconds-after-install-starts.injectable.ts similarity index 100% rename from src/features/application-update/renderer/force-update-modal/seconds-after-install-starts.injectable.ts rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/seconds-after-install-starts.injectable.ts diff --git a/src/features/application-update/renderer/force-update-modal/time-after-update-must-be-installed.injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/time-after-update-must-be-installed.injectable.ts similarity index 100% rename from src/features/application-update/renderer/force-update-modal/time-after-update-must-be-installed.injectable.ts rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/time-after-update-must-be-installed.injectable.ts diff --git a/src/features/application-update/renderer/force-update-modal/time-since-update-was-downloaded.injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/time-since-update-was-downloaded.injectable.ts similarity index 78% rename from src/features/application-update/renderer/force-update-modal/time-since-update-was-downloaded.injectable.ts rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/time-since-update-was-downloaded.injectable.ts index c961828f7f..8ac86c80ca 100644 --- a/src/features/application-update/renderer/force-update-modal/time-since-update-was-downloaded.injectable.ts +++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/time-since-update-was-downloaded.injectable.ts @@ -6,8 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { computed } from "mobx"; import moment from "moment"; -import updateDownloadedDateTimeInjectable from "../../common/update-downloaded-date-time/update-downloaded-date-time.injectable"; -import { reactiveNow } from "../../../../common/utils/reactive-now/reactive-now"; +import updateDownloadedDateTimeInjectable from "../../../../common/update-downloaded-date-time/update-downloaded-date-time.injectable"; +import { reactiveNow } from "../../../../../../common/utils/reactive-now/reactive-now"; const timeSinceUpdateWasDownloadedInjectable = getInjectable({ id: "time-since-update-was-downloaded", diff --git a/src/features/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap b/src/features/application-update/child-features/periodical-checking-of-updates/__snapshots__/periodical-checking-of-updates.test.ts.snap similarity index 100% rename from src/features/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap rename to src/features/application-update/child-features/periodical-checking-of-updates/__snapshots__/periodical-checking-of-updates.test.ts.snap diff --git a/src/features/application-update/main/periodical-check-for-updates/periodical-check-for-updates.global-override-for-injectable.ts b/src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.global-override-for-injectable.ts similarity index 81% rename from src/features/application-update/main/periodical-check-for-updates/periodical-check-for-updates.global-override-for-injectable.ts rename to src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.global-override-for-injectable.ts index ac2e329f1c..6c255f8bc3 100644 --- a/src/features/application-update/main/periodical-check-for-updates/periodical-check-for-updates.global-override-for-injectable.ts +++ b/src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.global-override-for-injectable.ts @@ -4,7 +4,7 @@ */ import periodicalCheckForUpdatesInjectable from "./periodical-check-for-updates.injectable"; -import { getGlobalOverride } from "../../../../common/test-utils/get-global-override"; +import { getGlobalOverride } from "../../../../../common/test-utils/get-global-override"; export default getGlobalOverride(periodicalCheckForUpdatesInjectable, () => ({ start: async () => {}, diff --git a/src/features/application-update/main/periodical-check-for-updates/periodical-check-for-updates.injectable.ts b/src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.injectable.ts similarity index 74% rename from src/features/application-update/main/periodical-check-for-updates/periodical-check-for-updates.injectable.ts rename to src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.injectable.ts index 27d18b39a0..472cf31a06 100644 --- a/src/features/application-update/main/periodical-check-for-updates/periodical-check-for-updates.injectable.ts +++ b/src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.injectable.ts @@ -3,9 +3,9 @@ * 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 processCheckingForUpdatesInjectable from "../check-for-updates/process-checking-for-updates.injectable"; -import withOrphanPromiseInjectable from "../../../../common/utils/with-orphan-promise/with-orphan-promise.injectable"; +import { getStartableStoppable } from "../../../../../common/utils/get-startable-stoppable"; +import processCheckingForUpdatesInjectable from "../../../main/process-checking-for-updates.injectable"; +import withOrphanPromiseInjectable from "../../../../../common/utils/with-orphan-promise/with-orphan-promise.injectable"; const periodicalCheckForUpdatesInjectable = getInjectable({ id: "periodical-check-for-updates", diff --git a/src/features/application-update/main/periodical-check-for-updates/start-checking-for-updates.injectable.ts b/src/features/application-update/child-features/periodical-checking-of-updates/main/start-checking-for-updates.injectable.ts similarity index 82% rename from src/features/application-update/main/periodical-check-for-updates/start-checking-for-updates.injectable.ts rename to src/features/application-update/child-features/periodical-checking-of-updates/main/start-checking-for-updates.injectable.ts index 398e35da26..0292d148df 100644 --- a/src/features/application-update/main/periodical-check-for-updates/start-checking-for-updates.injectable.ts +++ b/src/features/application-update/child-features/periodical-checking-of-updates/main/start-checking-for-updates.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import periodicalCheckForUpdatesInjectable from "./periodical-check-for-updates.injectable"; -import updatingIsEnabledInjectable from "../updating-is-enabled.injectable"; -import { afterApplicationIsLoadedInjectionToken } from "../../../../main/start-main-application/runnable-tokens/after-application-is-loaded-injection-token"; +import updatingIsEnabledInjectable from "../../../main/updating-is-enabled/updating-is-enabled.injectable"; +import { afterApplicationIsLoadedInjectionToken } from "../../../../../main/start-main-application/runnable-tokens/after-application-is-loaded-injection-token"; const startCheckingForUpdatesInjectable = getInjectable({ id: "start-checking-for-updates", diff --git a/src/features/application-update/main/periodical-check-for-updates/stop-checking-for-updates.injectable.ts b/src/features/application-update/child-features/periodical-checking-of-updates/main/stop-checking-for-updates.injectable.ts similarity index 84% rename from src/features/application-update/main/periodical-check-for-updates/stop-checking-for-updates.injectable.ts rename to src/features/application-update/child-features/periodical-checking-of-updates/main/stop-checking-for-updates.injectable.ts index 3751af53d2..ff7607e7db 100644 --- a/src/features/application-update/main/periodical-check-for-updates/stop-checking-for-updates.injectable.ts +++ b/src/features/application-update/child-features/periodical-checking-of-updates/main/stop-checking-for-updates.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import periodicalCheckForUpdatesInjectable from "./periodical-check-for-updates.injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../../../main/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 stopCheckingForUpdatesInjectable = getInjectable({ id: "stop-checking-for-updates", diff --git a/src/features/application-update/periodical-checking-of-updates.test.ts b/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts similarity index 82% rename from src/features/application-update/periodical-checking-of-updates.test.ts rename to src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts index 6449217594..e38ebdcbfc 100644 --- a/src/features/application-update/periodical-checking-of-updates.test.ts +++ b/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts @@ -2,14 +2,14 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; import type { RenderResult } from "@testing-library/react"; -import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable"; -import publishIsConfiguredInjectable from "./main/publish-is-configured.injectable"; -import processCheckingForUpdatesInjectable from "./main/check-for-updates/process-checking-for-updates.injectable"; -import periodicalCheckForUpdatesInjectable from "./main/periodical-check-for-updates/periodical-check-for-updates.injectable"; -import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time"; +import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable"; +import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable"; +import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable"; +import periodicalCheckForUpdatesInjectable from "./main/periodical-check-for-updates.injectable"; +import { advanceFakeTime, useFakeTime } from "../../../../common/test-utils/use-fake-time"; const ENOUGH_TIME = 1000 * 60 * 60 * 2; diff --git a/src/features/application-update/__snapshots__/selection-of-update-stability.test.ts.snap b/src/features/application-update/child-features/selection-of-update-stability/__snapshots__/selection-of-update-stability.test.ts.snap similarity index 100% rename from src/features/application-update/__snapshots__/selection-of-update-stability.test.ts.snap rename to src/features/application-update/child-features/selection-of-update-stability/__snapshots__/selection-of-update-stability.test.ts.snap diff --git a/src/features/application-update/selection-of-update-stability.test.ts b/src/features/application-update/child-features/selection-of-update-stability/selection-of-update-stability.test.ts similarity index 86% rename from src/features/application-update/selection-of-update-stability.test.ts rename to src/features/application-update/child-features/selection-of-update-stability/selection-of-update-stability.test.ts index bccfed0861..68f8047258 100644 --- a/src/features/application-update/selection-of-update-stability.test.ts +++ b/src/features/application-update/child-features/selection-of-update-stability/selection-of-update-stability.test.ts @@ -2,25 +2,25 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import quitAndInstallUpdateInjectable from "./main/quit-and-install-update.injectable"; +import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import quitAndInstallUpdateInjectable from "../../main/quit-and-install-update.injectable"; import type { RenderResult } from "@testing-library/react"; -import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable"; -import publishIsConfiguredInjectable from "./main/publish-is-configured.injectable"; -import type { CheckForPlatformUpdates } from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; +import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable"; +import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable"; +import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { UpdateChannel, ReleaseChannel } from "./common/update-channels"; -import { updateChannels } from "./common/update-channels"; -import type { DownloadPlatformUpdate } from "./main/download-platform-update/download-platform-update.injectable"; -import downloadPlatformUpdateInjectable from "./main/download-platform-update/download-platform-update.injectable"; -import selectedUpdateChannelInjectable from "./common/selected-update-channel/selected-update-channel.injectable"; +import type { UpdateChannel, ReleaseChannel } from "../../common/update-channels"; +import { updateChannels } from "../../common/update-channels"; +import type { DownloadPlatformUpdate } from "../../main/download-update/download-platform-update/download-platform-update.injectable"; +import downloadPlatformUpdateInjectable from "../../main/download-update/download-platform-update/download-platform-update.injectable"; +import selectedUpdateChannelInjectable from "../../common/selected-update-channel/selected-update-channel.injectable"; import type { IComputedValue } from "mobx"; -import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable"; -import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable"; -import processCheckingForUpdatesInjectable from "./main/check-for-updates/process-checking-for-updates.injectable"; +import setUpdateOnQuitInjectable from "../../../../main/electron-app/features/set-update-on-quit.injectable"; +import showInfoNotificationInjectable from "../../../../renderer/components/notifications/show-info-notification.injectable"; +import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import getBuildVersionInjectable from "../../main/vars/build-version/get-build-version.injectable"; diff --git a/src/features/application-update/downgrading-version-update.test.ts b/src/features/application-update/downgrading-version-update.test.ts index 761c99ff4c..69c6b5c6ff 100644 --- a/src/features/application-update/downgrading-version-update.test.ts +++ b/src/features/application-update/downgrading-version-update.test.ts @@ -5,12 +5,12 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable"; -import publishIsConfiguredInjectable from "./main/publish-is-configured.injectable"; +import publishIsConfiguredInjectable from "./main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { CheckForPlatformUpdates } from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; -import processCheckingForUpdatesInjectable from "./main/check-for-updates/process-checking-for-updates.injectable"; +import type { CheckForPlatformUpdates } from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; +import processCheckingForUpdatesInjectable from "./main/process-checking-for-updates.injectable"; import selectedUpdateChannelInjectable from "./common/selected-update-channel/selected-update-channel.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import { updateChannels } from "./common/update-channels"; diff --git a/src/features/application-update/installing-update.test.ts b/src/features/application-update/installing-update.test.ts index 0bfb82fdcd..f6041c200e 100644 --- a/src/features/application-update/installing-update.test.ts +++ b/src/features/application-update/installing-update.test.ts @@ -7,15 +7,15 @@ import { getApplicationBuilder } from "../../renderer/components/test-utils/get- import quitAndInstallUpdateInjectable from "./main/quit-and-install-update.injectable"; import type { RenderResult } from "@testing-library/react"; import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable"; -import publishIsConfiguredInjectable from "./main/publish-is-configured.injectable"; -import type { CheckForPlatformUpdates } from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "./main/check-for-platform-updates/check-for-platform-updates.injectable"; +import publishIsConfiguredInjectable from "./main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable"; +import type { CheckForPlatformUpdates } from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { DownloadPlatformUpdate } from "./main/download-platform-update/download-platform-update.injectable"; -import downloadPlatformUpdateInjectable from "./main/download-platform-update/download-platform-update.injectable"; +import type { DownloadPlatformUpdate } from "./main/download-update/download-platform-update/download-platform-update.injectable"; +import downloadPlatformUpdateInjectable from "./main/download-update/download-platform-update/download-platform-update.injectable"; import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable"; -import processCheckingForUpdatesInjectable from "./main/check-for-updates/process-checking-for-updates.injectable"; +import processCheckingForUpdatesInjectable from "./main/process-checking-for-updates.injectable"; import { useFakeTime } from "../../common/test-utils/use-fake-time"; import staticFilesDirectoryInjectable from "../../common/vars/static-files-directory.injectable"; diff --git a/src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts similarity index 73% rename from src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts rename to src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts index f150c7c504..5e271eaa30 100644 --- a/src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts +++ b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts @@ -3,6 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import checkForPlatformUpdatesInjectable from "./check-for-platform-updates.injectable"; -import { getGlobalOverrideForFunction } from "../../../../common/test-utils/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "../../../../../common/test-utils/get-global-override-for-function"; export default getGlobalOverrideForFunction(checkForPlatformUpdatesInjectable); diff --git a/src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.injectable.ts b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable.ts similarity index 86% rename from src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.injectable.ts rename to src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable.ts index 0e45bc6f54..22726467a9 100644 --- a/src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.injectable.ts +++ b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable.ts @@ -3,9 +3,9 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import electronUpdaterInjectable from "../../../../main/electron-app/features/electron-updater.injectable"; -import type { UpdateChannel } from "../../common/update-channels"; -import loggerInjectable from "../../../../common/logger.injectable"; +import electronUpdaterInjectable from "../../../../../main/electron-app/features/electron-updater.injectable"; +import type { UpdateChannel } from "../../../common/update-channels"; +import loggerInjectable from "../../../../../common/logger.injectable"; import type { UpdateCheckResult } from "electron-updater"; export type CheckForUpdatesResult = { diff --git a/src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.test.ts b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts similarity index 88% rename from src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.test.ts rename to src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts index 6a10fadcdf..4d9e9d9b7b 100644 --- a/src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.test.ts +++ b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts @@ -2,17 +2,17 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getDiForUnitTesting } from "../../../../main/getDiForUnitTesting"; -import electronUpdaterInjectable from "../../../../main/electron-app/features/electron-updater.injectable"; +import { getDiForUnitTesting } from "../../../../../main/getDiForUnitTesting"; +import electronUpdaterInjectable from "../../../../../main/electron-app/features/electron-updater.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import type { AppUpdater, UpdateCheckResult } from "electron-updater"; import type { CheckForPlatformUpdates } from "./check-for-platform-updates.injectable"; import checkForPlatformUpdatesInjectable from "./check-for-platform-updates.injectable"; -import type { UpdateChannel, ReleaseChannel } from "../../common/update-channels"; -import { getPromiseStatus } from "../../../../common/test-utils/get-promise-status"; -import loggerInjectable from "../../../../common/logger.injectable"; -import type { Logger } from "../../../../common/logger"; +import type { UpdateChannel, ReleaseChannel } from "../../../common/update-channels"; +import { getPromiseStatus } from "../../../../../common/test-utils/get-promise-status"; +import loggerInjectable from "../../../../../common/logger.injectable"; +import type { Logger } from "../../../../../common/logger"; describe("check-for-platform-updates", () => { let checkForPlatformUpdates: CheckForPlatformUpdates; diff --git a/src/features/application-update/main/check-for-updates/check-for-updates-starting-from-channel.injectable.ts b/src/features/application-update/main/check-for-updates/check-for-updates-starting-from-channel.injectable.ts index 5020039424..8bd8498654 100644 --- a/src/features/application-update/main/check-for-updates/check-for-updates-starting-from-channel.injectable.ts +++ b/src/features/application-update/main/check-for-updates/check-for-updates-starting-from-channel.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { UpdateChannel } from "../../common/update-channels"; -import checkForPlatformUpdatesInjectable from "../check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "./check-for-platform-updates/check-for-platform-updates.injectable"; import updateCanBeDowngradedInjectable from "./update-can-be-downgraded.injectable"; export type CheckForUpdatesFromChannelResult = { diff --git a/src/features/application-update/main/download-platform-update/download-platform-update.global-override-for-injectable.ts b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.global-override-for-injectable.ts similarity index 73% rename from src/features/application-update/main/download-platform-update/download-platform-update.global-override-for-injectable.ts rename to src/features/application-update/main/download-update/download-platform-update/download-platform-update.global-override-for-injectable.ts index 96ab9ecfd0..15df5d835b 100644 --- a/src/features/application-update/main/download-platform-update/download-platform-update.global-override-for-injectable.ts +++ b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.global-override-for-injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverrideForFunction } from "../../../../common/test-utils/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "../../../../../common/test-utils/get-global-override-for-function"; import downloadPlatformUpdateInjectable from "./download-platform-update.injectable"; export default getGlobalOverrideForFunction(downloadPlatformUpdateInjectable); diff --git a/src/features/application-update/main/download-platform-update/download-platform-update.injectable.ts b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.injectable.ts similarity index 81% rename from src/features/application-update/main/download-platform-update/download-platform-update.injectable.ts rename to src/features/application-update/main/download-update/download-platform-update/download-platform-update.injectable.ts index adbb9f192b..14c4d2b075 100644 --- a/src/features/application-update/main/download-platform-update/download-platform-update.injectable.ts +++ b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.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 electronUpdaterInjectable from "../../../../main/electron-app/features/electron-updater.injectable"; -import loggerInjectable from "../../../../common/logger.injectable"; +import electronUpdaterInjectable from "../../../../../main/electron-app/features/electron-updater.injectable"; +import loggerInjectable from "../../../../../common/logger.injectable"; import type { ProgressInfo } from "electron-updater"; -import type { ProgressOfDownload } from "../../common/progress-of-update-download/progress-of-update-download.injectable"; +import type { ProgressOfDownload } from "../../../common/progress-of-update-download/progress-of-update-download.injectable"; export type DownloadPlatformUpdate = ( onDownloadProgress: (arg: ProgressOfDownload) => void diff --git a/src/features/application-update/main/download-platform-update/download-platform-update.test.ts b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts similarity index 91% rename from src/features/application-update/main/download-platform-update/download-platform-update.test.ts rename to src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts index f15d01e2d1..d60b4eb897 100644 --- a/src/features/application-update/main/download-platform-update/download-platform-update.test.ts +++ b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts @@ -2,17 +2,17 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getDiForUnitTesting } from "../../../../main/getDiForUnitTesting"; -import electronUpdaterInjectable from "../../../../main/electron-app/features/electron-updater.injectable"; +import { getDiForUnitTesting } from "../../../../../main/getDiForUnitTesting"; +import electronUpdaterInjectable from "../../../../../main/electron-app/features/electron-updater.injectable"; import type { DownloadPlatformUpdate } from "./download-platform-update.injectable"; import downloadPlatformUpdateInjectable from "./download-platform-update.injectable"; import type { AppUpdater } from "electron-updater"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import { getPromiseStatus } from "../../../../common/test-utils/get-promise-status"; +import { getPromiseStatus } from "../../../../../common/test-utils/get-promise-status"; import type { DiContainer } from "@ogre-tools/injectable"; -import loggerInjectable from "../../../../common/logger.injectable"; -import type { Logger } from "../../../../common/logger"; +import loggerInjectable from "../../../../../common/logger.injectable"; +import type { Logger } from "../../../../../common/logger"; describe("download-platform-update", () => { let downloadPlatformUpdate: DownloadPlatformUpdate; diff --git a/src/features/application-update/main/download-update/download-update.injectable.ts b/src/features/application-update/main/download-update/download-update.injectable.ts index 83abb1752b..e9019dc7b2 100644 --- a/src/features/application-update/main/download-update/download-update.injectable.ts +++ b/src/features/application-update/main/download-update/download-update.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 downloadPlatformUpdateInjectable from "../download-platform-update/download-platform-update.injectable"; +import downloadPlatformUpdateInjectable from "./download-platform-update/download-platform-update.injectable"; import updateIsBeingDownloadedInjectable from "../../common/update-is-being-downloaded/update-is-being-downloaded.injectable"; import discoveredUpdateVersionInjectable from "../../common/discovered-update-version/discovered-update-version.injectable"; import { action, runInAction } from "mobx"; diff --git a/src/features/application-update/main/check-for-updates/process-checking-for-updates.injectable.ts b/src/features/application-update/main/process-checking-for-updates.injectable.ts similarity index 77% rename from src/features/application-update/main/check-for-updates/process-checking-for-updates.injectable.ts rename to src/features/application-update/main/process-checking-for-updates.injectable.ts index 1422af6946..f97eef7941 100644 --- a/src/features/application-update/main/check-for-updates/process-checking-for-updates.injectable.ts +++ b/src/features/application-update/main/process-checking-for-updates.injectable.ts @@ -3,14 +3,14 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import selectedUpdateChannelInjectable from "../../common/selected-update-channel/selected-update-channel.injectable"; -import updatesAreBeingDiscoveredInjectable from "../../common/updates-are-being-discovered/updates-are-being-discovered.injectable"; -import discoveredUpdateVersionInjectable from "../../common/discovered-update-version/discovered-update-version.injectable"; +import selectedUpdateChannelInjectable from "../common/selected-update-channel/selected-update-channel.injectable"; +import updatesAreBeingDiscoveredInjectable from "../common/updates-are-being-discovered/updates-are-being-discovered.injectable"; +import discoveredUpdateVersionInjectable from "../common/discovered-update-version/discovered-update-version.injectable"; import { runInAction } from "mobx"; -import downloadUpdateInjectable from "../download-update/download-update.injectable"; -import checkForUpdatesStartingFromChannelInjectable from "./check-for-updates-starting-from-channel.injectable"; -import emitEventInjectable from "../../../../common/app-event-bus/emit-event.injectable"; -import { getCurrentDateTime } from "../../../../common/utils/date/get-current-date-time"; +import downloadUpdateInjectable from "./download-update/download-update.injectable"; +import checkForUpdatesStartingFromChannelInjectable from "./check-for-updates/check-for-updates-starting-from-channel.injectable"; +import emitEventInjectable from "../../../common/app-event-bus/emit-event.injectable"; +import { getCurrentDateTime } from "../../../common/utils/date/get-current-date-time"; const processCheckingForUpdatesInjectable = getInjectable({ id: "process-checking-for-updates", diff --git a/src/features/application-update/main/publish-is-configured.global-override-for-injectable.ts b/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.global-override-for-injectable.ts similarity index 77% rename from src/features/application-update/main/publish-is-configured.global-override-for-injectable.ts rename to src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.global-override-for-injectable.ts index 9b2be0835c..f8c36953c6 100644 --- a/src/features/application-update/main/publish-is-configured.global-override-for-injectable.ts +++ b/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.global-override-for-injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../../../common/test-utils/get-global-override"; +import { getGlobalOverride } from "../../../../../common/test-utils/get-global-override"; import publishIsConfiguredInjectable from "./publish-is-configured.injectable"; export default getGlobalOverride(publishIsConfiguredInjectable, () => false); diff --git a/src/features/application-update/main/publish-is-configured.injectable.ts b/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable.ts similarity index 79% rename from src/features/application-update/main/publish-is-configured.injectable.ts rename to src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable.ts index e321e5c58f..4e4b01ef84 100644 --- a/src/features/application-update/main/publish-is-configured.injectable.ts +++ b/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.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 applicationInformationInjectable from "../../../common/vars/application-information.injectable"; +import applicationInformationInjectable from "../../../../../common/vars/application-information.injectable"; const publishIsConfiguredInjectable = getInjectable({ id: "publish-is-configured", diff --git a/src/features/application-update/main/updating-is-enabled.injectable.ts b/src/features/application-update/main/updating-is-enabled/updating-is-enabled.injectable.ts similarity index 79% rename from src/features/application-update/main/updating-is-enabled.injectable.ts rename to src/features/application-update/main/updating-is-enabled/updating-is-enabled.injectable.ts index 19b78fb603..0a9af398c0 100644 --- a/src/features/application-update/main/updating-is-enabled.injectable.ts +++ b/src/features/application-update/main/updating-is-enabled/updating-is-enabled.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 electronUpdaterIsActiveInjectable from "../../../main/electron-app/features/electron-updater-is-active.injectable"; -import publishIsConfiguredInjectable from "./publish-is-configured.injectable"; +import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable"; +import publishIsConfiguredInjectable from "./publish-is-configured/publish-is-configured.injectable"; const updatingIsEnabledInjectable = getInjectable({ id: "updating-is-enabled", diff --git a/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-button/restart-and-install-update.injectable.ts b/src/features/application-update/renderer/restart-and-install-update.injectable.ts similarity index 71% rename from src/features/application-update/child-features/application-update-using-top-bar/renderer/update-button/restart-and-install-update.injectable.ts rename to src/features/application-update/renderer/restart-and-install-update.injectable.ts index 4f6939b6d4..2502a599a2 100644 --- a/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-button/restart-and-install-update.injectable.ts +++ b/src/features/application-update/renderer/restart-and-install-update.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 { restartAndInstallUpdateChannel } from "../../../../common/restart-and-install-update-channel"; -import messageToChannelInjectable from "../../../../../../renderer/utils/channel/message-to-channel.injectable"; +import { restartAndInstallUpdateChannel } from "../common/restart-and-install-update-channel"; +import messageToChannelInjectable from "../../../renderer/utils/channel/message-to-channel.injectable"; const restartAndInstallUpdateInjectable = getInjectable({ id: "restart-and-install-update", diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts index 52f680b589..8bd7566a36 100644 --- a/src/main/menu/application-menu-items.injectable.ts +++ b/src/main/menu/application-menu-items.injectable.ts @@ -9,7 +9,7 @@ import type { MenuItemConstructorOptions } from "electron"; import { webContents } from "electron"; import loggerInjectable from "../../common/logger.injectable"; import electronMenuItemsInjectable from "./electron-menu-items.injectable"; -import updatingIsEnabledInjectable from "../../features/application-update/main/updating-is-enabled.injectable"; +import updatingIsEnabledInjectable from "../../features/application-update/main/updating-is-enabled/updating-is-enabled.injectable"; import navigateToPreferencesInjectable from "../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable"; import navigateToExtensionsInjectable from "../../common/front-end-routing/routes/extensions/navigate-to-extensions.injectable"; import navigateToCatalogInjectable from "../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; @@ -21,7 +21,7 @@ import { computed } from "mobx"; import showAboutInjectable from "./show-about.injectable"; import reloadCurrentApplicationWindowInjectable from "../start-main-application/lens-window/reload-current-application-window.injectable"; import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable"; -import processCheckingForUpdatesInjectable from "../../features/application-update/main/check-for-updates/process-checking-for-updates.injectable"; +import processCheckingForUpdatesInjectable from "../../features/application-update/main/process-checking-for-updates.injectable"; import openLinkInBrowserInjectable from "../../common/utils/open-link-in-browser.injectable"; import appNameInjectable from "../../common/vars/app-name.injectable"; import productNameInjectable from "../../common/vars/product-name.injectable";