diff --git a/packages/core/src/common/app-paths/path-to-npm-cli.global-override-for-injectable.ts b/packages/core/src/common/app-paths/path-to-npm-cli.global-override-for-injectable.ts index db4734994d..76a7a9b539 100644 --- a/packages/core/src/common/app-paths/path-to-npm-cli.global-override-for-injectable.ts +++ b/packages/core/src/common/app-paths/path-to-npm-cli.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import pathToNpmCliInjectable from "./path-to-npm-cli.injectable"; export default getGlobalOverride(pathToNpmCliInjectable, () => "/some/npm/cli/path"); diff --git a/packages/core/src/common/certificate/lens-proxy-certificate.global-override-for-injectable.ts b/packages/core/src/common/certificate/lens-proxy-certificate.global-override-for-injectable.ts index d547516062..4d0aeec1d8 100644 --- a/packages/core/src/common/certificate/lens-proxy-certificate.global-override-for-injectable.ts +++ b/packages/core/src/common/certificate/lens-proxy-certificate.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import lensProxyCertificateInjectable from "./lens-proxy-certificate.injectable"; export default getGlobalOverride(lensProxyCertificateInjectable, () => { diff --git a/packages/core/src/common/error-reporting/initialize-sentry-reporting.global-override-for-injectable.ts b/packages/core/src/common/error-reporting/initialize-sentry-reporting.global-override-for-injectable.ts index 1aa2934ef9..1a7dce6a61 100644 --- a/packages/core/src/common/error-reporting/initialize-sentry-reporting.global-override-for-injectable.ts +++ b/packages/core/src/common/error-reporting/initialize-sentry-reporting.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import initializeSentryReportingWithInjectable from "./initialize-sentry-reporting.injectable"; export default getGlobalOverride(initializeSentryReportingWithInjectable, () => () => {}); diff --git a/packages/core/src/common/fetch/fetch.global-override-for-injectable.ts b/packages/core/src/common/fetch/fetch.global-override-for-injectable.ts index d11e059023..7aa6db7a2d 100644 --- a/packages/core/src/common/fetch/fetch.global-override-for-injectable.ts +++ b/packages/core/src/common/fetch/fetch.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverrideForFunction } from "../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; import fetchInjectable from "./fetch.injectable"; export default getGlobalOverrideForFunction(fetchInjectable); diff --git a/packages/core/src/common/fetch/lens-fetch.global-override-for-injectable.ts b/packages/core/src/common/fetch/lens-fetch.global-override-for-injectable.ts index 627aa4c725..3598b6ce14 100644 --- a/packages/core/src/common/fetch/lens-fetch.global-override-for-injectable.ts +++ b/packages/core/src/common/fetch/lens-fetch.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverrideForFunction } from "../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; import lensFetchInjectable from "./lens-fetch.injectable"; export default getGlobalOverrideForFunction(lensFetchInjectable); diff --git a/packages/core/src/common/fs/copy.global-override-for-injectable.ts b/packages/core/src/common/fs/copy.global-override-for-injectable.ts index b6d899d2c4..3799d3b760 100644 --- a/packages/core/src/common/fs/copy.global-override-for-injectable.ts +++ b/packages/core/src/common/fs/copy.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import copyInjectable from "./copy.injectable"; export default getGlobalOverride(copyInjectable, () => async () => { diff --git a/packages/core/src/common/fs/exec-file.global-override-for-injectable.ts b/packages/core/src/common/fs/exec-file.global-override-for-injectable.ts index dc72a7f51a..381a546125 100644 --- a/packages/core/src/common/fs/exec-file.global-override-for-injectable.ts +++ b/packages/core/src/common/fs/exec-file.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverrideForFunction } from "../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; import execFileInjectable from "./exec-file.injectable"; export default getGlobalOverrideForFunction(execFileInjectable); diff --git a/packages/core/src/common/fs/extract-tar.global-override-for-injectable.ts b/packages/core/src/common/fs/extract-tar.global-override-for-injectable.ts index 02a46c1d6b..68d1fe4259 100644 --- a/packages/core/src/common/fs/extract-tar.global-override-for-injectable.ts +++ b/packages/core/src/common/fs/extract-tar.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import extractTarInjectable from "./extract-tar.injectable"; export default getGlobalOverride(extractTarInjectable, () => async () => { diff --git a/packages/core/src/common/fs/lstat.global-override-for-injectable.ts b/packages/core/src/common/fs/lstat.global-override-for-injectable.ts index 9c9f3d4933..155fac7451 100644 --- a/packages/core/src/common/fs/lstat.global-override-for-injectable.ts +++ b/packages/core/src/common/fs/lstat.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import lstatInjectable from "./lstat.injectable"; export default getGlobalOverride(lstatInjectable, () => async () => { diff --git a/packages/core/src/common/fs/read-directory.global-override-for-injectable.ts b/packages/core/src/common/fs/read-directory.global-override-for-injectable.ts index 57c83ceffb..72d9b523f4 100644 --- a/packages/core/src/common/fs/read-directory.global-override-for-injectable.ts +++ b/packages/core/src/common/fs/read-directory.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import readDirectoryInjectable from "./read-directory.injectable"; export default getGlobalOverride(readDirectoryInjectable, () => async () => { diff --git a/packages/core/src/common/fs/remove.global-override-for-injectable.ts b/packages/core/src/common/fs/remove.global-override-for-injectable.ts index 4b92353344..58fb0f9dce 100644 --- a/packages/core/src/common/fs/remove.global-override-for-injectable.ts +++ b/packages/core/src/common/fs/remove.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import removePathInjectable from "./remove.injectable"; export default getGlobalOverride(removePathInjectable, () => async () => { diff --git a/packages/core/src/common/fs/watch/watch.global-override-for-injectable.ts b/packages/core/src/common/fs/watch/watch.global-override-for-injectable.ts index 689c7150cf..b74c3eec20 100644 --- a/packages/core/src/common/fs/watch/watch.global-override-for-injectable.ts +++ b/packages/core/src/common/fs/watch/watch.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 "../../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import watchInjectable from "./watch.injectable"; export default getGlobalOverride(watchInjectable, () => () => { diff --git a/packages/core/src/common/fs/write-file.global-override-for-injectable.ts b/packages/core/src/common/fs/write-file.global-override-for-injectable.ts index c8b7ef8e45..e87f648305 100644 --- a/packages/core/src/common/fs/write-file.global-override-for-injectable.ts +++ b/packages/core/src/common/fs/write-file.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import writeFileInjectable from "./write-file.injectable"; export default getGlobalOverride(writeFileInjectable, () => async () => { diff --git a/packages/core/src/common/get-configuration-file-model/get-configuration-file-model.global-override-for-injectable.ts b/packages/core/src/common/get-configuration-file-model/get-configuration-file-model.global-override-for-injectable.ts index 5f51460a2b..95e2845825 100644 --- a/packages/core/src/common/get-configuration-file-model/get-configuration-file-model.global-override-for-injectable.ts +++ b/packages/core/src/common/get-configuration-file-model/get-configuration-file-model.global-override-for-injectable.ts @@ -5,7 +5,7 @@ import assert from "assert"; import path from "path"; -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import getConfigurationFileModelInjectable from "./get-configuration-file-model.injectable"; import type Config from "conf"; import readJsonSyncInjectable from "../fs/read-json-sync.injectable"; diff --git a/packages/core/src/common/ipc/broadcast-message.global-override-for-injectable.ts b/packages/core/src/common/ipc/broadcast-message.global-override-for-injectable.ts index 669f4ca79f..519d0761ed 100644 --- a/packages/core/src/common/ipc/broadcast-message.global-override-for-injectable.ts +++ b/packages/core/src/common/ipc/broadcast-message.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverrideForFunction } from "../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; import broadcastMessageInjectable from "./broadcast-message.injectable"; export default getGlobalOverrideForFunction(broadcastMessageInjectable); diff --git a/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts b/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts index 49f1347e68..081fb5bf64 100644 --- a/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts @@ -10,7 +10,7 @@ import type { Fetch } from "../../fetch/fetch.injectable"; import fetchInjectable from "../../fetch/fetch.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import { flushPromises } from "../../test-utils/flush-promises"; +import { flushPromises } from "@k8slens/test-utils"; import setupAutoRegistrationInjectable from "../../../renderer/before-frame-starts/runnables/setup-auto-registration.injectable"; import { createMockResponseFromString } from "../../../test-utils/mock-responses"; import storesAndApisCanBeCreatedInjectable from "../../../renderer/stores-apis-can-be-created.injectable"; diff --git a/packages/core/src/common/k8s-api/__tests__/kube-api.test.ts b/packages/core/src/common/k8s-api/__tests__/kube-api.test.ts index c5b0364da9..e559c4ce83 100644 --- a/packages/core/src/common/k8s-api/__tests__/kube-api.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/kube-api.test.ts @@ -15,7 +15,7 @@ import type { CreateKubeApiForRemoteCluster } from "../create-kube-api-for-remot import createKubeApiForRemoteClusterInjectable from "../create-kube-api-for-remote-cluster.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import { flushPromises } from "../../test-utils/flush-promises"; +import { flushPromises } from "@k8slens/test-utils"; import createKubeJsonApiInjectable from "../create-kube-json-api.injectable"; import type { IKubeWatchEvent } from "../kube-watch-event"; import type { KubeJsonApiDataFor } from "../kube-object"; diff --git a/packages/core/src/common/k8s-api/api-manager/api-manager.ts b/packages/core/src/common/k8s-api/api-manager/api-manager.ts index 04d059e418..f6c2758921 100644 --- a/packages/core/src/common/k8s-api/api-manager/api-manager.ts +++ b/packages/core/src/common/k8s-api/api-manager/api-manager.ts @@ -10,7 +10,7 @@ import { autorun, action, observable } from "mobx"; import type { KubeApi } from "../kube-api"; import type { KubeObject, ObjectReference } from "../kube-object"; import { parseKubeApi, createKubeApiURL } from "../kube-api-parse"; -import { chain, find } from "@k8slens/utilities"; +import { iter } from "@k8slens/utilities"; export type RegisterableStore = Store extends KubeObjectStore ? Store @@ -38,7 +38,7 @@ export class ApiManager { constructor(private readonly dependencies: Dependencies) { // NOTE: this is done to preserve the old behaviour of an API being discoverable using all previous apiBases autorun(() => { - const apis = chain(this.dependencies.apis.get().values()) + const apis = iter.chain(this.dependencies.apis.get().values()) .concat(this.externalApis.values()); const removedApis = new Set(this.apis.values()); const newState = new Map(this.apis); @@ -62,7 +62,7 @@ export class ApiManager { getApi(pathOrCallback: string | FindApiCallback) { if (typeof pathOrCallback === "function") { - return find(this.apis.values(), pathOrCallback); + return iter.find(this.apis.values(), pathOrCallback); } const { apiBase } = parseKubeApi(pathOrCallback); @@ -130,7 +130,7 @@ export class ApiManager { return undefined; } - return chain(this.dependencies.stores.get().values()) + return iter.chain(this.dependencies.stores.get().values()) .concat(this.externalStores.values()) .find(store => store.api.apiBase === api.apiBase); } diff --git a/packages/core/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.global-override-for-injectable.ts b/packages/core/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.global-override-for-injectable.ts index 18b3bd0ec0..631d4c5e17 100644 --- a/packages/core/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.global-override-for-injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../../../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import requestHelmReleaseConfigurationInjectable from "./request-configuration.injectable"; export default getGlobalOverride(requestHelmReleaseConfigurationInjectable, () => () => { diff --git a/packages/core/src/common/k8s-api/window-location.global-override-for-injectable.ts b/packages/core/src/common/k8s-api/window-location.global-override-for-injectable.ts index 616e110c88..3a75fb6134 100644 --- a/packages/core/src/common/k8s-api/window-location.global-override-for-injectable.ts +++ b/packages/core/src/common/k8s-api/window-location.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import windowLocationInjectable from "./window-location.injectable"; export default getGlobalOverride(windowLocationInjectable, () => ({ diff --git a/packages/core/src/common/os/temp-directory-path.global-override-for-injectable.ts b/packages/core/src/common/os/temp-directory-path.global-override-for-injectable.ts index 05615644f9..dde5e3008c 100644 --- a/packages/core/src/common/os/temp-directory-path.global-override-for-injectable.ts +++ b/packages/core/src/common/os/temp-directory-path.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import tempDirectoryPathInjectable from "./temp-directory-path.injectable"; export default getGlobalOverride(tempDirectoryPathInjectable, () => "/some-temp-directory"); diff --git a/packages/core/src/common/path/get-absolute-path.global-override-for-injectable.ts b/packages/core/src/common/path/get-absolute-path.global-override-for-injectable.ts index 15f377cb2c..6ebbd34bd8 100644 --- a/packages/core/src/common/path/get-absolute-path.global-override-for-injectable.ts +++ b/packages/core/src/common/path/get-absolute-path.global-override-for-injectable.ts @@ -4,7 +4,7 @@ */ import path from "path"; -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import getAbsolutePathInjectable from "./get-absolute-path.injectable"; export default getGlobalOverride(getAbsolutePathInjectable, () => path.posix.resolve); diff --git a/packages/core/src/common/path/get-basename.global-override-for-injectable.ts b/packages/core/src/common/path/get-basename.global-override-for-injectable.ts index 913ec9c5c2..76c45ae30f 100644 --- a/packages/core/src/common/path/get-basename.global-override-for-injectable.ts +++ b/packages/core/src/common/path/get-basename.global-override-for-injectable.ts @@ -4,7 +4,7 @@ */ import path from "path"; -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import getBasenameOfPathInjectable from "./get-basename.injectable"; export default getGlobalOverride(getBasenameOfPathInjectable, () => path.posix.basename); diff --git a/packages/core/src/common/path/get-dirname.global-override-for-injectable.ts b/packages/core/src/common/path/get-dirname.global-override-for-injectable.ts index ed694de182..5579636551 100644 --- a/packages/core/src/common/path/get-dirname.global-override-for-injectable.ts +++ b/packages/core/src/common/path/get-dirname.global-override-for-injectable.ts @@ -4,7 +4,7 @@ */ import path from "path"; -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import getDirnameOfPathInjectable from "./get-dirname.injectable"; export default getGlobalOverride(getDirnameOfPathInjectable, () => path.posix.dirname); diff --git a/packages/core/src/common/path/get-relative-path.global-override-for-injectable.ts b/packages/core/src/common/path/get-relative-path.global-override-for-injectable.ts index 9e96b70301..987165af15 100644 --- a/packages/core/src/common/path/get-relative-path.global-override-for-injectable.ts +++ b/packages/core/src/common/path/get-relative-path.global-override-for-injectable.ts @@ -4,7 +4,7 @@ */ import path from "path"; -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import getRelativePathInjectable from "./get-relative-path.injectable"; export default getGlobalOverride(getRelativePathInjectable, () => path.posix.relative); diff --git a/packages/core/src/common/path/join-paths.global-override-for-injectable.ts b/packages/core/src/common/path/join-paths.global-override-for-injectable.ts index d3e9d5e4c2..320490c0f3 100644 --- a/packages/core/src/common/path/join-paths.global-override-for-injectable.ts +++ b/packages/core/src/common/path/join-paths.global-override-for-injectable.ts @@ -4,7 +4,7 @@ */ import path from "path"; -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import joinPathsInjectable from "./join-paths.injectable"; export default getGlobalOverride(joinPathsInjectable, () => path.posix.join); diff --git a/packages/core/src/common/path/parse.global-override-for-injectable.ts b/packages/core/src/common/path/parse.global-override-for-injectable.ts index fad97db696..9dbc434bca 100644 --- a/packages/core/src/common/path/parse.global-override-for-injectable.ts +++ b/packages/core/src/common/path/parse.global-override-for-injectable.ts @@ -4,7 +4,7 @@ */ import path from "path"; -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import parsePathInjectable from "./parse.injectable"; export default getGlobalOverride(parsePathInjectable, () => path.posix.parse); diff --git a/packages/core/src/common/path/separator.global-override-for-injectable.ts b/packages/core/src/common/path/separator.global-override-for-injectable.ts index 655f8908b0..25d0700481 100644 --- a/packages/core/src/common/path/separator.global-override-for-injectable.ts +++ b/packages/core/src/common/path/separator.global-override-for-injectable.ts @@ -4,7 +4,7 @@ */ import path from "path"; -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import fileSystemSeparatorInjectable from "./separator.injectable"; export default getGlobalOverride(fileSystemSeparatorInjectable, () => path.posix.sep); diff --git a/packages/core/src/common/user-store/current-timezone.global-override-for-injectable.ts b/packages/core/src/common/user-store/current-timezone.global-override-for-injectable.ts index 6056074d3c..ef831ca3c1 100644 --- a/packages/core/src/common/user-store/current-timezone.global-override-for-injectable.ts +++ b/packages/core/src/common/user-store/current-timezone.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import currentTimezoneInjectable from "./current-timezone.injectable"; export default getGlobalOverride(currentTimezoneInjectable, () => "Etc/GMT"); diff --git a/packages/core/src/common/user-store/file-name-migration.global-override-for-injectable.ts b/packages/core/src/common/user-store/file-name-migration.global-override-for-injectable.ts index bb0ac054f3..0cd1383cc6 100644 --- a/packages/core/src/common/user-store/file-name-migration.global-override-for-injectable.ts +++ b/packages/core/src/common/user-store/file-name-migration.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import userStoreFileNameMigrationInjectable from "./file-name-migration.injectable"; export default getGlobalOverride(userStoreFileNameMigrationInjectable, () => async () => {}); diff --git a/packages/core/src/common/user-store/user-info.global-override-for-injectable.ts b/packages/core/src/common/user-store/user-info.global-override-for-injectable.ts index 21fb26f8a9..cc650f6de3 100644 --- a/packages/core/src/common/user-store/user-info.global-override-for-injectable.ts +++ b/packages/core/src/common/user-store/user-info.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import userInfoInjectable from "./user-info.injectable"; export default getGlobalOverride(userInfoInjectable, () => ({ diff --git a/packages/core/src/common/utils/channel/channel.test.ts b/packages/core/src/common/utils/channel/channel.test.ts index 72204d4fb6..c27817dd68 100644 --- a/packages/core/src/common/utils/channel/channel.test.ts +++ b/packages/core/src/common/utils/channel/channel.test.ts @@ -16,7 +16,7 @@ import { requestFromChannelInjectionToken } from "./request-from-channel-injecti import type { RequestChannel } from "./request-channel-listener-injection-token"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import { getPromiseStatus } from "../../test-utils/get-promise-status"; +import { getPromiseStatus } from "@k8slens/test-utils"; import { runInAction } from "mobx"; import type { RequestChannelHandler } from "../../../main/utils/channel/channel-listeners/listener-tokens"; import { diff --git a/packages/core/src/common/utils/channel/listening-on-message-channels.injectable.ts b/packages/core/src/common/utils/channel/listening-on-message-channels.injectable.ts index afe0c08f24..6ebc9ca7c1 100644 --- a/packages/core/src/common/utils/channel/listening-on-message-channels.injectable.ts +++ b/packages/core/src/common/utils/channel/listening-on-message-channels.injectable.ts @@ -4,9 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { getStartableStoppable } from "../get-startable-stoppable"; -import { disposer } from "../index"; import { messageChannelListenerInjectionToken } from "./message-channel-listener-injection-token"; import { enlistMessageChannelListenerInjectionToken } from "./enlist-message-channel-listener-injection-token"; +import { disposer } from "@k8slens/utilities"; const listeningOnMessageChannelsInjectable = getInjectable({ id: "listening-on-message-channels", diff --git a/packages/core/src/common/utils/composable-responsibilities/showable/showable.ts b/packages/core/src/common/utils/composable-responsibilities/showable/showable.ts index ad8e2ed25b..c31f1cd8ee 100644 --- a/packages/core/src/common/utils/composable-responsibilities/showable/showable.ts +++ b/packages/core/src/common/utils/composable-responsibilities/showable/showable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { isBoolean } from "@k8slens/utilities"; import type { IComputedValue } from "mobx"; -import { isBoolean } from "../../type-narrowing"; export interface Showable { readonly isShown: IComputedValue | boolean; diff --git a/packages/core/src/common/utils/get-random-id.global-override-for-injectable.ts b/packages/core/src/common/utils/get-random-id.global-override-for-injectable.ts index a0f87b4180..36f598cde1 100644 --- a/packages/core/src/common/utils/get-random-id.global-override-for-injectable.ts +++ b/packages/core/src/common/utils/get-random-id.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import getRandomIdInjectable from "./get-random-id.injectable"; export default getGlobalOverride(getRandomIdInjectable, () => () => "some-irrelevant-random-id"); diff --git a/packages/core/src/common/utils/open-link-in-browser.global-override-for-injectable.ts b/packages/core/src/common/utils/open-link-in-browser.global-override-for-injectable.ts index 62c1539757..d7e005020e 100644 --- a/packages/core/src/common/utils/open-link-in-browser.global-override-for-injectable.ts +++ b/packages/core/src/common/utils/open-link-in-browser.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import openLinkInBrowserInjectable from "./open-link-in-browser.injectable"; export default getGlobalOverride(openLinkInBrowserInjectable, () => async () => {}); diff --git a/packages/core/src/common/utils/random-bytes.global-override-for-injectable.ts b/packages/core/src/common/utils/random-bytes.global-override-for-injectable.ts index 9fce1baebd..d4cc7519cd 100644 --- a/packages/core/src/common/utils/random-bytes.global-override-for-injectable.ts +++ b/packages/core/src/common/utils/random-bytes.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import randomBytesInjectable from "./random-bytes.injectable"; export default getGlobalOverride(randomBytesInjectable, () => (size) => { diff --git a/packages/core/src/common/utils/reactive-now/reactive-now.test.tsx b/packages/core/src/common/utils/reactive-now/reactive-now.test.tsx index ab9b185438..41b9ed412e 100644 --- a/packages/core/src/common/utils/reactive-now/reactive-now.test.tsx +++ b/packages/core/src/common/utils/reactive-now/reactive-now.test.tsx @@ -8,7 +8,7 @@ import type { IComputedValue } from "mobx"; import { computed, observe } from "mobx"; import React from "react"; import { observer } from "mobx-react"; -import { advanceFakeTime, testUsingFakeTime } from "../../test-utils/use-fake-time"; +import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; import { reactiveNow } from "./reactive-now"; describe("reactiveNow", () => { diff --git a/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts b/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts index b1140d4e54..a0638e9db3 100644 --- a/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts +++ b/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts @@ -8,7 +8,7 @@ import withErrorLoggingInjectable from "./with-error-logging.injectable"; import { pipeline } from "@ogre-tools/fp"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import { getPromiseStatus } from "../../test-utils/get-promise-status"; +import { getPromiseStatus } from "@k8slens/test-utils"; import logErrorInjectable from "../../log-error.injectable"; describe("with-error-logging", () => { diff --git a/packages/core/src/common/utils/with-error-suppression/with-error-suppression.test.ts b/packages/core/src/common/utils/with-error-suppression/with-error-suppression.test.ts index 12d6a60441..63232ad06d 100644 --- a/packages/core/src/common/utils/with-error-suppression/with-error-suppression.test.ts +++ b/packages/core/src/common/utils/with-error-suppression/with-error-suppression.test.ts @@ -5,7 +5,7 @@ import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import { getPromiseStatus } from "../../test-utils/get-promise-status"; +import { getPromiseStatus } from "@k8slens/test-utils"; import { withErrorSuppression } from "./with-error-suppression"; describe("with-error-suppression", () => { diff --git a/packages/core/src/common/vars/extension-api-version.global-override-for-injectable.ts b/packages/core/src/common/vars/extension-api-version.global-override-for-injectable.ts index 6d473eb1de..b1a74f47b6 100644 --- a/packages/core/src/common/vars/extension-api-version.global-override-for-injectable.ts +++ b/packages/core/src/common/vars/extension-api-version.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import extensionApiVersionInjectable from "./extension-api-version.injectable"; export default getGlobalOverride(extensionApiVersionInjectable, () => "6.0.0"); diff --git a/packages/core/src/common/vars/is-debugging.global-override-for-injectable.ts b/packages/core/src/common/vars/is-debugging.global-override-for-injectable.ts index 7aa500ff2e..fab25913ed 100644 --- a/packages/core/src/common/vars/is-debugging.global-override-for-injectable.ts +++ b/packages/core/src/common/vars/is-debugging.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import isDebuggingInjectable from "./is-debugging.injectable"; export default getGlobalOverride(isDebuggingInjectable, () => false); diff --git a/packages/core/src/common/vars/is-snap-package.global-override-for-injectable.ts b/packages/core/src/common/vars/is-snap-package.global-override-for-injectable.ts index cb3ff0a6e9..a18d89f221 100644 --- a/packages/core/src/common/vars/is-snap-package.global-override-for-injectable.ts +++ b/packages/core/src/common/vars/is-snap-package.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import isSnapPackageInjectable from "./is-snap-package.injectable"; export default getGlobalOverride(isSnapPackageInjectable, () => false); diff --git a/packages/core/src/common/vars/lens-resources-dir.global-override-for-injectable.ts b/packages/core/src/common/vars/lens-resources-dir.global-override-for-injectable.ts index 1a72b0ccf7..f40bbe6cd4 100644 --- a/packages/core/src/common/vars/lens-resources-dir.global-override-for-injectable.ts +++ b/packages/core/src/common/vars/lens-resources-dir.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import lensResourcesDirInjectable from "./lens-resources-dir.injectable"; export default getGlobalOverride(lensResourcesDirInjectable, () => "/irrelavent-dir-for-lens-resources"); diff --git a/packages/core/src/common/vars/platform.global-override-for-injectable.ts b/packages/core/src/common/vars/platform.global-override-for-injectable.ts index 4bb06dec5e..2825ebe8cf 100644 --- a/packages/core/src/common/vars/platform.global-override-for-injectable.ts +++ b/packages/core/src/common/vars/platform.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import platformInjectable from "./platform.injectable"; export default getGlobalOverride(platformInjectable, () => "darwin"); diff --git a/packages/core/src/common/vars/process-arch.global-override-for-injectable.ts b/packages/core/src/common/vars/process-arch.global-override-for-injectable.ts index 42d74d4ec8..bdc4c5e823 100644 --- a/packages/core/src/common/vars/process-arch.global-override-for-injectable.ts +++ b/packages/core/src/common/vars/process-arch.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import processArchInjectable from "./process-arch.injectable"; export default getGlobalOverride(processArchInjectable, () => "x64"); diff --git a/packages/core/src/common/vars/static-files-directory.global-override-for-injectable.ts b/packages/core/src/common/vars/static-files-directory.global-override-for-injectable.ts index 3b8ec43046..2ed47dd1a4 100644 --- a/packages/core/src/common/vars/static-files-directory.global-override-for-injectable.ts +++ b/packages/core/src/common/vars/static-files-directory.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 "../test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import staticFilesDirectoryInjectable from "./static-files-directory.injectable"; export default getGlobalOverride(staticFilesDirectoryInjectable, () => "/some-static-directory"); diff --git a/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts b/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts index e1e31cd113..d8d336ef56 100644 --- a/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts +++ b/packages/core/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 "../../../../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; export default getGlobalOverrideForFunction(checkForPlatformUpdatesInjectable); diff --git a/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.global-override-for-injectable.ts b/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.global-override-for-injectable.ts index 49b57565fd..5a339e3ea3 100644 --- a/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.global-override-for-injectable.ts +++ b/packages/core/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 "../../../../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; import downloadPlatformUpdateInjectable from "./download-platform-update.injectable"; export default getGlobalOverrideForFunction(downloadPlatformUpdateInjectable); diff --git a/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.global-override-for-injectable.ts b/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.global-override-for-injectable.ts index 40d68a335a..f4fff46cce 100644 --- a/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.global-override-for-injectable.ts +++ b/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverrideForFunction } from "../../../../../../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; import requestPublicHelmRepositoriesInjectable from "./request-public-helm-repositories.injectable"; export default getGlobalOverrideForFunction(requestPublicHelmRepositoriesInjectable); diff --git a/packages/core/src/features/shell-sync/main/setup-shell.injectable.ts b/packages/core/src/features/shell-sync/main/setup-shell.injectable.ts index c75f5cc04b..44e351a054 100644 --- a/packages/core/src/features/shell-sync/main/setup-shell.injectable.ts +++ b/packages/core/src/features/shell-sync/main/setup-shell.injectable.ts @@ -5,12 +5,12 @@ import { getInjectable } from "@ogre-tools/injectable"; import loggerInjectable from "../../../common/logger.injectable"; import { onLoadOfApplicationInjectionToken } from "../../../main/start-main-application/runnable-tokens/phases"; -import { unionPATHs } from "../../../common/utils/union-env-path"; import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable"; import electronAppInjectable from "../../../main/electron-app/electron-app.injectable"; import computeShellEnvironmentInjectable from "./compute-shell-environment.injectable"; import userShellSettingInjectable from "../../../common/user-store/shell-setting.injectable"; import emitShellSyncFailedInjectable from "./emit-failure.injectable"; +import { unionPATHs } from "@k8slens/utilities"; const setupShellInjectable = getInjectable({ id: "setup-shell", diff --git a/packages/core/src/main/cluster/request-api-resources.injectable.ts b/packages/core/src/main/cluster/request-api-resources.injectable.ts index 3f4610ef7b..ed3ad376cc 100644 --- a/packages/core/src/main/cluster/request-api-resources.injectable.ts +++ b/packages/core/src/main/cluster/request-api-resources.injectable.ts @@ -8,10 +8,9 @@ import loggerInjectable from "../../common/logger.injectable"; import type { KubeApiResource } from "../../common/rbac"; import type { Cluster } from "../../common/cluster/cluster"; import { requestApiVersionsInjectionToken } from "./request-api-versions"; -import { withConcurrencyLimit } from "@k8slens/utilities"; +import { backoffCaller, withConcurrencyLimit } from "@k8slens/utilities"; import requestKubeApiResourcesForInjectable from "./request-kube-api-resources-for.injectable"; import type { AsyncResult } from "@k8slens/utilities"; -import { backoffCaller } from "../../common/utils/backoff-caller"; export type RequestApiResources = (cluster: Cluster) => AsyncResult; diff --git a/packages/core/src/main/cluster/request-non-core-api-versions.injectable.ts b/packages/core/src/main/cluster/request-non-core-api-versions.injectable.ts index aafbce062d..bbb75b9d25 100644 --- a/packages/core/src/main/cluster/request-non-core-api-versions.injectable.ts +++ b/packages/core/src/main/cluster/request-non-core-api-versions.injectable.ts @@ -4,7 +4,7 @@ */ import type { V1APIGroupList } from "@kubernetes/client-node"; import { getInjectable } from "@ogre-tools/injectable"; -import { chain } from "@k8slens/utilities"; +import { iter } from "@k8slens/utilities"; import k8sRequestInjectable from "../k8s-request.injectable"; import { requestApiVersionsInjectionToken } from "./request-api-versions"; @@ -19,7 +19,7 @@ const requestNonCoreApiVersionsInjectable = getInjectable({ return { callWasSuccessful: true, - response: chain(groups.values()) + response: iter.chain(groups.values()) .filterMap(group => group.preferredVersion?.groupVersion && ({ group: group.name, path: `/apis/${group.preferredVersion.groupVersion}`, diff --git a/packages/core/src/main/electron-app/features/show-open-dialog.global-override-for-injectable.ts b/packages/core/src/main/electron-app/features/show-open-dialog.global-override-for-injectable.ts index 232575f9a3..5015b2c07f 100644 --- a/packages/core/src/main/electron-app/features/show-open-dialog.global-override-for-injectable.ts +++ b/packages/core/src/main/electron-app/features/show-open-dialog.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverrideForFunction } from "../../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; import showOpenDialogInjectable from "./show-open-dialog.injectable"; export default getGlobalOverrideForFunction(showOpenDialogInjectable); diff --git a/packages/core/src/main/helm/helm-service/get-helm-release-resources/call-for-kube-resources-by-manifest/call-for-kube-resources-by-manifest.injectable.ts b/packages/core/src/main/helm/helm-service/get-helm-release-resources/call-for-kube-resources-by-manifest/call-for-kube-resources-by-manifest.injectable.ts index 69ce5cc697..637a4788a8 100644 --- a/packages/core/src/main/helm/helm-service/get-helm-release-resources/call-for-kube-resources-by-manifest/call-for-kube-resources-by-manifest.injectable.ts +++ b/packages/core/src/main/helm/helm-service/get-helm-release-resources/call-for-kube-resources-by-manifest/call-for-kube-resources-by-manifest.injectable.ts @@ -4,7 +4,6 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { JsonObject } from "type-fest"; -import { json } from "@k8slens/utilities"; import yaml from "js-yaml"; import execFileWithInputInjectable from "./exec-file-with-input/exec-file-with-input.injectable"; import { getErrorMessage } from "../../../../../common/utils/get-error-message"; @@ -60,7 +59,7 @@ const callForKubeResourcesByManifestInjectable = getInjectable({ throw new Error(errorMessage); } - const output = json.parse(result.response) as { items: JsonObject[] }; + const output = JSON.parse(result.response) as { items: JsonObject[] }; return output.items; }; diff --git a/packages/core/src/main/kubectl/create-kubectl.injectable.ts b/packages/core/src/main/kubectl/create-kubectl.injectable.ts index adfce0922f..3fc98d8bc1 100644 --- a/packages/core/src/main/kubectl/create-kubectl.injectable.ts +++ b/packages/core/src/main/kubectl/create-kubectl.injectable.ts @@ -18,6 +18,8 @@ import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable import joinPathsInjectable from "../../common/path/join-paths.injectable"; import getBasenameOfPathInjectable from "../../common/path/get-basename.injectable"; import loggerInjectable from "../../common/logger.injectable"; +import execFileInjectable from "../../common/fs/exec-file.injectable"; +import unlinkInjectable from "../../common/fs/unlink.injectable"; const createKubectlInjectable = getInjectable({ id: "create-kubectl", @@ -37,6 +39,8 @@ const createKubectlInjectable = getInjectable({ getDirnameOfPath: di.inject(getDirnameOfPathInjectable), joinPaths: di.inject(joinPathsInjectable), getBasenameOfPath: di.inject(getBasenameOfPathInjectable), + execFile: di.inject(execFileInjectable), + unlink: di.inject(unlinkInjectable), }; return (clusterVersion: string) => new Kubectl(dependencies, clusterVersion); diff --git a/packages/core/src/renderer/components/+custom-resources/crd-resources.tsx b/packages/core/src/renderer/components/+custom-resources/crd-resources.tsx index 3cd0864c36..3f89254d2a 100644 --- a/packages/core/src/renderer/components/+custom-resources/crd-resources.tsx +++ b/packages/core/src/renderer/components/+custom-resources/crd-resources.tsx @@ -11,7 +11,7 @@ import { KubeObjectListLayout } from "../kube-object-list-layout"; import type { IComputedValue } from "mobx"; import { computed, makeObservable } from "mobx"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; -import { formatJSONValue, safeJSONPathValue } from "../../utils/jsonPath"; +import { formatJSONValue, safeJSONPathValue } from "@k8slens/utilities"; import { TabLayout } from "../layout/tab-layout-2"; import { withInjectables } from "@ogre-tools/injectable-react"; import customResourcesRouteParametersInjectable from "./custom-resources-route-parameters.injectable"; diff --git a/packages/core/src/renderer/components/+nodes/route.tsx b/packages/core/src/renderer/components/+nodes/route.tsx index e00895ca71..99e5900c87 100644 --- a/packages/core/src/renderer/components/+nodes/route.tsx +++ b/packages/core/src/renderer/components/+nodes/route.tsx @@ -6,13 +6,12 @@ import "./nodes.scss"; import React from "react"; import { observer } from "mobx-react"; -import { cssNames, interval } from "@k8slens/utilities"; +import { bytesToUnits, cssNames, interval } from "@k8slens/utilities"; import { TabLayout } from "../layout/tab-layout-2"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import type { Node } from "../../../common/k8s-api/endpoints/node.api"; import { formatNodeTaint } from "../../../common/k8s-api/endpoints/node.api"; import { LineProgress } from "../line-progress"; -import { bytesToUnits } from "../../../common/utils/convertMemory"; import { Tooltip, TooltipPosition } from "../tooltip"; import kebabCase from "lodash/kebabCase"; import upperFirst from "lodash/upperFirst"; diff --git a/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.tsx b/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.tsx index 4cc84bbde1..0e04c92f49 100644 --- a/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.tsx +++ b/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.tsx @@ -9,8 +9,7 @@ import React from "react"; import { observer } from "mobx-react"; import { Link } from "react-router-dom"; import { KubeObjectListLayout } from "../kube-object-list-layout"; -import { unitsToBytes } from "../../../common/utils/convertMemory"; -import { stopPropagation } from "@k8slens/utilities"; +import { unitsToBytes, stopPropagation } from "@k8slens/utilities"; import type { StorageClassApi } from "../../../common/k8s-api/endpoints"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; diff --git a/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/dialog/view.tsx b/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/dialog/view.tsx index 42e107a3ce..8c870704bf 100644 --- a/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/dialog/view.tsx +++ b/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/dialog/view.tsx @@ -18,7 +18,7 @@ import { Icon } from "../../../icon"; import { SubTitle } from "../../../layout/sub-title"; import { onMultiSelectFor, Select } from "../../../select"; import { Wizard, WizardStep } from "../../../wizard"; -import { ObservableHashSet, nFircate } from "@k8slens/utilities"; +import { ObservableHashSet, iter } from "@k8slens/utilities"; import { Input } from "../../../input"; import { TooltipPosition } from "../../../tooltip"; import type { Subject } from "../../../../../common/k8s-api/endpoints/types/subject"; @@ -124,7 +124,7 @@ class NonInjectedClusterRoleBindingDialog extends React.Component item.getName() === binding.roleRef.name); - const [saSubjects, uSubjects, gSubjects] = nFircate(binding.getSubjects(), "kind", ["ServiceAccount", "User", "Group"]); + const [saSubjects, uSubjects, gSubjects] = iter.nFircate(binding.getSubjects(), "kind", ["ServiceAccount", "User", "Group"]); const accountNames = new Set(saSubjects.map(acc => acc.name)); this.selectedAccounts.replace( diff --git a/packages/core/src/renderer/components/+user-management/+role-bindings/details.tsx b/packages/core/src/renderer/components/+user-management/+role-bindings/details.tsx index d95e95131c..474e071d86 100644 --- a/packages/core/src/renderer/components/+user-management/+role-bindings/details.tsx +++ b/packages/core/src/renderer/components/+user-management/+role-bindings/details.tsx @@ -9,12 +9,11 @@ import { reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import React from "react"; import type { RoleBinding } from "../../../../common/k8s-api/endpoints"; -import { prevDefault } from "@k8slens/utilities"; +import { prevDefault, ObservableHashSet } from "@k8slens/utilities"; import { AddRemoveButtons } from "../../add-remove-buttons"; import { DrawerTitle } from "../../drawer"; import type { KubeObjectDetailsProps } from "../../kube-object-details"; import { Table, TableCell, TableHead, TableRow } from "../../table"; -import { ObservableHashSet } from "../../../../common/utils/hash-set"; import { hashSubject } from "../hashers"; import type { OpenConfirmDialog } from "../../confirm-dialog/open.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; diff --git a/packages/core/src/renderer/components/+user-management/+role-bindings/dialog/view.tsx b/packages/core/src/renderer/components/+user-management/+role-bindings/dialog/view.tsx index 003e7e6382..ada6080c0d 100644 --- a/packages/core/src/renderer/components/+user-management/+role-bindings/dialog/view.tsx +++ b/packages/core/src/renderer/components/+user-management/+role-bindings/dialog/view.tsx @@ -20,7 +20,7 @@ import type { SelectOption } from "../../../select"; import { onMultiSelectFor, Select } from "../../../select"; import { Wizard, WizardStep } from "../../../wizard"; import { Input } from "../../../input"; -import { ObservableHashSet, nFircate } from "@k8slens/utilities"; +import { ObservableHashSet, iter } from "@k8slens/utilities"; import type { Subject } from "../../../../../common/k8s-api/endpoints/types/subject"; import type { RoleBindingDialogState } from "./state.injectable"; import type { RoleBindingStore } from "../store"; @@ -147,7 +147,7 @@ class NonInjectedRoleBindingDialog extends React.Component acc.name)); this.selectedAccounts.replace( diff --git a/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts b/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts index 1f52dd7c85..029baa34a5 100644 --- a/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts +++ b/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts @@ -6,11 +6,12 @@ import { action, makeObservable, observable, when } from "mobx"; import type { ClusterId } from "../../../common/cluster-types"; import type { Disposer } from "@k8slens/utilities"; -import { getClusterFrameUrl, onceDefined } from "@k8slens/utilities"; +import { onceDefined } from "@k8slens/utilities"; import assert from "assert"; import type { Logger } from "../../../common/logger"; import type { GetClusterById } from "../../../common/cluster-store/get-by-id.injectable"; import type { EmitClusterVisibility } from "./emit-cluster-visibility.injectable"; +import { getClusterFrameUrl } from "../../../common/utils"; export interface LensView { isLoaded: boolean; diff --git a/packages/core/src/renderer/components/command-palette/command-container.tsx b/packages/core/src/renderer/components/command-palette/command-container.tsx index ca3d36bb00..bc8f38141b 100644 --- a/packages/core/src/renderer/components/command-palette/command-container.tsx +++ b/packages/core/src/renderer/components/command-palette/command-container.tsx @@ -22,7 +22,7 @@ import matchedClusterIdInjectable from "../../navigation/matched-cluster-id.inje import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable"; import isMacInjectable from "../../../common/vars/is-mac.injectable"; import legacyOnChannelListenInjectable from "../../ipc/legacy-channel-listen.injectable"; -import { onKeyboardShortcut } from "../../utils/on-keyboard-shortcut"; +import { onKeyboardShortcut } from "@k8slens/utilities"; interface Dependencies { addWindowEventListener: AddWindowEventListener; diff --git a/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts b/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts index d0b0680ca3..d69b5b0772 100644 --- a/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts +++ b/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed, observable } from "mobx"; -import { delay, getOrInsert, isErrnoException, waitForPath } from "@k8slens/utilities"; +import { delay, getOrInsert, isErrnoException } from "@k8slens/utilities"; import { readFile } from "fs/promises"; import { hasCorrectExtension } from "./has-correct-extension"; import type { RawTemplates } from "./create-resource-templates.injectable"; @@ -15,6 +15,7 @@ import homeDirectoryPathInjectable from "../../../../common/os/home-directory-pa import getDirnameOfPathInjectable from "../../../../common/path/get-dirname.injectable"; import loggerInjectable from "../../../../common/logger.injectable"; import parsePathInjectable from "../../../../common/path/parse.injectable"; +import { waitForPath } from "../../../../common/utils/wait-for-path"; const userCreateResourceTemplatesInjectable = getInjectable({ id: "user-create-resource-templates", diff --git a/packages/core/src/renderer/components/layout/top-bar/toggle-maximize-window/toggle-maximize-window.global-override-for-injectable.ts b/packages/core/src/renderer/components/layout/top-bar/toggle-maximize-window/toggle-maximize-window.global-override-for-injectable.ts index c9512cb43e..ab457b4f17 100644 --- a/packages/core/src/renderer/components/layout/top-bar/toggle-maximize-window/toggle-maximize-window.global-override-for-injectable.ts +++ b/packages/core/src/renderer/components/layout/top-bar/toggle-maximize-window/toggle-maximize-window.global-override-for-injectable.ts @@ -3,6 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import toggleMaximizeWindowInjectable from "./toggle-maximize-window.injectable"; -import { getGlobalOverrideForFunction } from "../../../../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; export default getGlobalOverrideForFunction(toggleMaximizeWindowInjectable); diff --git a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.global-override-for-injectable.ts b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.global-override-for-injectable.ts index 3210a9c4f8..cac2d6b182 100644 --- a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.global-override-for-injectable.ts +++ b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.global-override-for-injectable.ts @@ -3,6 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import openAppContextMenuInjectable from "./open-app-context-menu.injectable"; -import { getGlobalOverrideForFunction } from "../../../../../../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; export default getGlobalOverrideForFunction(openAppContextMenuInjectable); diff --git a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/go-back/go-back.global-override-for-injectable.ts b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/go-back/go-back.global-override-for-injectable.ts index b54321e220..1b0f4f6741 100644 --- a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/go-back/go-back.global-override-for-injectable.ts +++ b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/go-back/go-back.global-override-for-injectable.ts @@ -3,6 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import goBackInjectable from "./go-back.injectable"; -import { getGlobalOverrideForFunction } from "../../../../../../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; export default getGlobalOverrideForFunction(goBackInjectable); diff --git a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/go-forward/go-forward.global-override-for-injectable.ts b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/go-forward/go-forward.global-override-for-injectable.ts index 3f3d3348c2..0808279e4f 100644 --- a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/go-forward/go-forward.global-override-for-injectable.ts +++ b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/go-forward/go-forward.global-override-for-injectable.ts @@ -3,6 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import goForwardInjectable from "./go-forward.injectable"; -import { getGlobalOverrideForFunction } from "../../../../../../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; export default getGlobalOverrideForFunction(goForwardInjectable); diff --git a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/close-window/close-window.global-override-for-injectable.ts b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/close-window/close-window.global-override-for-injectable.ts index ecd45ec1e6..1d42413183 100644 --- a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/close-window/close-window.global-override-for-injectable.ts +++ b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/close-window/close-window.global-override-for-injectable.ts @@ -3,6 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import closeWindowInjectable from "./close-window.injectable"; -import { getGlobalOverrideForFunction } from "../../../../../../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; export default getGlobalOverrideForFunction(closeWindowInjectable); diff --git a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/maximize-window/maximize-window.global-override-for-injectable.ts b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/maximize-window/maximize-window.global-override-for-injectable.ts index 3c558b6958..12a702c7dd 100644 --- a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/maximize-window/maximize-window.global-override-for-injectable.ts +++ b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/maximize-window/maximize-window.global-override-for-injectable.ts @@ -3,6 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import maximizeWindowInjectable from "./maximize-window.injectable"; -import { getGlobalOverrideForFunction } from "../../../../../../../../../utility-features/test-utils/src/get-global-override-for-function"; +import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; export default getGlobalOverrideForFunction(maximizeWindowInjectable);