diff --git a/src/common/__tests__/hotbar-store.test.ts b/src/common/__tests__/hotbar-store.test.ts index 96c2c675d5..3dab5897db 100644 --- a/src/common/__tests__/hotbar-store.test.ts +++ b/src/common/__tests__/hotbar-store.test.ts @@ -6,11 +6,7 @@ import { anyObject } from "jest-mock-extended"; import mockFs from "mock-fs"; import logger from "../../main/logger"; -import type { - CatalogEntity, - CatalogEntityData, - CatalogEntityKindData, -} from "../catalog"; +import type { CatalogEntity, CatalogEntityData, CatalogEntityKindData } from "../catalog"; import { HotbarStore } from "../hotbar-store"; import { getDiForUnitTesting } from "../../main/getDiForUnitTesting"; import hotbarStoreInjectable from "../hotbar-store.injectable"; @@ -72,9 +68,7 @@ jest.mock("../../main/catalog/catalog-entity-registry", () => ({ }, })); -function getMockCatalogEntity( - data: Partial & CatalogEntityKindData, -): CatalogEntity { +function getMockCatalogEntity(data: Partial & CatalogEntityKindData): CatalogEntity { return { getName: jest.fn(() => data.metadata?.name), getId: jest.fn(() => data.metadata?.uid), @@ -233,16 +227,9 @@ describe("HotbarStore", () => { // aws -> catalog hotbarStore.restackItems(3, 0); - const items = hotbarStore - .getActive() - .items.map((item) => item?.entity.uid || null); + const items = hotbarStore.getActive().items.map(item => item?.entity.uid || null); - expect(items.slice(0, 4)).toEqual([ - "aws", - "catalog-entity", - "test", - "minikube", - ]); + expect(items.slice(0, 4)).toEqual(["aws", "catalog-entity", "test", "minikube"]); }); it("moves items up", () => { @@ -255,16 +242,9 @@ describe("HotbarStore", () => { // test -> aws hotbarStore.restackItems(1, 3); - const items = hotbarStore - .getActive() - .items.map((item) => item?.entity.uid || null); + const items = hotbarStore.getActive().items.map(item => item?.entity.uid || null); - expect(items.slice(0, 4)).toEqual([ - "catalog-entity", - "minikube", - "aws", - "test", - ]); + expect(items.slice(0, 4)).toEqual(["catalog-entity", "minikube", "aws", "test"]); }); it("logs an error if cellIndex is out of bounds", () => { @@ -279,22 +259,13 @@ describe("HotbarStore", () => { logger.error = mocked; hotbarStore.addToHotbar(testCluster, -1); - expect(mocked).toBeCalledWith( - "[HOTBAR-STORE]: cannot pin entity to hotbar outside of index range", - anyObject(), - ); + expect(mocked).toBeCalledWith("[HOTBAR-STORE]: cannot pin entity to hotbar outside of index range", anyObject()); hotbarStore.addToHotbar(testCluster, 12); - expect(mocked).toBeCalledWith( - "[HOTBAR-STORE]: cannot pin entity to hotbar outside of index range", - anyObject(), - ); + expect(mocked).toBeCalledWith("[HOTBAR-STORE]: cannot pin entity to hotbar outside of index range", anyObject()); hotbarStore.addToHotbar(testCluster, 13); - expect(mocked).toBeCalledWith( - "[HOTBAR-STORE]: cannot pin entity to hotbar outside of index range", - anyObject(), - ); + expect(mocked).toBeCalledWith("[HOTBAR-STORE]: cannot pin entity to hotbar outside of index range", anyObject()); logger.error = error; }); @@ -302,23 +273,15 @@ describe("HotbarStore", () => { it("throws an error if getId is invalid or returns not a string", () => { const hotbarStore = HotbarStore.getInstance(); - expect(() => hotbarStore.addToHotbar({} as any)).toThrowError( - TypeError, - ); - expect(() => - hotbarStore.addToHotbar({ getId: () => true } as any), - ).toThrowError(TypeError); + expect(() => hotbarStore.addToHotbar({} as any)).toThrowError(TypeError); + expect(() => hotbarStore.addToHotbar({ getId: () => true } as any)).toThrowError(TypeError); }); it("throws an error if getName is invalid or returns not a string", () => { const hotbarStore = HotbarStore.getInstance(); - expect(() => - hotbarStore.addToHotbar({ getId: () => "" } as any), - ).toThrowError(TypeError); - expect(() => - hotbarStore.addToHotbar({ getId: () => "", getName: () => 4 } as any), - ).toThrowError(TypeError); + expect(() => hotbarStore.addToHotbar({ getId: () => "" } as any)).toThrowError(TypeError); + expect(() => hotbarStore.addToHotbar({ getId: () => "", getName: () => 4 } as any)).toThrowError(TypeError); }); it("does nothing when item moved to same cell", () => { @@ -443,9 +406,7 @@ describe("HotbarStore", () => { }); it("allows to retrieve a hotbar", () => { - const hotbar = HotbarStore.getInstance().getById( - "3caac17f-aec2-4723-9694-ad204465d935", - ); + const hotbar = HotbarStore.getInstance().getById("3caac17f-aec2-4723-9694-ad204465d935"); expect(hotbar.id).toBe("3caac17f-aec2-4723-9694-ad204465d935"); }); diff --git a/src/common/base-store.ts b/src/common/base-store.ts index 6b3b4d17e8..b3d2e6e601 100644 --- a/src/common/base-store.ts +++ b/src/common/base-store.ts @@ -48,12 +48,9 @@ export abstract class BaseStore extends Singleton { */ load() { if (!isTestEnv) { - logger.info( - `[${kebabCase(this.displayName).toUpperCase()}]: LOADING from ${ - this.path - } ...`, - ); + logger.info(`[${kebabCase(this.displayName).toUpperCase()}]: LOADING from ${this.path} ...`); } + const di = getLegacyGlobalDiForExtensionApi(); const getConfigurationFileModel = di.inject(getConfigurationFileModelInjectable); @@ -67,23 +64,14 @@ export abstract class BaseStore extends Singleton { const res: any = this.fromStore(this.storeConfig.store); - if ( - res instanceof Promise || - (typeof res === "object" && res && typeof res.then === "function") - ) { - console.error( - `${this.displayName} extends BaseStore's fromStore method returns a Promise or promise-like object. This is an error and must be fixed.`, - ); + if (res instanceof Promise || (typeof res === "object" && res && typeof res.then === "function")) { + console.error(`${this.displayName} extends BaseStore's fromStore method returns a Promise or promise-like object. This is an error and must be fixed.`); } this.enableSync(); if (!isTestEnv) { - logger.info( - `[${kebabCase(this.displayName).toUpperCase()}]: LOADED from ${ - this.path - }`, - ); + logger.info(`[${kebabCase(this.displayName).toUpperCase()}]: LOADED from ${this.path}`); } } @@ -124,27 +112,23 @@ export abstract class BaseStore extends Singleton { this.syncDisposers.push( reaction( () => toJS(this.toJSON()), // unwrap possible observables and react to everything - (model) => this.onModelChange(model), + model => this.onModelChange(model), this.params.syncOptions, ), ); if (ipcMain) { - this.syncDisposers.push( - ipcMainOn(this.syncMainChannel, (event, model: T) => { - logger.silly(`[STORE]: SYNC ${this.name} from renderer`, { model }); - this.onSync(model); - }), - ); + this.syncDisposers.push(ipcMainOn(this.syncMainChannel, (event, model: T) => { + logger.silly(`[STORE]: SYNC ${this.name} from renderer`, { model }); + this.onSync(model); + })); } if (ipcRenderer) { - this.syncDisposers.push( - ipcRendererOn(this.syncRendererChannel, (event, model: T) => { - logger.silly(`[STORE]: SYNC ${this.name} from main`, { model }); - this.onSyncFromMain(model); - }), - ); + this.syncDisposers.push(ipcRendererOn(this.syncRendererChannel, (event, model: T) => { + logger.silly(`[STORE]: SYNC ${this.name} from main`, { model }); + this.onSyncFromMain(model); + })); } } @@ -160,7 +144,7 @@ export abstract class BaseStore extends Singleton { } disableSync() { - this.syncDisposers.forEach((dispose) => dispose()); + this.syncDisposers.forEach(dispose => dispose()); this.syncDisposers.length = 0; } diff --git a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.ts b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.ts index 733a20908b..340a97c941 100644 --- a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.ts +++ b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.ts @@ -16,4 +16,7 @@ export const asLegacyGlobalObjectForExtensionApiWithModifications = < injectable: Injectable, modificationObject: ModificationObject, ) => - Object.assign(asLegacyGlobalForExtensionApi(injectable), modificationObject); + Object.assign( + asLegacyGlobalForExtensionApi(injectable), + modificationObject, + ); diff --git a/src/extensions/extension-loader/extension-loader.injectable.ts b/src/extensions/extension-loader/extension-loader.injectable.ts index 36d8a7d9f6..87f53cd686 100644 --- a/src/extensions/extension-loader/extension-loader.injectable.ts +++ b/src/extensions/extension-loader/extension-loader.injectable.ts @@ -7,8 +7,7 @@ import { ExtensionLoader } from "./extension-loader"; import updateExtensionsStateInjectable from "./update-extensions-state/update-extensions-state.injectable"; import createExtensionInstanceInjectable from "./create-extension-instance/create-extension-instance.injectable"; import { extensionRegistratorInjectionToken } from "./extension-registrator-injection-token"; -import extensionInstallationCounterInjectable - from "./extension-installation-counter.injectable"; +import extensionInstallationCounterInjectable from "./extension-installation-counter.injectable"; const extensionLoaderInjectable = getInjectable({ id: "extension-loader", diff --git a/src/main/protocol-handler/__test__/router.test.ts b/src/main/protocol-handler/__test__/router.test.ts index 974582e828..d8c88f7f22 100644 --- a/src/main/protocol-handler/__test__/router.test.ts +++ b/src/main/protocol-handler/__test__/router.test.ts @@ -13,16 +13,11 @@ import { ExtensionsStore } from "../../../extensions/extensions-store/extensions import type { LensProtocolRouterMain } from "../lens-protocol-router-main/lens-protocol-router-main"; import mockFs from "mock-fs"; import { getDiForUnitTesting } from "../../getDiForUnitTesting"; -import extensionLoaderInjectable - from "../../../extensions/extension-loader/extension-loader.injectable"; -import lensProtocolRouterMainInjectable - from "../lens-protocol-router-main/lens-protocol-router-main.injectable"; -import extensionsStoreInjectable - from "../../../extensions/extensions-store/extensions-store.injectable"; -import getConfigurationFileModelInjectable - from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable - from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; +import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable"; +import lensProtocolRouterMainInjectable from "../lens-protocol-router-main/lens-protocol-router-main.injectable"; +import extensionsStoreInjectable from "../../../extensions/extensions-store/extensions-store.injectable"; +import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; +import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; jest.mock("../../../common/ipc"); diff --git a/src/migrations/cluster-store/5.0.0-beta.10.ts b/src/migrations/cluster-store/5.0.0-beta.10.ts index f087fca2b6..a9fc759ee4 100644 --- a/src/migrations/cluster-store/5.0.0-beta.10.ts +++ b/src/migrations/cluster-store/5.0.0-beta.10.ts @@ -8,8 +8,7 @@ import fse from "fs-extra"; import type { ClusterModel } from "../../common/cluster-types"; import type { MigrationDeclaration } from "../helpers"; import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; -import directoryForUserDataInjectable - from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; +import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; interface Pre500WorkspaceStoreModel { workspaces: { diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx index 2381c781eb..731ff2aa54 100644 --- a/src/renderer/components/+add-cluster/add-cluster.tsx +++ b/src/renderer/components/+add-cluster/add-cluster.tsx @@ -13,7 +13,6 @@ import { observer } from "mobx-react"; import path from "path"; import React from "react"; import * as uuid from "uuid"; - import { appEventBus } from "../../../common/app-event-bus/event-bus"; import { loadConfigFromString, splitConfig } from "../../../common/kube-helpers"; import { docsUrl } from "../../../common/vars"; @@ -24,9 +23,7 @@ import { SettingLayout } from "../layout/setting-layout"; import { MonacoEditor } from "../monaco-editor"; import { withInjectables } from "@ogre-tools/injectable-react"; import getCustomKubeConfigDirectoryInjectable from "../../../common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable"; -import navigateToCatalogInjectable, { - NavigateToCatalog, -} from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; +import navigateToCatalogInjectable, { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; interface Option { config: KubeConfig; diff --git a/src/renderer/components/+catalog/catalog.test.tsx b/src/renderer/components/+catalog/catalog.test.tsx index 574a9fca02..9422adf055 100644 --- a/src/renderer/components/+catalog/catalog.test.tsx +++ b/src/renderer/components/+catalog/catalog.test.tsx @@ -15,19 +15,15 @@ import type { CatalogEntityStore } from "./catalog-entity-store/catalog-entity.s import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import type { DiContainer } from "@ogre-tools/injectable"; import catalogEntityStoreInjectable from "./catalog-entity-store/catalog-entity-store.injectable"; -import catalogEntityRegistryInjectable - from "../../api/catalog-entity-registry/catalog-entity-registry.injectable"; +import catalogEntityRegistryInjectable from "../../api/catalog-entity-registry/catalog-entity-registry.injectable"; import type { DiRender } from "../test-utils/renderFor"; import { renderFor } from "../test-utils/renderFor"; import { ThemeStore } from "../../theme.store"; import { UserStore } from "../../../common/user-store"; import mockFs from "mock-fs"; -import directoryForUserDataInjectable - from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; -import getConfigurationFileModelInjectable - from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable - from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; +import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; +import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; +import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; import type { AppEvent } from "../../../common/app-event-bus/event-bus"; import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable"; diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx index 46379e2f14..d948951f45 100644 --- a/src/renderer/components/+catalog/catalog.tsx +++ b/src/renderer/components/+catalog/catalog.tsx @@ -8,16 +8,7 @@ import styles from "./catalog.module.scss"; import React from "react"; import { disposeOnUnmount, observer } from "mobx-react"; import { ItemListLayout } from "../item-object-list"; -import { - action, - computed, - IComputedValue, - makeObservable, - observable, - reaction, - runInAction, - when, -} from "mobx"; +import { action, computed, IComputedValue, makeObservable, observable, reaction, runInAction, when } from "mobx"; import type { CatalogEntityStore } from "./catalog-entity-store/catalog-entity.store"; import { navigate } from "../../navigation"; import { MenuItem, MenuActions } from "../menu"; @@ -43,9 +34,7 @@ import getCategoryColumnsInjectable from "./get-category-columns.injectable"; import type { RegisteredCustomCategoryViewDecl } from "./custom-views.injectable"; import customCategoryViewsInjectable from "./custom-views.injectable"; import type { CustomCategoryViewComponents } from "./custom-views"; -import navigateToCatalogInjectable, { - NavigateToCatalog, -} from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; +import navigateToCatalogInjectable, { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; import catalogRouteParametersInjectable from "./catalog-route-parameters.injectable"; import { browseCatalogTab } from "./catalog-browse-tab"; import type { AppEvent } from "../../../common/app-event-bus/event-bus"; diff --git a/src/renderer/components/+entity-settings/entity-settings.tsx b/src/renderer/components/+entity-settings/entity-settings.tsx index 755aa03b80..5ec917ceb3 100644 --- a/src/renderer/components/+entity-settings/entity-settings.tsx +++ b/src/renderer/components/+entity-settings/entity-settings.tsx @@ -56,11 +56,7 @@ class NonInjectedEntitySettings extends React.Component { get menuItems() { if (!this.entity) return []; - return EntitySettingRegistry.getInstance().getItemsForKind( - this.entity.kind, - this.entity.apiVersion, - this.entity.metadata.source, - ); + return EntitySettingRegistry.getInstance().getItemsForKind(this.entity.kind, this.entity.apiVersion, this.entity.metadata.source); } get activeSetting() { @@ -74,9 +70,7 @@ class NonInjectedEntitySettings extends React.Component { }; renderNavigation() { - const groups = Object.entries( - groupBy(this.menuItems, (item) => item.group || "Extensions"), - ); + const groups = Object.entries(groupBy(this.menuItems, (item) => item.group || "Extensions")); groups.sort((a, b) => { if (a[0] === "Settings") return -1; @@ -90,26 +84,21 @@ class NonInjectedEntitySettings extends React.Component {
-
{this.entity.getName()}
+
+ {this.entity.getName()} +
- - {groups.map((group, groupIndex) => ( + + { groups.map((group, groupIndex) => ( -
+
{group[0]}
- {group[1].map((setting, index) => ( + { group[1].map((setting, index) => ( { const { activeSetting } = this; return ( - - {activeSetting && ( -
-

- {activeSetting.title} -

+ + { + activeSetting && (
- +

{activeSetting.title}

+
+ +
-
- )} + ) + }
); } diff --git a/src/renderer/components/+network-port-forwards/port-forwards.tsx b/src/renderer/components/+network-port-forwards/port-forwards.tsx index fa05924516..7f35bd2373 100644 --- a/src/renderer/components/+network-port-forwards/port-forwards.tsx +++ b/src/renderer/components/+network-port-forwards/port-forwards.tsx @@ -14,7 +14,6 @@ import { PortForwardDetails } from "./port-forward-details"; import { withInjectables } from "@ogre-tools/injectable-react"; import portForwardStoreInjectable from "../../port-forward/port-forward-store/port-forward-store.injectable"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; - import { computed, IComputedValue, makeObservable } from "mobx"; import portForwardsRouteParametersInjectable from "./port-forwards-route-parameters.injectable"; import navigateToPortForwardsInjectable, { NavigateToPortForwards } from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable"; diff --git a/src/renderer/components/cluster-manager/cluster-manager.tsx b/src/renderer/components/cluster-manager/cluster-manager.tsx index 97854d8d11..9edd1b5b63 100644 --- a/src/renderer/components/cluster-manager/cluster-manager.tsx +++ b/src/renderer/components/cluster-manager/cluster-manager.tsx @@ -18,8 +18,7 @@ import { IComputedValue, reaction } from "mobx"; import currentRouteComponentInjectable from "../../routes/current-route-component.injectable"; import { setEntityOnRouteMatch } from "../../api/helpers/general-active-sync"; import { navigation } from "../../navigation"; -import welcomeRouteInjectable - from "../../../common/front-end-routing/routes/welcome/welcome-route.injectable"; +import welcomeRouteInjectable from "../../../common/front-end-routing/routes/welcome/welcome-route.injectable"; import { buildURL } from "../../../common/utils/buildUrl"; interface Dependencies { diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx index bd5a010449..02b4881f32 100644 --- a/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/src/renderer/components/cluster-manager/cluster-view.tsx @@ -14,9 +14,7 @@ import { ClusterStore } from "../../../common/cluster-store/cluster-store"; import { catalogEntityRegistry } from "../../api/catalog-entity-registry"; import { requestClusterActivation } from "../../ipc"; import { withInjectables } from "@ogre-tools/injectable-react"; -import navigateToCatalogInjectable, { - NavigateToCatalog, -} from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; +import navigateToCatalogInjectable, { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; import clusterViewRouteParametersInjectable from "./cluster-view-route-parameters.injectable"; interface Dependencies { diff --git a/src/renderer/components/hotbar/hotbar-switch-command.tsx b/src/renderer/components/hotbar/hotbar-switch-command.tsx index 86f16e2c7f..4ef904411e 100644 --- a/src/renderer/components/hotbar/hotbar-switch-command.tsx +++ b/src/renderer/components/hotbar/hotbar-switch-command.tsx @@ -6,11 +6,7 @@ import React from "react"; import { observer } from "mobx-react"; import { Select } from "../select"; - -import hotbarStoreInjectable, { - HotbarStore, -} from "../../../common/hotbar-store.injectable"; - +import hotbarStoreInjectable, { HotbarStore } from "../../../common/hotbar-store.injectable"; import type { CommandOverlay } from "../command-palette"; import { HotbarAddCommand } from "./hotbar-add-command"; import { HotbarRemoveCommand } from "./hotbar-remove-command"; diff --git a/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx b/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx index b8393cb1e3..cefdf0ea3c 100644 --- a/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx +++ b/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx @@ -24,13 +24,9 @@ import clusterFrameContextInjectable from "../../cluster-frame-context/cluster-f import kubeWatchApiInjectable from "../../kube-watch-api/kube-watch-api.injectable"; import type { KubeWatchSubscribeStoreOptions } from "../../kube-watch-api/kube-watch-api"; -type ItemListLayoutPropsWithoutGetItems = Omit< - ItemListLayoutProps, - "getItems" ->; +type ItemListLayoutPropsWithoutGetItems = Omit, "getItems">; -export interface KubeObjectListLayoutProps - extends ItemListLayoutPropsWithoutGetItems { +export interface KubeObjectListLayoutProps extends ItemListLayoutPropsWithoutGetItems { items?: K[]; getItems?: () => K[]; store: KubeObjectStore; @@ -45,10 +41,7 @@ const defaultProps: Partial> = { interface Dependencies { clusterFrameContext: ClusterFrameContext; - subscribeToStores: ( - stores: KubeObjectStore[], - options: KubeWatchSubscribeStoreOptions - ) => Disposer; + subscribeToStores: (stores: KubeObjectStore[], options: KubeWatchSubscribeStoreOptions) => Disposer; } @observer @@ -70,12 +63,10 @@ class NonInjectedKubeObjectListLayout extends React.Compon const { store, dependentStores = [], subscribeStores } = this.props; const stores = Array.from(new Set([store, ...dependentStores])); const reactions: Disposer[] = [ - reaction( - () => this.props.clusterFrameContext.contextNamespaces.slice(), - () => { - // clear load errors - this.loadErrors.length = 0; - }), + reaction(() => this.props.clusterFrameContext.contextNamespaces.slice(), () => { + // clear load errors + this.loadErrors.length = 0; + }), ]; if (subscribeStores) { @@ -111,10 +102,8 @@ class NonInjectedKubeObjectListLayout extends React.Compon } render() { - const { className, customizeHeader, store, items, ...layoutProps } = - this.props; - const placeholderString = - ResourceNames[ResourceKindMap[store.api.kind]] || store.api.kind; + const { className, customizeHeader, store, items, ...layoutProps } = this.props; + const placeholderString = ResourceNames[ResourceKindMap[store.api.kind]] || store.api.kind; return ( extends React.Compon } } -const InjectedKubeObjectListLayout = withInjectables< - Dependencies, - KubeObjectListLayoutProps ->(NonInjectedKubeObjectListLayout, { +const InjectedKubeObjectListLayout = withInjectables>(NonInjectedKubeObjectListLayout, { getProps: (di, props) => ({ clusterFrameContext: di.inject(clusterFrameContextInjectable), subscribeToStores: di.inject(kubeWatchApiInjectable).subscribeStores, diff --git a/src/renderer/components/select/select.test.tsx b/src/renderer/components/select/select.test.tsx index 46530443cb..6149f1072d 100644 --- a/src/renderer/components/select/select.test.tsx +++ b/src/renderer/components/select/select.test.tsx @@ -11,15 +11,12 @@ import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import type { DiContainer } from "@ogre-tools/injectable"; import { DiRender, renderFor } from "../test-utils/renderFor"; import mockFs from "mock-fs"; -import directoryForUserDataInjectable - from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; +import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; import { computed } from "mobx"; import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; -import getConfigurationFileModelInjectable - from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable - from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; +import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; +import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; jest.mock("electron", () => ({ ipcRenderer: { diff --git a/src/renderer/components/select/select.tsx b/src/renderer/components/select/select.tsx index 0a9736a701..cf22511ce2 100644 --- a/src/renderer/components/select/select.tsx +++ b/src/renderer/components/select/select.tsx @@ -30,9 +30,7 @@ export interface SelectOption { label?: React.ReactNode; } -export interface SelectProps - extends ReactSelectProps, - CreatableProps { +export interface SelectProps extends ReactSelectProps, CreatableProps { id: string; value?: T; themeName?: "dark" | "light" | "outlined" | "lens"; diff --git a/src/renderer/initializers/kube-object-detail-registry.tsx b/src/renderer/initializers/kube-object-detail-registry.tsx index 70f1807b57..74dff0a7b5 100644 --- a/src/renderer/initializers/kube-object-detail-registry.tsx +++ b/src/renderer/initializers/kube-object-detail-registry.tsx @@ -25,6 +25,7 @@ import { StorageClassDetails } from "../components/+storage-classes"; import { PersistentVolumeClaimDetails } from "../components/+storage-volume-claims"; import { PersistentVolumeDetails } from "../components/+storage-volumes"; import { ClusterRoleDetails } from "../components/+user-management/+cluster-roles"; +import { ClusterRoleBindingDetails } from "../components/+user-management/+cluster-role-bindings"; import { RoleDetails } from "../components/+user-management/+roles"; import { RoleBindingDetails } from "../components/+user-management/+role-bindings"; import { ServiceAccountsDetails } from "../components/+user-management/+service-accounts"; @@ -36,7 +37,6 @@ import { PodDetails } from "../components/+workloads-pods"; import { ReplicaSetDetails } from "../components/+workloads-replicasets"; import { StatefulSetDetails } from "../components/+workloads-statefulsets"; import type { KubeObjectDetailsProps } from "../components/kube-object-details"; -import { ClusterRoleBindingDetails } from "../components/+user-management/+cluster-role-bindings"; export function initKubeObjectDetailRegistry() { KubeObjectDetailRegistry.getInstance() diff --git a/src/test-utils/get-dis-for-unit-testing.ts b/src/test-utils/get-dis-for-unit-testing.ts index fc02cdbc69..976117bdf9 100644 --- a/src/test-utils/get-dis-for-unit-testing.ts +++ b/src/test-utils/get-dis-for-unit-testing.ts @@ -7,8 +7,8 @@ import { getDiForUnitTesting as getMainDi } from "../main/getDiForUnitTesting"; import { overrideIpcBridge } from "./override-ipc-bridge"; export const getDisForUnitTesting = ({ doGeneralOverrides } = { doGeneralOverrides: false }) => { - const mainDi = getMainDi({ doGeneralOverrides }); const rendererDi = getRendererDi({ doGeneralOverrides }); + const mainDi = getMainDi({ doGeneralOverrides }); overrideIpcBridge({ rendererDi, mainDi });