chore: Flatten file hierarchy

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-warning-level.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import updateDownloadedDateTimeInjectable from "../../../../common/update-downloaded-date-time/update-downloaded-date-time.injectable";
+import updateDownloadedDateTimeInjectable from "../../../../common/update-downloaded-date-time.injectable";
 import { reactiveNow } from "../../../../../../common/utils/reactive-now/reactive-now";
 
 const updateWarningLevelInjectable = getInjectable({

packages/core/src/features/application-update/child-features/application-update-using-tray/main/tray-icons/checking-for-updates-tray-icon.injectable.ts

@@ -6,8 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
 import getTrayIconPathInjectable from "../../../../../../main/tray/menu-icon/get-tray-icon-path.injectable";
 import { trayIconInjectionToken } from "../../../../../../main/tray/menu-icon/tray-icon-injection-token";
-import updatesAreBeingDiscoveredInjectable from "../../../../common/updates-are-being-discovered/updates-are-being-discovered.injectable";
+import updatesAreBeingDiscoveredInjectable from "../../../../common/updates-are-being-discovered.injectable";
-import updateIsBeingDownloadedInjectable from "../../../../common/update-is-being-downloaded/update-is-being-downloaded.injectable";
+import updateIsBeingDownloadedInjectable from "../../../../common/update-is-being-downloaded.injectable";
 
 const checkingForUpdatesTrayIconInjectable = getInjectable({
   id: "checking-for-updates-tray-icon",

packages/core/src/features/application-update/child-features/application-update-using-tray/main/tray-items/check-for-updates-tray-item.injectable.ts

@@ -7,10 +7,10 @@ import { computed } from "mobx";
 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";
+import discoveredUpdateVersionInjectable from "../../../../common/discovered-update-version.injectable";
-import updateIsBeingDownloadedInjectable from "../../../../common/update-is-being-downloaded/update-is-being-downloaded.injectable";
+import updateIsBeingDownloadedInjectable from "../../../../common/update-is-being-downloaded.injectable";
-import updatesAreBeingDiscoveredInjectable from "../../../../common/updates-are-being-discovered/updates-are-being-discovered.injectable";
+import updatesAreBeingDiscoveredInjectable from "../../../../common/updates-are-being-discovered.injectable";
-import progressOfUpdateDownloadInjectable from "../../../../common/progress-of-update-download/progress-of-update-download.injectable";
+import progressOfUpdateDownloadInjectable from "../../../../common/progress-of-update-download.injectable";
 import assert from "assert";
 import processCheckingForUpdatesInjectable from "../../../../main/process-checking-for-updates.injectable";
 import { withErrorSuppression } from "../../../../../../common/utils/with-error-suppression/with-error-suppression";

packages/core/src/features/application-update/child-features/application-update-using-tray/main/tray-items/install-application-update-tray-item.injectable.ts

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
 import { trayMenuItemInjectionToken } from "../../../../../../main/tray/tray-menu-item/tray-menu-item-injection-token";
-import discoveredUpdateVersionInjectable from "../../../../common/discovered-update-version/discovered-update-version.injectable";
+import discoveredUpdateVersionInjectable from "../../../../common/discovered-update-version.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";

packages/core/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 discoveredUpdateVersionInjectable from "../../../common/discovered-update-version.injectable";
-import updateIsBeingDownloadedInjectable from "../../../common/update-is-being-downloaded/update-is-being-downloaded.injectable";
+import updateIsBeingDownloadedInjectable from "../../../common/update-is-being-downloaded.injectable";
 
 const updateIsReadyToBeInstalledInjectable = getInjectable({
   id: "update-is-ready-to-be-installed",

packages/core/src/features/application-update/child-features/force-update/renderer/force-update-modal/force-update-modal-root-frame-component.injectable.ts

@@ -7,7 +7,7 @@ import { computed } from "mobx";
 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.injectable";
 import timeAfterUpdateMustBeInstalledInjectable from "./time-after-update-must-be-installed.injectable";
 
 const forceUpdateModalRootFrameComponentInjectable = getInjectable({

packages/core/src/features/application-update/child-features/force-update/renderer/force-update-modal/time-since-update-was-downloaded.injectable.ts

@@ -6,7 +6,7 @@ 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 updateDownloadedDateTimeInjectable from "../../../../common/update-downloaded-date-time.injectable";
 import { reactiveNow } from "../../../../../../common/utils/reactive-now/reactive-now";
 
 const timeSinceUpdateWasDownloadedInjectable = getInjectable({

packages/core/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel-preference-block.injectable.ts

@@ -9,7 +9,7 @@ import { UpdateChannel } from "./update-channel";
 const updateChannelPreferenceBlockInjectable = getInjectable({
   id: "update-channel-preference-item",
 
-  instantiate: () => ({
+  instantiate: (di) => ({
     kind: "block" as const,
     id: "update-channel",
     parentId: "application-page",

packages/core/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel.tsx

@@ -7,8 +7,8 @@ import { SubTitle } from "../../../../../../renderer/components/layout/sub-title
 import { withInjectables } from "@ogre-tools/injectable-react";
 import { Select } from "../../../../../../renderer/components/select";
 import { updateChannels } from "../../../../common/update-channels";
-import type { SelectedUpdateChannel } from "../../../../common/selected-update-channel/selected-update-channel.injectable";
+import type { SelectedUpdateChannel } from "../../../../common/selected-update-channel.injectable";
-import selectedUpdateChannelInjectable from "../../../../common/selected-update-channel/selected-update-channel.injectable";
+import selectedUpdateChannelInjectable from "../../../../common/selected-update-channel.injectable";
 import { pipeline } from "@ogre-tools/fp";
 import { map, toPairs } from "lodash/fp";
 import { observer } from "mobx-react";

packages/core/src/features/application-update/child-features/selection-of-update-stability/selection-of-update-stability.test.ts

@@ -16,7 +16,7 @@ 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 selectedUpdateChannelInjectable from "../../common/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";

packages/core/src/features/application-update/common/default-update-channel.injectable.ts

@@ -2,8 +2,8 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { updateChannels } from "../update-channels";
+import { updateChannels } from "./update-channels";
-import releaseChannelInjectable from "../../../vars/common/release-channel.injectable";
+import releaseChannelInjectable from "../../vars/common/release-channel.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 
 const defaultUpdateChannelInjectable = getInjectable({

packages/core/src/features/application-update/common/discovered-update-version.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 createSyncBoxInjectable from "../../../../common/utils/sync-box/create-sync-box.injectable";
+import createSyncBoxInjectable from "../../../common/utils/sync-box/create-sync-box.injectable";
-import type { UpdateChannel } from "../update-channels";
+import type { UpdateChannel } from "./update-channels";
-import type { SyncBox } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import type { SyncBox } from "../../../common/utils/sync-box/sync-box-injection-token";
-import { syncBoxInjectionToken } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import { syncBoxInjectionToken } from "../../../common/utils/sync-box/sync-box-injection-token";
 
 export type DiscoveredUpdateVersion = SyncBox<{ version: string; updateChannel: UpdateChannel } | null>;
 

packages/core/src/features/application-update/common/progress-of-update-download.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 createSyncBoxInjectable from "../../../../common/utils/sync-box/create-sync-box.injectable";
+import createSyncBoxInjectable from "../../../common/utils/sync-box/create-sync-box.injectable";
-import type { SyncBox } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import type { SyncBox } from "../../../common/utils/sync-box/sync-box-injection-token";
-import { syncBoxInjectionToken } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import { syncBoxInjectionToken } from "../../../common/utils/sync-box/sync-box-injection-token";
 
 export interface ProgressOfDownload {
   percentage: number;

packages/core/src/features/application-update/common/selected-update-channel.injectable.ts

@@ -5,8 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { IComputedValue } from "mobx";
 import { action, computed, observable } from "mobx";
-import type { UpdateChannel, ReleaseChannel } from "../update-channels";
+import type { UpdateChannel, ReleaseChannel } from "./update-channels";
-import { updateChannels } from "../update-channels";
+import { updateChannels } from "./update-channels";
 import defaultUpdateChannelInjectable from "./default-update-channel.injectable";
 
 export interface SelectedUpdateChannel {

packages/core/src/features/application-update/common/update-downloaded-date-time.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 createSyncBoxInjectable from "../../../../common/utils/sync-box/create-sync-box.injectable";
+import createSyncBoxInjectable from "../../../common/utils/sync-box/create-sync-box.injectable";
-import { syncBoxInjectionToken } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import { syncBoxInjectionToken } from "../../../common/utils/sync-box/sync-box-injection-token";
 
 const updateDownloadedDateTimeInjectable = getInjectable({
   id: "update-downloaded-date-time",

packages/core/src/features/application-update/common/update-is-being-downloaded.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 createSyncBoxInjectable from "../../../../common/utils/sync-box/create-sync-box.injectable";
+import createSyncBoxInjectable from "../../../common/utils/sync-box/create-sync-box.injectable";
-import type { SyncBox } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import type { SyncBox } from "../../../common/utils/sync-box/sync-box-injection-token";
-import { syncBoxInjectionToken } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import { syncBoxInjectionToken } from "../../../common/utils/sync-box/sync-box-injection-token";
 
 export type UpdateIsBeingDownloaded = SyncBox<boolean>;
 

packages/core/src/features/application-update/common/updates-are-being-discovered.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 createSyncBoxInjectable from "../../../../common/utils/sync-box/create-sync-box.injectable";
+import createSyncBoxInjectable from "../../../common/utils/sync-box/create-sync-box.injectable";
-import type { SyncBox } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import type { SyncBox } from "../../../common/utils/sync-box/sync-box-injection-token";
-import { syncBoxInjectionToken } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import { syncBoxInjectionToken } from "../../../common/utils/sync-box/sync-box-injection-token";
 
 export type UpdatesAreBeingDiscovered = SyncBox<boolean>;
 

packages/core/src/features/application-update/downgrading-version-update.test.ts

@@ -11,7 +11,7 @@ import asyncFn from "@async-fn/jest";
 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 selectedUpdateChannelInjectable from "./common/selected-update-channel.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
 import { updateChannels } from "./common/update-channels";
 import getBuildVersionInjectable from "../../main/electron-app/features/get-build-version.injectable";

packages/core/src/features/application-update/main/check-for-updates/update-can-be-downgraded.injectable.ts

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
 import releaseChannelInjectable from "../../../vars/common/release-channel.injectable";
-import selectedUpdateChannelInjectable from "../../common/selected-update-channel/selected-update-channel.injectable";
+import selectedUpdateChannelInjectable from "../../common/selected-update-channel.injectable";
 
 const updateCanBeDowngradedInjectable = getInjectable({
   id: "update-can-be-downgraded",

packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.injectable.ts

@@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/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.injectable";
 
 export type DownloadPlatformUpdate = (
   onDownloadProgress: (arg: ProgressOfDownload) => void

packages/core/src/features/application-update/main/download-update/download-update.injectable.ts

@@ -4,13 +4,13 @@
  */
 import { getInjectable } from "@ogre-tools/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 updateIsBeingDownloadedInjectable from "../../common/update-is-being-downloaded.injectable";
-import discoveredUpdateVersionInjectable from "../../common/discovered-update-version/discovered-update-version.injectable";
+import discoveredUpdateVersionInjectable from "../../common/discovered-update-version.injectable";
 import { action, runInAction } from "mobx";
-import type { ProgressOfDownload } from "../../common/progress-of-update-download/progress-of-update-download.injectable";
+import type { ProgressOfDownload } from "../../common/progress-of-update-download.injectable";
-import progressOfUpdateDownloadInjectable from "../../common/progress-of-update-download/progress-of-update-download.injectable";
+import progressOfUpdateDownloadInjectable from "../../common/progress-of-update-download.injectable";
 import { getCurrentDateTime } from "../../../../common/utils/date/get-current-date-time";
-import updateDownloadedDateTimeInjectable from "../../common/update-downloaded-date-time/update-downloaded-date-time.injectable";
+import updateDownloadedDateTimeInjectable from "../../common/update-downloaded-date-time.injectable";
 
 const downloadUpdateInjectable = getInjectable({
   id: "download-update",

packages/core/src/features/application-update/main/process-checking-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 selectedUpdateChannelInjectable from "../common/selected-update-channel/selected-update-channel.injectable";
+import selectedUpdateChannelInjectable from "../common/selected-update-channel.injectable";
-import updatesAreBeingDiscoveredInjectable from "../common/updates-are-being-discovered/updates-are-being-discovered.injectable";
+import updatesAreBeingDiscoveredInjectable from "../common/updates-are-being-discovered.injectable";
-import discoveredUpdateVersionInjectable from "../common/discovered-update-version/discovered-update-version.injectable";
+import discoveredUpdateVersionInjectable from "../common/discovered-update-version.injectable";
 import { runInAction } from "mobx";
 import downloadUpdateInjectable from "./download-update/download-update.injectable";
 import checkForUpdatesStartingFromChannelInjectable from "./check-for-updates/check-for-updates-starting-from-channel.injectable";

packages/core/src/features/application-update/main/quit-and-install-update.injectable.ts

@@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import electronQuitAndInstallUpdateInjectable from "../../../main/electron-app/features/electron-quit-and-install-update.injectable";
 import { getCurrentDateTime } from "../../../common/utils/date/get-current-date-time";
 import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
-import discoveredUpdateVersionInjectable from "../common/discovered-update-version/discovered-update-version.injectable";
+import discoveredUpdateVersionInjectable from "../common/discovered-update-version.injectable";
 
 const quitAndInstallUpdateInjectable = getInjectable({
   id: "quit-and-install-update",

packages/core/src/features/application-update/main/updating-is-enabled/publish-is-configured.injectable.ts

@@ -7,7 +7,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 
 const publishIsConfiguredInjectable = getInjectable({
   id: "publish-is-configured",
-  instantiate: (di) => Boolean(di.inject(applicationInformationToken).updatingIsEnabled),
+  instantiate: (di) => di.inject(applicationInformationToken).updatingIsEnabled,
 });
 
 export default publishIsConfiguredInjectable;

packages/core/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.global-override-for-injectable.ts

@@ -1,8 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getGlobalOverride } from "@k8slens/test-utils";
-import publishIsConfiguredInjectable from "./publish-is-configured.injectable";
-
-export default getGlobalOverride(publishIsConfiguredInjectable, () => false);

packages/core/src/features/application-update/main/updating-is-enabled/updating-is-enabled.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "./publish-is-configured/publish-is-configured.injectable";
+import publishIsConfiguredInjectable from "./publish-is-configured.injectable";
 
 const updatingIsEnabledInjectable = getInjectable({
   id: "updating-is-enabled",

packages/core/src/features/application-update/main/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts

@@ -6,9 +6,9 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { autorun } from "mobx";
 import { getStartableStoppable } from "@k8slens/startable-stoppable";
 import setUpdateOnQuitInjectable from "../../../../main/electron-app/features/set-update-on-quit.injectable";
-import selectedUpdateChannelInjectable from "../../common/selected-update-channel/selected-update-channel.injectable";
+import selectedUpdateChannelInjectable from "../../common/selected-update-channel.injectable";
 import type { ReleaseChannel, UpdateChannel } from "../../common/update-channels";
-import discoveredUpdateVersionInjectable from "../../common/discovered-update-version/discovered-update-version.injectable";
+import discoveredUpdateVersionInjectable from "../../common/discovered-update-version.injectable";
 
 const watchIfUpdateShouldHappenOnQuitInjectable = getInjectable({
   id: "watch-if-update-should-happen-on-quit",

packages/core/src/features/user-preferences/common/storage.injectable.ts

@@ -10,7 +10,7 @@ import persistentStorageMigrationsInjectable from "../../../common/persistent-st
 import { userPreferencesMigrationInjectionToken } from "./migrations-token";
 import { toJS } from "../../../common/utils";
 import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable";
-import selectedUpdateChannelInjectable from "../../application-update/common/selected-update-channel/selected-update-channel.injectable";
+import selectedUpdateChannelInjectable from "../../application-update/common/selected-update-channel.injectable";
 import type { ReleaseChannel } from "../../application-update/common/update-channels";
 import userPreferencesStateInjectable from "./state.injectable";
 import userPreferenceDescriptorsInjectable from "./preference-descriptors.injectable";