diff --git a/src/common/cluster-store/cluster-store.global-override-for-injectable.ts b/src/common/cluster-store/cluster-store.global-override-for-injectable.ts deleted file mode 100644 index f9f6bd8f69..0000000000 --- a/src/common/cluster-store/cluster-store.global-override-for-injectable.ts +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getGlobalOverride } from "../test-utils/get-global-override"; -import clusterStoreInjectable from "./cluster-store.injectable"; -import type { Cluster } from "../cluster/cluster"; -import type { ClusterStore } from "./cluster-store"; - -export default getGlobalOverride(clusterStoreInjectable, () => ({ - getById: () => ({}) as Cluster, -} as Partial as ClusterStore)); diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index d8f87d8692..32c21d0bf2 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -12,13 +12,6 @@ import readJsonFileInjectable from "../common/fs/read-json-file.injectable"; import readFileInjectable from "../common/fs/read-file.injectable"; import loggerInjectable from "../common/logger.injectable"; import spawnInjectable from "./child-process/spawn.injectable"; -import extensionsStoreInjectable from "../extensions/extensions-store/extensions-store.injectable"; -import type { ExtensionsStore } from "../extensions/extensions-store/extensions-store"; -import fileSystemProvisionerStoreInjectable from "../extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable"; -import type { FileSystemProvisionerStore } from "../extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store"; -import userStoreInjectable from "../common/user-store/user-store.injectable"; -import type { UserStore } from "../common/user-store"; -import hotbarStoreInjectable from "../common/hotbars/store.injectable"; import commandLineArgumentsInjectable from "./utils/command-line-arguments.injectable"; import initializeExtensionsInjectable from "./start-main-application/runnables/initialize-extensions.injectable"; import lensResourcesDirInjectable from "../common/vars/lens-resources-dir.injectable"; @@ -74,7 +67,6 @@ import rollbackHelmReleaseInjectable from "./helm/helm-service/rollback-helm-rel import waitUntilBundledExtensionsAreLoadedInjectable from "./start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable"; import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; import electronInjectable from "./utils/resolve-system-proxy/electron.injectable"; -import type { HotbarStore } from "../common/hotbars/store"; import focusApplicationInjectable from "./electron-app/features/focus-application.injectable"; import kubectlDownloadingNormalizedArchInjectable from "./kubectl/normalized-arch.injectable"; import initializeClusterManagerInjectable from "./cluster/initialize-manager.injectable"; @@ -121,19 +113,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) di.override(waitUntilBundledExtensionsAreLoadedInjectable, () => async () => {}); di.override(getRandomIdInjectable, () => () => "some-irrelevant-random-id"); di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64"); - di.override(hotbarStoreInjectable, () => ({ - load: () => {}, - getActive: () => ({ name: "some-hotbar", items: [] }), - getDisplayIndex: () => "0", - }) as unknown as HotbarStore); - - di.override(userStoreInjectable, () => ({ - startMainReactions: () => {}, - extensionRegistryUrl: { customUrl: "some-custom-url" }, - load: () => {}, - }) as Partial as UserStore); - di.override(extensionsStoreInjectable, () => ({ isEnabled: (opts) => (void opts, false) }) as ExtensionsStore); - di.override(fileSystemProvisionerStoreInjectable, () => ({}) as FileSystemProvisionerStore); overrideOperatingSystem(di); overrideRunnablesHavingSideEffects(di); diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx index 230b8ceb1d..84049c8df2 100644 --- a/src/renderer/getDiForUnitTesting.tsx +++ b/src/renderer/getDiForUnitTesting.tsx @@ -12,13 +12,6 @@ import loggerInjectable from "../common/logger.injectable"; import { overrideFsWithFakes } from "../test-utils/override-fs-with-fakes"; import { createMemoryHistory } from "history"; import focusWindowInjectable from "./navigation/focus-window.injectable"; -import extensionsStoreInjectable from "../extensions/extensions-store/extensions-store.injectable"; -import type { ExtensionsStore } from "../extensions/extensions-store/extensions-store"; -import fileSystemProvisionerStoreInjectable from "../extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable"; -import type { FileSystemProvisionerStore } from "../extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store"; -import userStoreInjectable from "../common/user-store/user-store.injectable"; -import type { UserStore } from "../common/user-store"; -import hotbarStoreInjectable from "../common/hotbars/store.injectable"; import terminalSpawningPoolInjectable from "./components/dock/terminal/terminal-spawning-pool.injectable"; import hostedClusterIdInjectable from "./cluster-frame-context/hosted-cluster-id.injectable"; import historyInjectable from "./navigation/history.injectable"; @@ -26,7 +19,7 @@ import { ApiManager } from "../common/k8s-api/api-manager"; import lensResourcesDirInjectable from "../common/vars/lens-resources-dir.injectable"; import broadcastMessageInjectable from "../common/ipc/broadcast-message.injectable"; import apiManagerInjectable from "../common/k8s-api/api-manager/manager.injectable"; -import { observable, computed, runInAction } from "mobx"; +import { computed, runInAction } from "mobx"; import requestAnimationFrameInjectable from "./components/animate/request-animation-frame.injectable"; import getRandomIdInjectable from "../common/utils/get-random-id.injectable"; import getFilePathsInjectable from "../features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable"; @@ -35,7 +28,6 @@ import platformInjectable from "../common/vars/platform.injectable"; import startTopbarStateSyncInjectable from "./components/layout/top-bar/start-state-sync.injectable"; import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; import watchHistoryStateInjectable from "./remote-helpers/watch-history-state.injectable"; -import type { HotbarStore } from "../common/hotbars/store"; import cronJobTriggerDialogClusterFrameChildComponentInjectable from "./components/+workloads-cronjobs/cron-job-trigger-dialog-cluster-frame-child-component.injectable"; import deploymentScaleDialogClusterFrameChildComponentInjectable from "./components/+workloads-deployments/scale/deployment-scale-dialog-cluster-frame-child-component.injectable"; import replicasetScaleDialogClusterFrameChildComponentInjectable from "./components/+workloads-replicasets/scale-dialog/replicaset-scale-dialog-cluster-frame-child-component.injectable"; @@ -50,7 +42,6 @@ import legacyOnChannelListenInjectable from "./ipc/legacy-channel-listen.injecta import storageSaveDelayInjectable from "./utils/create-storage/storage-save-delay.injectable"; import environmentVariablesInjectable from "../common/utils/environment-variables.injectable"; import type { GlobalOverride } from "../common/test-utils/get-global-override"; -import type { PartialDeep } from "type-fest"; export const getDiForUnitTesting = ( opts: { doGeneralOverrides?: boolean } = {}, @@ -145,31 +136,6 @@ export const getDiForUnitTesting = ( requestPublicHelmRepositoriesInjectable, ]); - di.override(extensionsStoreInjectable, () => ({ - isEnabled: () => false, - }) as Partial as ExtensionsStore); - - di.override(hotbarStoreInjectable, () => ({ - getActive: () => ({ - name: "some-hotbar", - items: [null, null, null, null, null, null, null, null, null, null, null, null], - id: "some-hotbar", - }), - getDisplayIndex: () => "0", - isAddedToActive: () => false, - }) as Partial as HotbarStore); - - di.override(fileSystemProvisionerStoreInjectable, () => ({}) as FileSystemProvisionerStore); - - di.override(userStoreInjectable, () => ({ - isTableColumnHidden: () => false, - extensionRegistryUrl: { customUrl: "some-custom-url" }, - syncKubeconfigEntries: observable.map(), - terminalConfig: { fontSize: 42 }, - editorConfiguration: { minimap: {}, tabSize: 42, fontSize: 42 }, - load: () => {}, - } as PartialDeep as UserStore)); - di.override(apiManagerInjectable, () => new ApiManager()); di.override(requestFromChannelInjectable, () => () => Promise.resolve(undefined as never));