diff --git a/src/common/application-update/checking-for-updates/checking-for-updates-state.injectable.ts b/src/common/application-update/discovered-update-version/discovered-update-version.injectable.ts similarity index 65% rename from src/common/application-update/checking-for-updates/checking-for-updates-state.injectable.ts rename to src/common/application-update/discovered-update-version/discovered-update-version.injectable.ts index dd21f471ce..0a56d36b66 100644 --- a/src/common/application-update/checking-for-updates/checking-for-updates-state.injectable.ts +++ b/src/common/application-update/discovered-update-version/discovered-update-version.injectable.ts @@ -5,14 +5,14 @@ import { getInjectable } from "@ogre-tools/injectable"; import createSyncBoxInjectable from "../../sync-box/create-sync-box.injectable"; -const checkingForUpdatesStateInjectable = getInjectable({ - id: "checking-for-updates-state", +const discoveredUpdateVersionInjectable = getInjectable({ + id: "discovered-update-version", instantiate: (di) => { const createSyncBox = di.inject(createSyncBoxInjectable); - return createSyncBox("checking-for-updates"); + return createSyncBox("discovered-update-version"); }, }); -export default checkingForUpdatesStateInjectable; +export default discoveredUpdateVersionInjectable; diff --git a/src/common/application-update/discovered-version/discovered-version-state.injectable.ts b/src/common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable.ts similarity index 65% rename from src/common/application-update/discovered-version/discovered-version-state.injectable.ts rename to src/common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable.ts index f841c80c98..b19ba47345 100644 --- a/src/common/application-update/discovered-version/discovered-version-state.injectable.ts +++ b/src/common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable.ts @@ -5,14 +5,14 @@ import { getInjectable } from "@ogre-tools/injectable"; import createSyncBoxInjectable from "../../sync-box/create-sync-box.injectable"; -const discoveredVersionStateInjectable = getInjectable({ - id: "discovered-version-state", +const updateIsBeingDownloadedInjectable = getInjectable({ + id: "update-is-being-downloaded", instantiate: (di) => { const createSyncBox = di.inject(createSyncBoxInjectable); - return createSyncBox("discovered-version-state"); + return createSyncBox("update-is-being-downloaded"); }, }); -export default discoveredVersionStateInjectable; +export default updateIsBeingDownloadedInjectable; diff --git a/src/common/application-update/downloading-update/downloading-update-state.injectable.ts b/src/common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable.ts similarity index 64% rename from src/common/application-update/downloading-update/downloading-update-state.injectable.ts rename to src/common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable.ts index d7f742d94c..3ab1439cd0 100644 --- a/src/common/application-update/downloading-update/downloading-update-state.injectable.ts +++ b/src/common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable.ts @@ -5,14 +5,14 @@ import { getInjectable } from "@ogre-tools/injectable"; import createSyncBoxInjectable from "../../sync-box/create-sync-box.injectable"; -const downloadingUpdateStateInjectable = getInjectable({ - id: "downloading-update-state", +const updatesAreBeingDiscoveredInjectable = getInjectable({ + id: "updates-are-being-discovered", instantiate: (di) => { const createSyncBox = di.inject(createSyncBoxInjectable); - return createSyncBox("downloading-update"); + return createSyncBox("updates-are-being-discovered"); }, }); -export default downloadingUpdateStateInjectable; +export default updatesAreBeingDiscoveredInjectable; diff --git a/src/main/update-app/check-for-updates-tray-item.injectable.ts b/src/main/update-app/check-for-updates-tray-item.injectable.ts index 9da2bf4ba4..5e67354d29 100644 --- a/src/main/update-app/check-for-updates-tray-item.injectable.ts +++ b/src/main/update-app/check-for-updates-tray-item.injectable.ts @@ -10,9 +10,9 @@ import showApplicationWindowInjectable from "../start-main-application/lens-wind import showNotificationInjectable from "../show-notification/show-notification.injectable"; import askBooleanInjectable from "../ask-boolean/ask-boolean.injectable"; import quitAndInstallUpdateInjectable from "../electron-app/features/quit-and-install-update.injectable"; -import discoveredVersionStateInjectable from "../../common/application-update/discovered-version/discovered-version-state.injectable"; -import downloadingUpdateStateInjectable from "../../common/application-update/downloading-update/downloading-update-state.injectable"; -import checkingForUpdatesStateInjectable from "../../common/application-update/checking-for-updates/checking-for-updates-state.injectable"; +import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable"; +import updateIsBeingDownloadedInjectable from "../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable"; +import updatesAreBeingDiscoveredInjectable from "../../common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable"; import checkForUpdatesInjectable from "./check-for-updates/check-for-updates.injectable"; import downloadUpdateInjectable from "./download-update/download-update.injectable"; import progressOfUpdateDownloadInjectable from "../../common/application-update/progress-of-update-download/progress-of-update-download.injectable"; @@ -27,9 +27,9 @@ const checkForUpdatesTrayItemInjectable = getInjectable({ const showNotification = di.inject(showNotificationInjectable); const askBoolean = di.inject(askBooleanInjectable); const quitAndInstallUpdate = di.inject(quitAndInstallUpdateInjectable); - const discoveredVersionState = di.inject(discoveredVersionStateInjectable); - const downloadingUpdateState = di.inject(downloadingUpdateStateInjectable); - const checkingForUpdatesState = di.inject(checkingForUpdatesStateInjectable); + const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable); + const downloadingUpdateState = di.inject(updateIsBeingDownloadedInjectable); + const checkingForUpdatesState = di.inject(updatesAreBeingDiscoveredInjectable); const checkForUpdates = di.inject(checkForUpdatesInjectable); const downloadUpdate = di.inject(downloadUpdateInjectable); diff --git a/src/main/update-app/check-for-updates/check-for-updates.injectable.ts b/src/main/update-app/check-for-updates/check-for-updates.injectable.ts index b012edb96a..02ed818359 100644 --- a/src/main/update-app/check-for-updates/check-for-updates.injectable.ts +++ b/src/main/update-app/check-for-updates/check-for-updates.injectable.ts @@ -8,8 +8,8 @@ import checkForPlatformUpdatesInjectable from "../check-for-platform-updates/che import type { UpdateChannel } from "../update-channels"; import selectedUpdateChannelInjectable from "../selected-update-channel.injectable"; import showNotificationInjectable from "../../show-notification/show-notification.injectable"; -import checkingForUpdatesStateInjectable from "../../../common/application-update/checking-for-updates/checking-for-updates-state.injectable"; -import discoveredVersionStateInjectable from "../../../common/application-update/discovered-version/discovered-version-state.injectable"; +import updatesAreBeingDiscoveredInjectable from "../../../common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable"; +import discoveredUpdateVersionInjectable from "../../../common/application-update/discovered-update-version/discovered-update-version.injectable"; import { runInAction } from "mobx"; const checkForUpdatesInjectable = getInjectable({ @@ -24,10 +24,10 @@ const checkForUpdatesInjectable = getInjectable({ ); const checkingForUpdatesState = di.inject( - checkingForUpdatesStateInjectable, + updatesAreBeingDiscoveredInjectable, ); - const discoveredVersionState = di.inject(discoveredVersionStateInjectable); + const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable); return async () => { runInAction(() => { diff --git a/src/main/update-app/download-update/download-update.injectable.ts b/src/main/update-app/download-update/download-update.injectable.ts index 4a0c740bc5..4abbd3185f 100644 --- a/src/main/update-app/download-update/download-update.injectable.ts +++ b/src/main/update-app/download-update/download-update.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import downloadPlatformUpdateInjectable from "../download-platform-update/download-platform-update.injectable"; -import downloadingUpdateStateInjectable from "../../../common/application-update/downloading-update/downloading-update-state.injectable"; -import discoveredVersionStateInjectable from "../../../common/application-update/discovered-version/discovered-version-state.injectable"; +import updateIsBeingDownloadedInjectable from "../../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable"; +import discoveredUpdateVersionInjectable from "../../../common/application-update/discovered-update-version/discovered-update-version.injectable"; import { action, runInAction } from "mobx"; import progressOfUpdateDownloadInjectable from "../../../common/application-update/progress-of-update-download/progress-of-update-download.injectable"; @@ -14,8 +14,8 @@ const downloadUpdateInjectable = getInjectable({ instantiate: (di) => { const downloadPlatformUpdate = di.inject(downloadPlatformUpdateInjectable); - const downloadingUpdateState = di.inject(downloadingUpdateStateInjectable); - const discoveredVersionState = di.inject(discoveredVersionStateInjectable); + const downloadingUpdateState = di.inject(updateIsBeingDownloadedInjectable); + const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable); const progressOfUpdateDownload = di.inject(progressOfUpdateDownloadInjectable); const updateDownloadProgress = action((percentage: number) => { diff --git a/src/main/update-app/install-application-update-tray-item.injectable.ts b/src/main/update-app/install-application-update-tray-item.injectable.ts index 67b3e19254..3a3e9002e3 100644 --- a/src/main/update-app/install-application-update-tray-item.injectable.ts +++ b/src/main/update-app/install-application-update-tray-item.injectable.ts @@ -6,16 +6,16 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import { trayMenuItemInjectionToken } from "../tray/tray-menu-item/tray-menu-item-injection-token"; import quitAndInstallUpdateInjectable from "../electron-app/features/quit-and-install-update.injectable"; -import discoveredVersionStateInjectable from "../../common/application-update/discovered-version/discovered-version-state.injectable"; -import downloadingUpdateStateInjectable from "../../common/application-update/downloading-update/downloading-update-state.injectable"; +import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable"; +import updateIsBeingDownloadedInjectable from "../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable"; const installApplicationUpdateTrayItemInjectable = getInjectable({ id: "install-update-tray-item", instantiate: (di) => { const quitAndInstallUpdate = di.inject(quitAndInstallUpdateInjectable); - const discoveredVersionState = di.inject(discoveredVersionStateInjectable); - const downloadingUpdateState = di.inject(downloadingUpdateStateInjectable); + const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable); + const downloadingUpdateState = di.inject(updateIsBeingDownloadedInjectable); return { id: "install-update", 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/update-app/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts index 8fb73908a3..d9e4c56f38 100644 --- a/src/main/update-app/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts +++ b/src/main/update-app/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts @@ -8,7 +8,7 @@ import { getStartableStoppable } from "../../../common/utils/get-startable-stopp import setUpdateOnQuitInjectable from "../../electron-app/features/set-update-on-quit.injectable"; import selectedUpdateChannelInjectable from "../selected-update-channel.injectable"; import type { UpdateChannel } from "../update-channels"; -import discoveredVersionStateInjectable from "../../../common/application-update/discovered-version/discovered-version-state.injectable"; +import discoveredUpdateVersionInjectable from "../../../common/application-update/discovered-update-version/discovered-update-version.injectable"; const watchIfUpdateShouldHappenOnQuitInjectable = getInjectable({ id: "watch-if-update-should-happen-on-quit", @@ -16,7 +16,7 @@ const watchIfUpdateShouldHappenOnQuitInjectable = getInjectable({ instantiate: (di) => { const setUpdateOnQuit = di.inject(setUpdateOnQuitInjectable); const selectedUpdateChannel = di.inject(selectedUpdateChannelInjectable); - const discoveredVersionState = di.inject(discoveredVersionStateInjectable); + const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable); return getStartableStoppable("watch-if-update-should-happen-on-quit", () => autorun(() => {