From d705e92b17adad669aaa8755c4deea9225bdebde Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Fri, 20 May 2022 14:03:05 +0300 Subject: [PATCH] Consolidate names of directories Signed-off-by: Janne Savolainen --- .../checking-for-updates-automatically.test.ts.snap | 0 ...stalling-update-from-update-channels.test.ts.snap | 0 .../installing-update-using-tray.test.ts.snap | 0 .../__snapshots__/installing-update.test.ts.snap | 0 .../checking-for-updates-automatically.test.ts | 6 +++--- .../downgrading-version-update.test.ts | 8 ++++---- .../installing-update-from-update-channels.test.ts | 12 ++++++------ .../installing-update-using-tray.test.ts | 10 +++++----- .../installing-update.test.ts | 12 ++++++------ .../check-for-platform-updates.injectable.ts | 0 .../check-for-platform-updates.test.ts | 0 .../check-for-updates-tray-item.injectable.ts | 0 ...broadcast-change-in-updating-status.injectable.ts | 0 ...k-for-updates-starting-from-channel.injectable.ts | 0 .../check-for-updates.injectable.ts | 0 .../update-can-be-downgraded.injectable.ts | 0 .../download-platform-update.injectable.ts | 0 .../download-platform-update.test.ts | 0 .../download-update/download-update.injectable.ts | 0 ...nstall-application-update-tray-item.injectable.ts | 0 .../periodical-check-for-updates.injectable.ts | 0 .../start-checking-for-updates.injectable.ts | 0 .../stop-checking-for-updates.injectable.ts | 0 .../publish-is-configured.injectable.ts | 0 .../updating-is-enabled.injectable.ts | 0 ...ing-if-update-should-happen-on-quit.injectable.ts | 0 ...ing-if-update-should-happen-on-quit.injectable.ts | 0 ...tch-if-update-should-happen-on-quit.injectable.ts | 0 src/main/getDiForUnitTesting.ts | 8 ++++---- src/main/menu/application-menu-items.injectable.ts | 4 ++-- 30 files changed, 30 insertions(+), 30 deletions(-) rename src/behaviours/{update-app => application-update}/__snapshots__/checking-for-updates-automatically.test.ts.snap (100%) rename src/behaviours/{update-app => application-update}/__snapshots__/installing-update-from-update-channels.test.ts.snap (100%) rename src/behaviours/{update-app => application-update}/__snapshots__/installing-update-using-tray.test.ts.snap (100%) rename src/behaviours/{update-app => application-update}/__snapshots__/installing-update.test.ts.snap (100%) rename src/behaviours/{update-app => application-update}/checking-for-updates-automatically.test.ts (91%) rename src/behaviours/{update-app => application-update}/downgrading-version-update.test.ts (85%) rename src/behaviours/{update-app => application-update}/installing-update-from-update-channels.test.ts (94%) rename src/behaviours/{update-app => application-update}/installing-update-using-tray.test.ts (92%) rename src/behaviours/{update-app => application-update}/installing-update.test.ts (90%) rename src/main/{update-app => application-update}/check-for-platform-updates/check-for-platform-updates.injectable.ts (100%) rename src/main/{update-app => application-update}/check-for-platform-updates/check-for-platform-updates.test.ts (100%) rename src/main/{update-app => application-update}/check-for-updates-tray-item.injectable.ts (100%) rename src/main/{update-app => application-update}/check-for-updates/broadcast-change-in-updating-status.injectable.ts (100%) rename src/main/{update-app => application-update}/check-for-updates/check-for-updates-starting-from-channel.injectable.ts (100%) rename src/main/{update-app => application-update}/check-for-updates/check-for-updates.injectable.ts (100%) rename src/main/{update-app => application-update}/check-for-updates/update-can-be-downgraded.injectable.ts (100%) rename src/main/{update-app => application-update}/download-platform-update/download-platform-update.injectable.ts (100%) rename src/main/{update-app => application-update}/download-platform-update/download-platform-update.test.ts (100%) rename src/main/{update-app => application-update}/download-update/download-update.injectable.ts (100%) rename src/main/{update-app => application-update}/install-application-update-tray-item.injectable.ts (100%) rename src/main/{update-app => application-update}/periodical-check-for-updates/periodical-check-for-updates.injectable.ts (100%) rename src/main/{update-app => application-update}/periodical-check-for-updates/start-checking-for-updates.injectable.ts (100%) rename src/main/{update-app => application-update}/periodical-check-for-updates/stop-checking-for-updates.injectable.ts (100%) rename src/main/{update-app => application-update}/publish-is-configured.injectable.ts (100%) rename src/main/{update-app => application-update}/updating-is-enabled.injectable.ts (100%) rename src/main/{update-app => application-update}/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts (100%) rename src/main/{update-app => application-update}/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts (100%) rename src/main/{update-app => application-update}/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts (100%) diff --git a/src/behaviours/update-app/__snapshots__/checking-for-updates-automatically.test.ts.snap b/src/behaviours/application-update/__snapshots__/checking-for-updates-automatically.test.ts.snap similarity index 100% rename from src/behaviours/update-app/__snapshots__/checking-for-updates-automatically.test.ts.snap rename to src/behaviours/application-update/__snapshots__/checking-for-updates-automatically.test.ts.snap diff --git a/src/behaviours/update-app/__snapshots__/installing-update-from-update-channels.test.ts.snap b/src/behaviours/application-update/__snapshots__/installing-update-from-update-channels.test.ts.snap similarity index 100% rename from src/behaviours/update-app/__snapshots__/installing-update-from-update-channels.test.ts.snap rename to src/behaviours/application-update/__snapshots__/installing-update-from-update-channels.test.ts.snap diff --git a/src/behaviours/update-app/__snapshots__/installing-update-using-tray.test.ts.snap b/src/behaviours/application-update/__snapshots__/installing-update-using-tray.test.ts.snap similarity index 100% rename from src/behaviours/update-app/__snapshots__/installing-update-using-tray.test.ts.snap rename to src/behaviours/application-update/__snapshots__/installing-update-using-tray.test.ts.snap diff --git a/src/behaviours/update-app/__snapshots__/installing-update.test.ts.snap b/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap similarity index 100% rename from src/behaviours/update-app/__snapshots__/installing-update.test.ts.snap rename to src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap diff --git a/src/behaviours/update-app/checking-for-updates-automatically.test.ts b/src/behaviours/application-update/checking-for-updates-automatically.test.ts similarity index 91% rename from src/behaviours/update-app/checking-for-updates-automatically.test.ts rename to src/behaviours/application-update/checking-for-updates-automatically.test.ts index d28926b428..f06608b617 100644 --- a/src/behaviours/update-app/checking-for-updates-automatically.test.ts +++ b/src/behaviours/application-update/checking-for-updates-automatically.test.ts @@ -6,12 +6,12 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge 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/update-app/publish-is-configured.injectable"; +import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import checkForUpdatesInjectable from "../../main/update-app/check-for-updates/check-for-updates.injectable"; +import checkForUpdatesInjectable from "../../main/application-update/check-for-updates/check-for-updates.injectable"; import startCheckingForUpdatesInjectable - from "../../main/update-app/periodical-check-for-updates/start-checking-for-updates.injectable"; + from "../../main/application-update/periodical-check-for-updates/start-checking-for-updates.injectable"; const ENOUGH_TIME = 1000 * 60 * 60 * 2; diff --git a/src/behaviours/update-app/downgrading-version-update.test.ts b/src/behaviours/application-update/downgrading-version-update.test.ts similarity index 85% rename from src/behaviours/update-app/downgrading-version-update.test.ts rename to src/behaviours/application-update/downgrading-version-update.test.ts index 125b899223..33810ba861 100644 --- a/src/behaviours/update-app/downgrading-version-update.test.ts +++ b/src/behaviours/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/update-app/publish-is-configured.injectable"; +import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { CheckForPlatformUpdates } from "../../main/update-app/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "../../main/update-app/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForUpdatesInjectable from "../../main/update-app/check-for-updates/check-for-updates.injectable"; +import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForUpdatesInjectable from "../../main/application-update/check-for-updates/check-for-updates.injectable"; import selectedUpdateChannelInjectable from "../../common/application-update/selected-update-channel/selected-update-channel.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; diff --git a/src/behaviours/update-app/installing-update-from-update-channels.test.ts b/src/behaviours/application-update/installing-update-from-update-channels.test.ts similarity index 94% rename from src/behaviours/update-app/installing-update-from-update-channels.test.ts rename to src/behaviours/application-update/installing-update-from-update-channels.test.ts index 28cb0e49f7..15b4918e0f 100644 --- a/src/behaviours/update-app/installing-update-from-update-channels.test.ts +++ b/src/behaviours/application-update/installing-update-from-update-channels.test.ts @@ -7,22 +7,22 @@ import { getApplicationBuilder } from "../../renderer/components/test-utils/get- import quitAndInstallUpdateInjectable from "../../main/electron-app/features/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/update-app/publish-is-configured.injectable"; -import type { CheckForPlatformUpdates } from "../../main/update-app/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "../../main/update-app/check-for-platform-updates/check-for-platform-updates.injectable"; +import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable"; +import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "../../main/application-update/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, UpdateChannelId } from "../../common/application-update/update-channels"; import { updateChannels } from "../../common/application-update/update-channels"; -import type { DownloadPlatformUpdate } from "../../main/update-app/download-platform-update/download-platform-update.injectable"; -import downloadPlatformUpdateInjectable from "../../main/update-app/download-platform-update/download-platform-update.injectable"; +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 selectedUpdateChannelInjectable from "../../common/application-update/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 type { AskBoolean } from "../../main/ask-boolean/ask-boolean.injectable"; import askBooleanInjectable from "../../main/ask-boolean/ask-boolean.injectable"; import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable"; -import checkForUpdatesInjectable from "../../main/update-app/check-for-updates/check-for-updates.injectable"; +import checkForUpdatesInjectable from "../../main/application-update/check-for-updates/check-for-updates.injectable"; import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; diff --git a/src/behaviours/update-app/installing-update-using-tray.test.ts b/src/behaviours/application-update/installing-update-using-tray.test.ts similarity index 92% rename from src/behaviours/update-app/installing-update-using-tray.test.ts rename to src/behaviours/application-update/installing-update-using-tray.test.ts index d838dea32b..8cb86e1e48 100644 --- a/src/behaviours/update-app/installing-update-using-tray.test.ts +++ b/src/behaviours/application-update/installing-update-using-tray.test.ts @@ -6,13 +6,13 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge 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/update-app/publish-is-configured.injectable"; -import type { CheckForPlatformUpdates } from "../../main/update-app/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "../../main/update-app/check-for-platform-updates/check-for-platform-updates.injectable"; +import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable"; +import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "../../main/application-update/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/update-app/download-platform-update/download-platform-update.injectable"; -import downloadPlatformUpdateInjectable from "../../main/update-app/download-platform-update/download-platform-update.injectable"; +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 showApplicationWindowInjectable from "../../main/start-main-application/lens-window/show-application-window.injectable"; import progressOfUpdateDownloadInjectable from "../../common/application-update/progress-of-update-download/progress-of-update-download.injectable"; diff --git a/src/behaviours/update-app/installing-update.test.ts b/src/behaviours/application-update/installing-update.test.ts similarity index 90% rename from src/behaviours/update-app/installing-update.test.ts rename to src/behaviours/application-update/installing-update.test.ts index ae29c36a82..b6b4d4c4d0 100644 --- a/src/behaviours/update-app/installing-update.test.ts +++ b/src/behaviours/application-update/installing-update.test.ts @@ -7,18 +7,18 @@ import { getApplicationBuilder } from "../../renderer/components/test-utils/get- import quitAndInstallUpdateInjectable from "../../main/electron-app/features/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/update-app/publish-is-configured.injectable"; -import type { CheckForPlatformUpdates } from "../../main/update-app/check-for-platform-updates/check-for-platform-updates.injectable"; -import checkForPlatformUpdatesInjectable from "../../main/update-app/check-for-platform-updates/check-for-platform-updates.injectable"; +import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable"; +import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable"; +import checkForPlatformUpdatesInjectable from "../../main/application-update/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/update-app/download-platform-update/download-platform-update.injectable"; -import downloadPlatformUpdateInjectable from "../../main/update-app/download-platform-update/download-platform-update.injectable"; +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 setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable"; import type { AskBoolean } from "../../main/ask-boolean/ask-boolean.injectable"; import askBooleanInjectable from "../../main/ask-boolean/ask-boolean.injectable"; import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable"; -import checkForUpdatesInjectable from "../../main/update-app/check-for-updates/check-for-updates.injectable"; +import checkForUpdatesInjectable from "../../main/application-update/check-for-updates/check-for-updates.injectable"; describe("installing update", () => { let applicationBuilder: ApplicationBuilder; diff --git a/src/main/update-app/check-for-platform-updates/check-for-platform-updates.injectable.ts b/src/main/application-update/check-for-platform-updates/check-for-platform-updates.injectable.ts similarity index 100% rename from src/main/update-app/check-for-platform-updates/check-for-platform-updates.injectable.ts rename to src/main/application-update/check-for-platform-updates/check-for-platform-updates.injectable.ts diff --git a/src/main/update-app/check-for-platform-updates/check-for-platform-updates.test.ts b/src/main/application-update/check-for-platform-updates/check-for-platform-updates.test.ts similarity index 100% rename from src/main/update-app/check-for-platform-updates/check-for-platform-updates.test.ts rename to src/main/application-update/check-for-platform-updates/check-for-platform-updates.test.ts diff --git a/src/main/update-app/check-for-updates-tray-item.injectable.ts b/src/main/application-update/check-for-updates-tray-item.injectable.ts similarity index 100% rename from src/main/update-app/check-for-updates-tray-item.injectable.ts rename to src/main/application-update/check-for-updates-tray-item.injectable.ts diff --git a/src/main/update-app/check-for-updates/broadcast-change-in-updating-status.injectable.ts b/src/main/application-update/check-for-updates/broadcast-change-in-updating-status.injectable.ts similarity index 100% rename from src/main/update-app/check-for-updates/broadcast-change-in-updating-status.injectable.ts rename to src/main/application-update/check-for-updates/broadcast-change-in-updating-status.injectable.ts diff --git a/src/main/update-app/check-for-updates/check-for-updates-starting-from-channel.injectable.ts b/src/main/application-update/check-for-updates/check-for-updates-starting-from-channel.injectable.ts similarity index 100% rename from src/main/update-app/check-for-updates/check-for-updates-starting-from-channel.injectable.ts rename to src/main/application-update/check-for-updates/check-for-updates-starting-from-channel.injectable.ts diff --git a/src/main/update-app/check-for-updates/check-for-updates.injectable.ts b/src/main/application-update/check-for-updates/check-for-updates.injectable.ts similarity index 100% rename from src/main/update-app/check-for-updates/check-for-updates.injectable.ts rename to src/main/application-update/check-for-updates/check-for-updates.injectable.ts diff --git a/src/main/update-app/check-for-updates/update-can-be-downgraded.injectable.ts b/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts similarity index 100% rename from src/main/update-app/check-for-updates/update-can-be-downgraded.injectable.ts rename to src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts diff --git a/src/main/update-app/download-platform-update/download-platform-update.injectable.ts b/src/main/application-update/download-platform-update/download-platform-update.injectable.ts similarity index 100% rename from src/main/update-app/download-platform-update/download-platform-update.injectable.ts rename to src/main/application-update/download-platform-update/download-platform-update.injectable.ts diff --git a/src/main/update-app/download-platform-update/download-platform-update.test.ts b/src/main/application-update/download-platform-update/download-platform-update.test.ts similarity index 100% rename from src/main/update-app/download-platform-update/download-platform-update.test.ts rename to src/main/application-update/download-platform-update/download-platform-update.test.ts diff --git a/src/main/update-app/download-update/download-update.injectable.ts b/src/main/application-update/download-update/download-update.injectable.ts similarity index 100% rename from src/main/update-app/download-update/download-update.injectable.ts rename to src/main/application-update/download-update/download-update.injectable.ts diff --git a/src/main/update-app/install-application-update-tray-item.injectable.ts b/src/main/application-update/install-application-update-tray-item.injectable.ts similarity index 100% rename from src/main/update-app/install-application-update-tray-item.injectable.ts rename to src/main/application-update/install-application-update-tray-item.injectable.ts diff --git a/src/main/update-app/periodical-check-for-updates/periodical-check-for-updates.injectable.ts b/src/main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable.ts similarity index 100% rename from src/main/update-app/periodical-check-for-updates/periodical-check-for-updates.injectable.ts rename to src/main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable.ts diff --git a/src/main/update-app/periodical-check-for-updates/start-checking-for-updates.injectable.ts b/src/main/application-update/periodical-check-for-updates/start-checking-for-updates.injectable.ts similarity index 100% rename from src/main/update-app/periodical-check-for-updates/start-checking-for-updates.injectable.ts rename to src/main/application-update/periodical-check-for-updates/start-checking-for-updates.injectable.ts diff --git a/src/main/update-app/periodical-check-for-updates/stop-checking-for-updates.injectable.ts b/src/main/application-update/periodical-check-for-updates/stop-checking-for-updates.injectable.ts similarity index 100% rename from src/main/update-app/periodical-check-for-updates/stop-checking-for-updates.injectable.ts rename to src/main/application-update/periodical-check-for-updates/stop-checking-for-updates.injectable.ts diff --git a/src/main/update-app/publish-is-configured.injectable.ts b/src/main/application-update/publish-is-configured.injectable.ts similarity index 100% rename from src/main/update-app/publish-is-configured.injectable.ts rename to src/main/application-update/publish-is-configured.injectable.ts diff --git a/src/main/update-app/updating-is-enabled.injectable.ts b/src/main/application-update/updating-is-enabled.injectable.ts similarity index 100% rename from src/main/update-app/updating-is-enabled.injectable.ts rename to src/main/application-update/updating-is-enabled.injectable.ts diff --git a/src/main/update-app/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts b/src/main/application-update/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts similarity index 100% rename from src/main/update-app/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts rename to src/main/application-update/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts diff --git a/src/main/update-app/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts b/src/main/application-update/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts similarity index 100% rename from src/main/update-app/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts rename to src/main/application-update/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts diff --git a/src/main/update-app/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts b/src/main/application-update/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts similarity index 100% rename from src/main/update-app/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts rename to src/main/application-update/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index a030473679..e19e115f51 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -78,13 +78,13 @@ import platformInjectable from "../common/vars/platform.injectable"; import productNameInjectable from "./app-paths/app-name/product-name.injectable"; import quitAndInstallUpdateInjectable from "./electron-app/features/quit-and-install-update.injectable"; import electronUpdaterIsActiveInjectable from "./electron-app/features/electron-updater-is-active.injectable"; -import publishIsConfiguredInjectable from "./update-app/publish-is-configured.injectable"; -import checkForPlatformUpdatesInjectable from "./update-app/check-for-platform-updates/check-for-platform-updates.injectable"; +import publishIsConfiguredInjectable from "./application-update/publish-is-configured.injectable"; +import checkForPlatformUpdatesInjectable from "./application-update/check-for-platform-updates/check-for-platform-updates.injectable"; import setUpdateOnQuitInjectable from "./electron-app/features/set-update-on-quit.injectable"; -import downloadPlatformUpdateInjectable from "./update-app/download-platform-update/download-platform-update.injectable"; +import downloadPlatformUpdateInjectable from "./application-update/download-platform-update/download-platform-update.injectable"; import startCatalogSyncInjectable from "./catalog-sync-to-renderer/start-catalog-sync.injectable"; import startKubeConfigSyncInjectable from "./start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable"; -import startCheckingForUpdatesInjectable from "./update-app/periodical-check-for-updates/start-checking-for-updates.injectable"; +import startCheckingForUpdatesInjectable from "./application-update/periodical-check-for-updates/start-checking-for-updates.injectable"; import appVersionInjectable from "../common/get-configuration-file-model/app-version/app-version.injectable"; export function getDiForUnitTesting(opts: GetDiForUnitTestingOptions = {}) { diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts index 8f505696e4..848764d382 100644 --- a/src/main/menu/application-menu-items.injectable.ts +++ b/src/main/menu/application-menu-items.injectable.ts @@ -11,7 +11,7 @@ import { webContents } from "electron"; import loggerInjectable from "../../common/logger.injectable"; import appNameInjectable from "../app-paths/app-name/app-name.injectable"; import electronMenuItemsInjectable from "./electron-menu-items.injectable"; -import updatingIsEnabledInjectable from "../update-app/updating-is-enabled.injectable"; +import updatingIsEnabledInjectable from "../application-update/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"; @@ -24,7 +24,7 @@ import showAboutInjectable from "./show-about.injectable"; import applicationWindowInjectable from "../start-main-application/lens-window/application-window/application-window.injectable"; import reloadWindowInjectable from "../start-main-application/lens-window/reload-window.injectable"; import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable"; -import checkForUpdatesInjectable from "../update-app/check-for-updates/check-for-updates.injectable"; +import checkForUpdatesInjectable from "../application-update/check-for-updates/check-for-updates.injectable"; function ignoreIf(check: boolean, menuItems: MenuItemOpts[]) { return check ? [] : menuItems;