diff --git a/.eslintrc.js b/.eslintrc.js index 062313f68d..8cd6fd26fa 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -214,6 +214,7 @@ module.exports = { "react-hooks/rules-of-hooks": "error", "react-hooks/exhaustive-deps": "off", "no-template-curly-in-string": "error", + "@typescript-eslint/consistent-type-imports": "error", }, }, ], diff --git a/build/download_binaries.ts b/build/download_binaries.ts index edae0e4535..73c9dff175 100644 --- a/build/download_binaries.ts +++ b/build/download_binaries.ts @@ -4,13 +4,15 @@ */ import packageInfo from "../package.json"; import { type WriteStream } from "fs"; -import { FileHandle, open } from "fs/promises"; +import type { FileHandle } from "fs/promises"; +import { open } from "fs/promises"; import { constants, ensureDir, unlink } from "fs-extra"; import path from "path"; import fetch from "node-fetch"; import { promisify } from "util"; import { pipeline as _pipeline, Transform, Writable } from "stream"; -import { MultiBar, SingleBar } from "cli-progress"; +import type { SingleBar } from "cli-progress"; +import { MultiBar } from "cli-progress"; import AbortController from "abort-controller"; import { extract } from "tar-stream"; import gunzip from "gunzip-maybe"; diff --git a/extensions/metrics-cluster-feature/renderer.tsx b/extensions/metrics-cluster-feature/renderer.tsx index 6b59d1dc4d..8b04ca0b8f 100644 --- a/extensions/metrics-cluster-feature/renderer.tsx +++ b/extensions/metrics-cluster-feature/renderer.tsx @@ -4,7 +4,8 @@ */ import React from "react"; -import { Common, Renderer } from "@k8slens/extensions"; +import type { Common } from "@k8slens/extensions"; +import { Renderer } from "@k8slens/extensions"; import { MetricsSettings } from "./src/metrics-settings"; export default class ClusterMetricsFeatureExtension extends Renderer.LensExtension { diff --git a/extensions/metrics-cluster-feature/src/metrics-feature.ts b/extensions/metrics-cluster-feature/src/metrics-feature.ts index 8b1a498e9d..c9d4275abb 100644 --- a/extensions/metrics-cluster-feature/src/metrics-feature.ts +++ b/extensions/metrics-cluster-feature/src/metrics-feature.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { Renderer, Common } from "@k8slens/extensions"; +import type { Common } from "@k8slens/extensions"; +import { Renderer } from "@k8slens/extensions"; import semver from "semver"; import * as path from "path"; diff --git a/extensions/metrics-cluster-feature/src/metrics-settings.tsx b/extensions/metrics-cluster-feature/src/metrics-settings.tsx index 706feaedba..dfd943797e 100644 --- a/extensions/metrics-cluster-feature/src/metrics-settings.tsx +++ b/extensions/metrics-cluster-feature/src/metrics-settings.tsx @@ -3,10 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import React from "react"; -import { Common, Renderer } from "@k8slens/extensions"; +import type { Common } from "@k8slens/extensions"; +import { Renderer } from "@k8slens/extensions"; import { observer } from "mobx-react"; import { computed, observable, makeObservable } from "mobx"; -import { MetricsFeature, MetricsConfiguration } from "./metrics-feature"; +import type { MetricsConfiguration } from "./metrics-feature"; +import { MetricsFeature } from "./metrics-feature"; const { K8sApi: { diff --git a/extensions/node-menu/renderer.tsx b/extensions/node-menu/renderer.tsx index 66d00403d5..31557c908d 100644 --- a/extensions/node-menu/renderer.tsx +++ b/extensions/node-menu/renderer.tsx @@ -5,7 +5,8 @@ import { Renderer } from "@k8slens/extensions"; import React from "react"; -import { NodeMenu, NodeMenuProps } from "./src/node-menu"; +import type { NodeMenuProps } from "./src/node-menu"; +import { NodeMenu } from "./src/node-menu"; export default class NodeMenuRendererExtension extends Renderer.LensExtension { kubeObjectMenuItems = [ diff --git a/extensions/pod-menu/renderer.tsx b/extensions/pod-menu/renderer.tsx index d1cb01dc51..4788da9707 100644 --- a/extensions/pod-menu/renderer.tsx +++ b/extensions/pod-menu/renderer.tsx @@ -4,9 +4,12 @@ */ import { Renderer } from "@k8slens/extensions"; -import { PodAttachMenu, PodAttachMenuProps } from "./src/attach-menu"; -import { PodShellMenu, PodShellMenuProps } from "./src/shell-menu"; -import { PodLogsMenu, PodLogsMenuProps } from "./src/logs-menu"; +import type { PodAttachMenuProps } from "./src/attach-menu"; +import { PodAttachMenu } from "./src/attach-menu"; +import type { PodShellMenuProps } from "./src/shell-menu"; +import { PodShellMenu } from "./src/shell-menu"; +import type { PodLogsMenuProps } from "./src/logs-menu"; +import { PodLogsMenu } from "./src/logs-menu"; import React from "react"; export default class PodMenuRendererExtension extends Renderer.LensExtension { diff --git a/integration/helpers/utils.ts b/integration/helpers/utils.ts index b3994eb931..33dabede04 100644 --- a/integration/helpers/utils.ts +++ b/integration/helpers/utils.ts @@ -7,7 +7,8 @@ import { mkdirp, remove } from "fs-extra"; import * as os from "os"; import * as path from "path"; import * as uuid from "uuid"; -import { ElectronApplication, Frame, Page, _electron as electron } from "playwright"; +import type { ElectronApplication, Frame, Page } from "playwright"; +import { _electron as electron } from "playwright"; import { noop } from "lodash"; export const appPaths: Partial> = { diff --git a/src/common/__tests__/catalog-category-registry.test.ts b/src/common/__tests__/catalog-category-registry.test.ts index 896845331d..7da9e1c7c7 100644 --- a/src/common/__tests__/catalog-category-registry.test.ts +++ b/src/common/__tests__/catalog-category-registry.test.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { CatalogCategory, CatalogCategoryRegistry, CatalogCategorySpec } from "../catalog"; +import type { CatalogCategorySpec } from "../catalog"; +import { CatalogCategory, CatalogCategoryRegistry } from "../catalog"; class TestCatalogCategoryRegistry extends CatalogCategoryRegistry { } diff --git a/src/common/__tests__/catalog-entity.test.tsx b/src/common/__tests__/catalog-entity.test.tsx index e6d2e939c7..d0700b53d3 100644 --- a/src/common/__tests__/catalog-entity.test.tsx +++ b/src/common/__tests__/catalog-entity.test.tsx @@ -4,7 +4,8 @@ */ import React from "react"; -import { CatalogCategory, CatalogCategorySpec } from "../catalog"; +import { CatalogCategory } from "../catalog"; +import type { CatalogCategorySpec } from "../catalog"; class TestCatalogCategoryWithoutBadge extends CatalogCategory { public readonly apiVersion = "catalog.k8slens.dev/v1alpha1"; diff --git a/src/common/__tests__/event-bus.test.ts b/src/common/__tests__/event-bus.test.ts index 54b70f2a09..e7165aac92 100644 --- a/src/common/__tests__/event-bus.test.ts +++ b/src/common/__tests__/event-bus.test.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { appEventBus, AppEvent } from "../app-event-bus/event-bus"; +import type { AppEvent } from "../app-event-bus/event-bus"; +import { appEventBus } from "../app-event-bus/event-bus"; import { Console } from "console"; import { stdout, stderr } from "process"; diff --git a/src/common/app-paths/app-paths.test.ts b/src/common/app-paths/app-paths.test.ts index ff53454da1..b436426e2e 100644 --- a/src/common/app-paths/app-paths.test.ts +++ b/src/common/app-paths/app-paths.test.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import type { DiContainer } from "@ogre-tools/injectable"; -import { AppPaths, appPathsInjectionToken } from "./app-path-injection-token"; +import type { AppPaths } from "./app-path-injection-token"; +import { appPathsInjectionToken } from "./app-path-injection-token"; import getElectronAppPathInjectable from "../../main/app-paths/get-electron-app-path/get-electron-app-path.injectable"; import { getDisForUnitTesting } from "../../test-utils/get-dis-for-unit-testing"; import type { PathName } from "./app-path-names"; diff --git a/src/common/base-store.ts b/src/common/base-store.ts index b3d2e6e601..4671e377e8 100644 --- a/src/common/base-store.ts +++ b/src/common/base-store.ts @@ -7,8 +7,10 @@ import path from "path"; import type Config from "conf"; import type { Options as ConfOptions } from "conf/dist/source/types"; import { ipcMain, ipcRenderer } from "electron"; -import { IEqualsComparer, makeObservable, reaction, runInAction } from "mobx"; -import { getAppVersion, Singleton, toJS, Disposer } from "./utils"; +import type { IEqualsComparer } from "mobx"; +import { makeObservable, reaction, runInAction } from "mobx"; +import type { Disposer } from "./utils"; +import { getAppVersion, Singleton, toJS } from "./utils"; import logger from "../main/logger"; import { broadcastMessage, ipcMainOn, ipcRendererOn } from "./ipc"; import isEqual from "lodash/isEqual"; diff --git a/src/common/catalog-entities/general.ts b/src/common/catalog-entities/general.ts index 9387528527..9c33499ec8 100644 --- a/src/common/catalog-entities/general.ts +++ b/src/common/catalog-entities/general.ts @@ -4,7 +4,8 @@ */ import { navigate } from "../../renderer/navigation"; -import { CatalogCategory, CatalogEntity, CatalogEntityMetadata, CatalogEntitySpec, CatalogEntityStatus } from "../catalog"; +import type { CatalogEntityMetadata, CatalogEntitySpec, CatalogEntityStatus } from "../catalog"; +import { CatalogCategory, CatalogEntity } from "../catalog"; import { catalogCategoryRegistry } from "../catalog/catalog-category-registry"; interface GeneralEntitySpec extends CatalogEntitySpec { diff --git a/src/common/catalog-entities/kubernetes-cluster.ts b/src/common/catalog-entities/kubernetes-cluster.ts index a4012491bd..83a596fcc8 100644 --- a/src/common/catalog-entities/kubernetes-cluster.ts +++ b/src/common/catalog-entities/kubernetes-cluster.ts @@ -4,7 +4,8 @@ */ import { catalogCategoryRegistry } from "../catalog/catalog-category-registry"; -import { CatalogEntity, CatalogEntityActionContext, CatalogEntityContextMenuContext, CatalogEntityMetadata, CatalogEntityStatus, CatalogCategory, CatalogCategorySpec } from "../catalog"; +import type { CatalogEntityActionContext, CatalogEntityContextMenuContext, CatalogEntityMetadata, CatalogEntityStatus, CatalogCategorySpec } from "../catalog"; +import { CatalogEntity, CatalogCategory } from "../catalog"; import { ClusterStore } from "../cluster-store/cluster-store"; import { broadcastMessage } from "../ipc"; import { app } from "electron"; diff --git a/src/common/catalog-entities/web-link.ts b/src/common/catalog-entities/web-link.ts index 52b5f20cd6..15331cc0fc 100644 --- a/src/common/catalog-entities/web-link.ts +++ b/src/common/catalog-entities/web-link.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { CatalogCategory, CatalogEntity, CatalogEntityContextMenuContext, CatalogEntityMetadata, CatalogEntityStatus } from "../catalog"; +import type { CatalogEntityContextMenuContext, CatalogEntityMetadata, CatalogEntityStatus } from "../catalog"; +import { CatalogCategory, CatalogEntity } from "../catalog"; import { catalogCategoryRegistry } from "../catalog/catalog-category-registry"; import { productName } from "../vars"; import { WeblinkStore } from "../weblink-store"; diff --git a/src/common/catalog/catalog-category-registry.ts b/src/common/catalog/catalog-category-registry.ts index 41bcf9c015..7eb3e0fac8 100644 --- a/src/common/catalog/catalog-category-registry.ts +++ b/src/common/catalog/catalog-category-registry.ts @@ -7,7 +7,7 @@ import { action, computed, observable, makeObservable } from "mobx"; import { once } from "lodash"; import { iter, getOrInsertMap, strictSet } from "../utils"; import type { Disposer } from "../utils"; -import { CatalogCategory, CatalogEntityData, CatalogEntityKindData } from "./catalog-entity"; +import type { CatalogCategory, CatalogEntityData, CatalogEntityKindData } from "./catalog-entity"; export type CategoryFilter = (category: CatalogCategory) => any; diff --git a/src/common/catalog/catalog-entity.ts b/src/common/catalog/catalog-entity.ts index 7bc396d377..a031e2766a 100644 --- a/src/common/catalog/catalog-entity.ts +++ b/src/common/catalog/catalog-entity.ts @@ -7,7 +7,8 @@ import EventEmitter from "events"; import type TypedEmitter from "typed-emitter"; import { observable, makeObservable } from "mobx"; import { once } from "lodash"; -import { iter, Disposer } from "../utils"; +import type { Disposer } from "../utils"; +import { iter } from "../utils"; import type { CategoryColumnRegistration } from "../../renderer/components/+catalog/custom-category-columns"; type ExtractEntityMetadataType = Entity extends CatalogEntity ? Metadata : never; diff --git a/src/common/cluster/authorization-review.injectable.ts b/src/common/cluster/authorization-review.injectable.ts index 6330a1971f..c622893b63 100644 --- a/src/common/cluster/authorization-review.injectable.ts +++ b/src/common/cluster/authorization-review.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { AuthorizationV1Api, KubeConfig, V1ResourceAttributes } from "@kubernetes/client-node"; +import type { KubeConfig, V1ResourceAttributes } from "@kubernetes/client-node"; +import { AuthorizationV1Api } from "@kubernetes/client-node"; import logger from "../logger"; import { getInjectable } from "@ogre-tools/injectable"; diff --git a/src/common/cluster/cluster.ts b/src/common/cluster/cluster.ts index cdadd4d3b4..fbe7880f3c 100644 --- a/src/common/cluster/cluster.ts +++ b/src/common/cluster/cluster.ts @@ -7,11 +7,13 @@ import { ipcMain } from "electron"; import { action, comparer, computed, makeObservable, observable, reaction, when } from "mobx"; import { broadcastMessage } from "../ipc"; import type { ContextHandler } from "../../main/context-handler/context-handler"; -import { HttpError, KubeConfig } from "@kubernetes/client-node"; +import type { KubeConfig } from "@kubernetes/client-node"; +import { HttpError } from "@kubernetes/client-node"; import type { Kubectl } from "../../main/kubectl/kubectl"; import type { KubeconfigManager } from "../../main/kubeconfig-manager/kubeconfig-manager"; import { loadConfigFromFile, loadConfigFromFileSync, validateKubeConfig } from "../kube-helpers"; -import { apiResourceRecord, apiResources, KubeApiResource, KubeResource } from "../rbac"; +import type { KubeApiResource, KubeResource } from "../rbac"; +import { apiResourceRecord, apiResources } from "../rbac"; import logger from "../../main/logger"; import { VersionDetector } from "../../main/cluster-detectors/version-detector"; import { DetectorRegistry } from "../../main/cluster-detectors/detector-registry"; diff --git a/src/common/cluster/list-namespaces.injectable.ts b/src/common/cluster/list-namespaces.injectable.ts index 97ae171442..200326c705 100644 --- a/src/common/cluster/list-namespaces.injectable.ts +++ b/src/common/cluster/list-namespaces.injectable.ts @@ -2,7 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { CoreV1Api, KubeConfig } from "@kubernetes/client-node"; +import type { KubeConfig } from "@kubernetes/client-node"; +import { CoreV1Api } from "@kubernetes/client-node"; import { getInjectable } from "@ogre-tools/injectable"; export type ListNamespaces = () => Promise; diff --git a/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts b/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts index 6dd4343049..203c62e65a 100644 --- a/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts +++ b/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { Route, routeInjectionToken } from "../../route-injection-token"; +import type { Route } from "../../route-injection-token"; +import { routeInjectionToken } from "../../route-injection-token"; export interface CatalogPathParameters { group?: string; diff --git a/src/common/front-end-routing/routes/catalog/navigate-to-catalog.injectable.ts b/src/common/front-end-routing/routes/catalog/navigate-to-catalog.injectable.ts index 0d52d41764..24fab385bb 100644 --- a/src/common/front-end-routing/routes/catalog/navigate-to-catalog.injectable.ts +++ b/src/common/front-end-routing/routes/catalog/navigate-to-catalog.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import catalogRouteInjectable, { CatalogPathParameters } from "./catalog-route.injectable"; +import type { CatalogPathParameters } from "./catalog-route.injectable"; +import catalogRouteInjectable from "./catalog-route.injectable"; import { navigateToRouteInjectionToken } from "../../navigate-to-route-injection-token"; export type NavigateToCatalog = (parameters?: CatalogPathParameters) => void; diff --git a/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts b/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts index 731b4e1e96..8e0709f33e 100644 --- a/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { Route, routeInjectionToken } from "../../../../route-injection-token"; +import type { Route } from "../../../../route-injection-token"; +import { routeInjectionToken } from "../../../../route-injection-token"; export interface CustomResourcesPathParameters { group?: string; diff --git a/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/navigate-to-custom-resources.injectable.ts b/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/navigate-to-custom-resources.injectable.ts index 7a60068299..9df8cd6e2c 100644 --- a/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/navigate-to-custom-resources.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/navigate-to-custom-resources.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import customResourcesRouteInjectable, { CustomResourcesPathParameters } from "./custom-resources-route.injectable"; +import type { CustomResourcesPathParameters } from "./custom-resources-route.injectable"; +import customResourcesRouteInjectable from "./custom-resources-route.injectable"; import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token"; const navigateToCustomResourcesInjectable = getInjectable({ diff --git a/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts b/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts index 22aa837be4..11509867e4 100644 --- a/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { Route, routeInjectionToken } from "../../../../route-injection-token"; +import type { Route } from "../../../../route-injection-token"; +import { routeInjectionToken } from "../../../../route-injection-token"; export interface HelmChartsPathParameters { repo?: string; diff --git a/src/common/front-end-routing/routes/cluster/helm/charts/navigate-to-helm-charts.injectable.ts b/src/common/front-end-routing/routes/cluster/helm/charts/navigate-to-helm-charts.injectable.ts index 1e5e895aae..37ab96cc2c 100644 --- a/src/common/front-end-routing/routes/cluster/helm/charts/navigate-to-helm-charts.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/helm/charts/navigate-to-helm-charts.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import helmChartsRouteInjectable, { HelmChartsPathParameters } from "./helm-charts-route.injectable"; +import type { HelmChartsPathParameters } from "./helm-charts-route.injectable"; +import helmChartsRouteInjectable from "./helm-charts-route.injectable"; import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token"; export type NavigateToHelmCharts = (parameters?: HelmChartsPathParameters) => void; diff --git a/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts b/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts index 5a90e1e1ff..bdc5a8a164 100644 --- a/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { Route, routeInjectionToken } from "../../../../route-injection-token"; +import type { Route } from "../../../../route-injection-token"; +import { routeInjectionToken } from "../../../../route-injection-token"; export interface HelmReleasesPathParameters { namespace?: string; diff --git a/src/common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable.ts b/src/common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable.ts index 9302cdc02d..77fae74011 100644 --- a/src/common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import helmReleasesRouteInjectable, { HelmReleasesPathParameters } from "./helm-releases-route.injectable"; +import type { HelmReleasesPathParameters } from "./helm-releases-route.injectable"; +import helmReleasesRouteInjectable from "./helm-releases-route.injectable"; import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token"; export type NavigateToHelmReleases = (parameters?: HelmReleasesPathParameters) => void; diff --git a/src/common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable.ts b/src/common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable.ts index ba16fd2866..9a03eeda47 100644 --- a/src/common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import portForwardsRouteInjectable, { PortForwardsPathParameters } from "./port-forwards-route.injectable"; +import type { PortForwardsPathParameters } from "./port-forwards-route.injectable"; +import portForwardsRouteInjectable from "./port-forwards-route.injectable"; import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token"; export type NavigateToPortForwards = (parameters?: PortForwardsPathParameters) => void; diff --git a/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts index a089033b76..5b6814ec06 100644 --- a/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { Route, routeInjectionToken } from "../../../../route-injection-token"; +import type { Route } from "../../../../route-injection-token"; +import { routeInjectionToken } from "../../../../route-injection-token"; export interface PortForwardsPathParameters { forwardport?: string; diff --git a/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts b/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts index be893c201f..d4ff30603f 100644 --- a/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts +++ b/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { Route, routeInjectionToken } from "../../route-injection-token"; +import type { Route } from "../../route-injection-token"; +import { routeInjectionToken } from "../../route-injection-token"; export interface EntitySettingsPathParameters { entityId: string; diff --git a/src/common/hotbar-store.ts b/src/common/hotbar-store.ts index 7de8ff7617..abbae0e1b0 100644 --- a/src/common/hotbar-store.ts +++ b/src/common/hotbar-store.ts @@ -7,15 +7,16 @@ import { action, comparer, observable, makeObservable, computed } from "mobx"; import { BaseStore } from "./base-store"; import migrations from "../migrations/hotbar-store"; import { toJS } from "./utils"; -import { CatalogEntity } from "./catalog"; +import type { CatalogEntity } from "./catalog"; import logger from "../main/logger"; import { broadcastMessage } from "./ipc"; +import type { + Hotbar, + CreateHotbarData, + CreateHotbarOptions } from "./hotbar-types"; import { defaultHotbarCells, getEmptyHotbar, - Hotbar, - CreateHotbarData, - CreateHotbarOptions, } from "./hotbar-types"; import { hotbarTooManyItemsChannel } from "./ipc/hotbar"; import type { GeneralEntity } from "./catalog-entities"; diff --git a/src/common/hotbar-types.ts b/src/common/hotbar-types.ts index 7fe13c8c6b..34ccfaa74e 100644 --- a/src/common/hotbar-types.ts +++ b/src/common/hotbar-types.ts @@ -4,7 +4,8 @@ */ import * as uuid from "uuid"; -import { tuple, Tuple } from "./utils"; +import type { Tuple } from "./utils"; +import { tuple } from "./utils"; export interface HotbarItem { entity: { diff --git a/src/common/ipc/ipc.ts b/src/common/ipc/ipc.ts index b875a7d30d..bddeb0ff3c 100644 --- a/src/common/ipc/ipc.ts +++ b/src/common/ipc/ipc.ts @@ -10,7 +10,8 @@ import { ipcMain, ipcRenderer, webContents } from "electron"; import { toJS } from "../utils/toJS"; import logger from "../../main/logger"; -import { ClusterFrameInfo, clusterFrameMap } from "../cluster-frames"; +import type { ClusterFrameInfo } from "../cluster-frames"; +import { clusterFrameMap } from "../cluster-frames"; import type { Disposer } from "../utils"; export const broadcastMainChannel = "ipc:broadcast-main"; diff --git a/src/common/k8s-api/__tests__/crd.test.ts b/src/common/k8s-api/__tests__/crd.test.ts index 50f9760cb1..5d9e51afe1 100644 --- a/src/common/k8s-api/__tests__/crd.test.ts +++ b/src/common/k8s-api/__tests__/crd.test.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { CustomResourceDefinition, CustomResourceDefinitionSpec } from "../endpoints"; +import type { CustomResourceDefinitionSpec } from "../endpoints"; +import { CustomResourceDefinition } from "../endpoints"; describe("Crds", () => { describe("getVersion()", () => { diff --git a/src/common/k8s-api/__tests__/kube-api-parse.test.ts b/src/common/k8s-api/__tests__/kube-api-parse.test.ts index 232d1efee5..8801837256 100644 --- a/src/common/k8s-api/__tests__/kube-api-parse.test.ts +++ b/src/common/k8s-api/__tests__/kube-api-parse.test.ts @@ -13,7 +13,8 @@ jest.mock("../api-manager", () => ({ }, })); -import { IKubeApiParsed, parseKubeApi } from "../kube-api-parse"; +import type { IKubeApiParsed } from "../kube-api-parse"; +import { parseKubeApi } from "../kube-api-parse"; /** * [, ] diff --git a/src/common/k8s-api/__tests__/kube-api.test.ts b/src/common/k8s-api/__tests__/kube-api.test.ts index 12b4577b17..b5b4094bf7 100644 --- a/src/common/k8s-api/__tests__/kube-api.test.ts +++ b/src/common/k8s-api/__tests__/kube-api.test.ts @@ -10,7 +10,8 @@ import { KubeObject } from "../kube-object"; import AbortController from "abort-controller"; import { delay } from "../../utils/delay"; import { PassThrough } from "stream"; -import { ApiManager, apiManager } from "../api-manager"; +import type { ApiManager } from "../api-manager"; +import { apiManager } from "../api-manager"; import { Ingress, Pod } from "../endpoints"; jest.mock("../api-manager"); diff --git a/src/common/k8s-api/api-manager.ts b/src/common/k8s-api/api-manager.ts index 728ac8b61d..b2d5021337 100644 --- a/src/common/k8s-api/api-manager.ts +++ b/src/common/k8s-api/api-manager.ts @@ -9,7 +9,8 @@ import { action, observable, makeObservable } from "mobx"; import { autoBind, iter } from "../utils"; import type { KubeApi } from "./kube-api"; import type { KubeObject } from "./kube-object"; -import { IKubeObjectRef, parseKubeApi, createKubeApiURL } from "./kube-api-parse"; +import type { IKubeObjectRef } from "./kube-api-parse"; +import { parseKubeApi, createKubeApiURL } from "./kube-api-parse"; export class ApiManager { private apis = observable.map>(); diff --git a/src/common/k8s-api/endpoints/cluster.api.ts b/src/common/k8s-api/endpoints/cluster.api.ts index 1d32806382..377fb47207 100644 --- a/src/common/k8s-api/endpoints/cluster.api.ts +++ b/src/common/k8s-api/endpoints/cluster.api.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { IMetrics, IMetricsReqParams, metricsApi } from "./metrics.api"; +import type { IMetrics, IMetricsReqParams } from "./metrics.api"; +import { metricsApi } from "./metrics.api"; import { KubeObject } from "../kube-object"; import { KubeApi } from "../kube-api"; import { isClusterPageContext } from "../../utils/cluster-id-url-parsing"; diff --git a/src/common/k8s-api/endpoints/daemon-set.api.ts b/src/common/k8s-api/endpoints/daemon-set.api.ts index 74198de4e5..ad12b44931 100644 --- a/src/common/k8s-api/endpoints/daemon-set.api.ts +++ b/src/common/k8s-api/endpoints/daemon-set.api.ts @@ -4,7 +4,8 @@ */ import get from "lodash/get"; -import { IAffinity, WorkloadKubeObject } from "../workload-kube-object"; +import type { IAffinity } from "../workload-kube-object"; +import { WorkloadKubeObject } from "../workload-kube-object"; import { autoBind } from "../../utils"; import { KubeApi } from "../kube-api"; import { metricsApi } from "./metrics.api"; diff --git a/src/common/k8s-api/endpoints/deployment.api.ts b/src/common/k8s-api/endpoints/deployment.api.ts index 505b32dd96..324310fa74 100644 --- a/src/common/k8s-api/endpoints/deployment.api.ts +++ b/src/common/k8s-api/endpoints/deployment.api.ts @@ -5,7 +5,8 @@ import moment from "moment"; -import { IAffinity, WorkloadKubeObject } from "../workload-kube-object"; +import type { IAffinity } from "../workload-kube-object"; +import { WorkloadKubeObject } from "../workload-kube-object"; import { autoBind } from "../../utils"; import { KubeApi } from "../kube-api"; import { metricsApi } from "./metrics.api"; diff --git a/src/common/k8s-api/endpoints/ingress.api.ts b/src/common/k8s-api/endpoints/ingress.api.ts index a78a4783b5..f4ec20af1a 100644 --- a/src/common/k8s-api/endpoints/ingress.api.ts +++ b/src/common/k8s-api/endpoints/ingress.api.ts @@ -3,9 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { KubeObject, TypedLocalObjectReference } from "../kube-object"; +import type { TypedLocalObjectReference } from "../kube-object"; +import { KubeObject } from "../kube-object"; import { autoBind, hasTypedProperty, isString, iter } from "../../utils"; -import { IMetrics, metricsApi } from "./metrics.api"; +import type { IMetrics } from "./metrics.api"; +import { metricsApi } from "./metrics.api"; import { KubeApi } from "../kube-api"; import type { KubeJsonApiData } from "../kube-json-api"; import { isClusterPageContext } from "../../utils/cluster-id-url-parsing"; diff --git a/src/common/k8s-api/endpoints/job.api.ts b/src/common/k8s-api/endpoints/job.api.ts index 9ceee0ce99..d59d49f921 100644 --- a/src/common/k8s-api/endpoints/job.api.ts +++ b/src/common/k8s-api/endpoints/job.api.ts @@ -5,7 +5,8 @@ import get from "lodash/get"; import { autoBind } from "../../utils"; -import { IAffinity, WorkloadKubeObject } from "../workload-kube-object"; +import type { IAffinity } from "../workload-kube-object"; +import { WorkloadKubeObject } from "../workload-kube-object"; import { KubeApi } from "../kube-api"; import { metricsApi } from "./metrics.api"; import type { KubeJsonApiData } from "../kube-json-api"; diff --git a/src/common/k8s-api/endpoints/network-policy.api.ts b/src/common/k8s-api/endpoints/network-policy.api.ts index f51c11d70f..64bdc563b0 100644 --- a/src/common/k8s-api/endpoints/network-policy.api.ts +++ b/src/common/k8s-api/endpoints/network-policy.api.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { KubeObject, LabelSelector } from "../kube-object"; +import type { LabelSelector } from "../kube-object"; +import { KubeObject } from "../kube-object"; import { autoBind } from "../../utils"; import { KubeApi } from "../kube-api"; import type { KubeJsonApiData } from "../kube-json-api"; diff --git a/src/common/k8s-api/endpoints/nodes.api.ts b/src/common/k8s-api/endpoints/nodes.api.ts index 4dc615eef6..62edc090e4 100644 --- a/src/common/k8s-api/endpoints/nodes.api.ts +++ b/src/common/k8s-api/endpoints/nodes.api.ts @@ -5,7 +5,8 @@ import { KubeObject } from "../kube-object"; import { autoBind, cpuUnitsToNumber, iter, unitsToBytes } from "../../../renderer/utils"; -import { IMetrics, metricsApi } from "./metrics.api"; +import type { IMetrics } from "./metrics.api"; +import { metricsApi } from "./metrics.api"; import { KubeApi } from "../kube-api"; import type { KubeJsonApiData } from "../kube-json-api"; import { isClusterPageContext } from "../../utils/cluster-id-url-parsing"; diff --git a/src/common/k8s-api/endpoints/persistent-volume-claims.api.ts b/src/common/k8s-api/endpoints/persistent-volume-claims.api.ts index cbe920421d..d013845d3c 100644 --- a/src/common/k8s-api/endpoints/persistent-volume-claims.api.ts +++ b/src/common/k8s-api/endpoints/persistent-volume-claims.api.ts @@ -3,9 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { KubeObject, LabelSelector } from "../kube-object"; +import type { LabelSelector } from "../kube-object"; +import { KubeObject } from "../kube-object"; import { autoBind } from "../../utils"; -import { IMetrics, metricsApi } from "./metrics.api"; +import type { IMetrics } from "./metrics.api"; +import { metricsApi } from "./metrics.api"; import type { Pod } from "./pods.api"; import { KubeApi } from "../kube-api"; import type { KubeJsonApiData } from "../kube-json-api"; diff --git a/src/common/k8s-api/endpoints/poddisruptionbudget.api.ts b/src/common/k8s-api/endpoints/poddisruptionbudget.api.ts index d6df3d3167..5797ddf877 100644 --- a/src/common/k8s-api/endpoints/poddisruptionbudget.api.ts +++ b/src/common/k8s-api/endpoints/poddisruptionbudget.api.ts @@ -4,7 +4,8 @@ */ import { autoBind } from "../../utils"; -import { KubeObject, LabelSelector } from "../kube-object"; +import type { LabelSelector } from "../kube-object"; +import { KubeObject } from "../kube-object"; import { KubeApi } from "../kube-api"; import type { KubeJsonApiData } from "../kube-json-api"; import { isClusterPageContext } from "../../utils/cluster-id-url-parsing"; diff --git a/src/common/k8s-api/endpoints/pods.api.ts b/src/common/k8s-api/endpoints/pods.api.ts index 83d2d2234e..c76a3d021c 100644 --- a/src/common/k8s-api/endpoints/pods.api.ts +++ b/src/common/k8s-api/endpoints/pods.api.ts @@ -3,9 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { IAffinity, WorkloadKubeObject } from "../workload-kube-object"; +import type { IAffinity } from "../workload-kube-object"; +import { WorkloadKubeObject } from "../workload-kube-object"; import { autoBind } from "../../utils"; -import { IMetrics, metricsApi } from "./metrics.api"; +import type { IMetrics } from "./metrics.api"; +import { metricsApi } from "./metrics.api"; import { KubeApi } from "../kube-api"; import type { KubeJsonApiData } from "../kube-json-api"; import { isClusterPageContext } from "../../utils/cluster-id-url-parsing"; diff --git a/src/common/k8s-api/endpoints/stateful-set.api.ts b/src/common/k8s-api/endpoints/stateful-set.api.ts index d32e24f952..b388ca8d44 100644 --- a/src/common/k8s-api/endpoints/stateful-set.api.ts +++ b/src/common/k8s-api/endpoints/stateful-set.api.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { IAffinity, WorkloadKubeObject } from "../workload-kube-object"; +import type { IAffinity } from "../workload-kube-object"; +import { WorkloadKubeObject } from "../workload-kube-object"; import { autoBind } from "../../utils"; import { KubeApi } from "../kube-api"; import { metricsApi } from "./metrics.api"; diff --git a/src/common/k8s-api/json-api.ts b/src/common/k8s-api/json-api.ts index 9ed120d135..41180df078 100644 --- a/src/common/k8s-api/json-api.ts +++ b/src/common/k8s-api/json-api.ts @@ -8,7 +8,8 @@ import { Agent as HttpAgent } from "http"; import { Agent as HttpsAgent } from "https"; import { merge } from "lodash"; -import fetch, { Response, RequestInit } from "node-fetch"; +import type { Response, RequestInit } from "node-fetch"; +import fetch from "node-fetch"; import { stringify } from "querystring"; import { EventEmitter } from "../../common/event-emitter"; import logger from "../../common/logger"; diff --git a/src/common/k8s-api/kube-api.ts b/src/common/k8s-api/kube-api.ts index 54231b3947..8d890a1d75 100644 --- a/src/common/k8s-api/kube-api.ts +++ b/src/common/k8s-api/kube-api.ts @@ -12,14 +12,17 @@ import logger from "../../main/logger"; import { apiManager } from "./api-manager"; import { apiBase, apiKube } from "./index"; import { createKubeApiURL, parseKubeApi } from "./kube-api-parse"; -import { KubeObjectConstructor, KubeObject, KubeStatus } from "./kube-object"; +import type { KubeObjectConstructor } from "./kube-object"; +import { KubeObject, KubeStatus } from "./kube-object"; import byline from "byline"; import type { IKubeWatchEvent } from "./kube-watch-event"; -import { KubeJsonApi, KubeJsonApiData } from "./kube-json-api"; +import type { KubeJsonApiData } from "./kube-json-api"; +import { KubeJsonApi } from "./kube-json-api"; import { noop, WrappedAbortController } from "../utils"; import type { RequestInit } from "node-fetch"; import type AbortController from "abort-controller"; -import { Agent, AgentOptions } from "https"; +import type { AgentOptions } from "https"; +import { Agent } from "https"; import type { Patch } from "rfc6902"; /** diff --git a/src/common/k8s-api/kube-json-api.ts b/src/common/k8s-api/kube-json-api.ts index 30131545fe..258c61af5e 100644 --- a/src/common/k8s-api/kube-json-api.ts +++ b/src/common/k8s-api/kube-json-api.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { JsonApi, JsonApiData, JsonApiError } from "./json-api"; +import type { JsonApiData, JsonApiError } from "./json-api"; +import { JsonApi } from "./json-api"; import type { Response } from "node-fetch"; import { apiKubePrefix, isDebugging } from "../vars"; import { apiBase } from "./api-base"; diff --git a/src/common/k8s-api/kube-object.store.ts b/src/common/k8s-api/kube-object.store.ts index beae1aa64d..9e6d21bc2d 100644 --- a/src/common/k8s-api/kube-object.store.ts +++ b/src/common/k8s-api/kube-object.store.ts @@ -6,11 +6,14 @@ import type { ClusterContext } from "./cluster-context"; import { action, computed, makeObservable, observable, reaction, when } from "mobx"; -import { autoBind, Disposer, noop, rejectPromiseBy } from "../utils"; -import { KubeObject, KubeStatus } from "./kube-object"; +import type { Disposer } from "../utils"; +import { autoBind, noop, rejectPromiseBy } from "../utils"; +import type { KubeObject } from "./kube-object"; +import { KubeStatus } from "./kube-object"; import type { IKubeWatchEvent } from "./kube-watch-event"; import { ItemStore } from "../item.store"; -import { ensureObjectSelfLink, IKubeApiQueryParams, KubeApi } from "./kube-api"; +import type { IKubeApiQueryParams, KubeApi } from "./kube-api"; +import { ensureObjectSelfLink } from "./kube-api"; import { parseKubeApi } from "./kube-api-parse"; import type { KubeJsonApiData } from "./kube-json-api"; import type { RequestInit } from "node-fetch"; diff --git a/src/common/kube-helpers.ts b/src/common/kube-helpers.ts index 35f033b259..9a04a3f3d8 100644 --- a/src/common/kube-helpers.ts +++ b/src/common/kube-helpers.ts @@ -9,7 +9,8 @@ import path from "path"; import os from "os"; import yaml from "js-yaml"; import logger from "../main/logger"; -import { Cluster, Context, newClusters, newContexts, newUsers, User } from "@kubernetes/client-node/dist/config_types"; +import type { Cluster, Context, User } from "@kubernetes/client-node/dist/config_types"; +import { newClusters, newContexts, newUsers } from "@kubernetes/client-node/dist/config_types"; import { resolvePath } from "./utils"; import Joi from "joi"; diff --git a/src/common/logger.injectable.ts b/src/common/logger.injectable.ts index 561494a20c..55e2f26b2a 100644 --- a/src/common/logger.injectable.ts +++ b/src/common/logger.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import logger, { Logger } from "./logger"; +import type { Logger } from "./logger"; +import logger from "./logger"; const loggerInjectable = getInjectable({ id: "logger", diff --git a/src/common/protocol-handler/router.ts b/src/common/protocol-handler/router.ts index 2dad320d98..1740071cfe 100644 --- a/src/common/protocol-handler/router.ts +++ b/src/common/protocol-handler/router.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { match, matchPath } from "react-router"; +import type { match } from "react-router"; +import { matchPath } from "react-router"; import { countBy } from "lodash"; import { iter } from "../utils"; import { pathToRegexp } from "path-to-regexp"; diff --git a/src/common/utils/autobind.ts b/src/common/utils/autobind.ts index d1fd4335d4..716de551c3 100644 --- a/src/common/utils/autobind.ts +++ b/src/common/utils/autobind.ts @@ -4,7 +4,8 @@ */ import { boundMethod, boundClass } from "autobind-decorator"; -import autoBindClass, { Options } from "auto-bind"; +import type { Options } from "auto-bind"; +import autoBindClass from "auto-bind"; import autoBindReactClass from "auto-bind/react"; // Automatically bind methods to their class instance diff --git a/src/common/utils/hash-set.ts b/src/common/utils/hash-set.ts index 86617d3989..23ce13b1b2 100644 --- a/src/common/utils/hash-set.ts +++ b/src/common/utils/hash-set.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { action, IInterceptable, IInterceptor, IListenable, ISetWillChange, observable, ObservableMap, ObservableSet } from "mobx"; +import type { IInterceptable, IInterceptor, IListenable, ISetWillChange, ObservableMap } from "mobx"; +import { action, observable, ObservableSet } from "mobx"; export function makeIterableIterator(iterator: Iterator): IterableIterator { (iterator as IterableIterator)[Symbol.iterator] = () => iterator as IterableIterator; diff --git a/src/common/utils/sort-compare.ts b/src/common/utils/sort-compare.ts index dafed080da..f05379cabd 100644 --- a/src/common/utils/sort-compare.ts +++ b/src/common/utils/sort-compare.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import semver, { coerce, SemVer } from "semver"; +import type { SemVer } from "semver"; +import semver, { coerce } from "semver"; import * as iter from "./iter"; import type { RawHelmChart } from "../k8s-api/endpoints/helm-charts.api"; import logger from "../logger"; diff --git a/src/common/utils/tar.ts b/src/common/utils/tar.ts index 2433ca23ef..a72f8b4a1a 100644 --- a/src/common/utils/tar.ts +++ b/src/common/utils/tar.ts @@ -5,7 +5,8 @@ // Helper for working with tarball files (.tar, .tgz) // Docs: https://github.com/npm/node-tar -import tar, { ExtractOptions, FileStat } from "tar"; +import type { ExtractOptions, FileStat } from "tar"; +import tar from "tar"; import path from "path"; export interface ReadFileFromTarOpts { diff --git a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.test.ts b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.test.ts index c7ebd07872..3a69f0d563 100644 --- a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.test.ts +++ b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.test.ts @@ -2,11 +2,12 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import type { + DiContainer, + Injectable } from "@ogre-tools/injectable"; import { createContainer, - DiContainer, getInjectable, - Injectable, } from "@ogre-tools/injectable"; import { Environments, setLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api"; import { asLegacyGlobalObjectForExtensionApiWithModifications } from "./as-legacy-global-object-for-extension-api-with-modifications"; diff --git a/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts b/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts index 35a4e67e1a..bd5dc6c6bb 100644 --- a/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts +++ b/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts @@ -4,8 +4,9 @@ */ import type { LensExtensionConstructor } from "../../lens-extension"; import type { InstalledExtension } from "../../extension-discovery/extension-discovery"; +import type { + LensExtensionDependencies } from "../../lens-extension-set-dependencies"; import { - LensExtensionDependencies, setLensExtensionDependencies, } from "../../lens-extension-set-dependencies"; diff --git a/src/extensions/extension-loader/extension-loader.ts b/src/extensions/extension-loader/extension-loader.ts index 5771c31c34..e1e1896fc1 100644 --- a/src/extensions/extension-loader/extension-loader.ts +++ b/src/extensions/extension-loader/extension-loader.ts @@ -9,7 +9,8 @@ import { isEqual } from "lodash"; import { action, computed, makeObservable, observable, observe, reaction, when } from "mobx"; import path from "path"; import { broadcastMessage, ipcMainOn, ipcRendererOn, ipcMainHandle } from "../../common/ipc"; -import { Disposer, toJS } from "../../common/utils"; +import type { Disposer } from "../../common/utils"; +import { toJS } from "../../common/utils"; import logger from "../../main/logger"; import type { KubernetesCluster } from "../common-api/catalog"; import type { InstalledExtension } from "../extension-discovery/extension-discovery"; diff --git a/src/extensions/lens-extension.ts b/src/extensions/lens-extension.ts index 6df8e3c08a..36a0955f47 100644 --- a/src/extensions/lens-extension.ts +++ b/src/extensions/lens-extension.ts @@ -8,9 +8,11 @@ import { action, observable, makeObservable, computed } from "mobx"; import logger from "../main/logger"; import type { ProtocolHandlerRegistration } from "./registries"; import type { PackageJson } from "type-fest"; -import { Disposer, disposer } from "../common/utils"; +import type { Disposer } from "../common/utils"; +import { disposer } from "../common/utils"; +import type { + LensExtensionDependencies } from "./lens-extension-set-dependencies"; import { - LensExtensionDependencies, setLensExtensionDependencies, } from "./lens-extension-set-dependencies"; diff --git a/src/extensions/lens-renderer-extension.ts b/src/extensions/lens-renderer-extension.ts index 3baa9fd8bc..9c897431dc 100644 --- a/src/extensions/lens-renderer-extension.ts +++ b/src/extensions/lens-renderer-extension.ts @@ -7,8 +7,10 @@ import type * as registries from "./registries"; import { Disposers, LensExtension } from "./lens-extension"; import type { CatalogEntity } from "../common/catalog"; import type { Disposer } from "../common/utils"; -import { catalogEntityRegistry, EntityFilter } from "../renderer/api/catalog-entity-registry"; -import { catalogCategoryRegistry, CategoryFilter } from "../renderer/api/catalog-category-registry"; +import type { EntityFilter } from "../renderer/api/catalog-entity-registry"; +import { catalogEntityRegistry } from "../renderer/api/catalog-entity-registry"; +import type { CategoryFilter } from "../renderer/api/catalog-category-registry"; +import { catalogCategoryRegistry } from "../renderer/api/catalog-category-registry"; import type { TopBarRegistration } from "../renderer/components/layout/top-bar/top-bar-registration"; import type { KubernetesCluster } from "../common/catalog-entities"; import type { WelcomeMenuRegistration } from "../renderer/components/+welcome/welcome-menu-items/welcome-menu-registration"; diff --git a/src/extensions/renderer-api/navigation.ts b/src/extensions/renderer-api/navigation.ts index 4d9315e18a..122e7c2be7 100644 --- a/src/extensions/renderer-api/navigation.ts +++ b/src/extensions/renderer-api/navigation.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { navigation, PageParam, PageParamInit } from "../../renderer/navigation"; +import type { PageParamInit } from "../../renderer/navigation"; +import { navigation, PageParam } from "../../renderer/navigation"; export type { PageParamInit, PageParam } from "../../renderer/navigation/page-param"; export { navigate, isActiveRoute } from "../../renderer/navigation/helpers"; diff --git a/src/main/__test__/context-handler.test.ts b/src/main/__test__/context-handler.test.ts index 9541889519..7acedb7bcf 100644 --- a/src/main/__test__/context-handler.test.ts +++ b/src/main/__test__/context-handler.test.ts @@ -5,7 +5,8 @@ import { UserStore } from "../../common/user-store"; import type { ContextHandler } from "../context-handler/context-handler"; -import { PrometheusProvider, PrometheusProviderRegistry, PrometheusService } from "../prometheus"; +import type { PrometheusService } from "../prometheus"; +import { PrometheusProvider, PrometheusProviderRegistry } from "../prometheus"; import mockFs from "mock-fs"; import { getDiForUnitTesting } from "../getDiForUnitTesting"; import createContextHandlerInjectable from "../context-handler/create-context-handler.injectable"; diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts index 92681218dd..36af031ecf 100644 --- a/src/main/__test__/kube-auth-proxy.test.ts +++ b/src/main/__test__/kube-auth-proxy.test.ts @@ -38,11 +38,14 @@ jest.mock("tcp-port-used"); import type { Cluster } from "../../common/cluster/cluster"; import type { KubeAuthProxy } from "../kube-auth-proxy/kube-auth-proxy"; import { broadcastMessage } from "../../common/ipc"; -import { ChildProcess, spawn } from "child_process"; +import type { ChildProcess } from "child_process"; +import { spawn } from "child_process"; import { Kubectl } from "../kubectl/kubectl"; -import { mock, MockProxy } from "jest-mock-extended"; +import type { MockProxy } from "jest-mock-extended"; +import { mock } from "jest-mock-extended"; import { waitUntilUsed } from "tcp-port-used"; -import { EventEmitter, Readable } from "stream"; +import type { Readable } from "stream"; +import { EventEmitter } from "stream"; import { UserStore } from "../../common/user-store"; import { Console } from "console"; import { stdout, stderr } from "process"; diff --git a/src/main/app-paths/app-paths.injectable.ts b/src/main/app-paths/app-paths.injectable.ts index b9df2c7f57..342c32252d 100644 --- a/src/main/app-paths/app-paths.injectable.ts +++ b/src/main/app-paths/app-paths.injectable.ts @@ -2,8 +2,9 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import type { + DiContainerForSetup } from "@ogre-tools/injectable"; import { - DiContainerForSetup, getInjectable, } from "@ogre-tools/injectable"; diff --git a/src/main/app-paths/get-app-paths.ts b/src/main/app-paths/get-app-paths.ts index 76c4061ee2..00aeff540c 100644 --- a/src/main/app-paths/get-app-paths.ts +++ b/src/main/app-paths/get-app-paths.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { fromPairs } from "lodash/fp"; -import { pathNames, PathName } from "../../common/app-paths/app-path-names"; +import type { PathName } from "../../common/app-paths/app-path-names"; +import { pathNames } from "../../common/app-paths/app-path-names"; import type { AppPaths } from "../../common/app-paths/app-path-injection-token"; interface Dependencies { diff --git a/src/main/app-updater.ts b/src/main/app-updater.ts index 4834a90234..0b7a5609b8 100644 --- a/src/main/app-updater.ts +++ b/src/main/app-updater.ts @@ -3,11 +3,13 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { autoUpdater, UpdateInfo } from "electron-updater"; +import type { UpdateInfo } from "electron-updater"; +import { autoUpdater } from "electron-updater"; import logger from "./logger"; import { isPublishConfigured, isTestEnv } from "../common/vars"; import { delay } from "../common/utils"; -import { areArgsUpdateAvailableToBackchannel, AutoUpdateChecking, AutoUpdateLogPrefix, AutoUpdateNoUpdateAvailable, broadcastMessage, onceCorrect, UpdateAvailableChannel, UpdateAvailableToBackchannel } from "../common/ipc"; +import type { UpdateAvailableToBackchannel } from "../common/ipc"; +import { areArgsUpdateAvailableToBackchannel, AutoUpdateChecking, AutoUpdateLogPrefix, AutoUpdateNoUpdateAvailable, broadcastMessage, onceCorrect, UpdateAvailableChannel } from "../common/ipc"; import { once } from "lodash"; import { ipcMain } from "electron"; import { nextUpdateChannel } from "./utils/update-channel"; diff --git a/src/main/catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.ts b/src/main/catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.ts index 52b73cc541..a9e1038f53 100644 --- a/src/main/catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.ts +++ b/src/main/catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.ts @@ -3,14 +3,17 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { action, observable, IComputedValue, computed, ObservableMap, runInAction, makeObservable, observe } from "mobx"; +import type { IComputedValue, ObservableMap } from "mobx"; +import { action, observable, computed, runInAction, makeObservable, observe } from "mobx"; import type { CatalogEntity } from "../../../common/catalog"; import { catalogEntityRegistry } from "../../catalog"; -import { FSWatcher, watch } from "chokidar"; +import type { FSWatcher } from "chokidar"; +import { watch } from "chokidar"; import fs from "fs"; import path from "path"; import type stream from "stream"; -import { bytesToUnits, Disposer, getOrInsertWith, iter, noop } from "../../../common/utils"; +import type { Disposer } from "../../../common/utils"; +import { bytesToUnits, getOrInsertWith, iter, noop } from "../../../common/utils"; import logger from "../../logger"; import type { KubeConfig } from "@kubernetes/client-node"; import { loadConfigFromString, splitConfig } from "../../../common/kube-helpers"; diff --git a/src/main/catalog/__tests__/catalog-entity-registry.test.ts b/src/main/catalog/__tests__/catalog-entity-registry.test.ts index 29409a9ecf..049af06318 100644 --- a/src/main/catalog/__tests__/catalog-entity-registry.test.ts +++ b/src/main/catalog/__tests__/catalog-entity-registry.test.ts @@ -4,8 +4,10 @@ */ import { observable, reaction } from "mobx"; -import { WebLink, WebLinkSpec, WebLinkStatus } from "../../../common/catalog-entities"; -import { catalogCategoryRegistry, CatalogEntity, CatalogEntityMetadata } from "../../../common/catalog"; +import type { WebLinkSpec, WebLinkStatus } from "../../../common/catalog-entities"; +import { WebLink } from "../../../common/catalog-entities"; +import type { CatalogEntityMetadata } from "../../../common/catalog"; +import { catalogCategoryRegistry, CatalogEntity } from "../../../common/catalog"; import { CatalogEntityRegistry } from "../catalog-entity-registry"; class InvalidEntity extends CatalogEntity { diff --git a/src/main/catalog/catalog-entity-registry.ts b/src/main/catalog/catalog-entity-registry.ts index 8c6298b7f5..fa633e093c 100644 --- a/src/main/catalog/catalog-entity-registry.ts +++ b/src/main/catalog/catalog-entity-registry.ts @@ -4,7 +4,8 @@ */ import { action, computed, type IComputedValue, type IObservableArray, makeObservable, observable } from "mobx"; -import { CatalogCategoryRegistry, catalogCategoryRegistry, CatalogEntity, CatalogEntityConstructor } from "../../common/catalog"; +import type { CatalogCategoryRegistry, CatalogEntity, CatalogEntityConstructor } from "../../common/catalog"; +import { catalogCategoryRegistry } from "../../common/catalog"; import { iter } from "../../common/utils"; export class CatalogEntityRegistry { diff --git a/src/main/cluster-manager.ts b/src/main/cluster-manager.ts index 831a7624b5..1991ce8ea1 100644 --- a/src/main/cluster-manager.ts +++ b/src/main/cluster-manager.ts @@ -6,12 +6,13 @@ import "../common/ipc/cluster"; import type http from "http"; import { action, makeObservable, observable, observe, reaction, toJS } from "mobx"; -import { Cluster } from "../common/cluster/cluster"; +import type { Cluster } from "../common/cluster/cluster"; import logger from "./logger"; import { apiKubePrefix } from "../common/vars"; import { getClusterIdFromHost, Singleton } from "../common/utils"; import { catalogEntityRegistry } from "./catalog"; -import { KubernetesCluster, KubernetesClusterPrometheusMetrics, LensKubernetesClusterStatus } from "../common/catalog-entities/kubernetes-cluster"; +import type { KubernetesClusterPrometheusMetrics } from "../common/catalog-entities/kubernetes-cluster"; +import { KubernetesCluster, LensKubernetesClusterStatus } from "../common/catalog-entities/kubernetes-cluster"; import { ipcMainOn } from "../common/ipc"; import { once } from "lodash"; import { ClusterStore } from "../common/cluster-store/cluster-store"; diff --git a/src/main/context-handler/context-handler.ts b/src/main/context-handler/context-handler.ts index 2eed4e1ad7..46e100c07e 100644 --- a/src/main/context-handler/context-handler.ts +++ b/src/main/context-handler/context-handler.ts @@ -8,7 +8,8 @@ import { PrometheusProviderRegistry } from "../prometheus/provider-registry"; import type { ClusterPrometheusPreferences } from "../../common/cluster-types"; import type { Cluster } from "../../common/cluster/cluster"; import type httpProxy from "http-proxy"; -import url, { UrlWithStringQuery } from "url"; +import type { UrlWithStringQuery } from "url"; +import url from "url"; import { CoreV1Api } from "@kubernetes/client-node"; import logger from "../logger"; import type { KubeAuthProxy } from "../kube-auth-proxy/kube-auth-proxy"; diff --git a/src/main/create-cluster/create-cluster.injectable.ts b/src/main/create-cluster/create-cluster.injectable.ts index c1c26217ae..d62c37e9c7 100644 --- a/src/main/create-cluster/create-cluster.injectable.ts +++ b/src/main/create-cluster/create-cluster.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { Cluster, ClusterDependencies } from "../../common/cluster/cluster"; +import type { ClusterDependencies } from "../../common/cluster/cluster"; +import { Cluster } from "../../common/cluster/cluster"; import directoryForKubeConfigsInjectable from "../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import createKubeconfigManagerInjectable from "../kubeconfig-manager/create-kubeconfig-manager.injectable"; import createKubectlInjectable from "../kubectl/create-kubectl.injectable"; diff --git a/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.ts b/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.ts index 1341ec18d7..1a657b78be 100644 --- a/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.ts +++ b/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { BrowserWindow, IpcMainInvokeEvent, Menu } from "electron"; +import type { IpcMainInvokeEvent } from "electron"; +import { BrowserWindow, Menu } from "electron"; import { clusterFrameMap } from "../../../common/cluster-frames"; import { clusterActivateHandler, clusterSetFrameIdHandler, clusterVisibilityHandler, clusterRefreshHandler, clusterDisconnectHandler, clusterKubectlApplyAllHandler, clusterKubectlDeleteAllHandler, clusterDeleteHandler, clusterSetDeletingHandler, clusterClearDeletingHandler } from "../../../common/ipc/cluster"; import type { ClusterId } from "../../../common/cluster-types"; diff --git a/src/main/ipc/dialog.ts b/src/main/ipc/dialog.ts index b777ef26c6..f1630db85f 100644 --- a/src/main/ipc/dialog.ts +++ b/src/main/ipc/dialog.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { BrowserWindow, dialog, OpenDialogOptions } from "electron"; +import type { OpenDialogOptions } from "electron"; +import { BrowserWindow, dialog } from "electron"; export async function showOpenDialog(dialogOptions: OpenDialogOptions): Promise<{ canceled: boolean; filePaths: string[] }> { const { canceled, filePaths } = await dialog.showOpenDialog(BrowserWindow.getFocusedWindow(), dialogOptions); diff --git a/src/main/k8s-request.ts b/src/main/k8s-request.ts index 43002f0b47..8531e9abb7 100644 --- a/src/main/k8s-request.ts +++ b/src/main/k8s-request.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import request, { RequestPromiseOptions } from "request-promise-native"; +import type { RequestPromiseOptions } from "request-promise-native"; +import request from "request-promise-native"; import { apiKubePrefix } from "../common/vars"; import type { IMetricsReqParams } from "../common/k8s-api/endpoints/metrics.api"; import { LensProxy } from "./lens-proxy"; diff --git a/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts b/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts index 9a8504c675..9d62a04cef 100644 --- a/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts +++ b/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { KubeAuthProxy, KubeAuthProxyDependencies } from "./kube-auth-proxy"; +import type { KubeAuthProxyDependencies } from "./kube-auth-proxy"; +import { KubeAuthProxy } from "./kube-auth-proxy"; import type { Cluster } from "../../common/cluster/cluster"; import path from "path"; import selfsigned from "selfsigned"; diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts index 5961d2121b..9e95414838 100644 --- a/src/main/menu/application-menu-items.injectable.ts +++ b/src/main/menu/application-menu-items.injectable.ts @@ -10,10 +10,11 @@ import { broadcastMessage } from "../../common/ipc"; import { openBrowser } from "../../common/utils"; import { showAbout } from "./menu"; import windowManagerInjectable from "../window-manager.injectable"; -import { +import type { BrowserWindow, MenuItem, - MenuItemConstructorOptions, + MenuItemConstructorOptions } from "electron"; +import { webContents, } from "electron"; import loggerInjectable from "../../common/logger.injectable"; diff --git a/src/main/menu/menu.ts b/src/main/menu/menu.ts index 03f31ecec7..4d5092b666 100644 --- a/src/main/menu/menu.ts +++ b/src/main/menu/menu.ts @@ -2,8 +2,10 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { app, BrowserWindow, dialog, Menu } from "electron"; -import { autorun, IComputedValue } from "mobx"; +import type { BrowserWindow } from "electron"; +import { app, dialog, Menu } from "electron"; +import type { IComputedValue } from "mobx"; +import { autorun } from "mobx"; import { appName, isWindows, productName } from "../../common/vars"; import packageJson from "../../../package.json"; import type { MenuItemOpts } from "./application-menu-items.injectable"; diff --git a/src/main/prometheus/lens.ts b/src/main/prometheus/lens.ts index 5c6c8bd019..e651a0a896 100644 --- a/src/main/prometheus/lens.ts +++ b/src/main/prometheus/lens.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { PrometheusProvider, PrometheusService } from "./provider-registry"; +import type { PrometheusService } from "./provider-registry"; +import { PrometheusProvider } from "./provider-registry"; import type { CoreV1Api } from "@kubernetes/client-node"; import { inspect } from "util"; diff --git a/src/main/prometheus/operator.ts b/src/main/prometheus/operator.ts index 6f055379e1..4673cad815 100644 --- a/src/main/prometheus/operator.ts +++ b/src/main/prometheus/operator.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { PrometheusProvider, PrometheusService } from "./provider-registry"; +import type { PrometheusService } from "./provider-registry"; +import { PrometheusProvider } from "./provider-registry"; import type { CoreV1Api } from "@kubernetes/client-node"; import { inspect } from "util"; diff --git a/src/main/prometheus/stacklight.ts b/src/main/prometheus/stacklight.ts index 974cd957bd..0eee912a24 100644 --- a/src/main/prometheus/stacklight.ts +++ b/src/main/prometheus/stacklight.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { PrometheusProvider, PrometheusService } from "./provider-registry"; +import type { PrometheusService } from "./provider-registry"; +import { PrometheusProvider } from "./provider-registry"; import type { CoreV1Api } from "@kubernetes/client-node"; import { inspect } from "util"; diff --git a/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.ts b/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.ts index 1b6903880a..e40ba5fa11 100644 --- a/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.ts +++ b/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.ts @@ -9,7 +9,8 @@ import URLParse from "url-parse"; import type { LensExtension } from "../../../extensions/lens-extension"; import { broadcastMessage } from "../../../common/ipc"; import { observable, when, makeObservable } from "mobx"; -import { ProtocolHandlerInvalid, RouteAttempt } from "../../../common/protocol-handler"; +import type { RouteAttempt } from "../../../common/protocol-handler"; +import { ProtocolHandlerInvalid } from "../../../common/protocol-handler"; import { disposer, noop } from "../../../common/utils"; import { WindowManager } from "../../window-manager"; import type { ExtensionLoader } from "../../../extensions/extension-loader"; diff --git a/src/main/proxy-functions/shell-api-request/shell-api-request.ts b/src/main/proxy-functions/shell-api-request/shell-api-request.ts index 4fc0e2d0a6..8a797f5f68 100644 --- a/src/main/proxy-functions/shell-api-request/shell-api-request.ts +++ b/src/main/proxy-functions/shell-api-request/shell-api-request.ts @@ -4,7 +4,8 @@ */ import logger from "../../logger"; -import WebSocket, { Server as WebSocketServer } from "ws"; +import type WebSocket from "ws"; +import { Server as WebSocketServer } from "ws"; import type { ProxyApiRequestArgs } from "../types"; import { ClusterManager } from "../../cluster-manager"; import URLParse from "url-parse"; diff --git a/src/main/router/router.injectable.ts b/src/main/router/router.injectable.ts index 620ce4f2c4..138219d035 100644 --- a/src/main/router/router.injectable.ts +++ b/src/main/router/router.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable, getInjectionToken } from "@ogre-tools/injectable"; -import { Route, Router } from "./router"; +import type { Route } from "./router"; +import { Router } from "./router"; import parseRequestInjectable from "./parse-request.injectable"; export const routeInjectionToken = getInjectionToken>({ diff --git a/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts b/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts index c4eec032fe..b0b2ae96e9 100644 --- a/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts +++ b/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts @@ -8,7 +8,8 @@ import { apiPrefix } from "../../../common/vars"; import type { Route } from "../../router/router"; import { routeInjectionToken } from "../../router/router.injectable"; import type { Cluster } from "../../../common/cluster/cluster"; -import { CoreV1Api, V1Secret } from "@kubernetes/client-node"; +import type { V1Secret } from "@kubernetes/client-node"; +import { CoreV1Api } from "@kubernetes/client-node"; const getServiceAccountRouteInjectable = getInjectable({ id: "get-service-account-route", diff --git a/src/main/routes/metrics/add-metrics-route.injectable.ts b/src/main/routes/metrics/add-metrics-route.injectable.ts index 4dc2158488..470fecd56c 100644 --- a/src/main/routes/metrics/add-metrics-route.injectable.ts +++ b/src/main/routes/metrics/add-metrics-route.injectable.ts @@ -7,7 +7,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import { apiPrefix } from "../../../common/vars"; import type { LensApiRequest, Route } from "../../router/router"; import { routeInjectionToken } from "../../router/router.injectable"; -import { ClusterMetadataKey, ClusterPrometheusMetadata } from "../../../common/cluster-types"; +import type { ClusterPrometheusMetadata } from "../../../common/cluster-types"; +import { ClusterMetadataKey } from "../../../common/cluster-types"; import logger from "../../logger"; import type { Cluster } from "../../../common/cluster/cluster"; import { getMetrics } from "../../k8s-request"; diff --git a/src/main/routes/port-forward/functionality/create-port-forward.injectable.ts b/src/main/routes/port-forward/functionality/create-port-forward.injectable.ts index 1bd7a1ea41..ab2a5e8c42 100644 --- a/src/main/routes/port-forward/functionality/create-port-forward.injectable.ts +++ b/src/main/routes/port-forward/functionality/create-port-forward.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { PortForward, PortForwardArgs } from "./port-forward"; +import type { PortForwardArgs } from "./port-forward"; +import { PortForward } from "./port-forward"; import bundledKubectlInjectable from "../../../kubectl/bundled-kubectl.injectable"; const createPortForwardInjectable = getInjectable({ diff --git a/src/main/routes/port-forward/functionality/port-forward.ts b/src/main/routes/port-forward/functionality/port-forward.ts index dcbfb3d752..497176ebf4 100644 --- a/src/main/routes/port-forward/functionality/port-forward.ts +++ b/src/main/routes/port-forward/functionality/port-forward.ts @@ -4,7 +4,8 @@ */ import logger from "../../../logger"; import { getPortFrom } from "../../../utils/get-port"; -import { spawn, ChildProcessWithoutNullStreams } from "child_process"; +import type { ChildProcessWithoutNullStreams } from "child_process"; +import { spawn } from "child_process"; import * as tcpPortUsed from "tcp-port-used"; const internalPortRegex = /^forwarding from (?
.+) ->/i; diff --git a/src/main/routes/port-forward/start-port-forward-route.injectable.ts b/src/main/routes/port-forward/start-port-forward-route.injectable.ts index 99f6624cd3..50afbd2575 100644 --- a/src/main/routes/port-forward/start-port-forward-route.injectable.ts +++ b/src/main/routes/port-forward/start-port-forward-route.injectable.ts @@ -6,7 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import { routeInjectionToken } from "../../router/router.injectable"; import type { LensApiRequest, Route } from "../../router/router"; import { apiPrefix } from "../../../common/vars"; -import { PortForward, PortForwardArgs } from "./functionality/port-forward"; +import type { PortForwardArgs } from "./functionality/port-forward"; +import { PortForward } from "./functionality/port-forward"; import logger from "../../logger"; import createPortForwardInjectable from "./functionality/create-port-forward.injectable"; diff --git a/src/main/routes/static-file-route.injectable.ts b/src/main/routes/static-file-route.injectable.ts index 21b4025a8d..cca25f2ed3 100644 --- a/src/main/routes/static-file-route.injectable.ts +++ b/src/main/routes/static-file-route.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { LensApiRequest, Route } from "../router/router"; -import { contentTypes, SupportedFileExtension } from "../router/router-content-types"; +import type { SupportedFileExtension } from "../router/router-content-types"; +import { contentTypes } from "../router/router-content-types"; import logger from "../logger"; import { routeInjectionToken } from "../router/router.injectable"; import { appName, publicPath } from "../../common/vars"; @@ -12,7 +13,8 @@ import path from "path"; import isDevelopmentInjectable from "../../common/vars/is-development.injectable"; import httpProxy from "http-proxy"; import readFileBufferInjectable from "../../common/fs/read-file-buffer.injectable"; -import getAbsolutePathInjectable, { GetAbsolutePath } from "../../common/path/get-absolute-path.injectable"; +import type { GetAbsolutePath } from "../../common/path/get-absolute-path.injectable"; +import getAbsolutePathInjectable from "../../common/path/get-absolute-path.injectable"; import type { JoinPaths } from "../../common/path/join-paths.injectable"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; diff --git a/src/main/shell-session/shell-env-modifier/terminal-shell-env-modifiers.ts b/src/main/shell-session/shell-env-modifier/terminal-shell-env-modifiers.ts index 1486beaef9..f60631e554 100644 --- a/src/main/shell-session/shell-env-modifier/terminal-shell-env-modifiers.ts +++ b/src/main/shell-session/shell-env-modifier/terminal-shell-env-modifiers.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; import type { ClusterId } from "../../../common/cluster-types"; import type { LensMainExtension } from "../../../extensions/lens-main-extension"; import { catalogEntityRegistry } from "../../catalog"; diff --git a/src/main/shell-session/shell-session.ts b/src/main/shell-session/shell-session.ts index 2c9372b269..831c24bc02 100644 --- a/src/main/shell-session/shell-session.ts +++ b/src/main/shell-session/shell-session.ts @@ -16,7 +16,8 @@ import { UserStore } from "../../common/user-store"; import * as pty from "node-pty"; import { appEventBus } from "../../common/app-event-bus/event-bus"; import logger from "../logger"; -import { TerminalChannels, TerminalMessage } from "../../renderer/api/terminal-api"; +import type { TerminalMessage } from "../../renderer/api/terminal-api"; +import { TerminalChannels } from "../../renderer/api/terminal-api"; import { deserialize, serialize } from "v8"; import { stat } from "fs/promises"; diff --git a/src/main/tray/tray.ts b/src/main/tray/tray.ts index 9bdfa5c082..ed33e7faa5 100644 --- a/src/main/tray/tray.ts +++ b/src/main/tray/tray.ts @@ -6,7 +6,8 @@ import path from "path"; import packageInfo from "../../../package.json"; import { Menu, Tray } from "electron"; -import { autorun, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { autorun } from "mobx"; import { showAbout } from "../menu/menu"; import { checkForUpdates, isAutoUpdateEnabled } from "../app-updater"; import type { WindowManager } from "../window-manager"; diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts index 74b80ca563..260a82ccc0 100644 --- a/src/main/window-manager.ts +++ b/src/main/window-manager.ts @@ -10,7 +10,8 @@ import windowStateKeeper from "electron-window-state"; import { appEventBus } from "../common/app-event-bus/event-bus"; import { ipcMainOn } from "../common/ipc"; import { delay, iter, Singleton, openBrowser } from "../common/utils"; -import { ClusterFrameInfo, clusterFrameMap } from "../common/cluster-frames"; +import type { ClusterFrameInfo } from "../common/cluster-frames"; +import { clusterFrameMap } from "../common/cluster-frames"; import { IpcRendererNavigationEvents } from "../renderer/navigation/events"; import logger from "./logger"; import { isMac, productName } from "../common/vars"; diff --git a/src/migrations/cluster-store/3.6.0-beta.1.ts b/src/migrations/cluster-store/3.6.0-beta.1.ts index 4c7e066c3f..d399c9f324 100644 --- a/src/migrations/cluster-store/3.6.0-beta.1.ts +++ b/src/migrations/cluster-store/3.6.0-beta.1.ts @@ -9,7 +9,8 @@ import path from "path"; import fse from "fs-extra"; import { loadConfigFromFileSync } from "../../common/kube-helpers"; -import { MigrationDeclaration, migrationLog } from "../helpers"; +import type { MigrationDeclaration } from "../helpers"; +import { migrationLog } from "../helpers"; import type { ClusterModel } from "../../common/cluster-types"; import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import directoryForUserDataInjectable diff --git a/src/migrations/cluster-store/5.0.0-beta.13.ts b/src/migrations/cluster-store/5.0.0-beta.13.ts index e29b81720b..d386d006d2 100644 --- a/src/migrations/cluster-store/5.0.0-beta.13.ts +++ b/src/migrations/cluster-store/5.0.0-beta.13.ts @@ -4,7 +4,8 @@ */ import type { ClusterModel, ClusterPreferences, ClusterPrometheusPreferences } from "../../common/cluster-types"; -import { MigrationDeclaration, migrationLog } from "../helpers"; +import type { MigrationDeclaration } from "../helpers"; +import { migrationLog } from "../helpers"; import { generateNewIdFor } from "../utils"; import path from "path"; import { moveSync, removeSync } from "fs-extra"; diff --git a/src/migrations/cluster-store/snap.ts b/src/migrations/cluster-store/snap.ts index bb3bfba273..9128dca82a 100644 --- a/src/migrations/cluster-store/snap.ts +++ b/src/migrations/cluster-store/snap.ts @@ -8,7 +8,8 @@ import type { ClusterModel } from "../../common/cluster-types"; import { getAppVersion } from "../../common/utils/app-version"; import fs from "fs"; -import { MigrationDeclaration, migrationLog } from "../helpers"; +import type { MigrationDeclaration } from "../helpers"; +import { migrationLog } from "../helpers"; export default { version: getAppVersion(), // Run always after upgrade diff --git a/src/migrations/hotbar-store/5.0.0-beta.10.ts b/src/migrations/hotbar-store/5.0.0-beta.10.ts index e880310adf..15466b993e 100644 --- a/src/migrations/hotbar-store/5.0.0-beta.10.ts +++ b/src/migrations/hotbar-store/5.0.0-beta.10.ts @@ -8,8 +8,10 @@ import { isNull } from "lodash"; import path from "path"; import * as uuid from "uuid"; import type { ClusterStoreModel } from "../../common/cluster-store/cluster-store"; -import { defaultHotbarCells, getEmptyHotbar, Hotbar, HotbarItem } from "../../common/hotbar-types"; -import { MigrationDeclaration, migrationLog } from "../helpers"; +import type { Hotbar, HotbarItem } from "../../common/hotbar-types"; +import { defaultHotbarCells, getEmptyHotbar } from "../../common/hotbar-types"; +import type { MigrationDeclaration } from "../helpers"; +import { migrationLog } from "../helpers"; import { generateNewIdFor } from "../utils"; import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import directoryForUserDataInjectable diff --git a/src/migrations/user-store/5.0.3-beta.1.ts b/src/migrations/user-store/5.0.3-beta.1.ts index d6b3d19696..f46949942c 100644 --- a/src/migrations/user-store/5.0.3-beta.1.ts +++ b/src/migrations/user-store/5.0.3-beta.1.ts @@ -8,7 +8,8 @@ import path from "path"; import os from "os"; import type { ClusterStoreModel } from "../../common/cluster-store/cluster-store"; import type { KubeconfigSyncEntry, UserPreferencesModel } from "../../common/user-store"; -import { MigrationDeclaration, migrationLog } from "../helpers"; +import type { MigrationDeclaration } from "../helpers"; +import { migrationLog } from "../helpers"; import { isLogicalChildPath } from "../../common/utils"; import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import directoryForUserDataInjectable diff --git a/src/renderer/api/__tests__/catalog-entity-registry.test.ts b/src/renderer/api/__tests__/catalog-entity-registry.test.ts index a76dfdab82..aeb537267e 100644 --- a/src/renderer/api/__tests__/catalog-entity-registry.test.ts +++ b/src/renderer/api/__tests__/catalog-entity-registry.test.ts @@ -5,7 +5,8 @@ import { CatalogEntityRegistry } from "../catalog-entity-registry"; import { catalogCategoryRegistry } from "../../../common/catalog/catalog-category-registry"; -import { CatalogCategory, CatalogEntityData, CatalogEntityKindData } from "../catalog-entity"; +import type { CatalogEntityData, CatalogEntityKindData } from "../catalog-entity"; +import { CatalogCategory } from "../catalog-entity"; import { KubernetesCluster, WebLink } from "../../../common/catalog-entities"; import { observable } from "mobx"; diff --git a/src/renderer/api/catalog-entity-registry.ts b/src/renderer/api/catalog-entity-registry.ts index 34014911e2..1cc3f24a0d 100644 --- a/src/renderer/api/catalog-entity-registry.ts +++ b/src/renderer/api/catalog-entity-registry.ts @@ -5,7 +5,8 @@ import { computed, observable, makeObservable, action } from "mobx"; import { ipcRendererOn } from "../../common/ipc"; -import { CatalogCategory, CatalogEntity, CatalogEntityData, catalogCategoryRegistry, CatalogCategoryRegistry, CatalogEntityKindData } from "../../common/catalog"; +import type { CatalogCategory, CatalogEntity, CatalogEntityData, CatalogCategoryRegistry, CatalogEntityKindData } from "../../common/catalog"; +import { catalogCategoryRegistry } from "../../common/catalog"; import "../../common/catalog-entities"; import type { Cluster } from "../../common/cluster/cluster"; import { ClusterStore } from "../../common/cluster-store/cluster-store"; diff --git a/src/renderer/api/terminal-api.ts b/src/renderer/api/terminal-api.ts index d1c842dbef..1e8c86a77c 100644 --- a/src/renderer/api/terminal-api.ts +++ b/src/renderer/api/terminal-api.ts @@ -4,7 +4,8 @@ */ import { getHostedClusterId } from "../utils"; -import { WebSocketApi, WebSocketEvents } from "./websocket-api"; +import type { WebSocketEvents } from "./websocket-api"; +import { WebSocketApi } from "./websocket-api"; import isEqual from "lodash/isEqual"; import url from "url"; import { makeObservable, observable } from "mobx"; diff --git a/src/renderer/app-paths/app-paths.injectable.ts b/src/renderer/app-paths/app-paths.injectable.ts index 1e80d7cd82..e6c77c1840 100644 --- a/src/renderer/app-paths/app-paths.injectable.ts +++ b/src/renderer/app-paths/app-paths.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { AppPaths, appPathsInjectionToken, appPathsIpcChannel } from "../../common/app-paths/app-path-injection-token"; +import type { AppPaths } from "../../common/app-paths/app-path-injection-token"; +import { appPathsInjectionToken, appPathsIpcChannel } from "../../common/app-paths/app-path-injection-token"; import getValueFromRegisteredChannelInjectable from "./get-value-from-registered-channel/get-value-from-registered-channel.injectable"; let syncAppPaths: AppPaths; diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx index 731ff2aa54..ce53440966 100644 --- a/src/renderer/components/+add-cluster/add-cluster.tsx +++ b/src/renderer/components/+add-cluster/add-cluster.tsx @@ -23,7 +23,8 @@ 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 type { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; +import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; interface Option { config: KubeConfig; diff --git a/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx b/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx index 5286fe02d5..1f1fa1bfab 100644 --- a/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx +++ b/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx @@ -5,7 +5,8 @@ import React from "react"; import { render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; -import { CatalogCategory, CatalogCategorySpec } from "../../../../common/catalog"; +import type { CatalogCategorySpec } from "../../../../common/catalog"; +import { CatalogCategory } from "../../../../common/catalog"; import { CatalogAddButton } from "../catalog-add-button"; class TestCatalogCategory extends CatalogCategory { diff --git a/src/renderer/components/+catalog/__tests__/catalog-category-label.test.tsx b/src/renderer/components/+catalog/__tests__/catalog-category-label.test.tsx index 015929b643..f15737451e 100644 --- a/src/renderer/components/+catalog/__tests__/catalog-category-label.test.tsx +++ b/src/renderer/components/+catalog/__tests__/catalog-category-label.test.tsx @@ -6,7 +6,8 @@ import { render, screen } from "@testing-library/react"; import React from "react"; import "@testing-library/jest-dom/extend-expect"; -import { CatalogCategory, CatalogCategorySpec } from "../../../../common/catalog"; +import type { CatalogCategorySpec } from "../../../../common/catalog"; +import { CatalogCategory } from "../../../../common/catalog"; import { CatalogCategoryLabel } from "../catalog-category-label"; class CatalogCategoryWithoutBadge extends CatalogCategory { diff --git a/src/renderer/components/+catalog/__tests__/custom-columns.test.ts b/src/renderer/components/+catalog/__tests__/custom-columns.test.ts index e95303f472..39dd880424 100644 --- a/src/renderer/components/+catalog/__tests__/custom-columns.test.ts +++ b/src/renderer/components/+catalog/__tests__/custom-columns.test.ts @@ -11,7 +11,8 @@ import rendererExtensionsInjectable from "../../../../extensions/renderer-extens import { CatalogCategory } from "../../../api/catalog-entity"; import { getDiForUnitTesting } from "../../../getDiForUnitTesting"; import type { AdditionalCategoryColumnRegistration, CategoryColumnRegistration } from "../custom-category-columns"; -import getCategoryColumnsInjectable, { CategoryColumns, GetCategoryColumnsParams } from "../get-category-columns.injectable"; +import type { CategoryColumns, GetCategoryColumnsParams } from "../get-category-columns.injectable"; +import getCategoryColumnsInjectable from "../get-category-columns.injectable"; import hotbarStoreInjectable from "../../../../common/hotbar-store.injectable"; class TestCategory extends CatalogCategory { diff --git a/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx b/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx index 3d4c6f93ad..93d9ea7e0d 100644 --- a/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx +++ b/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx @@ -5,7 +5,8 @@ import React from "react"; import { cssNames } from "../../utils"; -import { MenuActions, MenuActionsProps } from "../menu/menu-actions"; +import type { MenuActionsProps } from "../menu/menu-actions"; +import { MenuActions } from "../menu/menu-actions"; import type { CatalogEntity, CatalogEntityContextMenu, CatalogEntityContextMenuContext } from "../../api/catalog-entity"; import { observer } from "mobx-react"; import { makeObservable, observable } from "mobx"; diff --git a/src/renderer/components/+catalog/catalog-entity-store/catalog-entity.store.tsx b/src/renderer/components/+catalog/catalog-entity-store/catalog-entity.store.tsx index f9a6708102..732f5e822f 100644 --- a/src/renderer/components/+catalog/catalog-entity-store/catalog-entity.store.tsx +++ b/src/renderer/components/+catalog/catalog-entity-store/catalog-entity.store.tsx @@ -7,7 +7,8 @@ import { computed, makeObservable, observable, reaction } from "mobx"; import type { CatalogEntityRegistry } from "../../../api/catalog-entity-registry"; import type { CatalogEntity } from "../../../api/catalog-entity"; import { ItemStore } from "../../../../common/item.store"; -import { CatalogCategory, catalogCategoryRegistry } from "../../../../common/catalog"; +import type { CatalogCategory } from "../../../../common/catalog"; +import { catalogCategoryRegistry } from "../../../../common/catalog"; import { autoBind, disposer } from "../../../../common/utils"; interface Dependencies { diff --git a/src/renderer/components/+catalog/catalog-menu.tsx b/src/renderer/components/+catalog/catalog-menu.tsx index 36590b82a8..d9bbb71613 100644 --- a/src/renderer/components/+catalog/catalog-menu.tsx +++ b/src/renderer/components/+catalog/catalog-menu.tsx @@ -7,7 +7,8 @@ import treeStyles from "./catalog-tree.module.scss"; import styles from "./catalog-menu.module.scss"; import React from "react"; -import { TreeItem, TreeItemProps, TreeView } from "@material-ui/lab"; +import type { TreeItemProps } from "@material-ui/lab"; +import { TreeItem, TreeView } from "@material-ui/lab"; import { catalogCategoryRegistry } from "../../api/catalog-category-registry"; import { Icon } from "../icon"; import { StylesProvider } from "@material-ui/core"; diff --git a/src/renderer/components/+catalog/catalog.test.tsx b/src/renderer/components/+catalog/catalog.test.tsx index 9422adf055..9a481d9535 100644 --- a/src/renderer/components/+catalog/catalog.test.tsx +++ b/src/renderer/components/+catalog/catalog.test.tsx @@ -8,7 +8,8 @@ import { screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { Catalog } from "./catalog"; import { mockWindow } from "../../../../__mocks__/windowMock"; -import { CatalogCategoryRegistry, CatalogEntity, CatalogEntityActionContext, CatalogEntityData } from "../../../common/catalog"; +import type { CatalogEntityActionContext, CatalogEntityData } from "../../../common/catalog"; +import { CatalogCategoryRegistry, CatalogEntity } from "../../../common/catalog"; import { CatalogEntityRegistry } from "../../api/catalog-entity-registry"; import { CatalogEntityDetailRegistry } from "../../../extensions/registries"; import type { CatalogEntityStore } from "./catalog-entity-store/catalog-entity.store"; diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx index 784aa1ba45..78456761a3 100644 --- a/src/renderer/components/+catalog/catalog.tsx +++ b/src/renderer/components/+catalog/catalog.tsx @@ -8,13 +8,15 @@ 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 type { IComputedValue } from "mobx"; +import { action, computed, 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"; import type { CatalogEntityContextMenu, CatalogEntityContextMenuContext } from "../../api/catalog-entity"; import { ConfirmDialog } from "../confirm-dialog"; -import { catalogCategoryRegistry, CatalogEntity } from "../../../common/catalog"; +import type { CatalogEntity } from "../../../common/catalog"; +import { catalogCategoryRegistry } from "../../../common/catalog"; import { CatalogAddButton } from "./catalog-add-button"; import { Notifications } from "../notifications"; import { MainLayout } from "../layout/main-layout"; @@ -33,7 +35,8 @@ 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 type { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; +import navigateToCatalogInjectable 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/+catalog/custom-category-columns.injectable.tsx b/src/renderer/components/+catalog/custom-category-columns.injectable.tsx index 52eabc23eb..edfbe31f6d 100644 --- a/src/renderer/components/+catalog/custom-category-columns.injectable.tsx +++ b/src/renderer/components/+catalog/custom-category-columns.injectable.tsx @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; import { getOrInsert, getOrInsertMap } from "../../utils"; diff --git a/src/renderer/components/+catalog/custom-views.injectable.ts b/src/renderer/components/+catalog/custom-views.injectable.ts index f131923a5c..c6200f80c6 100644 --- a/src/renderer/components/+catalog/custom-views.injectable.ts +++ b/src/renderer/components/+catalog/custom-views.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { orderBy } from "lodash"; -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; import { getOrInsert, getOrInsertMap } from "../../utils"; diff --git a/src/renderer/components/+catalog/hotbar-toggle-menu-item.tsx b/src/renderer/components/+catalog/hotbar-toggle-menu-item.tsx index b48e629c94..0958213658 100644 --- a/src/renderer/components/+catalog/hotbar-toggle-menu-item.tsx +++ b/src/renderer/components/+catalog/hotbar-toggle-menu-item.tsx @@ -2,7 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import React, { ReactNode, useState } from "react"; +import type { ReactNode } from "react"; +import React, { useState } from "react"; import { MenuItem } from "../menu"; diff --git a/src/renderer/components/+cluster/cluster-metric-switchers.tsx b/src/renderer/components/+cluster/cluster-metric-switchers.tsx index 1b80da1aaa..3a91d8cf20 100644 --- a/src/renderer/components/+cluster/cluster-metric-switchers.tsx +++ b/src/renderer/components/+cluster/cluster-metric-switchers.tsx @@ -8,7 +8,8 @@ import { observer } from "mobx-react"; import { nodesStore } from "../+nodes/nodes.store"; import { cssNames } from "../../utils"; import { Radio, RadioGroup } from "../radio"; -import { ClusterOverviewStore, MetricNodeRole, MetricType } from "./cluster-overview-store/cluster-overview-store"; +import type { ClusterOverviewStore } from "./cluster-overview-store/cluster-overview-store"; +import { MetricNodeRole, MetricType } from "./cluster-overview-store/cluster-overview-store"; import clusterOverviewStoreInjectable from "./cluster-overview-store/cluster-overview-store.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; diff --git a/src/renderer/components/+cluster/cluster-metrics.tsx b/src/renderer/components/+cluster/cluster-metrics.tsx index 11cbb68084..4e964d4096 100644 --- a/src/renderer/components/+cluster/cluster-metrics.tsx +++ b/src/renderer/components/+cluster/cluster-metrics.tsx @@ -8,7 +8,8 @@ import styles from "./cluster-metrics.module.scss"; import React from "react"; import { observer } from "mobx-react"; import type { ChartOptions, ChartPoint } from "chart.js"; -import { ClusterOverviewStore, MetricType } from "./cluster-overview-store/cluster-overview-store"; +import type { ClusterOverviewStore } from "./cluster-overview-store/cluster-overview-store"; +import { MetricType } from "./cluster-overview-store/cluster-overview-store"; import { BarChart } from "../chart"; import { bytesToUnits, cssNames } from "../../utils"; import { Spinner } from "../spinner"; diff --git a/src/renderer/components/+cluster/cluster-overview-sidebar-items.injectable.tsx b/src/renderer/components/+cluster/cluster-overview-sidebar-items.injectable.tsx index 88f5900fed..d3cf4e6814 100644 --- a/src/renderer/components/+cluster/cluster-overview-sidebar-items.injectable.tsx +++ b/src/renderer/components/+cluster/cluster-overview-sidebar-items.injectable.tsx @@ -5,8 +5,9 @@ import { getInjectable } from "@ogre-tools/injectable"; import { Icon } from "../icon"; import React from "react"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { computed } from "mobx"; diff --git a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts index 69fdc7a3bc..f80fdcf4ee 100644 --- a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts +++ b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts @@ -3,8 +3,9 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import type { + ClusterOverviewStorageState } from "./cluster-overview-store"; import { - ClusterOverviewStorageState, ClusterOverviewStore, MetricNodeRole, MetricType, diff --git a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts index e9b3691e6a..414f31ccbc 100644 --- a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts +++ b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts @@ -5,8 +5,10 @@ import { action, observable, reaction, when, makeObservable } from "mobx"; import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store"; -import { Cluster, clusterApi, getMetricsByNodeNames, type IClusterMetrics } from "../../../../common/k8s-api/endpoints"; -import { autoBind, StorageHelper } from "../../../utils"; +import type { Cluster } from "../../../../common/k8s-api/endpoints"; +import { clusterApi, getMetricsByNodeNames, type IClusterMetrics } from "../../../../common/k8s-api/endpoints"; +import type { StorageHelper } from "../../../utils"; +import { autoBind } from "../../../utils"; import { type IMetricsReqParams, normalizeMetrics } from "../../../../common/k8s-api/endpoints/metrics.api"; import { nodesStore } from "../../+nodes/nodes.store"; diff --git a/src/renderer/components/+cluster/cluster-overview.tsx b/src/renderer/components/+cluster/cluster-overview.tsx index 609138c965..36590df34b 100644 --- a/src/renderer/components/+cluster/cluster-overview.tsx +++ b/src/renderer/components/+cluster/cluster-overview.tsx @@ -10,7 +10,8 @@ import { reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import { nodesStore } from "../+nodes/nodes.store"; import { podsStore } from "../+workloads-pods/pods.store"; -import { Disposer, getHostedClusterId, interval } from "../../utils"; +import type { Disposer } from "../../utils"; +import { getHostedClusterId, interval } from "../../utils"; import { TabLayout } from "../layout/tab-layout-2"; import { Spinner } from "../spinner"; import { ClusterIssues } from "./cluster-issues"; diff --git a/src/renderer/components/+cluster/cluster-pie-charts.tsx b/src/renderer/components/+cluster/cluster-pie-charts.tsx index f955ece37b..f039c89161 100644 --- a/src/renderer/components/+cluster/cluster-pie-charts.tsx +++ b/src/renderer/components/+cluster/cluster-pie-charts.tsx @@ -7,11 +7,13 @@ import styles from "./cluster-pie-charts.module.scss"; import React from "react"; import { observer } from "mobx-react"; -import { ClusterOverviewStore, MetricNodeRole } from "./cluster-overview-store/cluster-overview-store"; +import type { ClusterOverviewStore } from "./cluster-overview-store/cluster-overview-store"; +import { MetricNodeRole } from "./cluster-overview-store/cluster-overview-store"; import { Spinner } from "../spinner"; import { Icon } from "../icon"; import { nodesStore } from "../+nodes/nodes.store"; -import { ChartData, PieChart } from "../chart"; +import type { ChartData } from "../chart"; +import { PieChart } from "../chart"; import { ClusterNoMetrics } from "./cluster-no-metrics"; import { bytesToUnits, cssNames } from "../../utils"; import { ThemeStore } from "../../theme.store"; diff --git a/src/renderer/components/+config-autoscalers/horizontal-pod-auto-scalers-sidebar-items.injectable.tsx b/src/renderer/components/+config-autoscalers/horizontal-pod-auto-scalers-sidebar-items.injectable.tsx index 99bff705b8..7298fd1a8b 100644 --- a/src/renderer/components/+config-autoscalers/horizontal-pod-auto-scalers-sidebar-items.injectable.tsx +++ b/src/renderer/components/+config-autoscalers/horizontal-pod-auto-scalers-sidebar-items.injectable.tsx @@ -6,7 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import horizontalPodAutoscalersRouteInjectable from "../../../common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/horizontal-pod-autoscalers-route.injectable"; import { configSidebarItemId } from "../+config/config-sidebar-items.injectable"; -import { SidebarItemRegistration, sidebarItemsInjectionToken } from "../layout/sidebar-items.injectable"; +import type { SidebarItemRegistration } from "../layout/sidebar-items.injectable"; +import { sidebarItemsInjectionToken } from "../layout/sidebar-items.injectable"; import routeIsActiveInjectable from "../../routes/route-is-active.injectable"; import navigateToHorizontalPodAutoscalersInjectable from "../../../common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/navigate-to-horizontal-pod-autoscalers.injectable"; diff --git a/src/renderer/components/+config-autoscalers/hpa-details.tsx b/src/renderer/components/+config-autoscalers/hpa-details.tsx index 45c35eacd3..714de37b22 100644 --- a/src/renderer/components/+config-autoscalers/hpa-details.tsx +++ b/src/renderer/components/+config-autoscalers/hpa-details.tsx @@ -12,7 +12,8 @@ import { DrawerItem, DrawerTitle } from "../drawer"; import { Badge } from "../badge"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { cssNames } from "../../utils"; -import { HorizontalPodAutoscaler, HpaMetricType, IHpaMetric } from "../../../common/k8s-api/endpoints/hpa.api"; +import type { IHpaMetric } from "../../../common/k8s-api/endpoints/hpa.api"; +import { HorizontalPodAutoscaler, HpaMetricType } from "../../../common/k8s-api/endpoints/hpa.api"; import { Table, TableCell, TableHead, TableRow } from "../table"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { KubeObjectMeta } from "../kube-object-meta"; diff --git a/src/renderer/components/+config-autoscalers/hpa.store.ts b/src/renderer/components/+config-autoscalers/hpa.store.ts index 313a4a7d7c..d42ff1e4a8 100644 --- a/src/renderer/components/+config-autoscalers/hpa.store.ts +++ b/src/renderer/components/+config-autoscalers/hpa.store.ts @@ -4,7 +4,8 @@ */ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; -import { HorizontalPodAutoscaler, hpaApi } from "../../../common/k8s-api/endpoints/hpa.api"; +import type { HorizontalPodAutoscaler } from "../../../common/k8s-api/endpoints/hpa.api"; +import { hpaApi } from "../../../common/k8s-api/endpoints/hpa.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class HPAStore extends KubeObjectStore { diff --git a/src/renderer/components/+config-limit-ranges/limit-range-details.tsx b/src/renderer/components/+config-limit-ranges/limit-range-details.tsx index 8f8c7d455e..1448fc2b1f 100644 --- a/src/renderer/components/+config-limit-ranges/limit-range-details.tsx +++ b/src/renderer/components/+config-limit-ranges/limit-range-details.tsx @@ -8,7 +8,8 @@ import "./limit-range-details.scss"; import React from "react"; import { observer } from "mobx-react"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import { LimitPart, LimitRange, LimitRangeItem, Resource } from "../../../common/k8s-api/endpoints/limit-range.api"; +import type { LimitRangeItem } from "../../../common/k8s-api/endpoints/limit-range.api"; +import { LimitPart, LimitRange, Resource } from "../../../common/k8s-api/endpoints/limit-range.api"; import { KubeObjectMeta } from "../kube-object-meta"; import { DrawerItem } from "../drawer/drawer-item"; import { Badge } from "../badge"; diff --git a/src/renderer/components/+config-limit-ranges/limit-ranges.store.ts b/src/renderer/components/+config-limit-ranges/limit-ranges.store.ts index 4a58e575ea..dd5ef975ff 100644 --- a/src/renderer/components/+config-limit-ranges/limit-ranges.store.ts +++ b/src/renderer/components/+config-limit-ranges/limit-ranges.store.ts @@ -5,7 +5,8 @@ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; -import { LimitRange, limitRangeApi } from "../../../common/k8s-api/endpoints/limit-range.api"; +import type { LimitRange } from "../../../common/k8s-api/endpoints/limit-range.api"; +import { limitRangeApi } from "../../../common/k8s-api/endpoints/limit-range.api"; export class LimitRangesStore extends KubeObjectStore { api = limitRangeApi; diff --git a/src/renderer/components/+config-maps/config-maps.store.ts b/src/renderer/components/+config-maps/config-maps.store.ts index 9465079e9a..c37622a761 100644 --- a/src/renderer/components/+config-maps/config-maps.store.ts +++ b/src/renderer/components/+config-maps/config-maps.store.ts @@ -4,7 +4,8 @@ */ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; -import { ConfigMap, configMapApi } from "../../../common/k8s-api/endpoints/configmap.api"; +import type { ConfigMap } from "../../../common/k8s-api/endpoints/configmap.api"; +import { configMapApi } from "../../../common/k8s-api/endpoints/configmap.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class ConfigMapsStore extends KubeObjectStore { diff --git a/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.store.ts b/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.store.ts index 960c3ca973..d01aefe451 100644 --- a/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.store.ts +++ b/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.store.ts @@ -4,7 +4,8 @@ */ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; -import { pdbApi, PodDisruptionBudget } from "../../../common/k8s-api/endpoints/poddisruptionbudget.api"; +import type { PodDisruptionBudget } from "../../../common/k8s-api/endpoints/poddisruptionbudget.api"; +import { pdbApi } from "../../../common/k8s-api/endpoints/poddisruptionbudget.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class PodDisruptionBudgetsStore extends KubeObjectStore { diff --git a/src/renderer/components/+config-resource-quotas/add-quota-dialog.tsx b/src/renderer/components/+config-resource-quotas/add-quota-dialog.tsx index e292fd1163..96bbba8827 100644 --- a/src/renderer/components/+config-resource-quotas/add-quota-dialog.tsx +++ b/src/renderer/components/+config-resource-quotas/add-quota-dialog.tsx @@ -8,11 +8,13 @@ import "./add-quota-dialog.scss"; import React from "react"; import { computed, observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; import { Input } from "../input"; import { systemName } from "../input/input_validators"; -import { IResourceQuotaValues, resourceQuotaApi } from "../../../common/k8s-api/endpoints/resource-quota.api"; +import type { IResourceQuotaValues } from "../../../common/k8s-api/endpoints/resource-quota.api"; +import { resourceQuotaApi } from "../../../common/k8s-api/endpoints/resource-quota.api"; import { Select } from "../select"; import { Icon } from "../icon"; import { Button } from "../button"; diff --git a/src/renderer/components/+config-resource-quotas/resource-quotas.store.ts b/src/renderer/components/+config-resource-quotas/resource-quotas.store.ts index af03ef6318..ff801c0483 100644 --- a/src/renderer/components/+config-resource-quotas/resource-quotas.store.ts +++ b/src/renderer/components/+config-resource-quotas/resource-quotas.store.ts @@ -4,7 +4,8 @@ */ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; -import { ResourceQuota, resourceQuotaApi } from "../../../common/k8s-api/endpoints/resource-quota.api"; +import type { ResourceQuota } from "../../../common/k8s-api/endpoints/resource-quota.api"; +import { resourceQuotaApi } from "../../../common/k8s-api/endpoints/resource-quota.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class ResourceQuotasStore extends KubeObjectStore { diff --git a/src/renderer/components/+config-secrets/add-secret-dialog.tsx b/src/renderer/components/+config-secrets/add-secret-dialog.tsx index 592474b0f4..45950cce03 100644 --- a/src/renderer/components/+config-secrets/add-secret-dialog.tsx +++ b/src/renderer/components/+config-secrets/add-secret-dialog.tsx @@ -8,14 +8,17 @@ import "./add-secret-dialog.scss"; import React from "react"; import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; import { Input } from "../input"; import { systemName } from "../input/input_validators"; -import { Secret, secretsApi, SecretType } from "../../../common/k8s-api/endpoints"; +import type { Secret } from "../../../common/k8s-api/endpoints"; +import { secretsApi, SecretType } from "../../../common/k8s-api/endpoints"; import { SubTitle } from "../layout/sub-title"; import { NamespaceSelect } from "../+namespaces/namespace-select"; -import { Select, SelectOption } from "../select"; +import type { SelectOption } from "../select"; +import { Select } from "../select"; import { Icon } from "../icon"; import type { KubeObjectMetadata } from "../../../common/k8s-api/kube-object"; import { base64 } from "../../utils"; diff --git a/src/renderer/components/+config-secrets/secrets.store.ts b/src/renderer/components/+config-secrets/secrets.store.ts index 23d0896a7b..04581f5e12 100644 --- a/src/renderer/components/+config-secrets/secrets.store.ts +++ b/src/renderer/components/+config-secrets/secrets.store.ts @@ -4,7 +4,8 @@ */ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; -import { Secret, secretsApi } from "../../../common/k8s-api/endpoints"; +import type { Secret } from "../../../common/k8s-api/endpoints"; +import { secretsApi } from "../../../common/k8s-api/endpoints"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class SecretsStore extends KubeObjectStore { diff --git a/src/renderer/components/+config/config-sidebar-items.injectable.tsx b/src/renderer/components/+config/config-sidebar-items.injectable.tsx index 60d1820635..0730954aff 100644 --- a/src/renderer/components/+config/config-sidebar-items.injectable.tsx +++ b/src/renderer/components/+config/config-sidebar-items.injectable.tsx @@ -5,8 +5,9 @@ import { getInjectable } from "@ogre-tools/injectable"; import { Icon } from "../icon"; import React from "react"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { computed } from "mobx"; diff --git a/src/renderer/components/+custom-resources/crd-list.tsx b/src/renderer/components/+custom-resources/crd-list.tsx index 766559ad18..9b3df2ce14 100644 --- a/src/renderer/components/+custom-resources/crd-list.tsx +++ b/src/renderer/components/+custom-resources/crd-list.tsx @@ -12,7 +12,8 @@ import { Link } from "react-router-dom"; import { stopPropagation } from "../../utils"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { crdStore } from "./crd.store"; -import { Select, SelectOption } from "../select"; +import type { SelectOption } from "../select"; +import { Select } from "../select"; import { createPageParam } from "../../navigation"; import { Icon } from "../icon"; import { KubeObjectAge } from "../kube-object/age"; diff --git a/src/renderer/components/+custom-resources/crd-resource-details.tsx b/src/renderer/components/+custom-resources/crd-resource-details.tsx index ba69b456b5..6ac5d61ed2 100644 --- a/src/renderer/components/+custom-resources/crd-resource-details.tsx +++ b/src/renderer/components/+custom-resources/crd-resource-details.tsx @@ -14,9 +14,11 @@ import { DrawerItem } from "../drawer"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { KubeObjectMeta } from "../kube-object-meta"; import { Input } from "../input"; -import { AdditionalPrinterColumnsV1, CustomResourceDefinition } from "../../../common/k8s-api/endpoints/crd.api"; +import type { AdditionalPrinterColumnsV1 } from "../../../common/k8s-api/endpoints/crd.api"; +import { CustomResourceDefinition } from "../../../common/k8s-api/endpoints/crd.api"; import { parseJsonPath } from "../../utils/jsonPath"; -import { KubeObject, KubeObjectMetadata, KubeObjectStatus } from "../../../common/k8s-api/kube-object"; +import type { KubeObjectMetadata, KubeObjectStatus } from "../../../common/k8s-api/kube-object"; +import { KubeObject } from "../../../common/k8s-api/kube-object"; import logger from "../../../common/logger"; export interface CustomResourceDetailsProps extends KubeObjectDetailsProps { diff --git a/src/renderer/components/+custom-resources/crd-resources.tsx b/src/renderer/components/+custom-resources/crd-resources.tsx index 25601b1112..528f4ea0d9 100644 --- a/src/renderer/components/+custom-resources/crd-resources.tsx +++ b/src/renderer/components/+custom-resources/crd-resources.tsx @@ -9,7 +9,8 @@ import React from "react"; import { value } from "jsonpath"; import { observer } from "mobx-react"; import { KubeObjectListLayout } from "../kube-object-list-layout"; -import { computed, IComputedValue, makeObservable } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed, makeObservable } from "mobx"; import { crdStore } from "./crd.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { parseJsonPath } from "../../utils/jsonPath"; diff --git a/src/renderer/components/+custom-resources/crd.store.ts b/src/renderer/components/+custom-resources/crd.store.ts index ae221b1d05..90e58aef75 100644 --- a/src/renderer/components/+custom-resources/crd.store.ts +++ b/src/renderer/components/+custom-resources/crd.store.ts @@ -6,7 +6,8 @@ import { computed, reaction, makeObservable } from "mobx"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; -import { crdApi, CustomResourceDefinition } from "../../../common/k8s-api/endpoints/crd.api"; +import type { CustomResourceDefinition } from "../../../common/k8s-api/endpoints/crd.api"; +import { crdApi } from "../../../common/k8s-api/endpoints/crd.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { KubeApi } from "../../../common/k8s-api/kube-api"; import { CRDResourceStore } from "./crd-resource.store"; diff --git a/src/renderer/components/+custom-resources/custom-resource-sidebar-items.injectable.tsx b/src/renderer/components/+custom-resources/custom-resource-sidebar-items.injectable.tsx index d9908d6260..b6ddf7cf10 100644 --- a/src/renderer/components/+custom-resources/custom-resource-sidebar-items.injectable.tsx +++ b/src/renderer/components/+custom-resources/custom-resource-sidebar-items.injectable.tsx @@ -6,8 +6,9 @@ import { getInjectable } from "@ogre-tools/injectable"; import { noop, some } from "lodash/fp"; import { computed } from "mobx"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+entity-settings/entity-settings.tsx b/src/renderer/components/+entity-settings/entity-settings.tsx index 5ec917ceb3..fc23e94a19 100644 --- a/src/renderer/components/+entity-settings/entity-settings.tsx +++ b/src/renderer/components/+entity-settings/entity-settings.tsx @@ -6,7 +6,8 @@ import styles from "./entity-settings.module.scss"; import React from "react"; -import { observable, makeObservable, IComputedValue, computed } from "mobx"; +import type { IComputedValue } from "mobx"; +import { observable, makeObservable, computed } from "mobx"; import { observer } from "mobx-react"; import { navigation } from "../../navigation"; import { Tabs, Tab } from "../tabs"; diff --git a/src/renderer/components/+events/event.store.ts b/src/renderer/components/+events/event.store.ts index 61d5ab7a08..1c4e835b9f 100644 --- a/src/renderer/components/+events/event.store.ts +++ b/src/renderer/components/+events/event.store.ts @@ -7,7 +7,8 @@ import groupBy from "lodash/groupBy"; import compact from "lodash/compact"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; -import { eventApi, KubeEvent } from "../../../common/k8s-api/endpoints/events.api"; +import type { KubeEvent } from "../../../common/k8s-api/endpoints/events.api"; +import { eventApi } from "../../../common/k8s-api/endpoints/events.api"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; import { Pod } from "../../../common/k8s-api/endpoints/pods.api"; import { podsStore } from "../+workloads-pods/pods.store"; diff --git a/src/renderer/components/+events/events-sidebar-items.injectable.tsx b/src/renderer/components/+events/events-sidebar-items.injectable.tsx index 90fa787a84..02d965c854 100644 --- a/src/renderer/components/+events/events-sidebar-items.injectable.tsx +++ b/src/renderer/components/+events/events-sidebar-items.injectable.tsx @@ -5,8 +5,9 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import React from "react"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+events/events.tsx b/src/renderer/components/+events/events.tsx index fd922c647f..b81e30fbe2 100644 --- a/src/renderer/components/+events/events.tsx +++ b/src/renderer/components/+events/events.tsx @@ -10,14 +10,17 @@ import { computed, observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; import { orderBy } from "lodash"; import { TabLayout } from "../layout/tab-layout-2"; -import { EventStore, eventStore } from "./event.store"; -import { KubeObjectListLayout, KubeObjectListLayoutProps } from "../kube-object-list-layout"; +import type { EventStore } from "./event.store"; +import { eventStore } from "./event.store"; +import type { KubeObjectListLayoutProps } from "../kube-object-list-layout"; +import { KubeObjectListLayout } from "../kube-object-list-layout"; import type { KubeEvent } from "../../../common/k8s-api/endpoints/events.api"; import type { TableSortCallbacks, TableSortParams } from "../table"; import type { HeaderCustomizer } from "../item-object-list"; import { Tooltip } from "../tooltip"; import { Link } from "react-router-dom"; -import { cssNames, IClassName, stopPropagation } from "../../utils"; +import type { IClassName } from "../../utils"; +import { cssNames, stopPropagation } from "../../utils"; import { Icon } from "../icon"; import { getDetailsUrl } from "../kube-detail-params"; import { apiManager } from "../../../common/k8s-api/api-manager"; diff --git a/src/renderer/components/+events/kube-event-details.tsx b/src/renderer/components/+events/kube-event-details.tsx index 8dd3fb17ee..4bcb164af9 100644 --- a/src/renderer/components/+events/kube-event-details.tsx +++ b/src/renderer/components/+events/kube-event-details.tsx @@ -9,7 +9,8 @@ import React from "react"; import { disposeOnUnmount, observer } from "mobx-react"; import { KubeObject } from "../../../common/k8s-api/kube-object"; import { DrawerItem, DrawerTitle } from "../drawer"; -import { cssNames, Disposer } from "../../utils"; +import type { Disposer } from "../../utils"; +import { cssNames } from "../../utils"; import { LocaleDate } from "../locale-date"; import { eventStore } from "./event.store"; import logger from "../../../common/logger"; diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx index 8335e2c24c..a29e9bb004 100644 --- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx +++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx @@ -16,7 +16,8 @@ import mockFs from "mock-fs"; import { mockWindow } from "../../../../../__mocks__/windowMock"; import { getDiForUnitTesting } from "../../../getDiForUnitTesting"; import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable"; -import { DiRender, renderFor } from "../../test-utils/renderFor"; +import type { DiRender } from "../../test-utils/renderFor"; +import { renderFor } from "../../test-utils/renderFor"; import extensionDiscoveryInjectable from "../../../../extensions/extension-discovery/extension-discovery.injectable"; import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import directoryForDownloadsInjectable from "../../../../common/app-paths/directory-for-downloads/directory-for-downloads.injectable"; diff --git a/src/renderer/components/+extensions/attempt-install-by-info/attempt-install-by-info.tsx b/src/renderer/components/+extensions/attempt-install-by-info/attempt-install-by-info.tsx index 522aa86fc3..c737bb97d1 100644 --- a/src/renderer/components/+extensions/attempt-install-by-info/attempt-install-by-info.tsx +++ b/src/renderer/components/+extensions/attempt-install-by-info/attempt-install-by-info.tsx @@ -2,7 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { downloadFile, downloadJson, ExtendableDisposer } from "../../../../common/utils"; +import type { ExtendableDisposer } from "../../../../common/utils"; +import { downloadFile, downloadJson } from "../../../../common/utils"; import { Notifications } from "../../notifications"; import { ConfirmDialog } from "../../confirm-dialog"; import React from "react"; diff --git a/src/renderer/components/+extensions/attempt-install/attempt-install.tsx b/src/renderer/components/+extensions/attempt-install/attempt-install.tsx index 9ee078ecb9..0d9d7fc7e8 100644 --- a/src/renderer/components/+extensions/attempt-install/attempt-install.tsx +++ b/src/renderer/components/+extensions/attempt-install/attempt-install.tsx @@ -2,10 +2,11 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { +import type { Disposer, + ExtendableDisposer } from "../../../../common/utils"; +import { disposer, - ExtendableDisposer, } from "../../../../common/utils"; import { Notifications } from "../../notifications"; import { Button } from "../../button"; @@ -16,9 +17,10 @@ import { remove as removeDir } from "fs-extra"; import { shell } from "electron"; import type { InstallRequestValidated } from "./create-temp-files-and-validate/create-temp-files-and-validate"; import type { InstallRequest } from "./install-request"; +import type { + ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store"; import { ExtensionInstallationState, - ExtensionInstallationStateStore, } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store"; interface Dependencies { diff --git a/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.tsx b/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.tsx index 035d9e872a..69ff2a59a2 100644 --- a/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.tsx +++ b/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.tsx @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import type { InstallRequestValidated } from "../create-temp-files-and-validate/create-temp-files-and-validate"; -import { Disposer, extractTar, noop } from "../../../../../common/utils"; +import type { Disposer } from "../../../../../common/utils"; +import { extractTar, noop } from "../../../../../common/utils"; import { extensionDisplayName } from "../../../../../extensions/lens-extension"; import logger from "../../../../../main/logger"; import type { ExtensionLoader } from "../../../../../extensions/extension-loader"; diff --git a/src/renderer/components/+extensions/extensions.tsx b/src/renderer/components/+extensions/extensions.tsx index a078528d57..21a96eb873 100644 --- a/src/renderer/components/+extensions/extensions.tsx +++ b/src/renderer/components/+extensions/extensions.tsx @@ -4,8 +4,9 @@ */ import "./extensions.scss"; +import type { + IComputedValue } from "mobx"; import { - IComputedValue, makeObservable, observable, reaction, diff --git a/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.tsx b/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.tsx index 400737477a..89606beb5d 100644 --- a/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.tsx +++ b/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.tsx @@ -4,7 +4,8 @@ */ import React from "react"; -import { defaultExtensionRegistryUrl, ExtensionRegistry, ExtensionRegistryLocation } from "../../../../common/user-store/preferences-helpers"; +import type { ExtensionRegistry } from "../../../../common/user-store/preferences-helpers"; +import { defaultExtensionRegistryUrl, ExtensionRegistryLocation } from "../../../../common/user-store/preferences-helpers"; import { promiseExecFile } from "../../../utils"; import { Notifications } from "../../notifications"; diff --git a/src/renderer/components/+extensions/install-from-input/install-from-input.tsx b/src/renderer/components/+extensions/install-from-input/install-from-input.tsx index 9166b74c01..9fd3442a29 100644 --- a/src/renderer/components/+extensions/install-from-input/install-from-input.tsx +++ b/src/renderer/components/+extensions/install-from-input/install-from-input.tsx @@ -2,7 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { downloadFile, ExtendableDisposer } from "../../../../common/utils"; +import type { ExtendableDisposer } from "../../../../common/utils"; +import { downloadFile } from "../../../../common/utils"; import { InputValidators } from "../../input"; import { getMessageFromError } from "../get-message-from-error/get-message-from-error"; import logger from "../../../../main/logger"; diff --git a/src/renderer/components/+extensions/install.tsx b/src/renderer/components/+extensions/install.tsx index 46ddb69835..a3fee3064b 100644 --- a/src/renderer/components/+extensions/install.tsx +++ b/src/renderer/components/+extensions/install.tsx @@ -9,7 +9,8 @@ import { prevDefault } from "../../utils"; import { Button } from "../button"; import { Icon } from "../icon"; import { observer } from "mobx-react"; -import { Input, InputValidator, InputValidators } from "../input"; +import type { InputValidator } from "../input"; +import { Input, InputValidators } from "../input"; import { SubTitle } from "../layout/sub-title"; import { TooltipPosition } from "../tooltip"; import type { ExtensionInstallationStateStore } from "../../../extensions/extension-installation-state-store/extension-installation-state-store"; diff --git a/src/renderer/components/+extensions/notice.tsx b/src/renderer/components/+extensions/notice.tsx index 31a6170fd7..6626a2233a 100644 --- a/src/renderer/components/+extensions/notice.tsx +++ b/src/renderer/components/+extensions/notice.tsx @@ -4,7 +4,8 @@ */ import styles from "./notice.module.scss"; -import React, { DOMAttributes } from "react"; +import type { DOMAttributes } from "react"; +import React from "react"; import { cssNames } from "../../utils"; export interface NoticeProps extends DOMAttributes { diff --git a/src/renderer/components/+extensions/uninstall-extension/uninstall-extension.tsx b/src/renderer/components/+extensions/uninstall-extension/uninstall-extension.tsx index e6f09c29c6..3380df97d7 100644 --- a/src/renderer/components/+extensions/uninstall-extension/uninstall-extension.tsx +++ b/src/renderer/components/+extensions/uninstall-extension/uninstall-extension.tsx @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import type { ExtensionLoader } from "../../../../extensions/extension-loader"; -import { extensionDisplayName, LensExtensionId } from "../../../../extensions/lens-extension"; +import type { LensExtensionId } from "../../../../extensions/lens-extension"; +import { extensionDisplayName } from "../../../../extensions/lens-extension"; import logger from "../../../../main/logger"; import type { ExtensionDiscovery } from "../../../../extensions/extension-discovery/extension-discovery"; import { Notifications } from "../../notifications"; diff --git a/src/renderer/components/+helm-charts/helm-chart-details.tsx b/src/renderer/components/+helm-charts/helm-chart-details.tsx index 729c31bcb4..c5808a254f 100644 --- a/src/renderer/components/+helm-charts/helm-chart-details.tsx +++ b/src/renderer/components/+helm-charts/helm-chart-details.tsx @@ -6,7 +6,8 @@ import "./helm-chart-details.scss"; import React, { Component } from "react"; -import { getChartDetails, HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api"; +import type { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api"; +import { getChartDetails } from "../../../common/k8s-api/endpoints/helm-charts.api"; import { observable, makeObservable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import { Drawer, DrawerItem } from "../drawer"; diff --git a/src/renderer/components/+helm-charts/helm-chart.store.ts b/src/renderer/components/+helm-charts/helm-chart.store.ts index 3c01869d9f..2296bffe32 100644 --- a/src/renderer/components/+helm-charts/helm-chart.store.ts +++ b/src/renderer/components/+helm-charts/helm-chart.store.ts @@ -6,7 +6,8 @@ import semver from "semver"; import { observable, makeObservable } from "mobx"; import { autoBind, sortCompareChartVersions } from "../../utils"; -import { getChartDetails, HelmChart, listCharts } from "../../../common/k8s-api/endpoints/helm-charts.api"; +import type { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api"; +import { getChartDetails, listCharts } from "../../../common/k8s-api/endpoints/helm-charts.api"; import { ItemStore } from "../../../common/item.store"; import flatten from "lodash/flatten"; diff --git a/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts b/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts index a91a621625..0903299500 100644 --- a/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts +++ b/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts @@ -3,9 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import type { + IReleaseCreatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import { createRelease, - IReleaseCreatePayload, } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import releasesInjectable from "../releases.injectable"; diff --git a/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts b/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts index d9755e1e6d..4619ddaf1f 100644 --- a/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts +++ b/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts @@ -3,9 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import type { + HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import { deleteRelease, - HelmRelease, } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import releasesInjectable from "../releases.injectable"; diff --git a/src/renderer/components/+helm-releases/release-details/release-details.tsx b/src/renderer/components/+helm-releases/release-details/release-details.tsx index 5f4168ed57..c43798cf60 100644 --- a/src/renderer/components/+helm-releases/release-details/release-details.tsx +++ b/src/renderer/components/+helm-releases/release-details/release-details.tsx @@ -7,7 +7,8 @@ import "./release-details.scss"; import React, { Component } from "react"; import groupBy from "lodash/groupBy"; -import { computed, IComputedValue, makeObservable, observable } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed, makeObservable, observable } from "mobx"; import { Link } from "react-router-dom"; import kebabCase from "lodash/kebabCase"; import type { HelmRelease, IReleaseDetails, IReleaseUpdateDetails, IReleaseUpdatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api"; @@ -26,7 +27,8 @@ import { SubTitle } from "../../layout/sub-title"; import { getDetailsUrl } from "../../kube-detail-params"; import { Checkbox } from "../../checkbox"; import { MonacoEditor } from "../../monaco-editor"; -import { IAsyncComputed, withInjectables } from "@ogre-tools/injectable-react"; +import type { IAsyncComputed } from "@ogre-tools/injectable-react"; +import { withInjectables } from "@ogre-tools/injectable-react"; import createUpgradeChartTabInjectable from "../../dock/upgrade-chart/create-upgrade-chart-tab.injectable"; import updateReleaseInjectable from "../update-release/update-release.injectable"; import releaseInjectable from "./release.injectable"; diff --git a/src/renderer/components/+helm-releases/release-menu.tsx b/src/renderer/components/+helm-releases/release-menu.tsx index 5852a8384e..473c3fb20d 100644 --- a/src/renderer/components/+helm-releases/release-menu.tsx +++ b/src/renderer/components/+helm-releases/release-menu.tsx @@ -6,7 +6,8 @@ import React from "react"; import type { HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api"; import { cssNames } from "../../utils"; -import { MenuActions, MenuActionsProps } from "../menu/menu-actions"; +import type { MenuActionsProps } from "../menu/menu-actions"; +import { MenuActions } from "../menu/menu-actions"; import { MenuItem } from "../menu"; import { Icon } from "../icon"; import { withInjectables } from "@ogre-tools/injectable-react"; diff --git a/src/renderer/components/+helm-releases/release-rollback-dialog.tsx b/src/renderer/components/+helm-releases/release-rollback-dialog.tsx index 3ef34b17be..e7f9868c75 100644 --- a/src/renderer/components/+helm-releases/release-rollback-dialog.tsx +++ b/src/renderer/components/+helm-releases/release-rollback-dialog.tsx @@ -8,10 +8,13 @@ import "./release-rollback-dialog.scss"; import React from "react"; import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; -import { getReleaseHistory, HelmRelease, type IReleaseRevision } from "../../../common/k8s-api/endpoints/helm-releases.api"; -import { Select, SelectOption } from "../select"; +import type { HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api"; +import { getReleaseHistory, type IReleaseRevision } from "../../../common/k8s-api/endpoints/helm-releases.api"; +import type { SelectOption } from "../select"; +import { Select } from "../select"; import { Notifications } from "../notifications"; import orderBy from "lodash/orderBy"; import { withInjectables } from "@ogre-tools/injectable-react"; diff --git a/src/renderer/components/+helm-releases/removable-releases.ts b/src/renderer/components/+helm-releases/removable-releases.ts index 5d72e0b5ea..0b5692a7d1 100644 --- a/src/renderer/components/+helm-releases/removable-releases.ts +++ b/src/renderer/components/+helm-releases/removable-releases.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import type { IAsyncComputed } from "@ogre-tools/injectable-react"; -import { computed, ObservableMap } from "mobx"; +import type { ObservableMap } from "mobx"; +import { computed } from "mobx"; import type { HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api"; interface Dependencies { diff --git a/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts b/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts index 3400728e77..8b9f670c8a 100644 --- a/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts +++ b/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts @@ -3,8 +3,9 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import type { + IReleaseUpdatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import { - IReleaseUpdatePayload, updateRelease, } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import releasesInjectable from "../releases.injectable"; diff --git a/src/renderer/components/+helm/helm-sidebar-items.injectable.tsx b/src/renderer/components/+helm/helm-sidebar-items.injectable.tsx index 76796bc440..c7085b382a 100644 --- a/src/renderer/components/+helm/helm-sidebar-items.injectable.tsx +++ b/src/renderer/components/+helm/helm-sidebar-items.injectable.tsx @@ -5,8 +5,9 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import React from "react"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+namespaces/add-namespace-dialog.tsx b/src/renderer/components/+namespaces/add-namespace-dialog.tsx index ef82f9ca81..3307769bad 100644 --- a/src/renderer/components/+namespaces/add-namespace-dialog.tsx +++ b/src/renderer/components/+namespaces/add-namespace-dialog.tsx @@ -8,7 +8,8 @@ import "./add-namespace-dialog.scss"; import React from "react"; import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; import type { Namespace } from "../../../common/k8s-api/endpoints"; import { Input } from "../input"; diff --git a/src/renderer/components/+namespaces/namespace-details.tsx b/src/renderer/components/+namespaces/namespace-details.tsx index 9d0ce85b4f..c97eece3d4 100644 --- a/src/renderer/components/+namespaces/namespace-details.tsx +++ b/src/renderer/components/+namespaces/namespace-details.tsx @@ -9,7 +9,8 @@ import React from "react"; import { computed, makeObservable, observable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import { DrawerItem } from "../drawer"; -import { boundMethod, cssNames, Disposer } from "../../utils"; +import type { Disposer } from "../../utils"; +import { boundMethod, cssNames } from "../../utils"; import { getMetricsForNamespace, type IPodMetrics, Namespace } from "../../../common/k8s-api/endpoints"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { Link } from "react-router-dom"; diff --git a/src/renderer/components/+namespaces/namespace-select-filter.tsx b/src/renderer/components/+namespaces/namespace-select-filter.tsx index b7f8bd7c32..e08b5f0620 100644 --- a/src/renderer/components/+namespaces/namespace-select-filter.tsx +++ b/src/renderer/components/+namespaces/namespace-select-filter.tsx @@ -7,7 +7,8 @@ import "./namespace-select-filter.scss"; import React from "react"; import { observer } from "mobx-react"; -import { components, OptionTypeBase, PlaceholderProps } from "react-select"; +import type { OptionTypeBase, PlaceholderProps } from "react-select"; +import { components } from "react-select"; import { Icon } from "../icon"; import { NamespaceSelect } from "./namespace-select"; diff --git a/src/renderer/components/+namespaces/namespace-select.tsx b/src/renderer/components/+namespaces/namespace-select.tsx index 904511c5cb..d28758b0cb 100644 --- a/src/renderer/components/+namespaces/namespace-select.tsx +++ b/src/renderer/components/+namespaces/namespace-select.tsx @@ -8,7 +8,8 @@ import "./namespace-select.scss"; import React from "react"; import { computed, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import { Select, SelectOption, SelectProps } from "../select"; +import type { SelectOption, SelectProps } from "../select"; +import { Select } from "../select"; import { cssNames } from "../../utils"; import { Icon } from "../icon"; import type { NamespaceStore } from "./namespace-store/namespace.store"; diff --git a/src/renderer/components/+namespaces/namespace-store/namespace.store.ts b/src/renderer/components/+namespaces/namespace-store/namespace.store.ts index 1a01d9dddc..3c02d880c1 100644 --- a/src/renderer/components/+namespaces/namespace-store/namespace.store.ts +++ b/src/renderer/components/+namespaces/namespace-store/namespace.store.ts @@ -3,9 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { action, comparer, computed, IReactionDisposer, makeObservable, reaction } from "mobx"; -import { autoBind, noop, StorageHelper, toggle } from "../../../utils"; -import { KubeObjectStore, KubeObjectStoreLoadingParams } from "../../../../common/k8s-api/kube-object.store"; +import type { IReactionDisposer } from "mobx"; +import { action, comparer, computed, makeObservable, reaction } from "mobx"; +import type { StorageHelper } from "../../../utils"; +import { autoBind, noop, toggle } from "../../../utils"; +import type { KubeObjectStoreLoadingParams } from "../../../../common/k8s-api/kube-object.store"; +import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store"; import { Namespace, namespacesApi } from "../../../../common/k8s-api/endpoints/namespaces.api"; interface Dependencies { diff --git a/src/renderer/components/+namespaces/namespaces-sidebar-items.injectable.tsx b/src/renderer/components/+namespaces/namespaces-sidebar-items.injectable.tsx index 296bed7336..0a17b16fbd 100644 --- a/src/renderer/components/+namespaces/namespaces-sidebar-items.injectable.tsx +++ b/src/renderer/components/+namespaces/namespaces-sidebar-items.injectable.tsx @@ -4,8 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+network-endpoints/endpoint-subset-list.tsx b/src/renderer/components/+network-endpoints/endpoint-subset-list.tsx index 38b9dedb1e..b2e1e858c7 100644 --- a/src/renderer/components/+network-endpoints/endpoint-subset-list.tsx +++ b/src/renderer/components/+network-endpoints/endpoint-subset-list.tsx @@ -7,7 +7,7 @@ import "./endpoint-subset-list.scss"; import React from "react"; import { observer } from "mobx-react"; -import { EndpointSubset, Endpoint, EndpointAddress } from "../../../common/k8s-api/endpoints"; +import type { EndpointSubset, Endpoint, EndpointAddress } from "../../../common/k8s-api/endpoints"; import { Table, TableCell, TableHead, TableRow } from "../table"; import { boundMethod } from "../../utils"; import { apiManager } from "../../../common/k8s-api/api-manager"; diff --git a/src/renderer/components/+network-endpoints/endpoints.store.ts b/src/renderer/components/+network-endpoints/endpoints.store.ts index d6e87e8b95..3b80f63465 100644 --- a/src/renderer/components/+network-endpoints/endpoints.store.ts +++ b/src/renderer/components/+network-endpoints/endpoints.store.ts @@ -4,7 +4,8 @@ */ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; -import { Endpoint, endpointApi } from "../../../common/k8s-api/endpoints/endpoint.api"; +import type { Endpoint } from "../../../common/k8s-api/endpoints/endpoint.api"; +import { endpointApi } from "../../../common/k8s-api/endpoints/endpoint.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class EndpointStore extends KubeObjectStore { diff --git a/src/renderer/components/+network-ingresses/ingress-charts.tsx b/src/renderer/components/+network-ingresses/ingress-charts.tsx index 89338a44cb..c82493c652 100644 --- a/src/renderer/components/+network-ingresses/ingress-charts.tsx +++ b/src/renderer/components/+network-ingresses/ingress-charts.tsx @@ -10,7 +10,8 @@ import type { IIngressMetrics, Ingress } from "../../../common/k8s-api/endpoints import { BarChart, memoryOptions } from "../chart"; import { normalizeMetrics, isMetricsEmpty } from "../../../common/k8s-api/endpoints/metrics.api"; import { NoMetrics } from "../resource-metrics/no-metrics"; -import { ResourceMetricsContext, IResourceMetricsValue } from "../resource-metrics"; +import type { IResourceMetricsValue } from "../resource-metrics"; +import { ResourceMetricsContext } from "../resource-metrics"; type IContext = IResourceMetricsValue; diff --git a/src/renderer/components/+network-ingresses/ingress-details.tsx b/src/renderer/components/+network-ingresses/ingress-details.tsx index 2d5a3fd3f7..ee8c1a3198 100644 --- a/src/renderer/components/+network-ingresses/ingress-details.tsx +++ b/src/renderer/components/+network-ingresses/ingress-details.tsx @@ -9,7 +9,8 @@ import React from "react"; import { disposeOnUnmount, observer } from "mobx-react"; import { makeObservable, observable, reaction } from "mobx"; import { DrawerItem, DrawerTitle } from "../drawer"; -import { ILoadBalancerIngress, Ingress } from "../../../common/k8s-api/endpoints"; +import type { ILoadBalancerIngress } from "../../../common/k8s-api/endpoints"; +import { Ingress } from "../../../common/k8s-api/endpoints"; import { Table, TableCell, TableHead, TableRow } from "../table"; import { ResourceMetrics } from "../resource-metrics"; import type { KubeObjectDetailsProps } from "../kube-object-details"; diff --git a/src/renderer/components/+network-ingresses/ingress.store.ts b/src/renderer/components/+network-ingresses/ingress.store.ts index b2df671656..4cb3ef7d1a 100644 --- a/src/renderer/components/+network-ingresses/ingress.store.ts +++ b/src/renderer/components/+network-ingresses/ingress.store.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiManager } from "../../../common/k8s-api/api-manager"; -import { Ingress, ingressApi } from "../../../common/k8s-api/endpoints"; +import type { Ingress } from "../../../common/k8s-api/endpoints"; +import { ingressApi } from "../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; export class IngressStore extends KubeObjectStore { diff --git a/src/renderer/components/+network-policies/__tests__/network-policy-details.test.tsx b/src/renderer/components/+network-policies/__tests__/network-policy-details.test.tsx index 2724dfa68c..294fc323ae 100644 --- a/src/renderer/components/+network-policies/__tests__/network-policy-details.test.tsx +++ b/src/renderer/components/+network-policies/__tests__/network-policy-details.test.tsx @@ -5,7 +5,8 @@ import React from "react"; import { findByTestId, findByText, render } from "@testing-library/react"; -import { NetworkPolicy, NetworkPolicySpec } from "../../../../common/k8s-api/endpoints"; +import type { NetworkPolicySpec } from "../../../../common/k8s-api/endpoints"; +import { NetworkPolicy } from "../../../../common/k8s-api/endpoints"; import { NetworkPolicyDetails } from "../network-policy-details"; jest.mock("../../kube-object-meta"); diff --git a/src/renderer/components/+network-policies/network-policy-details.tsx b/src/renderer/components/+network-policies/network-policy-details.tsx index 36e1e6da29..f04cdac495 100644 --- a/src/renderer/components/+network-policies/network-policy-details.tsx +++ b/src/renderer/components/+network-policies/network-policy-details.tsx @@ -7,7 +7,8 @@ import styles from "./network-policy-details.module.scss"; import React from "react"; import { DrawerItem, DrawerTitle } from "../drawer"; -import { IPolicyIpBlock, NetworkPolicy, NetworkPolicyPeer, NetworkPolicyPort } from "../../../common/k8s-api/endpoints/network-policy.api"; +import type { IPolicyIpBlock, NetworkPolicyPeer, NetworkPolicyPort } from "../../../common/k8s-api/endpoints/network-policy.api"; +import { NetworkPolicy } from "../../../common/k8s-api/endpoints/network-policy.api"; import { Badge } from "../badge"; import { SubTitle } from "../layout/sub-title"; import { observer } from "mobx-react"; diff --git a/src/renderer/components/+network-policies/network-policy.store.ts b/src/renderer/components/+network-policies/network-policy.store.ts index f3ccf874a6..4b5908afd7 100644 --- a/src/renderer/components/+network-policies/network-policy.store.ts +++ b/src/renderer/components/+network-policies/network-policy.store.ts @@ -4,7 +4,8 @@ */ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; -import { NetworkPolicy, networkPolicyApi } from "../../../common/k8s-api/endpoints/network-policy.api"; +import type { NetworkPolicy } from "../../../common/k8s-api/endpoints/network-policy.api"; +import { networkPolicyApi } from "../../../common/k8s-api/endpoints/network-policy.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class NetworkPolicyStore extends KubeObjectStore { diff --git a/src/renderer/components/+network-port-forwards/port-forward-details.tsx b/src/renderer/components/+network-port-forwards/port-forward-details.tsx index b3eebff181..4ab2db0264 100644 --- a/src/renderer/components/+network-port-forwards/port-forward-details.tsx +++ b/src/renderer/components/+network-port-forwards/port-forward-details.tsx @@ -7,7 +7,8 @@ import "./port-forward-details.scss"; import React from "react"; import { Link } from "react-router-dom"; -import { portForwardAddress, PortForwardItem } from "../../port-forward"; +import type { PortForwardItem } from "../../port-forward"; +import { portForwardAddress } from "../../port-forward"; import { Drawer, DrawerItem } from "../drawer"; import { cssNames } from "../../utils"; import { podsApi, serviceApi } from "../../../common/k8s-api/endpoints"; diff --git a/src/renderer/components/+network-port-forwards/port-forward-menu.tsx b/src/renderer/components/+network-port-forwards/port-forward-menu.tsx index b1d1264db3..928728e068 100644 --- a/src/renderer/components/+network-port-forwards/port-forward-menu.tsx +++ b/src/renderer/components/+network-port-forwards/port-forward-menu.tsx @@ -5,8 +5,10 @@ import React from "react"; import { boundMethod, cssNames } from "../../utils"; -import { openPortForward, PortForwardItem, PortForwardStore } from "../../port-forward"; -import { MenuActions, MenuActionsProps } from "../menu/menu-actions"; +import type { PortForwardItem, PortForwardStore } from "../../port-forward"; +import { openPortForward } from "../../port-forward"; +import type { MenuActionsProps } from "../menu/menu-actions"; +import { MenuActions } from "../menu/menu-actions"; import { MenuItem } from "../menu"; import { Icon } from "../icon"; import { Notifications } from "../notifications"; diff --git a/src/renderer/components/+network-port-forwards/port-forwards.tsx b/src/renderer/components/+network-port-forwards/port-forwards.tsx index 7f35bd2373..489af01d62 100644 --- a/src/renderer/components/+network-port-forwards/port-forwards.tsx +++ b/src/renderer/components/+network-port-forwards/port-forwards.tsx @@ -14,9 +14,11 @@ 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 type { IComputedValue } from "mobx"; +import { computed, 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"; +import type { NavigateToPortForwards } from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable"; +import navigateToPortForwardsInjectable from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable"; enum columnId { name = "name", diff --git a/src/renderer/components/+network-services/service-port-component.tsx b/src/renderer/components/+network-services/service-port-component.tsx index 6945a5dc6a..b0a7a4ca5a 100644 --- a/src/renderer/components/+network-services/service-port-component.tsx +++ b/src/renderer/components/+network-services/service-port-component.tsx @@ -12,8 +12,8 @@ import { action, makeObservable, observable, reaction } from "mobx"; import { cssNames } from "../../utils"; import { Notifications } from "../notifications"; import { Button } from "../button"; -import type { ForwardedPort } from "../../port-forward"; -import { openPortForward, PortForwardStore, predictProtocol } from "../../port-forward"; +import type { ForwardedPort, PortForwardStore } from "../../port-forward"; +import { openPortForward, predictProtocol } from "../../port-forward"; import { Spinner } from "../spinner"; import { withInjectables } from "@ogre-tools/injectable-react"; import portForwardStoreInjectable from "../../port-forward/port-forward-store/port-forward-store.injectable"; diff --git a/src/renderer/components/+network-services/services.store.ts b/src/renderer/components/+network-services/services.store.ts index d0deb90827..d0e7d15936 100644 --- a/src/renderer/components/+network-services/services.store.ts +++ b/src/renderer/components/+network-services/services.store.ts @@ -4,7 +4,8 @@ */ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; -import { Service, serviceApi } from "../../../common/k8s-api/endpoints/service.api"; +import type { Service } from "../../../common/k8s-api/endpoints/service.api"; +import { serviceApi } from "../../../common/k8s-api/endpoints/service.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class ServiceStore extends KubeObjectStore { diff --git a/src/renderer/components/+network/network-sidebar-items.injectable.tsx b/src/renderer/components/+network/network-sidebar-items.injectable.tsx index e0e78a77cf..bb6f107d9d 100644 --- a/src/renderer/components/+network/network-sidebar-items.injectable.tsx +++ b/src/renderer/components/+network/network-sidebar-items.injectable.tsx @@ -4,8 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+nodes/details.tsx b/src/renderer/components/+nodes/details.tsx index feffd12d21..9e57322576 100644 --- a/src/renderer/components/+nodes/details.tsx +++ b/src/renderer/components/+nodes/details.tsx @@ -14,7 +14,8 @@ import { Badge } from "../badge"; import { ResourceMetrics } from "../resource-metrics"; import { podsStore } from "../+workloads-pods/pods.store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import { formatNodeTaint, getMetricsByNodeNames, IClusterMetrics, Node } from "../../../common/k8s-api/endpoints"; +import type { IClusterMetrics } from "../../../common/k8s-api/endpoints"; +import { formatNodeTaint, getMetricsByNodeNames, Node } from "../../../common/k8s-api/endpoints"; import { NodeCharts } from "./node-charts"; import { makeObservable, observable, reaction } from "mobx"; import { PodDetailsList } from "../+workloads-pods/pod-details-list"; @@ -23,7 +24,8 @@ import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import { NodeDetailsResources } from "./details-resources"; import { DrawerTitle } from "../drawer/drawer-title"; -import { boundMethod, Disposer } from "../../utils"; +import type { Disposer } from "../../utils"; +import { boundMethod } from "../../utils"; import logger from "../../../common/logger"; import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; diff --git a/src/renderer/components/+nodes/node-charts.tsx b/src/renderer/components/+nodes/node-charts.tsx index 434dba1146..4c09279d99 100644 --- a/src/renderer/components/+nodes/node-charts.tsx +++ b/src/renderer/components/+nodes/node-charts.tsx @@ -8,7 +8,8 @@ import type { IClusterMetrics, Node } from "../../../common/k8s-api/endpoints"; import { BarChart, cpuOptions, memoryOptions } from "../chart"; import { isMetricsEmpty, normalizeMetrics } from "../../../common/k8s-api/endpoints/metrics.api"; import { NoMetrics } from "../resource-metrics/no-metrics"; -import { IResourceMetricsValue, ResourceMetricsContext } from "../resource-metrics"; +import type { IResourceMetricsValue } from "../resource-metrics"; +import { ResourceMetricsContext } from "../resource-metrics"; import { observer } from "mobx-react"; import type { ChartOptions, ChartPoint } from "chart.js"; import { ThemeStore } from "../../theme.store"; diff --git a/src/renderer/components/+nodes/nodes-sidebar-items.injectable.tsx b/src/renderer/components/+nodes/nodes-sidebar-items.injectable.tsx index 605754a248..580ebd3c90 100644 --- a/src/renderer/components/+nodes/nodes-sidebar-items.injectable.tsx +++ b/src/renderer/components/+nodes/nodes-sidebar-items.injectable.tsx @@ -4,8 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+nodes/nodes.store.ts b/src/renderer/components/+nodes/nodes.store.ts index f9d7e3ea2d..f80b3fcddd 100644 --- a/src/renderer/components/+nodes/nodes.store.ts +++ b/src/renderer/components/+nodes/nodes.store.ts @@ -6,7 +6,8 @@ import { sum } from "lodash"; import { computed, makeObservable } from "mobx"; import { apiManager } from "../../../common/k8s-api/api-manager"; -import { Node, nodesApi } from "../../../common/k8s-api/endpoints"; +import type { Node } from "../../../common/k8s-api/endpoints"; +import { nodesApi } from "../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; diff --git a/src/renderer/components/+nodes/route.tsx b/src/renderer/components/+nodes/route.tsx index 2fd494a3ae..3d4e17cec5 100644 --- a/src/renderer/components/+nodes/route.tsx +++ b/src/renderer/components/+nodes/route.tsx @@ -10,7 +10,8 @@ import { cssNames, interval } from "../../utils"; import { TabLayout } from "../layout/tab-layout-2"; import { nodesStore } from "./nodes.store"; import { KubeObjectListLayout } from "../kube-object-list-layout"; -import { formatNodeTaint, getMetricsForAllNodes, INodeMetrics, Node } from "../../../common/k8s-api/endpoints/nodes.api"; +import type { INodeMetrics, Node } from "../../../common/k8s-api/endpoints/nodes.api"; +import { formatNodeTaint, getMetricsForAllNodes } from "../../../common/k8s-api/endpoints/nodes.api"; import { LineProgress } from "../line-progress"; import { bytesToUnits } from "../../../common/utils/convertMemory"; import { Tooltip, TooltipPosition } from "../tooltip"; diff --git a/src/renderer/components/+pod-security-policies/pod-security-policies.store.ts b/src/renderer/components/+pod-security-policies/pod-security-policies.store.ts index 5b913449cf..5c736663e8 100644 --- a/src/renderer/components/+pod-security-policies/pod-security-policies.store.ts +++ b/src/renderer/components/+pod-security-policies/pod-security-policies.store.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { PodSecurityPolicy, pspApi } from "../../../common/k8s-api/endpoints"; +import type { PodSecurityPolicy } from "../../../common/k8s-api/endpoints"; +import { pspApi } from "../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; diff --git a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx b/src/renderer/components/+preferences/add-helm-repo-dialog.tsx index a8768db1e1..75317b8de9 100644 --- a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx +++ b/src/renderer/components/+preferences/add-helm-repo-dialog.tsx @@ -9,7 +9,8 @@ import React from "react"; import type { FileFilter } from "electron"; import { observable, makeObservable, action } from "mobx"; import { observer } from "mobx-react"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; import { Input } from "../input"; import { Checkbox } from "../checkbox"; diff --git a/src/renderer/components/+preferences/app-preferences/get-app-preferences.ts b/src/renderer/components/+preferences/app-preferences/get-app-preferences.ts index 3120e14f77..b0befb011e 100644 --- a/src/renderer/components/+preferences/app-preferences/get-app-preferences.ts +++ b/src/renderer/components/+preferences/app-preferences/get-app-preferences.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension"; import type { AppPreferenceRegistration, RegisteredAppPreference } from "./app-preference-registration"; diff --git a/src/renderer/components/+preferences/application.tsx b/src/renderer/components/+preferences/application.tsx index 4809590b9f..461ac5f91c 100644 --- a/src/renderer/components/+preferences/application.tsx +++ b/src/renderer/components/+preferences/application.tsx @@ -6,14 +6,16 @@ import React from "react"; import { observer } from "mobx-react"; import { SubTitle } from "../layout/sub-title"; -import { Select, SelectOption } from "../select"; +import type { SelectOption } from "../select"; +import { Select } from "../select"; import type { ThemeStore } from "../../theme.store"; import type { UserStore } from "../../../common/user-store"; import { Input } from "../input"; import { Switch } from "../switch"; import moment from "moment-timezone"; import { CONSTANTS, defaultExtensionRegistryUrl, ExtensionRegistryLocation } from "../../../common/user-store/preferences-helpers"; -import { action, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { action } from "mobx"; import { isUrl } from "../input/input_validators"; import { ExtensionSettings } from "./extension-settings"; import type { RegisteredAppPreference } from "./app-preferences/app-preference-registration"; diff --git a/src/renderer/components/+preferences/extension-settings.tsx b/src/renderer/components/+preferences/extension-settings.tsx index d796bc35f8..1a6050760e 100644 --- a/src/renderer/components/+preferences/extension-settings.tsx +++ b/src/renderer/components/+preferences/extension-settings.tsx @@ -4,7 +4,8 @@ */ import { SubTitle } from "../layout/sub-title"; import type { AppPreferenceRegistration } from "./app-preferences/app-preference-registration"; -import React, { DOMAttributes } from "react"; +import type { DOMAttributes } from "react"; +import React from "react"; import { cssNames } from "../../../renderer/utils"; export interface ExtensionSettingsProps extends DOMAttributes { diff --git a/src/renderer/components/+preferences/helm-charts.tsx b/src/renderer/components/+preferences/helm-charts.tsx index bd98679844..22f4e65ad6 100644 --- a/src/renderer/components/+preferences/helm-charts.tsx +++ b/src/renderer/components/+preferences/helm-charts.tsx @@ -8,11 +8,13 @@ import styles from "./helm-charts.module.scss"; import React from "react"; import { computed, observable, makeObservable } from "mobx"; -import { HelmRepo, HelmRepoManager } from "../../../main/helm/helm-repo-manager"; +import type { HelmRepo } from "../../../main/helm/helm-repo-manager"; +import { HelmRepoManager } from "../../../main/helm/helm-repo-manager"; import { Button } from "../button"; import { Icon } from "../icon"; import { Notifications } from "../notifications"; -import { Select, SelectOption } from "../select"; +import type { SelectOption } from "../select"; +import { Select } from "../select"; import { AddHelmRepoDialog } from "./add-helm-repo-dialog"; import { observer } from "mobx-react"; import { RemovableItem } from "./removable-item"; diff --git a/src/renderer/components/+preferences/kubectl-binaries.tsx b/src/renderer/components/+preferences/kubectl-binaries.tsx index cbd90588e8..138a6f805d 100644 --- a/src/renderer/components/+preferences/kubectl-binaries.tsx +++ b/src/renderer/components/+preferences/kubectl-binaries.tsx @@ -8,7 +8,8 @@ import { observer } from "mobx-react"; import { Input, InputValidators } from "../input"; import { SubTitle } from "../layout/sub-title"; import type { UserStore } from "../../../common/user-store"; -import { SelectOption, Select } from "../select"; +import type { SelectOption } from "../select"; +import { Select } from "../select"; import { Switch } from "../switch"; import { packageMirrors } from "../../../common/user-store/preferences-helpers"; import directoryForBinariesInjectable from "../../../common/app-paths/directory-for-binaries/directory-for-binaries.injectable"; diff --git a/src/renderer/components/+preferences/preferences-navigation/preference-navigation-items.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/preference-navigation-items.injectable.ts index 28eaa06efd..e72d3f7b4d 100644 --- a/src/renderer/components/+preferences/preferences-navigation/preference-navigation-items.injectable.ts +++ b/src/renderer/components/+preferences/preferences-navigation/preference-navigation-items.injectable.ts @@ -5,7 +5,8 @@ import { pipeline } from "@ogre-tools/fp"; import { getInjectable, getInjectionToken } from "@ogre-tools/injectable"; import { filter, orderBy } from "lodash/fp"; -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; export const preferenceNavigationItemInjectionToken = getInjectionToken({ diff --git a/src/renderer/components/+preferences/preferences-navigation/preferences-navigation.tsx b/src/renderer/components/+preferences/preferences-navigation/preferences-navigation.tsx index ef0f85a263..b728412f97 100644 --- a/src/renderer/components/+preferences/preferences-navigation/preferences-navigation.tsx +++ b/src/renderer/components/+preferences/preferences-navigation/preferences-navigation.tsx @@ -7,9 +7,10 @@ import { Tab, Tabs } from "../../tabs"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { IComputedValue } from "mobx"; import React from "react"; -import preferenceNavigationItemsInjectable, { +import type { PreferenceNavigationItem, } from "./preference-navigation-items.injectable"; +import preferenceNavigationItemsInjectable from "./preference-navigation-items.injectable"; import { observer } from "mobx-react"; diff --git a/src/renderer/components/+preferences/removable-item.tsx b/src/renderer/components/+preferences/removable-item.tsx index 390b30f36c..eb0cf048e3 100644 --- a/src/renderer/components/+preferences/removable-item.tsx +++ b/src/renderer/components/+preferences/removable-item.tsx @@ -4,7 +4,8 @@ */ import styles from "./removable-item.module.scss"; -import React, { DOMAttributes } from "react"; +import type { DOMAttributes } from "react"; +import React from "react"; import { cssNames } from "../../utils"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+storage-classes/storage-class.store.ts b/src/renderer/components/+storage-classes/storage-class.store.ts index f8f3681661..aa86d48786 100644 --- a/src/renderer/components/+storage-classes/storage-class.store.ts +++ b/src/renderer/components/+storage-classes/storage-class.store.ts @@ -5,7 +5,8 @@ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; -import { StorageClass, storageClassApi } from "../../../common/k8s-api/endpoints/storage-class.api"; +import type { StorageClass } from "../../../common/k8s-api/endpoints/storage-class.api"; +import { storageClassApi } from "../../../common/k8s-api/endpoints/storage-class.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { volumesStore } from "../+storage-volumes/volumes.store"; diff --git a/src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx b/src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx index eebd712232..815e3ffff3 100644 --- a/src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx +++ b/src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx @@ -6,10 +6,12 @@ import React, { useContext } from "react"; import { observer } from "mobx-react"; import type { IPvcMetrics, PersistentVolumeClaim } from "../../../common/k8s-api/endpoints"; -import { BarChart, ChartDataSets, memoryOptions } from "../chart"; +import type { ChartDataSets } from "../chart"; +import { BarChart, memoryOptions } from "../chart"; import { isMetricsEmpty, normalizeMetrics } from "../../../common/k8s-api/endpoints/metrics.api"; import { NoMetrics } from "../resource-metrics/no-metrics"; -import { IResourceMetricsValue, ResourceMetricsContext } from "../resource-metrics"; +import type { IResourceMetricsValue } from "../resource-metrics"; +import { ResourceMetricsContext } from "../resource-metrics"; import { ThemeStore } from "../../theme.store"; type IContext = IResourceMetricsValue; diff --git a/src/renderer/components/+storage-volume-claims/volume-claim.store.ts b/src/renderer/components/+storage-volume-claims/volume-claim.store.ts index e943ebed43..e83594d98e 100644 --- a/src/renderer/components/+storage-volume-claims/volume-claim.store.ts +++ b/src/renderer/components/+storage-volume-claims/volume-claim.store.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiManager } from "../../../common/k8s-api/api-manager"; -import { PersistentVolumeClaim, pvcApi } from "../../../common/k8s-api/endpoints"; +import type { PersistentVolumeClaim } from "../../../common/k8s-api/endpoints"; +import { pvcApi } from "../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; export class VolumeClaimStore extends KubeObjectStore { diff --git a/src/renderer/components/+storage-volumes/volumes.store.ts b/src/renderer/components/+storage-volumes/volumes.store.ts index d1028b24ec..f2fa98591e 100644 --- a/src/renderer/components/+storage-volumes/volumes.store.ts +++ b/src/renderer/components/+storage-volumes/volumes.store.ts @@ -5,7 +5,8 @@ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; -import { PersistentVolume, persistentVolumeApi } from "../../../common/k8s-api/endpoints/persistent-volume.api"; +import type { PersistentVolume } from "../../../common/k8s-api/endpoints/persistent-volume.api"; +import { persistentVolumeApi } from "../../../common/k8s-api/endpoints/persistent-volume.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; import type { StorageClass } from "../../../common/k8s-api/endpoints/storage-class.api"; diff --git a/src/renderer/components/+storage/storage-sidebar-items.injectable.tsx b/src/renderer/components/+storage/storage-sidebar-items.injectable.tsx index 3faebf6835..fe243ba729 100644 --- a/src/renderer/components/+storage/storage-sidebar-items.injectable.tsx +++ b/src/renderer/components/+storage/storage-sidebar-items.injectable.tsx @@ -4,8 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx b/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx index fedd40d181..689b31951f 100644 --- a/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx +++ b/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx @@ -9,7 +9,8 @@ import { clusterRolesStore } from "../../+cluster-roles/store"; import { ClusterRole } from "../../../../../common/k8s-api/endpoints"; import userEvent from "@testing-library/user-event"; import { getDiForUnitTesting } from "../../../../getDiForUnitTesting"; -import { DiRender, renderFor } from "../../../test-utils/renderFor"; +import type { DiRender } from "../../../test-utils/renderFor"; +import { renderFor } from "../../../test-utils/renderFor"; jest.mock("../../+cluster-roles/store"); diff --git a/src/renderer/components/+user-management/+cluster-role-bindings/dialog.tsx b/src/renderer/components/+user-management/+cluster-role-bindings/dialog.tsx index 3a83329723..588d04d103 100644 --- a/src/renderer/components/+user-management/+cluster-role-bindings/dialog.tsx +++ b/src/renderer/components/+user-management/+cluster-role-bindings/dialog.tsx @@ -10,14 +10,16 @@ import { disposeOnUnmount, observer } from "mobx-react"; import React from "react"; import { serviceAccountsStore } from "../+service-accounts/store"; -import { ClusterRole, ClusterRoleBinding, ClusterRoleBindingSubject, ServiceAccount } from "../../../../common/k8s-api/endpoints"; -import { Dialog, DialogProps } from "../../dialog"; +import type { ClusterRole, ClusterRoleBinding, ClusterRoleBindingSubject, ServiceAccount } from "../../../../common/k8s-api/endpoints"; +import type { DialogProps } from "../../dialog"; +import { Dialog } from "../../dialog"; import { EditableList } from "../../editable-list"; import { Icon } from "../../icon"; import { showDetails } from "../../kube-detail-params"; import { SubTitle } from "../../layout/sub-title"; import { Notifications } from "../../notifications"; -import { Select, SelectOption } from "../../select"; +import type { SelectOption } from "../../select"; +import { Select } from "../../select"; import { Wizard, WizardStep } from "../../wizard"; import { clusterRoleBindingsStore } from "./store"; import { clusterRolesStore } from "../+cluster-roles/store"; diff --git a/src/renderer/components/+user-management/+cluster-role-bindings/store.ts b/src/renderer/components/+user-management/+cluster-role-bindings/store.ts index 52e22f6939..66159036e7 100644 --- a/src/renderer/components/+user-management/+cluster-role-bindings/store.ts +++ b/src/renderer/components/+user-management/+cluster-role-bindings/store.ts @@ -4,7 +4,8 @@ */ import { apiManager } from "../../../../common/k8s-api/api-manager"; -import { ClusterRoleBinding, clusterRoleBindingApi, ClusterRoleBindingSubject } from "../../../../common/k8s-api/endpoints"; +import type { ClusterRoleBinding, ClusterRoleBindingSubject } from "../../../../common/k8s-api/endpoints"; +import { clusterRoleBindingApi } from "../../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store"; import { autoBind, HashSet } from "../../../utils"; import { hashClusterRoleBindingSubject } from "./hashers"; diff --git a/src/renderer/components/+user-management/+cluster-roles/add-dialog.tsx b/src/renderer/components/+user-management/+cluster-roles/add-dialog.tsx index 86e5ca90f4..a238a9c0ac 100644 --- a/src/renderer/components/+user-management/+cluster-roles/add-dialog.tsx +++ b/src/renderer/components/+user-management/+cluster-roles/add-dialog.tsx @@ -8,7 +8,8 @@ import { makeObservable, observable } from "mobx"; import { observer } from "mobx-react"; import React from "react"; -import { Dialog, DialogProps } from "../../dialog"; +import type { DialogProps } from "../../dialog"; +import { Dialog } from "../../dialog"; import { Input } from "../../input"; import { showDetails } from "../../kube-detail-params"; import { SubTitle } from "../../layout/sub-title"; diff --git a/src/renderer/components/+user-management/+cluster-roles/store.ts b/src/renderer/components/+user-management/+cluster-roles/store.ts index b83c1de0a1..a36e19f8d9 100644 --- a/src/renderer/components/+user-management/+cluster-roles/store.ts +++ b/src/renderer/components/+user-management/+cluster-roles/store.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiManager } from "../../../../common/k8s-api/api-manager"; -import { ClusterRole, clusterRoleApi } from "../../../../common/k8s-api/endpoints"; +import type { ClusterRole } from "../../../../common/k8s-api/endpoints"; +import { clusterRoleApi } from "../../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../../utils"; diff --git a/src/renderer/components/+user-management/+role-bindings/dialog.tsx b/src/renderer/components/+user-management/+role-bindings/dialog.tsx index 8d1e40d741..994d3dee07 100644 --- a/src/renderer/components/+user-management/+role-bindings/dialog.tsx +++ b/src/renderer/components/+user-management/+role-bindings/dialog.tsx @@ -12,14 +12,17 @@ import React from "react"; import { rolesStore } from "../+roles/store"; import { serviceAccountsStore } from "../+service-accounts/store"; import { NamespaceSelect } from "../../+namespaces/namespace-select"; -import { ClusterRole, Role, roleApi, RoleBinding, RoleBindingSubject, ServiceAccount } from "../../../../common/k8s-api/endpoints"; -import { Dialog, DialogProps } from "../../dialog"; +import type { ClusterRole, Role, RoleBinding, RoleBindingSubject, ServiceAccount } from "../../../../common/k8s-api/endpoints"; +import { roleApi } from "../../../../common/k8s-api/endpoints"; +import type { DialogProps } from "../../dialog"; +import { Dialog } from "../../dialog"; import { EditableList } from "../../editable-list"; import { Icon } from "../../icon"; import { showDetails } from "../../kube-detail-params"; import { SubTitle } from "../../layout/sub-title"; import { Notifications } from "../../notifications"; -import { Select, SelectOption } from "../../select"; +import type { SelectOption } from "../../select"; +import { Select } from "../../select"; import { Wizard, WizardStep } from "../../wizard"; import { roleBindingsStore } from "./store"; import { clusterRolesStore } from "../+cluster-roles/store"; diff --git a/src/renderer/components/+user-management/+role-bindings/store.ts b/src/renderer/components/+user-management/+role-bindings/store.ts index fcd7383d92..f3ea97c85d 100644 --- a/src/renderer/components/+user-management/+role-bindings/store.ts +++ b/src/renderer/components/+user-management/+role-bindings/store.ts @@ -4,7 +4,8 @@ */ import { apiManager } from "../../../../common/k8s-api/api-manager"; -import { RoleBinding, roleBindingApi, RoleBindingSubject } from "../../../../common/k8s-api/endpoints"; +import type { RoleBinding, RoleBindingSubject } from "../../../../common/k8s-api/endpoints"; +import { roleBindingApi } from "../../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store"; import { HashSet } from "../../../utils"; import { hashRoleBindingSubject } from "./hashers"; diff --git a/src/renderer/components/+user-management/+roles/add-dialog.tsx b/src/renderer/components/+user-management/+roles/add-dialog.tsx index ac9b7262e7..469090d57b 100644 --- a/src/renderer/components/+user-management/+roles/add-dialog.tsx +++ b/src/renderer/components/+user-management/+roles/add-dialog.tsx @@ -10,7 +10,8 @@ import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; import { NamespaceSelect } from "../../+namespaces/namespace-select"; -import { Dialog, DialogProps } from "../../dialog"; +import type { DialogProps } from "../../dialog"; +import { Dialog } from "../../dialog"; import { Input } from "../../input"; import { showDetails } from "../../kube-detail-params"; import { SubTitle } from "../../layout/sub-title"; diff --git a/src/renderer/components/+user-management/+roles/store.ts b/src/renderer/components/+user-management/+roles/store.ts index 7518899093..a19c4f59f8 100644 --- a/src/renderer/components/+user-management/+roles/store.ts +++ b/src/renderer/components/+user-management/+roles/store.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiManager } from "../../../../common/k8s-api/api-manager"; -import { Role, roleApi } from "../../../../common/k8s-api/endpoints"; +import type { Role } from "../../../../common/k8s-api/endpoints"; +import { roleApi } from "../../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../../utils"; diff --git a/src/renderer/components/+user-management/+service-accounts/create-dialog.tsx b/src/renderer/components/+user-management/+service-accounts/create-dialog.tsx index 7c77ed41b3..e67f9da07f 100644 --- a/src/renderer/components/+user-management/+service-accounts/create-dialog.tsx +++ b/src/renderer/components/+user-management/+service-accounts/create-dialog.tsx @@ -10,7 +10,8 @@ import { makeObservable, observable } from "mobx"; import { observer } from "mobx-react"; import { NamespaceSelect } from "../../+namespaces/namespace-select"; -import { Dialog, DialogProps } from "../../dialog"; +import type { DialogProps } from "../../dialog"; +import { Dialog } from "../../dialog"; import { Input } from "../../input"; import { systemName } from "../../input/input_validators"; import { showDetails } from "../../kube-detail-params"; diff --git a/src/renderer/components/+user-management/+service-accounts/details.tsx b/src/renderer/components/+user-management/+service-accounts/details.tsx index 7d0beedfd8..fb277e0765 100644 --- a/src/renderer/components/+user-management/+service-accounts/details.tsx +++ b/src/renderer/components/+user-management/+service-accounts/details.tsx @@ -11,7 +11,8 @@ import React from "react"; import { Link } from "react-router-dom"; import { secretsStore } from "../../+config-secrets/secrets.store"; -import { Secret, SecretType, ServiceAccount } from "../../../../common/k8s-api/endpoints"; +import type { ServiceAccount } from "../../../../common/k8s-api/endpoints"; +import { Secret, SecretType } from "../../../../common/k8s-api/endpoints"; import { DrawerItem, DrawerTitle } from "../../drawer"; import { Icon } from "../../icon"; import type { KubeObjectDetailsProps } from "../../kube-object-details"; diff --git a/src/renderer/components/+user-management/+service-accounts/store.ts b/src/renderer/components/+user-management/+service-accounts/store.ts index 96ae5cc547..c1c2e1844b 100644 --- a/src/renderer/components/+user-management/+service-accounts/store.ts +++ b/src/renderer/components/+user-management/+service-accounts/store.ts @@ -4,7 +4,8 @@ */ import { apiManager } from "../../../../common/k8s-api/api-manager"; -import { ServiceAccount, serviceAccountsApi } from "../../../../common/k8s-api/endpoints"; +import type { ServiceAccount } from "../../../../common/k8s-api/endpoints"; +import { serviceAccountsApi } from "../../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../../utils"; diff --git a/src/renderer/components/+user-management/user-management-sidebar-items.injectable.tsx b/src/renderer/components/+user-management/user-management-sidebar-items.injectable.tsx index f07fcaf6c8..5a14bd083b 100644 --- a/src/renderer/components/+user-management/user-management-sidebar-items.injectable.tsx +++ b/src/renderer/components/+user-management/user-management-sidebar-items.injectable.tsx @@ -4,8 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+welcome/welcome-menu-items/get-welcome-menu-items.ts b/src/renderer/components/+welcome/welcome-menu-items/get-welcome-menu-items.ts index 4d01e7e9cb..696d76777d 100644 --- a/src/renderer/components/+welcome/welcome-menu-items/get-welcome-menu-items.ts +++ b/src/renderer/components/+welcome/welcome-menu-items/get-welcome-menu-items.ts @@ -2,7 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension"; import type { NavigateToCatalog } from "../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; diff --git a/src/renderer/components/+workloads-cronjobs/cron-job-menu.tsx b/src/renderer/components/+workloads-cronjobs/cron-job-menu.tsx index b7f6184519..d242b28d40 100644 --- a/src/renderer/components/+workloads-cronjobs/cron-job-menu.tsx +++ b/src/renderer/components/+workloads-cronjobs/cron-job-menu.tsx @@ -4,7 +4,8 @@ */ import React from "react"; import type { KubeObjectMenuProps } from "../kube-object-menu"; -import { CronJob, cronJobApi } from "../../../common/k8s-api/endpoints"; +import type { CronJob } from "../../../common/k8s-api/endpoints"; +import { cronJobApi } from "../../../common/k8s-api/endpoints"; import { MenuItem } from "../menu"; import { CronJobTriggerDialog } from "./cronjob-trigger-dialog"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx b/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx index 4e73d11e6f..1d6b909fba 100644 --- a/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx +++ b/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx @@ -15,7 +15,8 @@ import { Link } from "react-router-dom"; import { cronJobStore } from "./cronjob.store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { getDetailsUrl } from "../kube-detail-params"; -import { CronJob, Job } from "../../../common/k8s-api/endpoints"; +import type { Job } from "../../../common/k8s-api/endpoints"; +import { CronJob } from "../../../common/k8s-api/endpoints"; import { KubeObjectMeta } from "../kube-object-meta"; import logger from "../../../common/logger"; import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; diff --git a/src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx b/src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx index 0ed6ef3d02..59f189bec5 100644 --- a/src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx +++ b/src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx @@ -8,9 +8,11 @@ import "./cronjob-trigger-dialog.scss"; import React, { Component } from "react"; import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; -import { CronJob, cronJobApi, jobApi } from "../../../common/k8s-api/endpoints"; +import type { CronJob } from "../../../common/k8s-api/endpoints"; +import { cronJobApi, jobApi } from "../../../common/k8s-api/endpoints"; import { Notifications } from "../notifications"; import { cssNames } from "../../utils"; import { Input } from "../input"; diff --git a/src/renderer/components/+workloads-cronjobs/cronjob.store.ts b/src/renderer/components/+workloads-cronjobs/cronjob.store.ts index 2a495489fa..61915a4f41 100644 --- a/src/renderer/components/+workloads-cronjobs/cronjob.store.ts +++ b/src/renderer/components/+workloads-cronjobs/cronjob.store.ts @@ -5,7 +5,8 @@ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; -import { CronJob, cronJobApi } from "../../../common/k8s-api/endpoints/cron-job.api"; +import type { CronJob } from "../../../common/k8s-api/endpoints/cron-job.api"; +import { cronJobApi } from "../../../common/k8s-api/endpoints/cron-job.api"; import { jobStore } from "../+workloads-jobs/job.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; diff --git a/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx b/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx index b6b76db605..114f3c499f 100644 --- a/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx +++ b/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx @@ -23,7 +23,8 @@ import { PodDetailsList } from "../+workloads-pods/pod-details-list"; import { KubeObjectMeta } from "../kube-object-meta"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; -import { boundMethod, Disposer } from "../../utils"; +import type { Disposer } from "../../utils"; +import { boundMethod } from "../../utils"; import logger from "../../../common/logger"; import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; diff --git a/src/renderer/components/+workloads-daemonsets/daemonsets.store.ts b/src/renderer/components/+workloads-daemonsets/daemonsets.store.ts index 5fe857dc5b..d4b8875749 100644 --- a/src/renderer/components/+workloads-daemonsets/daemonsets.store.ts +++ b/src/renderer/components/+workloads-daemonsets/daemonsets.store.ts @@ -6,7 +6,8 @@ import { makeObservable } from "mobx"; import { podsStore } from "../+workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; -import { DaemonSet, daemonSetApi, Pod, PodStatus } from "../../../common/k8s-api/endpoints"; +import type { DaemonSet, Pod } from "../../../common/k8s-api/endpoints"; +import { daemonSetApi, PodStatus } from "../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; diff --git a/src/renderer/components/+workloads-deployments/deployment-details.tsx b/src/renderer/components/+workloads-deployments/deployment-details.tsx index 56f4070e80..0ab7721229 100644 --- a/src/renderer/components/+workloads-deployments/deployment-details.tsx +++ b/src/renderer/components/+workloads-deployments/deployment-details.tsx @@ -25,7 +25,8 @@ import { replicaSetStore } from "../+workloads-replicasets/replicasets.store"; import { DeploymentReplicaSets } from "./deployment-replicasets"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; -import { boundMethod, Disposer } from "../../utils"; +import type { Disposer } from "../../utils"; +import { boundMethod } from "../../utils"; import logger from "../../../common/logger"; import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; diff --git a/src/renderer/components/+workloads-deployments/deployment-menu.tsx b/src/renderer/components/+workloads-deployments/deployment-menu.tsx index 9c7544a1c4..f4e1e5572a 100644 --- a/src/renderer/components/+workloads-deployments/deployment-menu.tsx +++ b/src/renderer/components/+workloads-deployments/deployment-menu.tsx @@ -4,7 +4,8 @@ */ import React from "react"; import type { KubeObjectMenuProps } from "../kube-object-menu"; -import { Deployment, deploymentApi } from "../../../common/k8s-api/endpoints"; +import type { Deployment } from "../../../common/k8s-api/endpoints"; +import { deploymentApi } from "../../../common/k8s-api/endpoints"; import { MenuItem } from "../menu"; import { DeploymentScaleDialog } from "./deployment-scale-dialog"; import { Icon } from "../icon"; diff --git a/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx b/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx index 46795770f1..8861e6f0e5 100644 --- a/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx +++ b/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx @@ -8,7 +8,8 @@ import "./deployment-replicasets.scss"; import React from "react"; import { observer } from "mobx-react"; import type { ReplicaSet } from "../../../common/k8s-api/endpoints"; -import { KubeObjectMenu, KubeObjectMenuProps } from "../kube-object-menu"; +import type { KubeObjectMenuProps } from "../kube-object-menu"; +import { KubeObjectMenu } from "../kube-object-menu"; import { Spinner } from "../spinner"; import { prevDefault, stopPropagation } from "../../utils"; import { DrawerTitle } from "../drawer"; diff --git a/src/renderer/components/+workloads-deployments/deployment-scale-dialog.tsx b/src/renderer/components/+workloads-deployments/deployment-scale-dialog.tsx index a9cf32c61e..1b4385a626 100644 --- a/src/renderer/components/+workloads-deployments/deployment-scale-dialog.tsx +++ b/src/renderer/components/+workloads-deployments/deployment-scale-dialog.tsx @@ -8,9 +8,11 @@ import "./deployment-scale-dialog.scss"; import React, { Component } from "react"; import { computed, observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; -import { Deployment, DeploymentApi, deploymentApi } from "../../../common/k8s-api/endpoints"; +import type { Deployment, DeploymentApi } from "../../../common/k8s-api/endpoints"; +import { deploymentApi } from "../../../common/k8s-api/endpoints"; import { Icon } from "../icon"; import { Slider } from "../slider"; import { Notifications } from "../notifications"; diff --git a/src/renderer/components/+workloads-deployments/deployments.store.ts b/src/renderer/components/+workloads-deployments/deployments.store.ts index 9744cba38c..b49248458d 100644 --- a/src/renderer/components/+workloads-deployments/deployments.store.ts +++ b/src/renderer/components/+workloads-deployments/deployments.store.ts @@ -6,7 +6,8 @@ import { makeObservable } from "mobx"; import { podsStore } from "../+workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; -import { Deployment, deploymentApi, PodStatus } from "../../../common/k8s-api/endpoints"; +import type { Deployment } from "../../../common/k8s-api/endpoints"; +import { deploymentApi, PodStatus } from "../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; diff --git a/src/renderer/components/+workloads-jobs/job.store.ts b/src/renderer/components/+workloads-jobs/job.store.ts index b7bba5b344..315e4f9159 100644 --- a/src/renderer/components/+workloads-jobs/job.store.ts +++ b/src/renderer/components/+workloads-jobs/job.store.ts @@ -5,8 +5,10 @@ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; -import { Job, jobApi } from "../../../common/k8s-api/endpoints/job.api"; -import { CronJob, Pod, PodStatus } from "../../../common/k8s-api/endpoints"; +import type { Job } from "../../../common/k8s-api/endpoints/job.api"; +import { jobApi } from "../../../common/k8s-api/endpoints/job.api"; +import type { CronJob, Pod } from "../../../common/k8s-api/endpoints"; +import { PodStatus } from "../../../common/k8s-api/endpoints"; import { podsStore } from "../+workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; diff --git a/src/renderer/components/+workloads-overview/overview.tsx b/src/renderer/components/+workloads-overview/overview.tsx index e71636c463..d88cc23df8 100644 --- a/src/renderer/components/+workloads-overview/overview.tsx +++ b/src/renderer/components/+workloads-overview/overview.tsx @@ -15,7 +15,8 @@ import { statefulSetStore } from "../+workloads-statefulsets/statefulset.store"; import { replicaSetStore } from "../+workloads-replicasets/replicasets.store"; import { jobStore } from "../+workloads-jobs/job.store"; import { cronJobStore } from "../+workloads-cronjobs/cronjob.store"; -import { IComputedValue, makeObservable, observable, reaction } from "mobx"; +import type { IComputedValue } from "mobx"; +import { makeObservable, observable, reaction } from "mobx"; import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter"; import { Icon } from "../icon"; import { TooltipPosition } from "../tooltip"; diff --git a/src/renderer/components/+workloads-overview/workloads/workloads.injectable.ts b/src/renderer/components/+workloads-overview/workloads/workloads.injectable.ts index 330c9ae8ae..aeaa62ed4a 100644 --- a/src/renderer/components/+workloads-overview/workloads/workloads.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads/workloads.injectable.ts @@ -6,7 +6,8 @@ import { pipeline } from "@ogre-tools/fp"; import { getInjectable } from "@ogre-tools/injectable"; import { filter, sortBy as sortByWithBadTyping } from "lodash/fp"; import { computed } from "mobx"; -import { Workload, workloadInjectionToken } from "./workload-injection-token"; +import type { Workload } from "./workload-injection-token"; +import { workloadInjectionToken } from "./workload-injection-token"; import isAllowedResourceInjectable from "../../../../common/utils/is-allowed-resource.injectable"; const sortBy = diff --git a/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx b/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx index 69102ca38b..d970592628 100644 --- a/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx +++ b/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx @@ -9,7 +9,8 @@ import { fireEvent } from "@testing-library/react"; import type { IToleration } from "../../../../common/k8s-api/workload-kube-object"; import { PodTolerations } from "../pod-tolerations"; import { getDiForUnitTesting } from "../../../getDiForUnitTesting"; -import { DiRender, renderFor } from "../../test-utils/renderFor"; +import type { DiRender } from "../../test-utils/renderFor"; +import { renderFor } from "../../test-utils/renderFor"; import directoryForLensLocalStorageInjectable from "../../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable"; jest.mock("electron", () => ({ diff --git a/src/renderer/components/+workloads-pods/container-charts.tsx b/src/renderer/components/+workloads-pods/container-charts.tsx index 85182ed516..1f271e7801 100644 --- a/src/renderer/components/+workloads-pods/container-charts.tsx +++ b/src/renderer/components/+workloads-pods/container-charts.tsx @@ -9,7 +9,8 @@ import type { IPodMetrics } from "../../../common/k8s-api/endpoints"; import { BarChart, cpuOptions, memoryOptions } from "../chart"; import { isMetricsEmpty, normalizeMetrics } from "../../../common/k8s-api/endpoints/metrics.api"; import { NoMetrics } from "../resource-metrics/no-metrics"; -import { IResourceMetricsValue, ResourceMetricsContext } from "../resource-metrics"; +import type { IResourceMetricsValue } from "../resource-metrics"; +import { ResourceMetricsContext } from "../resource-metrics"; import { ThemeStore } from "../../theme.store"; import { mapValues } from "lodash"; diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/ceph-fs.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/ceph-fs.tsx index 2f9260a58c..d283a93f9d 100644 --- a/src/renderer/components/+workloads-pods/details/volumes/variants/ceph-fs.tsx +++ b/src/renderer/components/+workloads-pods/details/volumes/variants/ceph-fs.tsx @@ -6,7 +6,8 @@ import React from "react"; import { secretsApi } from "../../../../../../common/k8s-api/endpoints"; import { DrawerItem } from "../../../../drawer"; -import { LocalRef, VolumeVariantComponent } from "../variant-helpers"; +import type { VolumeVariantComponent } from "../variant-helpers"; +import { LocalRef } from "../variant-helpers"; export const CephFs: VolumeVariantComponent<"cephfs"> = ( ({ pod, variant: { monitors, path = "/", user = "admin", secretFile = "/etc/ceph/user.secret", secretRef, readOnly }}) => ( diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/config-map.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/config-map.tsx index 35cace6617..d4eb28c0e5 100644 --- a/src/renderer/components/+workloads-pods/details/volumes/variants/config-map.tsx +++ b/src/renderer/components/+workloads-pods/details/volumes/variants/config-map.tsx @@ -5,7 +5,8 @@ import React from "react"; import { configMapApi } from "../../../../../../common/k8s-api/endpoints"; -import { LocalRef, VolumeVariantComponent } from "../variant-helpers"; +import type { VolumeVariantComponent } from "../variant-helpers"; +import { LocalRef } from "../variant-helpers"; export const ConfigMap: VolumeVariantComponent<"configMap"> = ( ({ pod, variant: { name }}) => ( diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/container-storage-interface.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/container-storage-interface.tsx index 57dff33196..5d789297a1 100644 --- a/src/renderer/components/+workloads-pods/details/volumes/variants/container-storage-interface.tsx +++ b/src/renderer/components/+workloads-pods/details/volumes/variants/container-storage-interface.tsx @@ -6,7 +6,8 @@ import React from "react"; import { secretsApi } from "../../../../../../common/k8s-api/endpoints"; import { DrawerItem } from "../../../../drawer"; -import { LocalRef, VolumeVariantComponent } from "../variant-helpers"; +import type { VolumeVariantComponent } from "../variant-helpers"; +import { LocalRef } from "../variant-helpers"; export const ContainerStorageInterface: VolumeVariantComponent<"csi"> = ({ pod, diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/flex-volume.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/flex-volume.tsx index f7cc60de35..9fd8c9c455 100644 --- a/src/renderer/components/+workloads-pods/details/volumes/variants/flex-volume.tsx +++ b/src/renderer/components/+workloads-pods/details/volumes/variants/flex-volume.tsx @@ -6,7 +6,8 @@ import React from "react"; import { secretsApi } from "../../../../../../common/k8s-api/endpoints"; import { DrawerItem } from "../../../../drawer"; -import { LocalRef, VolumeVariantComponent } from "../variant-helpers"; +import type { VolumeVariantComponent } from "../variant-helpers"; +import { LocalRef } from "../variant-helpers"; export const FlexVolume: VolumeVariantComponent<"flexVolume"> = ( ({ pod, variant: { driver, fsType, secretRef, readOnly = false, options }}) => ( diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/persistent-volume-claim.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/persistent-volume-claim.tsx index f7d89907a9..f059de1675 100644 --- a/src/renderer/components/+workloads-pods/details/volumes/variants/persistent-volume-claim.tsx +++ b/src/renderer/components/+workloads-pods/details/volumes/variants/persistent-volume-claim.tsx @@ -5,7 +5,8 @@ import React from "react"; import { pvcApi } from "../../../../../../common/k8s-api/endpoints"; -import { LocalRef, VolumeVariantComponent } from "../variant-helpers"; +import type { VolumeVariantComponent } from "../variant-helpers"; +import { LocalRef } from "../variant-helpers"; export const PersistentVolumeClaim: VolumeVariantComponent<"persistentVolumeClaim"> = ( ({ pod, variant: { claimName }}) => ( diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/rados-block-device.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/rados-block-device.tsx index 060aa14554..95437345ae 100644 --- a/src/renderer/components/+workloads-pods/details/volumes/variants/rados-block-device.tsx +++ b/src/renderer/components/+workloads-pods/details/volumes/variants/rados-block-device.tsx @@ -6,7 +6,8 @@ import React from "react"; import { secretsApi } from "../../../../../../common/k8s-api/endpoints"; import { DrawerItem } from "../../../../drawer"; -import { LocalRef, VolumeVariantComponent } from "../variant-helpers"; +import type { VolumeVariantComponent } from "../variant-helpers"; +import { LocalRef } from "../variant-helpers"; export const RadosBlockDevice: VolumeVariantComponent<"rbd"> = ( ({ pod, variant: { monitors, image, fsType = "ext4", pool = "rbd", user = "admin", keyring = "/etc/ceph/keyright", secretRef, readOnly = false }}) => ( diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/scale-io.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/scale-io.tsx index be9ae981e8..de3d424f32 100644 --- a/src/renderer/components/+workloads-pods/details/volumes/variants/scale-io.tsx +++ b/src/renderer/components/+workloads-pods/details/volumes/variants/scale-io.tsx @@ -6,7 +6,8 @@ import React from "react"; import { secretsApi } from "../../../../../../common/k8s-api/endpoints"; import { DrawerItem } from "../../../../drawer"; -import { LocalRef, VolumeVariantComponent } from "../variant-helpers"; +import type { VolumeVariantComponent } from "../variant-helpers"; +import { LocalRef } from "../variant-helpers"; export const ScaleIo: VolumeVariantComponent<"scaleIO"> = ( ({ pod, variant: { gateway, system, secretRef, sslEnabled = false, protectionDomain, storagePool, storageMode = "ThinProvisioned", volumeName, fsType = "xfs", readOnly = false }}) => ( diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/secret.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/secret.tsx index ae67a8ce83..886a898f4b 100644 --- a/src/renderer/components/+workloads-pods/details/volumes/variants/secret.tsx +++ b/src/renderer/components/+workloads-pods/details/volumes/variants/secret.tsx @@ -6,7 +6,8 @@ import React from "react"; import { secretsApi } from "../../../../../../common/k8s-api/endpoints"; import { DrawerItem } from "../../../../drawer"; -import { LocalRef, VolumeVariantComponent } from "../variant-helpers"; +import type { VolumeVariantComponent } from "../variant-helpers"; +import { LocalRef } from "../variant-helpers"; export const Secret: VolumeVariantComponent<"secret"> = ( ({ pod, variant: { secretName, items = [], defaultMode = 0o644, optional = false }}) => ( diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/storage-os.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/storage-os.tsx index 0954b9288f..f25da65bec 100644 --- a/src/renderer/components/+workloads-pods/details/volumes/variants/storage-os.tsx +++ b/src/renderer/components/+workloads-pods/details/volumes/variants/storage-os.tsx @@ -6,7 +6,8 @@ import React from "react"; import { secretsApi } from "../../../../../../common/k8s-api/endpoints"; import { DrawerItem } from "../../../../drawer"; -import { LocalRef, VolumeVariantComponent } from "../variant-helpers"; +import type { VolumeVariantComponent } from "../variant-helpers"; +import { LocalRef } from "../variant-helpers"; export const StorageOs: VolumeVariantComponent<"storageos"> = ( ({ pod, variant: { volumeName, volumeNamespace, fsType = "ext4", readOnly = false, secretRef }}) => ( diff --git a/src/renderer/components/+workloads-pods/pod-charts.tsx b/src/renderer/components/+workloads-pods/pod-charts.tsx index f5bbe1cdb3..8650b83944 100644 --- a/src/renderer/components/+workloads-pods/pod-charts.tsx +++ b/src/renderer/components/+workloads-pods/pod-charts.tsx @@ -8,7 +8,8 @@ import { observer } from "mobx-react"; import React, { useContext } from "react"; import { isMetricsEmpty, normalizeMetrics } from "../../../common/k8s-api/endpoints/metrics.api"; import { BarChart, cpuOptions, memoryOptions } from "../chart"; -import { IResourceMetricsValue, ResourceMetricsContext } from "../resource-metrics"; +import type { IResourceMetricsValue } from "../resource-metrics"; +import { ResourceMetricsContext } from "../resource-metrics"; import { NoMetrics } from "../resource-metrics/no-metrics"; import type { WorkloadKubeObject } from "../../../common/k8s-api/workload-kube-object"; diff --git a/src/renderer/components/+workloads-pods/pod-container-port.tsx b/src/renderer/components/+workloads-pods/pod-container-port.tsx index 1e38f377a4..9352d59835 100644 --- a/src/renderer/components/+workloads-pods/pod-container-port.tsx +++ b/src/renderer/components/+workloads-pods/pod-container-port.tsx @@ -12,8 +12,8 @@ import { action, makeObservable, observable, reaction } from "mobx"; import { cssNames } from "../../utils"; import { Notifications } from "../notifications"; import { Button } from "../button"; -import type { ForwardedPort } from "../../port-forward"; -import { openPortForward, PortForwardStore, predictProtocol } from "../../port-forward"; +import type { ForwardedPort, PortForwardStore } from "../../port-forward"; +import { openPortForward, predictProtocol } from "../../port-forward"; import { Spinner } from "../spinner"; import { withInjectables } from "@ogre-tools/injectable-react"; import portForwardStoreInjectable from "../../port-forward/port-forward-store/port-forward-store.injectable"; diff --git a/src/renderer/components/+workloads-pods/pod-details-secrets.tsx b/src/renderer/components/+workloads-pods/pod-details-secrets.tsx index 9c10e0cc8e..34116036fa 100644 --- a/src/renderer/components/+workloads-pods/pod-details-secrets.tsx +++ b/src/renderer/components/+workloads-pods/pod-details-secrets.tsx @@ -9,7 +9,8 @@ import React, { useEffect, useState } from "react"; import { Link } from "react-router-dom"; import { reaction } from "mobx"; import { observer } from "mobx-react"; -import { Pod, Secret, secretsApi } from "../../../common/k8s-api/endpoints"; +import type { Pod, Secret } from "../../../common/k8s-api/endpoints"; +import { secretsApi } from "../../../common/k8s-api/endpoints"; import { getDetailsUrl } from "../kube-detail-params"; export interface PodDetailsSecretsProps { diff --git a/src/renderer/components/+workloads-pods/pods.store.ts b/src/renderer/components/+workloads-pods/pods.store.ts index 04e5a1942c..02c0498122 100644 --- a/src/renderer/components/+workloads-pods/pods.store.ts +++ b/src/renderer/components/+workloads-pods/pods.store.ts @@ -7,7 +7,8 @@ import countBy from "lodash/countBy"; import { observable, makeObservable } from "mobx"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind, cpuUnitsToNumber, unitsToBytes } from "../../utils"; -import { Pod, PodMetrics, podMetricsApi, podsApi } from "../../../common/k8s-api/endpoints"; +import type { Pod, PodMetrics } from "../../../common/k8s-api/endpoints"; +import { podMetricsApi, podsApi } from "../../../common/k8s-api/endpoints"; import { apiManager } from "../../../common/k8s-api/api-manager"; import type { WorkloadKubeObject } from "../../../common/k8s-api/workload-kube-object"; diff --git a/src/renderer/components/+workloads-pods/pods.tsx b/src/renderer/components/+workloads-pods/pods.tsx index fb3e571d84..4b651ce858 100644 --- a/src/renderer/components/+workloads-pods/pods.tsx +++ b/src/renderer/components/+workloads-pods/pods.tsx @@ -11,7 +11,8 @@ import { Link } from "react-router-dom"; import { podsStore } from "./pods.store"; import { eventStore } from "../+events/event.store"; import { KubeObjectListLayout } from "../kube-object-list-layout"; -import { nodesApi, Pod } from "../../../common/k8s-api/endpoints"; +import type { Pod } from "../../../common/k8s-api/endpoints"; +import { nodesApi } from "../../../common/k8s-api/endpoints"; import { StatusBrick } from "../status-brick"; import { cssNames, getConvertedParts, stopPropagation } from "../../utils"; import toPairs from "lodash/toPairs"; diff --git a/src/renderer/components/+workloads-replicasets/replicaset-details.tsx b/src/renderer/components/+workloads-replicasets/replicaset-details.tsx index 997f8c27f5..9ef630d36d 100644 --- a/src/renderer/components/+workloads-replicasets/replicaset-details.tsx +++ b/src/renderer/components/+workloads-replicasets/replicaset-details.tsx @@ -22,7 +22,8 @@ import { PodDetailsList } from "../+workloads-pods/pod-details-list"; import { KubeObjectMeta } from "../kube-object-meta"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; -import { boundMethod, Disposer } from "../../utils"; +import type { Disposer } from "../../utils"; +import { boundMethod } from "../../utils"; import logger from "../../../common/logger"; import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; diff --git a/src/renderer/components/+workloads-replicasets/replicaset-scale-dialog.tsx b/src/renderer/components/+workloads-replicasets/replicaset-scale-dialog.tsx index b601e69f89..47de7cba5d 100644 --- a/src/renderer/components/+workloads-replicasets/replicaset-scale-dialog.tsx +++ b/src/renderer/components/+workloads-replicasets/replicaset-scale-dialog.tsx @@ -8,13 +8,15 @@ import "./replicaset-scale-dialog.scss"; import React, { Component } from "react"; import { computed, observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; import { Icon } from "../icon"; import { Slider } from "../slider"; import { Notifications } from "../notifications"; import { cssNames } from "../../utils"; -import { ReplicaSet, ReplicaSetApi, replicaSetApi } from "../../../common/k8s-api/endpoints/replica-set.api"; +import type { ReplicaSet, ReplicaSetApi } from "../../../common/k8s-api/endpoints/replica-set.api"; +import { replicaSetApi } from "../../../common/k8s-api/endpoints/replica-set.api"; export interface ReplicaSetScaleDialogProps extends Partial { replicaSetApi: ReplicaSetApi; diff --git a/src/renderer/components/+workloads-replicasets/replicasets.store.ts b/src/renderer/components/+workloads-replicasets/replicasets.store.ts index 283a13f196..7aff820880 100644 --- a/src/renderer/components/+workloads-replicasets/replicasets.store.ts +++ b/src/renderer/components/+workloads-replicasets/replicasets.store.ts @@ -6,7 +6,8 @@ import { makeObservable } from "mobx"; import { podsStore } from "../+workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; -import { Deployment, ReplicaSet, replicaSetApi } from "../../../common/k8s-api/endpoints"; +import type { Deployment, ReplicaSet } from "../../../common/k8s-api/endpoints"; +import { replicaSetApi } from "../../../common/k8s-api/endpoints"; import { PodStatus } from "../../../common/k8s-api/endpoints/pods.api"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; diff --git a/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx b/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx index 2a9aad08fd..d5c33f0ac0 100644 --- a/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx +++ b/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx @@ -23,7 +23,8 @@ import { PodDetailsList } from "../+workloads-pods/pod-details-list"; import { KubeObjectMeta } from "../kube-object-meta"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; -import { boundMethod, Disposer } from "../../utils"; +import type { Disposer } from "../../utils"; +import { boundMethod } from "../../utils"; import logger from "../../../common/logger"; import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; diff --git a/src/renderer/components/+workloads-statefulsets/statefulset-scale-dialog.tsx b/src/renderer/components/+workloads-statefulsets/statefulset-scale-dialog.tsx index 2f9d8067ff..d54dcf1e44 100644 --- a/src/renderer/components/+workloads-statefulsets/statefulset-scale-dialog.tsx +++ b/src/renderer/components/+workloads-statefulsets/statefulset-scale-dialog.tsx @@ -5,11 +5,13 @@ import "./statefulset-scale-dialog.scss"; -import { StatefulSet, StatefulSetApi, statefulSetApi } from "../../../common/k8s-api/endpoints"; +import type { StatefulSet, StatefulSetApi } from "../../../common/k8s-api/endpoints"; +import { statefulSetApi } from "../../../common/k8s-api/endpoints"; import React, { Component } from "react"; import { computed, makeObservable, observable } from "mobx"; import { observer } from "mobx-react"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; import { Icon } from "../icon"; import { Slider } from "../slider"; diff --git a/src/renderer/components/+workloads-statefulsets/statefulset.store.ts b/src/renderer/components/+workloads-statefulsets/statefulset.store.ts index 78962ade79..fd9c51e013 100644 --- a/src/renderer/components/+workloads-statefulsets/statefulset.store.ts +++ b/src/renderer/components/+workloads-statefulsets/statefulset.store.ts @@ -6,7 +6,8 @@ import { makeObservable } from "mobx"; import { podsStore } from "../+workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; -import { PodStatus, StatefulSet, statefulSetApi } from "../../../common/k8s-api/endpoints"; +import type { StatefulSet } from "../../../common/k8s-api/endpoints"; +import { PodStatus, statefulSetApi } from "../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; diff --git a/src/renderer/components/+workloads/workloads-sidebar-items.injectable.tsx b/src/renderer/components/+workloads/workloads-sidebar-items.injectable.tsx index 9a0dfc86af..933dced46a 100644 --- a/src/renderer/components/+workloads/workloads-sidebar-items.injectable.tsx +++ b/src/renderer/components/+workloads/workloads-sidebar-items.injectable.tsx @@ -4,8 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; +import type { + SidebarItemRegistration } from "../layout/sidebar-items.injectable"; import { - SidebarItemRegistration, sidebarItemsInjectionToken, } from "../layout/sidebar-items.injectable"; import { Icon } from "../icon"; diff --git a/src/renderer/components/activate-entity-command/activate-entity-command.tsx b/src/renderer/components/activate-entity-command/activate-entity-command.tsx index bb353d294e..806013c361 100644 --- a/src/renderer/components/activate-entity-command/activate-entity-command.tsx +++ b/src/renderer/components/activate-entity-command/activate-entity-command.tsx @@ -4,7 +4,8 @@ */ import { withInjectables } from "@ogre-tools/injectable-react"; -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; import { observer } from "mobx-react"; import React from "react"; import { broadcastMessage } from "../../../common/ipc"; diff --git a/src/renderer/components/avatar/avatar.tsx b/src/renderer/components/avatar/avatar.tsx index 540b57cc64..2e56bb4f5e 100644 --- a/src/renderer/components/avatar/avatar.tsx +++ b/src/renderer/components/avatar/avatar.tsx @@ -5,7 +5,8 @@ import styles from "./avatar.module.scss"; -import React, { HTMLAttributes, ImgHTMLAttributes } from "react"; +import type { HTMLAttributes, ImgHTMLAttributes } from "react"; +import React from "react"; import randomColor from "randomcolor"; import GraphemeSplitter from "grapheme-splitter"; import { cssNames, iter } from "../../utils"; diff --git a/src/renderer/components/badge/badge.tsx b/src/renderer/components/badge/badge.tsx index 91cc21f95e..f4b06b74a3 100644 --- a/src/renderer/components/badge/badge.tsx +++ b/src/renderer/components/badge/badge.tsx @@ -9,7 +9,8 @@ import React from "react"; import { computed, makeObservable, observable } from "mobx"; import { observer } from "mobx-react"; import { cssNames } from "../../utils/cssNames"; -import { TooltipDecoratorProps, withTooltip } from "../tooltip"; +import type { TooltipDecoratorProps } from "../tooltip"; +import { withTooltip } from "../tooltip"; import { boundMethod } from "../../utils"; export interface BadgeProps extends React.HTMLAttributes, TooltipDecoratorProps { diff --git a/src/renderer/components/button/button.tsx b/src/renderer/components/button/button.tsx index 6e94403fba..c5dcc860f1 100644 --- a/src/renderer/components/button/button.tsx +++ b/src/renderer/components/button/button.tsx @@ -4,9 +4,11 @@ */ import "./button.scss"; -import React, { ButtonHTMLAttributes } from "react"; +import type { ButtonHTMLAttributes } from "react"; +import React from "react"; import { cssNames } from "../../utils"; -import { TooltipDecoratorProps, withTooltip } from "../tooltip"; +import type { TooltipDecoratorProps } from "../tooltip"; +import { withTooltip } from "../tooltip"; export interface ButtonProps extends ButtonHTMLAttributes, TooltipDecoratorProps { label?: React.ReactNode; diff --git a/src/renderer/components/chart/bar-chart.tsx b/src/renderer/components/chart/bar-chart.tsx index f53bed6e51..e5bb95566b 100644 --- a/src/renderer/components/chart/bar-chart.tsx +++ b/src/renderer/components/chart/bar-chart.tsx @@ -9,7 +9,8 @@ import moment from "moment"; import Color from "color"; import { observer } from "mobx-react"; import type { ChartData, ChartOptions, ChartPoint, ChartTooltipItem, Scriptable } from "chart.js"; -import { Chart, ChartKind, ChartProps } from "./chart"; +import type { ChartProps } from "./chart"; +import { Chart, ChartKind } from "./chart"; import { bytesToUnits, cssNames } from "../../utils"; import { ZebraStripes } from "./zebra-stripes.plugin"; import { ThemeStore } from "../../theme.store"; diff --git a/src/renderer/components/chart/pie-chart.tsx b/src/renderer/components/chart/pie-chart.tsx index bc6cd318f3..c5f5854c97 100644 --- a/src/renderer/components/chart/pie-chart.tsx +++ b/src/renderer/components/chart/pie-chart.tsx @@ -6,8 +6,10 @@ import "./pie-chart.scss"; import React from "react"; import { observer } from "mobx-react"; -import ChartJS, { ChartOptions } from "chart.js"; -import { Chart, ChartProps } from "./chart"; +import type { ChartOptions } from "chart.js"; +import ChartJS from "chart.js"; +import type { ChartProps } from "./chart"; +import { Chart } from "./chart"; import { cssNames } from "../../utils"; import { ThemeStore } from "../../theme.store"; diff --git a/src/renderer/components/chart/zebra-stripes.plugin.ts b/src/renderer/components/chart/zebra-stripes.plugin.ts index eae96af41e..b64f6d7b00 100644 --- a/src/renderer/components/chart/zebra-stripes.plugin.ts +++ b/src/renderer/components/chart/zebra-stripes.plugin.ts @@ -7,7 +7,8 @@ // Based on cover DIV element with repeating-linear-gradient style import type ChartJS from "chart.js"; -import moment, { Moment } from "moment"; +import type { Moment } from "moment"; +import moment from "moment"; import get from "lodash/get"; const defaultOptions = { diff --git a/src/renderer/components/cluster-manager/cluster-manager.tsx b/src/renderer/components/cluster-manager/cluster-manager.tsx index 9edd1b5b63..7758b11b66 100644 --- a/src/renderer/components/cluster-manager/cluster-manager.tsx +++ b/src/renderer/components/cluster-manager/cluster-manager.tsx @@ -14,7 +14,8 @@ import { DeleteClusterDialog } from "../delete-cluster-dialog"; import { withInjectables } from "@ogre-tools/injectable-react"; import { TopBar } from "../layout/top-bar/top-bar"; import catalogPreviousActiveTabStorageInjectable from "../+catalog/catalog-previous-active-tab-storage/catalog-previous-active-tab-storage.injectable"; -import { IComputedValue, reaction } from "mobx"; +import type { IComputedValue } from "mobx"; +import { reaction } from "mobx"; import currentRouteComponentInjectable from "../../routes/current-route-component.injectable"; import { setEntityOnRouteMatch } from "../../api/helpers/general-active-sync"; import { navigation } from "../../navigation"; diff --git a/src/renderer/components/cluster-manager/cluster-status.tsx b/src/renderer/components/cluster-manager/cluster-status.tsx index f43ed4aae7..25a9b7408b 100644 --- a/src/renderer/components/cluster-manager/cluster-status.tsx +++ b/src/renderer/components/cluster-manager/cluster-status.tsx @@ -10,7 +10,8 @@ import { disposeOnUnmount, observer } from "mobx-react"; import React from "react"; import { ipcRendererOn } from "../../../common/ipc"; import type { Cluster } from "../../../common/cluster/cluster"; -import { cssNames, IClassName } from "../../utils"; +import type { IClassName } from "../../utils"; +import { cssNames } from "../../utils"; import { Button } from "../button"; import { Icon } from "../icon"; import { Spinner } from "../spinner"; diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx index 02b4881f32..b4f36d5529 100644 --- a/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/src/renderer/components/cluster-manager/cluster-view.tsx @@ -5,7 +5,8 @@ import "./cluster-view.scss"; import React from "react"; -import { computed, IComputedValue, makeObservable, reaction } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed, makeObservable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import { ClusterStatus } from "./cluster-status"; import { ClusterFrameHandler } from "./lens-views"; @@ -14,7 +15,8 @@ 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 type { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; +import navigateToCatalogInjectable 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/cluster-manager/lens-views.ts b/src/renderer/components/cluster-manager/lens-views.ts index 22d5cba586..a8fcd12257 100644 --- a/src/renderer/components/cluster-manager/lens-views.ts +++ b/src/renderer/components/cluster-manager/lens-views.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { action, IReactionDisposer, makeObservable, observable, when } from "mobx"; +import type { IReactionDisposer } from "mobx"; +import { action, makeObservable, observable, when } from "mobx"; import logger from "../../../main/logger"; import { clusterVisibilityHandler } from "../../../common/ipc/cluster"; import { ClusterStore } from "../../../common/cluster-store/cluster-store"; diff --git a/src/renderer/components/cluster-settings/components/cluster-metrics-setting.tsx b/src/renderer/components/cluster-settings/components/cluster-metrics-setting.tsx index 95f9e89bc2..58c6e57388 100644 --- a/src/renderer/components/cluster-settings/components/cluster-metrics-setting.tsx +++ b/src/renderer/components/cluster-settings/components/cluster-metrics-setting.tsx @@ -5,7 +5,8 @@ import React from "react"; import { disposeOnUnmount, observer } from "mobx-react"; -import { Select, SelectOption } from "../../select/select"; +import type { SelectOption } from "../../select/select"; +import { Select } from "../../select/select"; import { Icon } from "../../icon/icon"; import { Button } from "../../button/button"; import { SubTitle } from "../../layout/sub-title"; diff --git a/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx b/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx index a339387483..8675456fd8 100644 --- a/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx +++ b/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx @@ -7,11 +7,13 @@ import React from "react"; import { observer, disposeOnUnmount } from "mobx-react"; import type { Cluster } from "../../../../common/cluster/cluster"; import { SubTitle } from "../../layout/sub-title"; -import { Select, SelectOption } from "../../select"; +import type { SelectOption } from "../../select"; +import { Select } from "../../select"; import { Input } from "../../input"; import { observable, computed, autorun, makeObservable } from "mobx"; import { productName } from "../../../../common/vars"; -import { MetricProviderInfo, metricsApi } from "../../../../common/k8s-api/endpoints/metrics.api"; +import type { MetricProviderInfo } from "../../../../common/k8s-api/endpoints/metrics.api"; +import { metricsApi } from "../../../../common/k8s-api/endpoints/metrics.api"; import { Spinner } from "../../spinner"; export interface ClusterPrometheusSettingProps { diff --git a/src/renderer/components/command-palette/command-container.tsx b/src/renderer/components/command-palette/command-container.tsx index dee3dd27c8..c6a390b6b7 100644 --- a/src/renderer/components/command-palette/command-container.tsx +++ b/src/renderer/components/command-palette/command-container.tsx @@ -10,7 +10,8 @@ import React from "react"; import { Dialog } from "../dialog"; import { CommandDialog } from "./command-dialog"; import type { ClusterId } from "../../../common/cluster-types"; -import commandOverlayInjectable, { CommandOverlay } from "./command-overlay.injectable"; +import type { CommandOverlay } from "./command-overlay.injectable"; +import commandOverlayInjectable from "./command-overlay.injectable"; import { isMac } from "../../../common/vars"; import { catalogEntityRegistry } from "../../api/catalog-entity-registry"; import { broadcastMessage, ipcRendererOn } from "../../../common/ipc"; diff --git a/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx b/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx index cf544f7569..6d10064f02 100644 --- a/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx +++ b/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx @@ -4,7 +4,8 @@ */ import React from "react"; -import { EntitySettingRegistry, RegisteredEntitySetting } from "../../../../extensions/registries"; +import type { RegisteredEntitySetting } from "../../../../extensions/registries"; +import { EntitySettingRegistry } from "../../../../extensions/registries"; import { HotbarAddCommand } from "../../hotbar/hotbar-add-command"; import { HotbarRemoveCommand } from "../../hotbar/hotbar-remove-command"; import { HotbarSwitchCommand } from "../../hotbar/hotbar-switch-command"; diff --git a/src/renderer/components/command-palette/registered-commands/registered-commands.injectable.ts b/src/renderer/components/command-palette/registered-commands/registered-commands.injectable.ts index 997934b11b..361b1d023a 100644 --- a/src/renderer/components/command-palette/registered-commands/registered-commands.injectable.ts +++ b/src/renderer/components/command-palette/registered-commands/registered-commands.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; import type { CustomResourceDefinition } from "../../../../common/k8s-api/endpoints"; import customResourceDefinitionsInjectable from "../../+custom-resources/custom-resources.injectable"; import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension"; diff --git a/src/renderer/components/confirm-dialog/confirm-dialog.tsx b/src/renderer/components/confirm-dialog/confirm-dialog.tsx index a3b5409fd3..191c719bcc 100644 --- a/src/renderer/components/confirm-dialog/confirm-dialog.tsx +++ b/src/renderer/components/confirm-dialog/confirm-dialog.tsx @@ -5,12 +5,15 @@ import "./confirm-dialog.scss"; -import React, { ReactNode } from "react"; +import type { ReactNode } from "react"; +import React from "react"; import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; import { cssNames, noop, prevDefault } from "../../utils"; -import { Button, ButtonProps } from "../button"; -import { Dialog, DialogProps } from "../dialog"; +import type { ButtonProps } from "../button"; +import { Button } from "../button"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Icon } from "../icon"; import { Notifications } from "../notifications"; diff --git a/src/renderer/components/delete-cluster-dialog/save-config.ts b/src/renderer/components/delete-cluster-dialog/save-config.ts index 54fb636fe5..6037470c60 100644 --- a/src/renderer/components/delete-cluster-dialog/save-config.ts +++ b/src/renderer/components/delete-cluster-dialog/save-config.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { dumpYaml, KubeConfig } from "@kubernetes/client-node"; +import type { KubeConfig } from "@kubernetes/client-node"; +import { dumpYaml } from "@kubernetes/client-node"; import fs from "fs"; import * as lockFile from "proper-lockfile"; diff --git a/src/renderer/components/dialog/logs-dialog.tsx b/src/renderer/components/dialog/logs-dialog.tsx index a46cdf0a78..b50d39ce85 100644 --- a/src/renderer/components/dialog/logs-dialog.tsx +++ b/src/renderer/components/dialog/logs-dialog.tsx @@ -6,7 +6,8 @@ import "./logs-dialog.scss"; import React from "react"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; import { Notifications } from "../notifications"; import { Button } from "../button"; diff --git a/src/renderer/components/dock/__test__/dock-store.test.ts b/src/renderer/components/dock/__test__/dock-store.test.ts index 28c3bdf6e8..88f6b8d11a 100644 --- a/src/renderer/components/dock/__test__/dock-store.test.ts +++ b/src/renderer/components/dock/__test__/dock-store.test.ts @@ -5,7 +5,8 @@ import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import { getDiForUnitTesting } from "../../../getDiForUnitTesting"; -import { DockStore, DockTab, TabKind } from "../dock/store"; +import type { DockStore, DockTab } from "../dock/store"; +import { TabKind } from "../dock/store"; import dockStoreInjectable from "../dock/store.injectable"; import fse from "fs-extra"; diff --git a/src/renderer/components/dock/__test__/dock-tabs.test.tsx b/src/renderer/components/dock/__test__/dock-tabs.test.tsx index 3bc1f048d7..6408b4d352 100644 --- a/src/renderer/components/dock/__test__/dock-tabs.test.tsx +++ b/src/renderer/components/dock/__test__/dock-tabs.test.tsx @@ -8,7 +8,8 @@ import { fireEvent } from "@testing-library/react"; import "@testing-library/jest-dom/extend-expect"; import fse from "fs-extra"; import { DockTabs } from "../dock-tabs"; -import { DockStore, DockTab, TabKind } from "../dock/store"; +import type { DockStore, DockTab } from "../dock/store"; +import { TabKind } from "../dock/store"; import { noop } from "../../../utils"; import { ThemeStore } from "../../../theme.store"; import { UserStore } from "../../../../common/user-store"; diff --git a/src/renderer/components/dock/create-resource/create-resource-tab.injectable.ts b/src/renderer/components/dock/create-resource/create-resource-tab.injectable.ts index ab7d9b1de5..1218109286 100644 --- a/src/renderer/components/dock/create-resource/create-resource-tab.injectable.ts +++ b/src/renderer/components/dock/create-resource/create-resource-tab.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import dockStoreInjectable from "../dock/store.injectable"; -import { DockTabCreateSpecific, TabKind } from "../dock/store"; +import type { DockTabCreateSpecific } from "../dock/store"; +import { TabKind } from "../dock/store"; const createResourceTabInjectable = getInjectable({ id: "create-resource-tab", diff --git a/src/renderer/components/dock/create-resource/lens-templates.injectable.ts b/src/renderer/components/dock/create-resource/lens-templates.injectable.ts index 22736ec249..d162dcb931 100644 --- a/src/renderer/components/dock/create-resource/lens-templates.injectable.ts +++ b/src/renderer/components/dock/create-resource/lens-templates.injectable.ts @@ -9,7 +9,8 @@ import "../../../../common/vars"; import readFileInjectable from "../../../../common/fs/read-file.injectable"; import readDirInjectable from "../../../../common/fs/read-dir.injectable"; import type { RawTemplates } from "./create-resource-templates.injectable"; -import getAbsolutePathInjectable, { GetAbsolutePath } from "../../../../common/path/get-absolute-path.injectable"; +import type { GetAbsolutePath } from "../../../../common/path/get-absolute-path.injectable"; +import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable"; interface Dependencies { readDir: (dirPath: string) => Promise; diff --git a/src/renderer/components/dock/create-resource/store.ts b/src/renderer/components/dock/create-resource/store.ts index 8fc1340594..ef0214b477 100644 --- a/src/renderer/components/dock/create-resource/store.ts +++ b/src/renderer/components/dock/create-resource/store.ts @@ -4,7 +4,8 @@ */ import type { StorageHelper } from "../../../utils"; -import { DockTabStorageState, DockTabStore } from "../dock-tab-store/dock-tab.store"; +import type { DockTabStorageState } from "../dock-tab-store/dock-tab.store"; +import { DockTabStore } from "../dock-tab-store/dock-tab.store"; interface Dependencies { createStorage: (storageKey: string, options: DockTabStorageState) => StorageHelper>; diff --git a/src/renderer/components/dock/create-resource/user-templates.injectable.ts b/src/renderer/components/dock/create-resource/user-templates.injectable.ts index 2fad8b074c..a13bf3c3ac 100644 --- a/src/renderer/components/dock/create-resource/user-templates.injectable.ts +++ b/src/renderer/components/dock/create-resource/user-templates.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { computed, IComputedValue, observable } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed, observable } from "mobx"; import path from "path"; import os from "os"; import { delay, getOrInsert, waitForPath } from "../../../utils"; diff --git a/src/renderer/components/dock/create-resource/view.tsx b/src/renderer/components/dock/create-resource/view.tsx index 938b8b71d2..ccaf97463a 100644 --- a/src/renderer/components/dock/create-resource/view.tsx +++ b/src/renderer/components/dock/create-resource/view.tsx @@ -4,9 +4,11 @@ */ import React from "react"; -import { GroupSelectOption, Select, SelectOption } from "../../select"; +import type { GroupSelectOption, SelectOption } from "../../select"; +import { Select } from "../../select"; import yaml from "js-yaml"; -import { IComputedValue, makeObservable, observable } from "mobx"; +import type { IComputedValue } from "mobx"; +import { makeObservable, observable } from "mobx"; import { observer } from "mobx-react"; import type { CreateResourceTabStore } from "./store"; import type { DockTab } from "../dock/store"; diff --git a/src/renderer/components/dock/dock-tab-store/create-dock-tab-store.injectable.ts b/src/renderer/components/dock/dock-tab-store/create-dock-tab-store.injectable.ts index 399f091c76..0fa8a3bdf8 100644 --- a/src/renderer/components/dock/dock-tab-store/create-dock-tab-store.injectable.ts +++ b/src/renderer/components/dock/dock-tab-store/create-dock-tab-store.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { DockTabStore, DockTabStoreOptions } from "./dock-tab.store"; +import type { DockTabStoreOptions } from "./dock-tab.store"; +import { DockTabStore } from "./dock-tab.store"; import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; const createDockTabStoreInjectable = getInjectable({ diff --git a/src/renderer/components/dock/dock-tab-store/dock-tab.store.ts b/src/renderer/components/dock/dock-tab-store/dock-tab.store.ts index f3f74a4ec6..a88c937b69 100644 --- a/src/renderer/components/dock/dock-tab-store/dock-tab.store.ts +++ b/src/renderer/components/dock/dock-tab-store/dock-tab.store.ts @@ -4,7 +4,8 @@ */ import { action, observable, reaction } from "mobx"; -import { autoBind, StorageHelper, toJS } from "../../../utils"; +import type { StorageHelper } from "../../../utils"; +import { autoBind, toJS } from "../../../utils"; import type { TabId } from "../dock/store"; export interface DockTabStoreOptions { diff --git a/src/renderer/components/dock/dock-tab.tsx b/src/renderer/components/dock/dock-tab.tsx index 699cec40e0..32ff2d8391 100644 --- a/src/renderer/components/dock/dock-tab.tsx +++ b/src/renderer/components/dock/dock-tab.tsx @@ -9,7 +9,8 @@ import React from "react"; import { observer } from "mobx-react"; import { boundMethod, cssNames, prevDefault, isMiddleClick } from "../../utils"; import type { DockStore, DockTab as DockTabModel } from "./dock/store"; -import { Tab, TabProps } from "../tabs"; +import type { TabProps } from "../tabs"; +import { Tab } from "../tabs"; import { Icon } from "../icon"; import { Menu, MenuItem } from "../menu"; import { observable, makeObservable } from "mobx"; diff --git a/src/renderer/components/dock/dock.tsx b/src/renderer/components/dock/dock.tsx index 1a2177c88f..527057f261 100644 --- a/src/renderer/components/dock/dock.tsx +++ b/src/renderer/components/dock/dock.tsx @@ -13,7 +13,8 @@ import { MenuActions } from "../menu/menu-actions"; import { ResizeDirection, ResizingAnchor } from "../resizing-anchor"; import { CreateResource } from "./create-resource/view"; import { DockTabs } from "./dock-tabs"; -import { DockStore, DockTab, TabKind } from "./dock/store"; +import type { DockStore, DockTab } from "./dock/store"; +import { TabKind } from "./dock/store"; import { EditResource } from "./edit-resource/view"; import { InstallChart } from "./install-chart/view"; import { LogsDockTab } from "./logs/view"; diff --git a/src/renderer/components/dock/dock/dock-storage.injectable.ts b/src/renderer/components/dock/dock/dock-storage.injectable.ts index df276290c9..ad3dbca7d1 100644 --- a/src/renderer/components/dock/dock/dock-storage.injectable.ts +++ b/src/renderer/components/dock/dock/dock-storage.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; -import { DockStorageState, TabKind } from "./store"; +import type { DockStorageState } from "./store"; +import { TabKind } from "./store"; const dockStorageInjectable = getInjectable({ id: "dock-storage", diff --git a/src/renderer/components/dock/dock/store.ts b/src/renderer/components/dock/dock/store.ts index 4e3252f99d..f932dda079 100644 --- a/src/renderer/components/dock/dock/store.ts +++ b/src/renderer/components/dock/dock/store.ts @@ -5,7 +5,8 @@ import * as uuid from "uuid"; import { action, comparer, computed, makeObservable, observable, reaction, runInAction } from "mobx"; -import { autoBind, StorageHelper } from "../../../utils"; +import type { StorageHelper } from "../../../utils"; +import { autoBind } from "../../../utils"; import throttle from "lodash/throttle"; export type TabId = string; diff --git a/src/renderer/components/dock/edit-resource/edit-resource-tab.injectable.ts b/src/renderer/components/dock/edit-resource/edit-resource-tab.injectable.ts index eeba197acc..5d9382e4ce 100644 --- a/src/renderer/components/dock/edit-resource/edit-resource-tab.injectable.ts +++ b/src/renderer/components/dock/edit-resource/edit-resource-tab.injectable.ts @@ -6,7 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import editResourceTabStoreInjectable from "./store.injectable"; import dockStoreInjectable from "../dock/store.injectable"; import type { KubeObject } from "../../../../common/k8s-api/kube-object"; -import { DockStore, DockTabCreateSpecific, TabId, TabKind } from "../dock/store"; +import type { DockStore, DockTabCreateSpecific, TabId } from "../dock/store"; +import { TabKind } from "../dock/store"; import type { EditResourceTabStore } from "./store"; import { runInAction } from "mobx"; diff --git a/src/renderer/components/dock/edit-resource/store.ts b/src/renderer/components/dock/edit-resource/store.ts index 022a642e06..772d06ddb0 100644 --- a/src/renderer/components/dock/edit-resource/store.ts +++ b/src/renderer/components/dock/edit-resource/store.ts @@ -4,7 +4,8 @@ */ import type { StorageHelper } from "../../../utils"; -import { DockTabStorageState, DockTabStore } from "../dock-tab-store/dock-tab.store"; +import type { DockTabStorageState } from "../dock-tab-store/dock-tab.store"; +import { DockTabStore } from "../dock-tab-store/dock-tab.store"; import type { TabId } from "../dock/store"; import type { KubeObject } from "../../../../common/k8s-api/kube-object"; import { apiManager } from "../../../../common/k8s-api/api-manager"; diff --git a/src/renderer/components/dock/editor-panel.tsx b/src/renderer/components/dock/editor-panel.tsx index caa1c732f2..a401e0f43e 100644 --- a/src/renderer/components/dock/editor-panel.tsx +++ b/src/renderer/components/dock/editor-panel.tsx @@ -10,7 +10,8 @@ import { makeObservable, observable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import type { DockStore, TabId } from "./dock/store"; import { cssNames } from "../../utils"; -import { MonacoEditor, MonacoEditorProps } from "../monaco-editor"; +import type { MonacoEditorProps } from "../monaco-editor"; +import { MonacoEditor } from "../monaco-editor"; import { withInjectables } from "@ogre-tools/injectable-react"; import dockStoreInjectable from "./dock/store.injectable"; diff --git a/src/renderer/components/dock/info-panel.tsx b/src/renderer/components/dock/info-panel.tsx index 28d68e1f39..b94944ad55 100644 --- a/src/renderer/components/dock/info-panel.tsx +++ b/src/renderer/components/dock/info-panel.tsx @@ -5,7 +5,8 @@ import "./info-panel.scss"; -import React, { Component, ReactNode } from "react"; +import type { ReactNode } from "react"; +import React, { Component } from "react"; import { computed, observable, reaction, makeObservable } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import { cssNames } from "../../utils"; diff --git a/src/renderer/components/dock/install-chart/create-install-chart-tab.injectable.ts b/src/renderer/components/dock/install-chart/create-install-chart-tab.injectable.ts index 4be192504e..c568351844 100644 --- a/src/renderer/components/dock/install-chart/create-install-chart-tab.injectable.ts +++ b/src/renderer/components/dock/install-chart/create-install-chart-tab.injectable.ts @@ -5,10 +5,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import installChartTabStoreInjectable from "./store.injectable"; import type { HelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api"; -import { +import type { DockTab, DockTabCreate, - DockTabCreateSpecific, + DockTabCreateSpecific } from "../dock/store"; +import { TabKind, } from "../dock/store"; import type { InstallChartTabStore } from "./store"; diff --git a/src/renderer/components/dock/install-chart/store.ts b/src/renderer/components/dock/install-chart/store.ts index e322a0ec78..b2e1455c84 100644 --- a/src/renderer/components/dock/install-chart/store.ts +++ b/src/renderer/components/dock/install-chart/store.ts @@ -5,7 +5,8 @@ import { action, makeObservable, when } from "mobx"; import type { TabId } from "../dock/store"; -import { DockTabStorageState, DockTabStore } from "../dock-tab-store/dock-tab.store"; +import type { DockTabStorageState } from "../dock-tab-store/dock-tab.store"; +import { DockTabStore } from "../dock-tab-store/dock-tab.store"; import { getChartDetails, getChartValues } from "../../../../common/k8s-api/endpoints/helm-charts.api"; import type { IReleaseUpdateDetails } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import type { StorageHelper } from "../../../utils"; diff --git a/src/renderer/components/dock/install-chart/view.tsx b/src/renderer/components/dock/install-chart/view.tsx index c9bb36507c..a98247cd3f 100644 --- a/src/renderer/components/dock/install-chart/view.tsx +++ b/src/renderer/components/dock/install-chart/view.tsx @@ -18,7 +18,8 @@ import { Spinner } from "../../spinner"; import { Icon } from "../../icon"; import { Button } from "../../button"; import { LogsDialog } from "../../dialog/logs-dialog"; -import { Select, SelectOption } from "../../select"; +import type { SelectOption } from "../../select"; +import { Select } from "../../select"; import { Input } from "../../input"; import { EditorPanel } from "../editor-panel"; import type { IReleaseCreatePayload, IReleaseUpdateDetails } from "../../../../common/k8s-api/endpoints/helm-releases.api"; diff --git a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx index f9d92aab06..fcbd1f1382 100644 --- a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx +++ b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx @@ -17,7 +17,8 @@ import type { DiRender } from "../../../test-utils/renderFor"; import { renderFor } from "../../../test-utils/renderFor"; import directoryForUserDataInjectable from "../../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import callForLogsInjectable from "../call-for-logs.injectable"; -import { LogTabViewModel, LogTabViewModelDependencies } from "../logs-view-model"; +import type { LogTabViewModelDependencies } from "../logs-view-model"; +import { LogTabViewModel } from "../logs-view-model"; import type { TabId } from "../../dock/store"; import userEvent from "@testing-library/user-event"; import { SearchStore } from "../../../../search-store/search-store"; diff --git a/src/renderer/components/dock/logs/__test__/log-search.test.tsx b/src/renderer/components/dock/logs/__test__/log-search.test.tsx index 24c2001eec..ab1a5b3e02 100644 --- a/src/renderer/components/dock/logs/__test__/log-search.test.tsx +++ b/src/renderer/components/dock/logs/__test__/log-search.test.tsx @@ -10,7 +10,8 @@ import { dockerPod } from "./pod.mock"; import { getDiForUnitTesting } from "../../../../getDiForUnitTesting"; import type { DiRender } from "../../../test-utils/renderFor"; import { renderFor } from "../../../test-utils/renderFor"; -import { LogTabViewModel, LogTabViewModelDependencies } from "../logs-view-model"; +import type { LogTabViewModelDependencies } from "../logs-view-model"; +import { LogTabViewModel } from "../logs-view-model"; import type { TabId } from "../../dock/store"; import { LogSearch } from "../search"; import userEvent from "@testing-library/user-event"; diff --git a/src/renderer/components/dock/logs/create-logs-tab.injectable.ts b/src/renderer/components/dock/logs/create-logs-tab.injectable.ts index e7c03bc271..47cef1dd95 100644 --- a/src/renderer/components/dock/logs/create-logs-tab.injectable.ts +++ b/src/renderer/components/dock/logs/create-logs-tab.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { DockTabCreate, DockTab, TabKind, TabId } from "../dock/store"; +import type { DockTabCreate, DockTab, TabId } from "../dock/store"; +import { TabKind } from "../dock/store"; import type { LogTabData } from "./tab-store"; import * as uuid from "uuid"; import { runInAction } from "mobx"; diff --git a/src/renderer/components/dock/logs/create-workload-logs-tab.injectable.ts b/src/renderer/components/dock/logs/create-workload-logs-tab.injectable.ts index 6b96ff5af7..119d782798 100644 --- a/src/renderer/components/dock/logs/create-workload-logs-tab.injectable.ts +++ b/src/renderer/components/dock/logs/create-workload-logs-tab.injectable.ts @@ -6,7 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import { podsStore } from "../../+workloads-pods/pods.store"; import type { WorkloadKubeObject } from "../../../../common/k8s-api/workload-kube-object"; import type { TabId } from "../dock/store"; -import createLogsTabInjectable, { CreateLogsTabData } from "./create-logs-tab.injectable"; +import type { CreateLogsTabData } from "./create-logs-tab.injectable"; +import createLogsTabInjectable from "./create-logs-tab.injectable"; export interface WorkloadLogsTabData { workload: WorkloadKubeObject; diff --git a/src/renderer/components/dock/logs/logs-view-model.ts b/src/renderer/components/dock/logs/logs-view-model.ts index 73ed0c770f..ed14ad6e91 100644 --- a/src/renderer/components/dock/logs/logs-view-model.ts +++ b/src/renderer/components/dock/logs/logs-view-model.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import type { LogTabData } from "./tab-store"; -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; import type { TabId } from "../dock/store"; import type { SearchStore } from "../../../search-store/search-store"; import type { Pod } from "../../../../common/k8s-api/endpoints"; diff --git a/src/renderer/components/dock/logs/resource-selector.tsx b/src/renderer/components/dock/logs/resource-selector.tsx index f107adf0fa..97ad7b3dfc 100644 --- a/src/renderer/components/dock/logs/resource-selector.tsx +++ b/src/renderer/components/dock/logs/resource-selector.tsx @@ -9,7 +9,8 @@ import React from "react"; import { observer } from "mobx-react"; import { Badge } from "../../badge"; -import { Select, SelectOption } from "../../select"; +import type { SelectOption } from "../../select"; +import { Select } from "../../select"; import type { LogTabViewModel } from "./logs-view-model"; import type { IPodContainer, Pod } from "../../../../common/k8s-api/endpoints"; diff --git a/src/renderer/components/dock/logs/store.ts b/src/renderer/components/dock/logs/store.ts index ccef18ad77..987a6db095 100644 --- a/src/renderer/components/dock/logs/store.ts +++ b/src/renderer/components/dock/logs/store.ts @@ -3,9 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { observable, IComputedValue, when } from "mobx"; +import type { IComputedValue } from "mobx"; +import { observable, when } from "mobx"; import type { IPodLogsQuery, Pod } from "../../../../common/k8s-api/endpoints"; -import { getOrInsertWith, interval, IntervalFn } from "../../../utils"; +import type { IntervalFn } from "../../../utils"; +import { getOrInsertWith, interval } from "../../../utils"; import type { TabId } from "../dock/store"; import type { LogTabData } from "./tab-store"; diff --git a/src/renderer/components/dock/logs/tab-store.ts b/src/renderer/components/dock/logs/tab-store.ts index 4c910e0733..7310e71881 100644 --- a/src/renderer/components/dock/logs/tab-store.ts +++ b/src/renderer/components/dock/logs/tab-store.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { DockTabStorageState, DockTabStore } from "../dock-tab-store/dock-tab.store"; +import type { DockTabStorageState } from "../dock-tab-store/dock-tab.store"; +import { DockTabStore } from "../dock-tab-store/dock-tab.store"; import type { StorageHelper } from "../../../utils"; import type { TabId } from "../dock/store"; import { logTabDataValidator } from "./log-tab-data.validator"; diff --git a/src/renderer/components/dock/logs/view.tsx b/src/renderer/components/dock/logs/view.tsx index 5e5591a1f9..01002efc62 100644 --- a/src/renderer/components/dock/logs/view.tsx +++ b/src/renderer/components/dock/logs/view.tsx @@ -14,7 +14,8 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import logsViewModelInjectable from "./logs-view-model.injectable"; import type { LogTabViewModel } from "./logs-view-model"; import type { DockTab } from "../dock/store"; -import { cssNames, Disposer } from "../../../utils"; +import type { Disposer } from "../../../utils"; +import { cssNames } from "../../../utils"; import type { KubeWatchSubscribeStoreOptions } from "../../../kube-watch-api/kube-watch-api"; import subscribeStoresInjectable from "../../../kube-watch-api/subscribe-stores.injectable"; import type { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store"; diff --git a/src/renderer/components/dock/terminal/create-terminal-tab.injectable.ts b/src/renderer/components/dock/terminal/create-terminal-tab.injectable.ts index 8ee4ab45b0..dbf692d81c 100644 --- a/src/renderer/components/dock/terminal/create-terminal-tab.injectable.ts +++ b/src/renderer/components/dock/terminal/create-terminal-tab.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import dockStoreInjectable from "../dock/store.injectable"; -import { DockTabCreateSpecific, TabKind } from "../dock/store"; +import type { DockTabCreateSpecific } from "../dock/store"; +import { TabKind } from "../dock/store"; const createTerminalTabInjectable = getInjectable({ id: "create-terminal-tab", diff --git a/src/renderer/components/dock/terminal/dock-tab.tsx b/src/renderer/components/dock/terminal/dock-tab.tsx index 7c32d6a950..daa4627062 100644 --- a/src/renderer/components/dock/terminal/dock-tab.tsx +++ b/src/renderer/components/dock/terminal/dock-tab.tsx @@ -7,7 +7,8 @@ import "./terminal-dock-tab.scss"; import React from "react"; import { observer } from "mobx-react"; import { boundMethod, cssNames } from "../../../utils"; -import { DockTab, DockTabProps } from "../dock-tab"; +import type { DockTabProps } from "../dock-tab"; +import { DockTab } from "../dock-tab"; import { Icon } from "../../icon"; import type { TerminalStore } from "./store"; import type { DockStore } from "../dock/store"; diff --git a/src/renderer/components/dock/terminal/send-command.injectable.ts b/src/renderer/components/dock/terminal/send-command.injectable.ts index c193d4804c..edc0a2b7ed 100644 --- a/src/renderer/components/dock/terminal/send-command.injectable.ts +++ b/src/renderer/components/dock/terminal/send-command.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { when } from "mobx"; -import { TerminalApi, TerminalChannels } from "../../../api/terminal-api"; +import type { TerminalApi } from "../../../api/terminal-api"; +import { TerminalChannels } from "../../../api/terminal-api"; import { noop } from "../../../utils"; import { Notifications } from "../../notifications"; import selectDockTabInjectable from "../dock/select-dock-tab.injectable"; diff --git a/src/renderer/components/dock/terminal/terminal.ts b/src/renderer/components/dock/terminal/terminal.ts index c119c071c6..d6f1701028 100644 --- a/src/renderer/components/dock/terminal/terminal.ts +++ b/src/renderer/components/dock/terminal/terminal.ts @@ -8,7 +8,8 @@ import { reaction } from "mobx"; import { Terminal as XTerm } from "xterm"; import { FitAddon } from "xterm-addon-fit"; import type { TabId } from "../dock/store"; -import { TerminalApi, TerminalChannels } from "../../../api/terminal-api"; +import type { TerminalApi } from "../../../api/terminal-api"; +import { TerminalChannels } from "../../../api/terminal-api"; import { ThemeStore } from "../../../theme.store"; import { disposer } from "../../../utils"; import { isMac } from "../../../../common/vars"; diff --git a/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts b/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts index 0a50681a93..014e46760f 100644 --- a/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts +++ b/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts @@ -6,7 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import upgradeChartTabStoreInjectable from "./store.injectable"; import dockStoreInjectable from "../dock/store.injectable"; import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; -import { DockStore, DockTabCreateSpecific, TabId, TabKind } from "../dock/store"; +import type { DockStore, DockTabCreateSpecific, TabId } from "../dock/store"; +import { TabKind } from "../dock/store"; import type { UpgradeChartTabStore } from "./store"; import { runInAction } from "mobx"; diff --git a/src/renderer/components/dock/upgrade-chart/store.ts b/src/renderer/components/dock/upgrade-chart/store.ts index ddc1a78188..06bb78d58d 100644 --- a/src/renderer/components/dock/upgrade-chart/store.ts +++ b/src/renderer/components/dock/upgrade-chart/store.ts @@ -5,7 +5,8 @@ import { action, computed, makeObservable } from "mobx"; import type { TabId } from "../dock/store"; -import { DockTabStorageState, DockTabStore } from "../dock-tab-store/dock-tab.store"; +import type { DockTabStorageState } from "../dock-tab-store/dock-tab.store"; +import { DockTabStore } from "../dock-tab-store/dock-tab.store"; import { getReleaseValues } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import type { StorageHelper } from "../../../utils"; diff --git a/src/renderer/components/dock/upgrade-chart/view.tsx b/src/renderer/components/dock/upgrade-chart/view.tsx index 4bf9c1c15d..f35a3602b1 100644 --- a/src/renderer/components/dock/upgrade-chart/view.tsx +++ b/src/renderer/components/dock/upgrade-chart/view.tsx @@ -17,8 +17,10 @@ import { Badge } from "../../badge"; import { EditorPanel } from "../editor-panel"; import { helmChartStore, type IChartVersion } from "../../+helm-charts/helm-chart.store"; import type { HelmRelease, IReleaseUpdateDetails, IReleaseUpdatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api"; -import { Select, SelectOption } from "../../select"; -import { IAsyncComputed, withInjectables } from "@ogre-tools/injectable-react"; +import type { SelectOption } from "../../select"; +import { Select } from "../../select"; +import type { IAsyncComputed } from "@ogre-tools/injectable-react"; +import { withInjectables } from "@ogre-tools/injectable-react"; import upgradeChartTabStoreInjectable from "./store.injectable"; import updateReleaseInjectable from "../../+helm-releases/update-release/update-release.injectable"; import releasesInjectable from "../../+helm-releases/releases.injectable"; diff --git a/src/renderer/components/drawer/drawer-item-labels.tsx b/src/renderer/components/drawer/drawer-item-labels.tsx index e25e615910..4d2a23b253 100644 --- a/src/renderer/components/drawer/drawer-item-labels.tsx +++ b/src/renderer/components/drawer/drawer-item-labels.tsx @@ -4,7 +4,8 @@ */ import React from "react"; -import { DrawerItem, DrawerItemProps } from "./drawer-item"; +import type { DrawerItemProps } from "./drawer-item"; +import { DrawerItem } from "./drawer-item"; import { Badge } from "../badge"; import { KubeObject } from "../../../common/k8s-api/kube-object"; diff --git a/src/renderer/components/drawer/drawer.tsx b/src/renderer/components/drawer/drawer.tsx index 404667feb2..c1a3283b20 100644 --- a/src/renderer/components/drawer/drawer.tsx +++ b/src/renderer/components/drawer/drawer.tsx @@ -8,9 +8,11 @@ import "./drawer.scss"; import React from "react"; import { clipboard } from "electron"; import { createPortal } from "react-dom"; -import { cssNames, noop, StorageHelper } from "../../utils"; +import type { StorageHelper } from "../../utils"; +import { cssNames, noop } from "../../utils"; import { Icon } from "../icon"; -import { Animate, AnimateName } from "../animate"; +import type { AnimateName } from "../animate"; +import { Animate } from "../animate"; import { ResizeDirection, ResizeGrowthDirection, ResizeSide, ResizingAnchor } from "../resizing-anchor"; import drawerStorageInjectable, { defaultDrawerWidth, diff --git a/src/renderer/components/editable-list/editable-list.tsx b/src/renderer/components/editable-list/editable-list.tsx index c712d44974..c2ede52352 100644 --- a/src/renderer/components/editable-list/editable-list.tsx +++ b/src/renderer/components/editable-list/editable-list.tsx @@ -9,7 +9,8 @@ import { observer } from "mobx-react"; import React from "react"; import { Icon } from "../icon"; -import { Input, InputProps, InputValidator } from "../input"; +import type { InputProps, InputValidator } from "../input"; +import { Input } from "../input"; import { boundMethod } from "../../utils"; export interface EditableListProps { diff --git a/src/renderer/components/error-boundary/error-boundary.tsx b/src/renderer/components/error-boundary/error-boundary.tsx index e4bf9aa63b..fa9d8dd90c 100644 --- a/src/renderer/components/error-boundary/error-boundary.tsx +++ b/src/renderer/components/error-boundary/error-boundary.tsx @@ -5,7 +5,8 @@ import "./error-boundary.scss"; -import React, { ErrorInfo } from "react"; +import type { ErrorInfo } from "react"; +import React from "react"; import { observer } from "mobx-react"; import { Button } from "../button"; import { navigation } from "../../navigation"; diff --git a/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx b/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx index f51dc1e8b2..0d4c6491b1 100644 --- a/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx +++ b/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx @@ -9,7 +9,8 @@ import { fireEvent } from "@testing-library/react"; import React from "react"; import type { DiContainer } from "@ogre-tools/injectable"; import { getDiForUnitTesting } from "../../../getDiForUnitTesting"; -import { DiRender, renderFor } from "../../test-utils/renderFor"; +import type { DiRender } from "../../test-utils/renderFor"; +import { renderFor } from "../../test-utils/renderFor"; import hotbarStoreInjectable from "../../../../common/hotbar-store.injectable"; import { ThemeStore } from "../../../theme.store"; import { ConfirmDialog } from "../../confirm-dialog"; diff --git a/src/renderer/components/hotbar/hotbar-add-command.tsx b/src/renderer/components/hotbar/hotbar-add-command.tsx index ee270dd866..4b0af4ca19 100644 --- a/src/renderer/components/hotbar/hotbar-add-command.tsx +++ b/src/renderer/components/hotbar/hotbar-add-command.tsx @@ -5,7 +5,8 @@ import React from "react"; import { observer } from "mobx-react"; -import { Input, InputValidator } from "../input"; +import type { InputValidator } from "../input"; +import { Input } from "../input"; import type { CreateHotbarData, CreateHotbarOptions } from "../../../common/hotbar-types"; import { withInjectables } from "@ogre-tools/injectable-react"; import commandOverlayInjectable from "../command-palette/command-overlay.injectable"; diff --git a/src/renderer/components/hotbar/hotbar-cell.tsx b/src/renderer/components/hotbar/hotbar-cell.tsx index 8baa14b17a..c44e3c3f5f 100644 --- a/src/renderer/components/hotbar/hotbar-cell.tsx +++ b/src/renderer/components/hotbar/hotbar-cell.tsx @@ -4,7 +4,8 @@ */ import "./hotbar-menu.scss"; -import React, { HTMLAttributes, ReactNode, useState } from "react"; +import type { HTMLAttributes, ReactNode } from "react"; +import React, { useState } from "react"; import { cssNames } from "../../utils"; diff --git a/src/renderer/components/hotbar/hotbar-entity-icon.tsx b/src/renderer/components/hotbar/hotbar-entity-icon.tsx index 8bc4572050..c314c38763 100644 --- a/src/renderer/components/hotbar/hotbar-entity-icon.tsx +++ b/src/renderer/components/hotbar/hotbar-entity-icon.tsx @@ -5,7 +5,8 @@ import styles from "./hotbar-entity-icon.module.scss"; -import React, { HTMLAttributes } from "react"; +import type { HTMLAttributes } from "react"; +import React from "react"; import { makeObservable, observable } from "mobx"; import { observer } from "mobx-react"; @@ -13,7 +14,8 @@ import type { CatalogEntity, CatalogEntityContextMenu, CatalogEntityContextMenuC import { catalogCategoryRegistry } from "../../api/catalog-category-registry"; import { catalogEntityRegistry } from "../../api/catalog-entity-registry"; import { navigate } from "../../navigation"; -import { cssNames, IClassName } from "../../utils"; +import type { IClassName } from "../../utils"; +import { cssNames } from "../../utils"; import { Icon } from "../icon"; import { HotbarIcon } from "./hotbar-icon"; import { LensKubernetesClusterStatus } from "../../../common/catalog-entities/kubernetes-cluster"; diff --git a/src/renderer/components/hotbar/hotbar-icon.tsx b/src/renderer/components/hotbar/hotbar-icon.tsx index cc6a5c21e4..f976ecd03e 100644 --- a/src/renderer/components/hotbar/hotbar-icon.tsx +++ b/src/renderer/components/hotbar/hotbar-icon.tsx @@ -12,7 +12,8 @@ import { cssNames } from "../../utils"; import { ConfirmDialog } from "../confirm-dialog"; import { Menu, MenuItem } from "../menu"; import { observer } from "mobx-react"; -import { Avatar, AvatarProps } from "../avatar"; +import type { AvatarProps } from "../avatar"; +import { Avatar } from "../avatar"; import { Icon } from "../icon"; import { Tooltip } from "../tooltip"; diff --git a/src/renderer/components/hotbar/hotbar-menu.tsx b/src/renderer/components/hotbar/hotbar-menu.tsx index f40ddd8108..96d812aeb1 100644 --- a/src/renderer/components/hotbar/hotbar-menu.tsx +++ b/src/renderer/components/hotbar/hotbar-menu.tsx @@ -8,14 +8,16 @@ import "./hotbar-menu.scss"; import React from "react"; import { observer } from "mobx-react"; import { HotbarEntityIcon } from "./hotbar-entity-icon"; -import { cssNames, IClassName } from "../../utils"; +import type { IClassName } from "../../utils"; +import { cssNames } from "../../utils"; import { catalogEntityRegistry } from "../../api/catalog-entity-registry"; import type { CatalogEntity } from "../../api/catalog-entity"; import { DragDropContext, Draggable, Droppable, type DropResult } from "react-beautiful-dnd"; import { HotbarSelector } from "./hotbar-selector"; import { HotbarCell } from "./hotbar-cell"; import { HotbarIcon } from "./hotbar-icon"; -import { defaultHotbarCells, HotbarItem } from "../../../common/hotbar-types"; +import type { HotbarItem } from "../../../common/hotbar-types"; +import { defaultHotbarCells } from "../../../common/hotbar-types"; import { action, makeObservable, observable } from "mobx"; import hotbarStoreInjectable from "../../../common/hotbar-store.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; diff --git a/src/renderer/components/hotbar/hotbar-rename-command.tsx b/src/renderer/components/hotbar/hotbar-rename-command.tsx index 686ba9c7f7..6b69b7b7a3 100644 --- a/src/renderer/components/hotbar/hotbar-rename-command.tsx +++ b/src/renderer/components/hotbar/hotbar-rename-command.tsx @@ -7,7 +7,8 @@ import React, { useState } from "react"; import { observer } from "mobx-react"; import { Select } from "../select"; import hotbarStoreInjectable from "../../../common/hotbar-store.injectable"; -import { Input, InputValidator } from "../input"; +import type { InputValidator } from "../input"; +import { Input } from "../input"; import type { Hotbar } from "../../../common/hotbar-types"; import { withInjectables } from "@ogre-tools/injectable-react"; import commandOverlayInjectable from "../command-palette/command-overlay.injectable"; diff --git a/src/renderer/components/icon/icon.tsx b/src/renderer/components/icon/icon.tsx index 1335f344ad..8a48e33cc2 100644 --- a/src/renderer/components/icon/icon.tsx +++ b/src/renderer/components/icon/icon.tsx @@ -5,11 +5,13 @@ import "./icon.scss"; -import React, { createRef, ReactNode } from "react"; +import type { ReactNode } from "react"; +import React, { createRef } from "react"; import { NavLink } from "react-router-dom"; import type { LocationDescriptor } from "history"; import { boundMethod, cssNames } from "../../utils"; -import { TooltipDecoratorProps, withTooltip } from "../tooltip"; +import type { TooltipDecoratorProps } from "../tooltip"; +import { withTooltip } from "../tooltip"; import isNumber from "lodash/isNumber"; import { decode } from "../../../common/utils/base64"; diff --git a/src/renderer/components/input/drop-file-input.tsx b/src/renderer/components/input/drop-file-input.tsx index 09c4092dac..02c1b1f364 100644 --- a/src/renderer/components/input/drop-file-input.tsx +++ b/src/renderer/components/input/drop-file-input.tsx @@ -5,7 +5,8 @@ import "./drop-file-input.scss"; import React from "react"; -import { boundMethod, cssNames, IClassName } from "../../utils"; +import type { IClassName } from "../../utils"; +import { boundMethod, cssNames } from "../../utils"; import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; import logger from "../../../main/logger"; diff --git a/src/renderer/components/input/file-input.tsx b/src/renderer/components/input/file-input.tsx index 6649a00332..9768face01 100644 --- a/src/renderer/components/input/file-input.tsx +++ b/src/renderer/components/input/file-input.tsx @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import React, { InputHTMLAttributes } from "react"; +import type { InputHTMLAttributes } from "react"; +import React from "react"; export interface FileInputSelection { file: File; diff --git a/src/renderer/components/input/input.tsx b/src/renderer/components/input/input.tsx index 903c1ba162..6bc2579f65 100644 --- a/src/renderer/components/input/input.tsx +++ b/src/renderer/components/input/input.tsx @@ -5,10 +5,12 @@ import "./input.scss"; -import React, { DOMAttributes, InputHTMLAttributes, TextareaHTMLAttributes } from "react"; +import type { DOMAttributes, InputHTMLAttributes, TextareaHTMLAttributes } from "react"; +import React from "react"; import { boundMethod, cssNames, debouncePromise, getRandId } from "../../utils"; import { Icon } from "../icon"; -import { Tooltip, TooltipProps } from "../tooltip"; +import type { TooltipProps } from "../tooltip"; +import { Tooltip } from "../tooltip"; import * as Validators from "./input_validators"; import type { InputValidator } from "./input_validators"; import isFunction from "lodash/isFunction"; diff --git a/src/renderer/components/input/search-input.tsx b/src/renderer/components/input/search-input.tsx index edeab21d77..0290144ee0 100644 --- a/src/renderer/components/input/search-input.tsx +++ b/src/renderer/components/input/search-input.tsx @@ -9,7 +9,8 @@ import React, { createRef } from "react"; import { observer } from "mobx-react"; import { boundMethod, cssNames } from "../../utils"; import { Icon } from "../icon"; -import { Input, InputProps } from "./input"; +import type { InputProps } from "./input"; +import { Input } from "./input"; import { isMac } from "../../../common/vars"; export interface SearchInputProps extends InputProps { diff --git a/src/renderer/components/item-object-list/content.tsx b/src/renderer/components/item-object-list/content.tsx index eb7b5dedb2..28fa8b0459 100644 --- a/src/renderer/components/item-object-list/content.tsx +++ b/src/renderer/components/item-object-list/content.tsx @@ -5,17 +5,23 @@ import "./item-list-layout.scss"; -import React, { ReactNode } from "react"; +import type { ReactNode } from "react"; +import React from "react"; import { computed, makeObservable } from "mobx"; import { Observer, observer } from "mobx-react"; -import { ConfirmDialog, ConfirmDialogParams } from "../confirm-dialog"; -import { Table, TableCell, TableCellProps, TableHead, TableProps, TableRow, TableRowProps, TableSortCallbacks } from "../table"; -import { boundMethod, cssNames, IClassName, isReactNode, prevDefault, stopPropagation } from "../../utils"; -import { AddRemoveButtons, AddRemoveButtonsProps } from "../add-remove-buttons"; +import type { ConfirmDialogParams } from "../confirm-dialog"; +import { ConfirmDialog } from "../confirm-dialog"; +import type { TableCellProps, TableProps, TableRowProps, TableSortCallbacks } from "../table"; +import { Table, TableCell, TableHead, TableRow } from "../table"; +import type { IClassName } from "../../utils"; +import { boundMethod, cssNames, isReactNode, prevDefault, stopPropagation } from "../../utils"; +import type { AddRemoveButtonsProps } from "../add-remove-buttons"; +import { AddRemoveButtons } from "../add-remove-buttons"; import { NoItems } from "../no-items"; import { Spinner } from "../spinner"; import type { ItemObject, ItemStore } from "../../../common/item.store"; -import { Filter, pageFilters } from "./page-filters.store"; +import type { Filter } from "./page-filters.store"; +import { pageFilters } from "./page-filters.store"; import { ThemeStore } from "../../theme.store"; import { MenuActions } from "../menu/menu-actions"; import { MenuItem } from "../menu"; diff --git a/src/renderer/components/item-object-list/filter-icon.tsx b/src/renderer/components/item-object-list/filter-icon.tsx index 28dd9aec02..af85b8777b 100644 --- a/src/renderer/components/item-object-list/filter-icon.tsx +++ b/src/renderer/components/item-object-list/filter-icon.tsx @@ -4,7 +4,8 @@ */ import React from "react"; -import { Icon, IconProps } from "../icon"; +import type { IconProps } from "../icon"; +import { Icon } from "../icon"; import { FilterType } from "./page-filters.store"; export interface FilterIconProps extends Partial { diff --git a/src/renderer/components/item-object-list/header.tsx b/src/renderer/components/item-object-list/header.tsx index ce5f19fd05..d3063c4fc7 100644 --- a/src/renderer/components/item-object-list/header.tsx +++ b/src/renderer/components/item-object-list/header.tsx @@ -5,9 +5,11 @@ import "./item-list-layout.scss"; -import React, { ReactNode } from "react"; +import type { ReactNode } from "react"; +import React from "react"; import { observer } from "mobx-react"; -import { cssNames, IClassName } from "../../utils"; +import type { IClassName } from "../../utils"; +import { cssNames } from "../../utils"; import type { ItemObject, ItemStore } from "../../../common/item.store"; import type { Filter } from "./page-filters.store"; import type { HeaderCustomizer, HeaderPlaceholders, SearchFilter } from "./list-layout"; diff --git a/src/renderer/components/item-object-list/list-layout.tsx b/src/renderer/components/item-object-list/list-layout.tsx index 9af91fc755..d0b035179a 100644 --- a/src/renderer/components/item-object-list/list-layout.tsx +++ b/src/renderer/components/item-object-list/list-layout.tsx @@ -5,11 +5,13 @@ import "./item-list-layout.scss"; -import React, { ReactNode } from "react"; +import type { ReactNode } from "react"; +import React from "react"; import { computed, makeObservable, untracked } from "mobx"; import type { ConfirmDialogParams } from "../confirm-dialog"; import type { TableCellProps, TableProps, TableRowProps, TableSortCallbacks } from "../table"; -import { boundMethod, cssNames, IClassName, noop, StorageHelper } from "../../utils"; +import type { IClassName, StorageHelper } from "../../utils"; +import { boundMethod, cssNames, noop } from "../../utils"; import type { AddRemoveButtonsProps } from "../add-remove-buttons"; import type { ItemObject, ItemStore } from "../../../common/item.store"; import type { SearchInputUrlProps } from "../input"; diff --git a/src/renderer/components/item-object-list/page-filters-list.tsx b/src/renderer/components/item-object-list/page-filters-list.tsx index 771e6248af..f94b4600ec 100644 --- a/src/renderer/components/item-object-list/page-filters-list.tsx +++ b/src/renderer/components/item-object-list/page-filters-list.tsx @@ -8,7 +8,8 @@ import React from "react"; import { observer } from "mobx-react"; import { Badge } from "../badge"; import { cssNames } from "../../utils"; -import { Filter, pageFilters } from "./page-filters.store"; +import type { Filter } from "./page-filters.store"; +import { pageFilters } from "./page-filters.store"; import { FilterIcon } from "./filter-icon"; import { Icon } from "../icon"; import { searchUrlParam } from "../input"; 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 cefdf0ea3c..c840da6e15 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 @@ -8,9 +8,11 @@ import "./kube-object-list-layout.scss"; import React from "react"; import { computed, makeObservable, observable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; -import { cssNames, Disposer } from "../../utils"; +import type { Disposer } from "../../utils"; +import { cssNames } from "../../utils"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; -import { ItemListLayout, ItemListLayoutProps } from "../item-object-list/list-layout"; +import type { ItemListLayoutProps } from "../item-object-list/list-layout"; +import { ItemListLayout } from "../item-object-list/list-layout"; import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { KubeObjectMenu } from "../kube-object-menu"; import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter"; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx index c6959e66ed..540c8295ce 100644 --- a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx +++ b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx @@ -9,12 +9,14 @@ import { KubeObject } from "../../../common/k8s-api/kube-object"; import userEvent from "@testing-library/user-event"; import type { DiContainer } from "@ogre-tools/injectable"; import { ConfirmDialog } from "../confirm-dialog"; -import asyncFn, { AsyncFnMock } from "@async-fn/jest"; +import type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import clusterInjectable from "./dependencies/cluster.injectable"; import hideDetailsInjectable from "./dependencies/hide-details.injectable"; -import { DiRender, renderFor } from "../test-utils/renderFor"; +import type { DiRender } from "../test-utils/renderFor"; +import { renderFor } from "../test-utils/renderFor"; import type { Cluster } from "../../../common/cluster/cluster"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; import apiManagerInjectable from "./dependencies/api-manager.injectable"; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.tsx index 83cba3ade7..b4af03c431 100644 --- a/src/renderer/components/kube-object-menu/kube-object-menu.tsx +++ b/src/renderer/components/kube-object-menu/kube-object-menu.tsx @@ -6,7 +6,8 @@ import React from "react"; import { boundMethod, cssNames } from "../../utils"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; -import { MenuActions, MenuActionsProps } from "../menu"; +import type { MenuActionsProps } from "../menu"; +import { MenuActions } from "../menu"; import identity from "lodash/identity"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; import { withInjectables } from "@ogre-tools/injectable-react"; diff --git a/src/renderer/components/kube-object-meta/kube-object-meta.tsx b/src/renderer/components/kube-object-meta/kube-object-meta.tsx index b6c63db0f8..1c3415c8b5 100644 --- a/src/renderer/components/kube-object-meta/kube-object-meta.tsx +++ b/src/renderer/components/kube-object-meta/kube-object-meta.tsx @@ -4,7 +4,8 @@ */ import React from "react"; -import { KubeMetaField, KubeObject } from "../../../common/k8s-api/kube-object"; +import type { KubeMetaField } from "../../../common/k8s-api/kube-object"; +import { KubeObject } from "../../../common/k8s-api/kube-object"; import { DrawerItem, DrawerItemLabels } from "../drawer"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { Link } from "react-router-dom"; diff --git a/src/renderer/components/kube-object-status-icon/kube-object-status-icon.test.tsx b/src/renderer/components/kube-object-status-icon/kube-object-status-icon.test.tsx index 7f181af8f8..c2338f634c 100644 --- a/src/renderer/components/kube-object-status-icon/kube-object-status-icon.test.tsx +++ b/src/renderer/components/kube-object-status-icon/kube-object-status-icon.test.tsx @@ -4,7 +4,8 @@ */ import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; -import { DiRender, renderFor } from "../test-utils/renderFor"; +import type { DiRender } from "../test-utils/renderFor"; +import { renderFor } from "../test-utils/renderFor"; import { computed } from "mobx"; import { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; import { KubeObjectStatusLevel } from "../../../extensions/renderer-api/kube-object-status"; diff --git a/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx b/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx index db5429998e..e1c820c948 100644 --- a/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx +++ b/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx @@ -8,7 +8,8 @@ import "./kube-object-status-icon.scss"; import React from "react"; import { Icon } from "../icon"; import { cssNames, formatDuration } from "../../utils"; -import { KubeObject, KubeObjectStatus, KubeObjectStatusLevel } from "../../..//extensions/renderer-api/k8s-api"; +import type { KubeObject, KubeObjectStatus } from "../../..//extensions/renderer-api/k8s-api"; +import { KubeObjectStatusLevel } from "../../..//extensions/renderer-api/k8s-api"; import { withInjectables } from "@ogre-tools/injectable-react"; import statusesForKubeObjectInjectable from "./statuses-for-kube-object.injectable"; diff --git a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx index db37e5d3ce..f634c8f238 100644 --- a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx +++ b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx @@ -11,7 +11,8 @@ import yaml from "js-yaml"; import type { ServiceAccount } from "../../../common/k8s-api/endpoints"; import { saveFileDialog } from "../../utils"; import { Button } from "../button"; -import { Dialog, DialogProps } from "../dialog"; +import type { DialogProps } from "../dialog"; +import { Dialog } from "../dialog"; import { Icon } from "../icon"; import { Notifications } from "../notifications"; import { Wizard, WizardStep } from "../wizard"; diff --git a/src/renderer/components/layout/close-button.tsx b/src/renderer/components/layout/close-button.tsx index 14e0290f76..0330600836 100644 --- a/src/renderer/components/layout/close-button.tsx +++ b/src/renderer/components/layout/close-button.tsx @@ -5,7 +5,8 @@ import styles from "./close-button.module.scss"; -import React, { HTMLAttributes } from "react"; +import type { HTMLAttributes } from "react"; +import React from "react"; import { Icon } from "../icon"; export interface CloseButtonProps extends HTMLAttributes { diff --git a/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx b/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx index bba3a9e810..01e1e39d56 100644 --- a/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx +++ b/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx @@ -2,11 +2,13 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { DiContainer, getInjectable } from "@ogre-tools/injectable"; +import type { DiContainer } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; import React from "react"; import { extensionRegistratorInjectionToken } from "../../../extensions/extension-loader/extension-registrator-injection-token"; -import { SidebarItemRegistration, sidebarItemsInjectionToken } from "./sidebar-items.injectable"; +import type { SidebarItemRegistration } from "./sidebar-items.injectable"; +import { sidebarItemsInjectionToken } from "./sidebar-items.injectable"; import { computed } from "mobx"; import routesInjectable from "../../routes/routes.injectable"; import { matches, noop } from "lodash/fp"; diff --git a/src/renderer/components/layout/main-layout.tsx b/src/renderer/components/layout/main-layout.tsx index 08e57a723e..87a7af04d4 100755 --- a/src/renderer/components/layout/main-layout.tsx +++ b/src/renderer/components/layout/main-layout.tsx @@ -7,13 +7,15 @@ import styles from "./main-layout.module.scss"; import React from "react"; import { observer } from "mobx-react"; -import { cssNames, StorageHelper } from "../../utils"; +import type { StorageHelper } from "../../utils"; +import { cssNames } from "../../utils"; import { ErrorBoundary } from "../error-boundary"; import { ResizeDirection, ResizeGrowthDirection, ResizeSide, ResizingAnchor } from "../resizing-anchor"; import { withInjectables } from "@ogre-tools/injectable-react"; +import type { + SidebarStorageState } from "./sidebar-storage/sidebar-storage.injectable"; import sidebarStorageInjectable, { defaultSidebarWidth, - SidebarStorageState, } from "./sidebar-storage/sidebar-storage.injectable"; export interface MainLayoutProps { diff --git a/src/renderer/components/layout/setting-layout.tsx b/src/renderer/components/layout/setting-layout.tsx index db92aff4af..a6f6283c6e 100644 --- a/src/renderer/components/layout/setting-layout.tsx +++ b/src/renderer/components/layout/setting-layout.tsx @@ -7,7 +7,8 @@ import "./setting-layout.scss"; import React from "react"; import { observer } from "mobx-react"; -import { cssNames, IClassName } from "../../utils"; +import type { IClassName } from "../../utils"; +import { cssNames } from "../../utils"; import { CloseButton } from "./close-button"; import { getLegacyGlobalDiForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; diff --git a/src/renderer/components/layout/sidebar-item.tsx b/src/renderer/components/layout/sidebar-item.tsx index c4b785d718..96e9ea513d 100644 --- a/src/renderer/components/layout/sidebar-item.tsx +++ b/src/renderer/components/layout/sidebar-item.tsx @@ -7,14 +7,16 @@ import "./sidebar-item.scss"; import React from "react"; import { computed, makeObservable } from "mobx"; -import { cssNames, StorageHelper } from "../../utils"; +import type { StorageHelper } from "../../utils"; +import { cssNames } from "../../utils"; import { observer } from "mobx-react"; import { NavLink } from "react-router-dom"; import { Icon } from "../icon"; import { withInjectables } from "@ogre-tools/injectable-react"; -import sidebarStorageInjectable, { +import type { SidebarStorageState, } from "./sidebar-storage/sidebar-storage.injectable"; +import sidebarStorageInjectable from "./sidebar-storage/sidebar-storage.injectable"; import type { HierarchicalSidebarItem } from "./sidebar-items.injectable"; interface Dependencies { diff --git a/src/renderer/components/layout/sidebar-items.injectable.ts b/src/renderer/components/layout/sidebar-items.injectable.ts index e1ac1281d8..d4f9ba7a93 100644 --- a/src/renderer/components/layout/sidebar-items.injectable.ts +++ b/src/renderer/components/layout/sidebar-items.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable, getInjectionToken } from "@ogre-tools/injectable"; -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; import { pipeline } from "@ogre-tools/fp"; import { diff --git a/src/renderer/components/layout/sidebar.tsx b/src/renderer/components/layout/sidebar.tsx index fc6330a3d4..eec38eb535 100644 --- a/src/renderer/components/layout/sidebar.tsx +++ b/src/renderer/components/layout/sidebar.tsx @@ -12,9 +12,10 @@ import { SidebarItem } from "./sidebar-item"; import { catalogEntityRegistry } from "../../api/catalog-entity-registry"; import { SidebarCluster } from "./sidebar-cluster"; import { withInjectables } from "@ogre-tools/injectable-react"; -import sidebarItemsInjectable, { +import type { HierarchicalSidebarItem, } from "./sidebar-items.injectable"; +import sidebarItemsInjectable from "./sidebar-items.injectable"; import type { IComputedValue } from "mobx"; interface Dependencies { diff --git a/src/renderer/components/layout/tab-layout.tsx b/src/renderer/components/layout/tab-layout.tsx index 185422636a..4af490e1f2 100644 --- a/src/renderer/components/layout/tab-layout.tsx +++ b/src/renderer/components/layout/tab-layout.tsx @@ -5,10 +5,12 @@ import "./tab-layout.scss"; -import React, { ReactNode } from "react"; +import type { ReactNode } from "react"; +import React from "react"; import { matchPath, Redirect, Route, Switch } from "react-router"; import { observer } from "mobx-react"; -import { cssNames, IClassName } from "../../utils"; +import type { IClassName } from "../../utils"; +import { cssNames } from "../../utils"; import { Tab, Tabs } from "../tabs"; import { ErrorBoundary } from "../error-boundary"; import { navigate, navigation } from "../../navigation"; diff --git a/src/renderer/components/layout/top-bar/top-bar-win-linux.test.tsx b/src/renderer/components/layout/top-bar/top-bar-win-linux.test.tsx index d66b236e44..7f606a31be 100644 --- a/src/renderer/components/layout/top-bar/top-bar-win-linux.test.tsx +++ b/src/renderer/components/layout/top-bar/top-bar-win-linux.test.tsx @@ -8,7 +8,8 @@ import { fireEvent } from "@testing-library/react"; import "@testing-library/jest-dom/extend-expect"; import { TopBar } from "./top-bar"; import { getDiForUnitTesting } from "../../../getDiForUnitTesting"; -import { DiRender, renderFor } from "../../test-utils/renderFor"; +import type { DiRender } from "../../test-utils/renderFor"; +import { renderFor } from "../../test-utils/renderFor"; import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import mockFs from "mock-fs"; import { emitOpenAppMenuAsContextMenu, requestWindowAction } from "../../../ipc"; diff --git a/src/renderer/components/layout/top-bar/top-bar.test.tsx b/src/renderer/components/layout/top-bar/top-bar.test.tsx index 06a1a16855..a33573b32b 100644 --- a/src/renderer/components/layout/top-bar/top-bar.test.tsx +++ b/src/renderer/components/layout/top-bar/top-bar.test.tsx @@ -9,7 +9,8 @@ import "@testing-library/jest-dom/extend-expect"; import { TopBar } from "./top-bar"; import { getDiForUnitTesting } from "../../../getDiForUnitTesting"; import type { DiContainer } from "@ogre-tools/injectable"; -import { DiRender, renderFor } from "../../test-utils/renderFor"; +import type { DiRender } from "../../test-utils/renderFor"; +import { renderFor } from "../../test-utils/renderFor"; import topBarItemsInjectable from "./top-bar-items/top-bar-items.injectable"; import { computed } from "mobx"; import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; diff --git a/src/renderer/components/layout/top-bar/top-bar.tsx b/src/renderer/components/layout/top-bar/top-bar.tsx index ac51c66448..158fe84276 100644 --- a/src/renderer/components/layout/top-bar/top-bar.tsx +++ b/src/renderer/components/layout/top-bar/top-bar.tsx @@ -19,7 +19,8 @@ import { emitOpenAppMenuAsContextMenu, requestWindowAction } from "../../../ipc" import { WindowAction } from "../../../../common/ipc/window"; import isLinuxInjectable from "../../../../common/vars/is-linux.injectable"; import isWindowsInjectable from "../../../../common/vars/is-windows.injectable"; -import navigateToCatalogInjectable, { NavigateToCatalog } from "../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; +import type { NavigateToCatalog } from "../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; +import navigateToCatalogInjectable from "../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; import catalogRouteInjectable from "../../../../common/front-end-routing/routes/catalog/catalog-route.injectable"; import routeIsActiveInjectable from "../../../routes/route-is-active.injectable"; diff --git a/src/renderer/components/layout/wizard-layout.tsx b/src/renderer/components/layout/wizard-layout.tsx index 1994ae41f0..9012a0f66f 100644 --- a/src/renderer/components/layout/wizard-layout.tsx +++ b/src/renderer/components/layout/wizard-layout.tsx @@ -6,7 +6,8 @@ import "./wizard-layout.scss"; import React from "react"; import { observer } from "mobx-react"; -import { cssNames, IClassName } from "../../utils"; +import type { IClassName } from "../../utils"; +import { cssNames } from "../../utils"; export interface WizardLayoutProps extends React.DOMAttributes { className?: IClassName; diff --git a/src/renderer/components/line-progress/line-progress.tsx b/src/renderer/components/line-progress/line-progress.tsx index c70c0e1c2c..3a8d195b5a 100644 --- a/src/renderer/components/line-progress/line-progress.tsx +++ b/src/renderer/components/line-progress/line-progress.tsx @@ -6,7 +6,8 @@ import "./line-progress.scss"; import React from "react"; import { cssNames } from "../../utils"; -import { TooltipDecoratorProps, withTooltip } from "../tooltip"; +import type { TooltipDecoratorProps } from "../tooltip"; +import { withTooltip } from "../tooltip"; export interface LineProgressProps extends React.HTMLProps, TooltipDecoratorProps { value: number; diff --git a/src/renderer/components/menu/menu-actions.tsx b/src/renderer/components/menu/menu-actions.tsx index e7e270f126..4e8fc6a331 100644 --- a/src/renderer/components/menu/menu-actions.tsx +++ b/src/renderer/components/menu/menu-actions.tsx @@ -10,8 +10,10 @@ import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; import { boundMethod, cssNames } from "../../utils"; import { ConfirmDialog } from "../confirm-dialog"; -import { Icon, IconProps } from "../icon"; -import { Menu, MenuItem, MenuProps } from "./menu"; +import type { IconProps } from "../icon"; +import { Icon } from "../icon"; +import type { MenuProps } from "./menu"; +import { Menu, MenuItem } from "./menu"; import uniqueId from "lodash/uniqueId"; import isString from "lodash/isString"; diff --git a/src/renderer/components/menu/menu.tsx b/src/renderer/components/menu/menu.tsx index 1d176d0b83..8d5fb08c77 100644 --- a/src/renderer/components/menu/menu.tsx +++ b/src/renderer/components/menu/menu.tsx @@ -5,11 +5,13 @@ import "./menu.scss"; -import React, { Fragment, ReactElement, ReactNode } from "react"; +import type { ReactElement, ReactNode } from "react"; +import React, { Fragment } from "react"; import { createPortal } from "react-dom"; import { autoBind, cssNames, noop } from "../../utils"; import { Animate } from "../animate"; -import { Icon, IconProps } from "../icon"; +import type { IconProps } from "../icon"; +import { Icon } from "../icon"; import isEqual from "lodash/isEqual"; export const MenuContext = React.createContext(null); diff --git a/src/renderer/components/monaco-editor/monaco-editor.tsx b/src/renderer/components/monaco-editor/monaco-editor.tsx index b4931bdaea..f50e49f191 100644 --- a/src/renderer/components/monaco-editor/monaco-editor.tsx +++ b/src/renderer/components/monaco-editor/monaco-editor.tsx @@ -9,7 +9,8 @@ import { observer } from "mobx-react"; import { action, computed, makeObservable, observable, reaction } from "mobx"; import { editor, Uri } from "monaco-editor"; import type { MonacoTheme } from "./monaco-themes"; -import { MonacoValidator, monacoValidators } from "./monaco-validators"; +import type { MonacoValidator } from "./monaco-validators"; +import { monacoValidators } from "./monaco-validators"; import { debounce, merge } from "lodash"; import { cssNames, disposer } from "../../utils"; import { UserStore } from "../../../common/user-store"; diff --git a/src/renderer/components/no-items/no-items.tsx b/src/renderer/components/no-items/no-items.tsx index 658a28d6d1..e5656e8af6 100644 --- a/src/renderer/components/no-items/no-items.tsx +++ b/src/renderer/components/no-items/no-items.tsx @@ -6,7 +6,8 @@ import "./no-items.scss"; import React from "react"; -import { cssNames, IClassName } from "../../utils"; +import type { IClassName } from "../../utils"; +import { cssNames } from "../../utils"; export interface NoItemsProps { className?: IClassName; diff --git a/src/renderer/components/notifications/notifications.tsx b/src/renderer/components/notifications/notifications.tsx index bfafffb4be..4948358150 100644 --- a/src/renderer/components/notifications/notifications.tsx +++ b/src/renderer/components/notifications/notifications.tsx @@ -10,7 +10,8 @@ import { reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import { JsonApiErrorParsed } from "../../../common/k8s-api/json-api"; import { cssNames, prevDefault } from "../../utils"; -import { Notification, NotificationMessage, notificationsStore, NotificationStatus } from "./notifications.store"; +import type { Notification, NotificationMessage } from "./notifications.store"; +import { notificationsStore, NotificationStatus } from "./notifications.store"; import { Animate } from "../animate"; import { Icon } from "../icon"; diff --git a/src/renderer/components/resource-metrics/resource-metrics-text.tsx b/src/renderer/components/resource-metrics/resource-metrics-text.tsx index 2701207e77..1f2d810a04 100644 --- a/src/renderer/components/resource-metrics/resource-metrics-text.tsx +++ b/src/renderer/components/resource-metrics/resource-metrics-text.tsx @@ -5,7 +5,8 @@ import React from "react"; import type { IPodMetrics } from "../../../common/k8s-api/endpoints"; -import { getMetricLastPoints, IMetrics } from "../../../common/k8s-api/endpoints/metrics.api"; +import type { IMetrics } from "../../../common/k8s-api/endpoints/metrics.api"; +import { getMetricLastPoints } from "../../../common/k8s-api/endpoints/metrics.api"; import { bytesToUnits } from "../../utils"; import { Badge } from "../badge"; import { DrawerItem } from "../drawer"; diff --git a/src/renderer/components/select/select.test.tsx b/src/renderer/components/select/select.test.tsx index 6149f1072d..ee5252e8d9 100644 --- a/src/renderer/components/select/select.test.tsx +++ b/src/renderer/components/select/select.test.tsx @@ -9,7 +9,8 @@ import { UserStore } from "../../../common/user-store"; import { ThemeStore } from "../../theme.store"; import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import type { DiContainer } from "@ogre-tools/injectable"; -import { DiRender, renderFor } from "../test-utils/renderFor"; +import type { DiRender } from "../test-utils/renderFor"; +import { 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 rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; diff --git a/src/renderer/components/select/select.tsx b/src/renderer/components/select/select.tsx index 9de1944408..eb333cb6c5 100644 --- a/src/renderer/components/select/select.tsx +++ b/src/renderer/components/select/select.tsx @@ -7,7 +7,8 @@ // API docs: https://react-select.com/ import "./select.scss"; -import React, { ReactNode } from "react"; +import type { ReactNode } from "react"; +import React from "react"; import { computed, makeObservable } from "mobx"; import { observer } from "mobx-react"; import ReactSelect, { components } from "react-select"; diff --git a/src/renderer/components/slider/slider.tsx b/src/renderer/components/slider/slider.tsx index cd948b7433..70468d87d3 100644 --- a/src/renderer/components/slider/slider.tsx +++ b/src/renderer/components/slider/slider.tsx @@ -9,7 +9,8 @@ import "./slider.scss"; import React, { Component } from "react"; import { cssNames } from "../../utils"; -import MaterialSlider, { SliderClassKey, SliderProps as MaterialSliderProps } from "@material-ui/core/Slider"; +import type { SliderClassKey, SliderProps as MaterialSliderProps } from "@material-ui/core/Slider"; +import MaterialSlider from "@material-ui/core/Slider"; export interface SliderProps extends Omit { className?: string; diff --git a/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx b/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx index 803e5b1800..976d36451c 100644 --- a/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx +++ b/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx @@ -4,7 +4,8 @@ */ import React from "react"; import { getInjectable } from "@ogre-tools/injectable"; -import { computed, IComputedValue } from "mobx"; +import type { IComputedValue } from "mobx"; +import { computed } from "mobx"; import type { StatusBarItemProps, StatusBarRegistration, diff --git a/src/renderer/components/status-bar/status-bar.test.tsx b/src/renderer/components/status-bar/status-bar.test.tsx index 95d747b85b..0dbccb7644 100644 --- a/src/renderer/components/status-bar/status-bar.test.tsx +++ b/src/renderer/components/status-bar/status-bar.test.tsx @@ -9,7 +9,8 @@ import { StatusBar } from "./status-bar"; import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import type { DiRender } from "../test-utils/renderFor"; import { renderFor } from "../test-utils/renderFor"; -import { computed, IObservableArray, observable } from "mobx"; +import type { IObservableArray } from "mobx"; +import { computed, observable } from "mobx"; import type { DiContainer } from "@ogre-tools/injectable"; import statusBarItemsInjectable from "./status-bar-items.injectable"; import type { StatusBarRegistration } from "./status-bar-registration"; diff --git a/src/renderer/components/status-bar/status-bar.tsx b/src/renderer/components/status-bar/status-bar.tsx index c32cfb7cc1..9d08cfb1fa 100644 --- a/src/renderer/components/status-bar/status-bar.tsx +++ b/src/renderer/components/status-bar/status-bar.tsx @@ -8,7 +8,8 @@ import styles from "./status-bar.module.scss"; import React from "react"; import { observer } from "mobx-react"; import { withInjectables } from "@ogre-tools/injectable-react"; -import registeredStatusBarItemsInjectable, { RegisteredStatusBarItems } from "./registered-status-bar-items.injectable"; +import type { RegisteredStatusBarItems } from "./registered-status-bar-items.injectable"; +import registeredStatusBarItemsInjectable from "./registered-status-bar-items.injectable"; import type { IComputedValue } from "mobx"; export interface StatusBarProps {} diff --git a/src/renderer/components/status-brick/status-brick.tsx b/src/renderer/components/status-brick/status-brick.tsx index f5b9ca26f6..130b7b68d3 100644 --- a/src/renderer/components/status-brick/status-brick.tsx +++ b/src/renderer/components/status-brick/status-brick.tsx @@ -7,7 +7,8 @@ import "./status-brick.scss"; import React from "react"; import { cssNames } from "../../utils"; -import { TooltipDecoratorProps, withTooltip } from "../tooltip"; +import type { TooltipDecoratorProps } from "../tooltip"; +import { withTooltip } from "../tooltip"; export interface StatusBrickProps extends React.HTMLAttributes, TooltipDecoratorProps { } diff --git a/src/renderer/components/switch/form-switcher.tsx b/src/renderer/components/switch/form-switcher.tsx index 2ca81bc2c4..8f2a8a231c 100644 --- a/src/renderer/components/switch/form-switcher.tsx +++ b/src/renderer/components/switch/form-switcher.tsx @@ -4,7 +4,8 @@ */ import React from "react"; -import FormControlLabel, { FormControlLabelProps } from "@material-ui/core/FormControlLabel"; +import type { FormControlLabelProps } from "@material-ui/core/FormControlLabel"; +import FormControlLabel from "@material-ui/core/FormControlLabel"; import { makeStyles } from "@material-ui/styles"; const useStyles = makeStyles({ diff --git a/src/renderer/components/switch/switch.tsx b/src/renderer/components/switch/switch.tsx index 8649a723f2..5052941e84 100644 --- a/src/renderer/components/switch/switch.tsx +++ b/src/renderer/components/switch/switch.tsx @@ -5,7 +5,8 @@ import styles from "./switch.module.scss"; -import React, { ChangeEvent, HTMLProps } from "react"; +import type { ChangeEvent, HTMLProps } from "react"; +import React from "react"; import { cssNames } from "../../utils"; export interface SwitchProps extends Omit, "onChange"> { diff --git a/src/renderer/components/switch/switcher.tsx b/src/renderer/components/switch/switcher.tsx index f73d6dc6f4..21b2cddb22 100644 --- a/src/renderer/components/switch/switcher.tsx +++ b/src/renderer/components/switch/switcher.tsx @@ -4,8 +4,10 @@ */ import React from "react"; -import { createStyles, withStyles, Theme } from "@material-ui/core/styles"; -import Switch, { SwitchClassKey, SwitchProps } from "@material-ui/core/Switch"; +import type { Theme } from "@material-ui/core/styles"; +import { createStyles, withStyles } from "@material-ui/core/styles"; +import type { SwitchClassKey, SwitchProps } from "@material-ui/core/Switch"; +import Switch from "@material-ui/core/Switch"; interface Styles extends Partial> { focusVisible?: string; diff --git a/src/renderer/components/table/react-table.tsx b/src/renderer/components/table/react-table.tsx index ca0d062ba6..afac50dfa0 100644 --- a/src/renderer/components/table/react-table.tsx +++ b/src/renderer/components/table/react-table.tsx @@ -5,7 +5,8 @@ import styles from "./react-table.module.scss"; import React, { useCallback, useMemo } from "react"; -import { useFlexLayout, useSortBy, useTable, UseTableOptions } from "react-table"; +import type { UseTableOptions } from "react-table"; +import { useFlexLayout, useSortBy, useTable } from "react-table"; import { Icon } from "../icon"; import { cssNames } from "../../utils"; diff --git a/src/renderer/components/table/table-cell.tsx b/src/renderer/components/table/table-cell.tsx index 2fab334783..3764f73e8f 100644 --- a/src/renderer/components/table/table-cell.tsx +++ b/src/renderer/components/table/table-cell.tsx @@ -6,7 +6,8 @@ import "./table-cell.scss"; import type { TableSortBy, TableSortParams } from "./table"; -import React, { ReactNode } from "react"; +import type { ReactNode } from "react"; +import React from "react"; import { boundMethod, cssNames, displayBooleans } from "../../utils"; import { Icon } from "../icon"; import { Checkbox } from "../checkbox"; diff --git a/src/renderer/components/table/table-model/table-model.injectable.ts b/src/renderer/components/table/table-model/table-model.injectable.ts index b0fc376ae1..d1780a3e64 100644 --- a/src/renderer/components/table/table-model/table-model.injectable.ts +++ b/src/renderer/components/table/table-model/table-model.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; -import { TableModel, TableStorageModel } from "./table-model"; +import type { TableStorageModel } from "./table-model"; +import { TableModel } from "./table-model"; const tableModelInjectable = getInjectable({ id: "table-model", diff --git a/src/renderer/components/table/table-row.tsx b/src/renderer/components/table/table-row.tsx index 75a13ef37a..29e625ee48 100644 --- a/src/renderer/components/table/table-row.tsx +++ b/src/renderer/components/table/table-row.tsx @@ -5,7 +5,8 @@ import "./table-row.scss"; -import React, { CSSProperties } from "react"; +import type { CSSProperties } from "react"; +import React from "react"; import { cssNames } from "../../utils"; import type { ItemObject } from "../../../common/item.store"; diff --git a/src/renderer/components/table/table.tsx b/src/renderer/components/table/table.tsx index 3190c96d33..05d1ff5c0c 100644 --- a/src/renderer/components/table/table.tsx +++ b/src/renderer/components/table/table.tsx @@ -8,8 +8,10 @@ import "./table.scss"; import React from "react"; import { observer } from "mobx-react"; import { boundMethod, cssNames } from "../../utils"; -import { TableRow, TableRowElem, TableRowProps } from "./table-row"; -import { TableHead, TableHeadElem, TableHeadProps } from "./table-head"; +import type { TableRowElem, TableRowProps } from "./table-row"; +import { TableRow } from "./table-row"; +import type { TableHeadElem, TableHeadProps } from "./table-head"; +import { TableHead } from "./table-head"; import type { TableCellElem } from "./table-cell"; import { VirtualList } from "../virtual-list"; import { createPageParam } from "../../navigation"; diff --git a/src/renderer/components/tabs/tabs.tsx b/src/renderer/components/tabs/tabs.tsx index 9eb5c67471..1de69624f8 100644 --- a/src/renderer/components/tabs/tabs.tsx +++ b/src/renderer/components/tabs/tabs.tsx @@ -4,7 +4,8 @@ */ import "./tabs.scss"; -import React, { DOMAttributes } from "react"; +import type { DOMAttributes } from "react"; +import React from "react"; import { boundMethod, cssNames } from "../../utils"; import { Icon } from "../icon"; diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index ef0fbdafb2..deaa51eb0b 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -6,7 +6,8 @@ import type { LensRendererExtension } from "../../../extensions/lens-renderer-ex import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; import currentlyInClusterFrameInjectable from "../../routes/currently-in-cluster-frame.injectable"; import { extensionRegistratorInjectionToken } from "../../../extensions/extension-loader/extension-registrator-injection-token"; -import { computed, IObservableArray, observable, runInAction } from "mobx"; +import type { IObservableArray } from "mobx"; +import { computed, observable, runInAction } from "mobx"; import { renderFor } from "./renderFor"; import observableHistoryInjectable from "../../navigation/observable-history.injectable"; import React from "react"; @@ -14,7 +15,8 @@ import { Router } from "react-router"; import { Observer } from "mobx-react"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; import allowedResourcesInjectable from "../../../common/cluster-store/allowed-resources.injectable"; -import { fireEvent, RenderResult } from "@testing-library/react"; +import type { RenderResult } from "@testing-library/react"; +import { fireEvent } from "@testing-library/react"; import type { KubeResource } from "../../../common/rbac"; import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable"; import { Sidebar } from "../layout/sidebar"; @@ -29,7 +31,8 @@ import { pipeline } from "@ogre-tools/fp"; import { flatMap, compact, join, get, filter } from "lodash/fp"; import preferenceNavigationItemsInjectable from "../+preferences/preferences-navigation/preference-navigation-items.injectable"; import navigateToPreferencesInjectable from "../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable"; -import applicationMenuItemsInjectable, { MenuItemOpts } from "../../../main/menu/application-menu-items.injectable"; +import type { MenuItemOpts } from "../../../main/menu/application-menu-items.injectable"; +import applicationMenuItemsInjectable from "../../../main/menu/application-menu-items.injectable"; type Callback = (dis: DiContainers) => void | Promise; diff --git a/src/renderer/components/test-utils/renderFor.tsx b/src/renderer/components/test-utils/renderFor.tsx index 9e56700b69..eb33b72b70 100644 --- a/src/renderer/components/test-utils/renderFor.tsx +++ b/src/renderer/components/test-utils/renderFor.tsx @@ -4,9 +4,10 @@ */ import React from "react"; +import type { + RenderResult } from "@testing-library/react"; import { render as testingLibraryRender, - RenderResult, } from "@testing-library/react"; import type { DiContainer } from "@ogre-tools/injectable"; diff --git a/src/renderer/components/tooltip/tooltip.tsx b/src/renderer/components/tooltip/tooltip.tsx index 4a8b0c30ca..33e0652404 100644 --- a/src/renderer/components/tooltip/tooltip.tsx +++ b/src/renderer/components/tooltip/tooltip.tsx @@ -8,7 +8,8 @@ import "./tooltip.scss"; import React from "react"; import { createPortal } from "react-dom"; import { observer } from "mobx-react"; -import { boundMethod, cssNames, IClassName } from "../../utils"; +import type { IClassName } from "../../utils"; +import { boundMethod, cssNames } from "../../utils"; import { observable, makeObservable, action } from "mobx"; export enum TooltipPosition { diff --git a/src/renderer/components/tooltip/withTooltip.tsx b/src/renderer/components/tooltip/withTooltip.tsx index adf3029e62..21c2752f7f 100644 --- a/src/renderer/components/tooltip/withTooltip.tsx +++ b/src/renderer/components/tooltip/withTooltip.tsx @@ -5,9 +5,11 @@ // Tooltip decorator for simple composition with other components -import React, { HTMLAttributes, ReactNode } from "react"; +import type { HTMLAttributes, ReactNode } from "react"; +import React from "react"; import hoistNonReactStatics from "hoist-non-react-statics"; -import { Tooltip, TooltipProps } from "./tooltip"; +import type { TooltipProps } from "./tooltip"; +import { Tooltip } from "./tooltip"; import { isReactNode } from "../../utils/isReactNode"; import uniqueId from "lodash/uniqueId"; diff --git a/src/renderer/components/virtual-list/virtual-list.tsx b/src/renderer/components/virtual-list/virtual-list.tsx index 8e8de118c2..fe6bca980a 100644 --- a/src/renderer/components/virtual-list/virtual-list.tsx +++ b/src/renderer/components/virtual-list/virtual-list.tsx @@ -9,7 +9,8 @@ import "./virtual-list.scss"; import React, { Component } from "react"; import { observer } from "mobx-react"; -import { Align, ListChildComponentProps, ListOnScrollProps, VariableSizeList } from "react-window"; +import type { Align, ListChildComponentProps, ListOnScrollProps } from "react-window"; +import { VariableSizeList } from "react-window"; import { cssNames, noop } from "../../utils"; import type { TableRowProps } from "../table/table-row"; import type { ItemObject } from "../../../common/item.store"; diff --git a/src/renderer/create-cluster/create-cluster.injectable.ts b/src/renderer/create-cluster/create-cluster.injectable.ts index a0cfba7701..a1c244568c 100644 --- a/src/renderer/create-cluster/create-cluster.injectable.ts +++ b/src/renderer/create-cluster/create-cluster.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { Cluster, ClusterDependencies } from "../../common/cluster/cluster"; +import type { ClusterDependencies } from "../../common/cluster/cluster"; +import { Cluster } from "../../common/cluster/cluster"; import directoryForKubeConfigsInjectable from "../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import { createClusterInjectionToken } from "../../common/cluster/create-cluster-injection-token"; diff --git a/src/renderer/initializers/catalog-entity-detail-registry.tsx b/src/renderer/initializers/catalog-entity-detail-registry.tsx index 0ffccd8063..be4b17e898 100644 --- a/src/renderer/initializers/catalog-entity-detail-registry.tsx +++ b/src/renderer/initializers/catalog-entity-detail-registry.tsx @@ -5,7 +5,8 @@ import React from "react"; import { KubernetesCluster, WebLink } from "../../common/catalog-entities"; -import { CatalogEntityDetailRegistry, CatalogEntityDetailsProps } from "../../extensions/registries"; +import type { CatalogEntityDetailsProps } from "../../extensions/registries"; +import { CatalogEntityDetailRegistry } from "../../extensions/registries"; import { DrawerItem, DrawerTitle } from "../components/drawer"; export function initCatalogEntityDetailRegistry() { diff --git a/src/renderer/initializers/kube-object-detail-registry.tsx b/src/renderer/initializers/kube-object-detail-registry.tsx index 74dff0a7b5..e7024f50a4 100644 --- a/src/renderer/initializers/kube-object-detail-registry.tsx +++ b/src/renderer/initializers/kube-object-detail-registry.tsx @@ -5,7 +5,8 @@ import React from "react"; import { KubeObjectDetailRegistry } from "../api/kube-object-detail-registry"; -import { HpaDetails, HpaDetailsProps } from "../components/+config-autoscalers"; +import type { HpaDetailsProps } from "../components/+config-autoscalers"; +import { HpaDetails } from "../components/+config-autoscalers"; import { LimitRangeDetails } from "../components/+config-limit-ranges"; import { ConfigMapDetails } from "../components/+config-maps"; import { PodDisruptionBudgetDetails } from "../components/+config-pod-disruption-budgets"; diff --git a/src/renderer/ipc/index.ts b/src/renderer/ipc/index.ts index 19baf7ea7b..5e204ef98b 100644 --- a/src/renderer/ipc/index.ts +++ b/src/renderer/ipc/index.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { ipcRenderer, OpenDialogOptions } from "electron"; +import type { OpenDialogOptions } from "electron"; +import { ipcRenderer } from "electron"; import { clusterActivateHandler, clusterClearDeletingHandler, clusterDeleteHandler, clusterDisconnectHandler, clusterKubectlApplyAllHandler, clusterKubectlDeleteAllHandler, clusterSetDeletingHandler, clusterSetFrameIdHandler, clusterStates } from "../../common/ipc/cluster"; import type { ClusterId, ClusterState } from "../../common/cluster-types"; import { windowActionHandleChannel, windowLocationChangedChannel, windowOpenAppMenuAsContextMenuChannel, type WindowAction } from "../../common/ipc/window"; diff --git a/src/renderer/ipc/register-listeners.tsx b/src/renderer/ipc/register-listeners.tsx index 6e71231224..f457070aa5 100644 --- a/src/renderer/ipc/register-listeners.tsx +++ b/src/renderer/ipc/register-listeners.tsx @@ -4,8 +4,10 @@ */ import React from "react"; -import { ipcRenderer, IpcRendererEvent } from "electron"; -import { areArgsUpdateAvailableFromMain, UpdateAvailableChannel, onCorrect, UpdateAvailableFromMain, BackchannelArg, ipcRendererOn, AutoUpdateChecking, AutoUpdateNoUpdateAvailable } from "../../common/ipc"; +import type { IpcRendererEvent } from "electron"; +import { ipcRenderer } from "electron"; +import type { UpdateAvailableFromMain, BackchannelArg } from "../../common/ipc"; +import { areArgsUpdateAvailableFromMain, UpdateAvailableChannel, onCorrect, ipcRendererOn, AutoUpdateChecking, AutoUpdateNoUpdateAvailable } from "../../common/ipc"; import { Notifications, notificationsStore } from "../components/notifications"; import { Button } from "../components/button"; import { isMac } from "../../common/vars"; diff --git a/src/renderer/kube-watch-api/kube-watch-api.ts b/src/renderer/kube-watch-api/kube-watch-api.ts index 81868f7b80..dbe676e509 100644 --- a/src/renderer/kube-watch-api/kube-watch-api.ts +++ b/src/renderer/kube-watch-api/kube-watch-api.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { comparer, reaction } from "mobx"; -import { disposer, Disposer, noop, WrappedAbortController } from "../../common/utils"; +import type { Disposer } from "../../common/utils"; +import { disposer, noop, WrappedAbortController } from "../../common/utils"; import type { KubeObject } from "../../common/k8s-api/kube-object"; import AbortController from "abort-controller"; import { once } from "lodash"; diff --git a/src/renderer/navigation/helpers.ts b/src/renderer/navigation/helpers.ts index 14fa76e503..a7738c397f 100644 --- a/src/renderer/navigation/helpers.ts +++ b/src/renderer/navigation/helpers.ts @@ -5,9 +5,11 @@ import type { LocationDescriptor } from "history"; import { createPath } from "history"; -import { matchPath, RouteProps } from "react-router"; +import type { RouteProps } from "react-router"; +import { matchPath } from "react-router"; import { navigation } from "./history"; -import { PageParam, PageParamInit } from "./page-param"; +import type { PageParamInit } from "./page-param"; +import { PageParam } from "./page-param"; export function navigate(location: LocationDescriptor) { const currentLocation = createPath(navigation.location); diff --git a/src/renderer/navigation/history.ts b/src/renderer/navigation/history.ts index fa7df172b4..92176521f2 100644 --- a/src/renderer/navigation/history.ts +++ b/src/renderer/navigation/history.ts @@ -5,7 +5,8 @@ import { ipcRenderer } from "electron"; import { createBrowserHistory, createMemoryHistory } from "history"; -import { createObservableHistory, ObservableSearchParamsOptions } from "mobx-observable-history"; +import type { ObservableSearchParamsOptions } from "mobx-observable-history"; +import { createObservableHistory } from "mobx-observable-history"; import logger from "../../main/logger"; export const searchParamsOptions: ObservableSearchParamsOptions = { diff --git a/src/renderer/port-forward/port-forward-dialog.tsx b/src/renderer/port-forward/port-forward-dialog.tsx index 65ace376f4..9dab84a9f9 100644 --- a/src/renderer/port-forward/port-forward-dialog.tsx +++ b/src/renderer/port-forward/port-forward-dialog.tsx @@ -8,7 +8,8 @@ import "./port-forward-dialog.scss"; import React, { Component } from "react"; import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import { Dialog, DialogProps } from "../components/dialog"; +import type { DialogProps } from "../components/dialog"; +import { Dialog } from "../components/dialog"; import { Wizard, WizardStep } from "../components/wizard"; import { Input } from "../components/input"; import { cssNames } from "../utils"; diff --git a/src/renderer/port-forward/port-forward-store/port-forward-store.ts b/src/renderer/port-forward/port-forward-store/port-forward-store.ts index d3a4f833a3..8e07737b71 100644 --- a/src/renderer/port-forward/port-forward-store/port-forward-store.ts +++ b/src/renderer/port-forward/port-forward-store/port-forward-store.ts @@ -5,8 +5,10 @@ import { action, makeObservable, observable, reaction } from "mobx"; import { ItemStore } from "../../../common/item.store"; -import { autoBind, disposer, StorageHelper } from "../../utils"; -import { ForwardedPort, PortForwardItem } from "../port-forward-item"; +import type { StorageHelper } from "../../utils"; +import { autoBind, disposer } from "../../utils"; +import type { ForwardedPort } from "../port-forward-item"; +import { PortForwardItem } from "../port-forward-item"; import { apiBase } from "../../api"; import { waitUntilFree } from "tcp-port-used"; import logger from "../../../common/logger"; diff --git a/src/renderer/routes/all-routes.injectable.ts b/src/renderer/routes/all-routes.injectable.ts index 75a69bb31c..1c3c72cb94 100644 --- a/src/renderer/routes/all-routes.injectable.ts +++ b/src/renderer/routes/all-routes.injectable.ts @@ -7,7 +7,8 @@ import { overSome } from "lodash/fp"; import { computed } from "mobx"; import rendererExtensionsInjectable from "../../extensions/renderer-extensions.injectable"; import type { LensRendererExtension } from "../../extensions/lens-renderer-extension"; -import { Route, routeInjectionToken } from "../../common/front-end-routing/route-injection-token"; +import type { Route } from "../../common/front-end-routing/route-injection-token"; +import { routeInjectionToken } from "../../common/front-end-routing/route-injection-token"; const allRoutesInjectable = getInjectable({ id: "all-routes", diff --git a/src/renderer/routes/extension-page-parameters.injectable.ts b/src/renderer/routes/extension-page-parameters.injectable.ts index 1fe2d65857..e03aa567d3 100644 --- a/src/renderer/routes/extension-page-parameters.injectable.ts +++ b/src/renderer/routes/extension-page-parameters.injectable.ts @@ -4,7 +4,8 @@ */ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { pipeline } from "@ogre-tools/fp"; -import { PageParam, PageParamInit } from "../navigation"; +import type { PageParamInit } from "../navigation"; +import { PageParam } from "../navigation"; import observableHistoryInjectable from "../navigation/observable-history.injectable"; import type { LensRendererExtension } from "../../extensions/lens-renderer-extension"; import type { PageRegistration } from "../../extensions/registries"; diff --git a/src/renderer/routes/extension-route-registrator.injectable.tsx b/src/renderer/routes/extension-route-registrator.injectable.tsx index 172da10e26..4e02af296b 100644 --- a/src/renderer/routes/extension-route-registrator.injectable.tsx +++ b/src/renderer/routes/extension-route-registrator.injectable.tsx @@ -2,7 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { DiContainer, getInjectable } from "@ogre-tools/injectable"; +import type { DiContainer } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import type { LensRendererExtension } from "../../extensions/lens-renderer-extension"; import { observer } from "mobx-react"; diff --git a/src/renderer/routes/sibling-tabs.injectable.ts b/src/renderer/routes/sibling-tabs.injectable.ts index e126fa0b74..c8ca52f3fb 100644 --- a/src/renderer/routes/sibling-tabs.injectable.ts +++ b/src/renderer/routes/sibling-tabs.injectable.ts @@ -5,7 +5,8 @@ import { computed } from "mobx"; import { getInjectable } from "@ogre-tools/injectable"; -import sidebarItemsInjectable, { HierarchicalSidebarItem } from "../components/layout/sidebar-items.injectable"; +import type { HierarchicalSidebarItem } from "../components/layout/sidebar-items.injectable"; +import sidebarItemsInjectable from "../components/layout/sidebar-items.injectable"; import { find } from "lodash/fp"; import { pipeline } from "@ogre-tools/fp"; diff --git a/src/renderer/utils/isReactNode.ts b/src/renderer/utils/isReactNode.ts index 015ff5d2ed..20f93db55a 100755 --- a/src/renderer/utils/isReactNode.ts +++ b/src/renderer/utils/isReactNode.ts @@ -4,7 +4,8 @@ */ // Type guard for checking valid react node to use in render -import React, { ReactNode } from "react"; +import type { ReactNode } from "react"; +import React from "react"; export function isReactNode(node: ReactNode): node is ReactNode { return React.isValidElement(node) diff --git a/src/renderer/utils/rbac.ts b/src/renderer/utils/rbac.ts index a6b07525f5..e8d9ecb429 100644 --- a/src/renderer/utils/rbac.ts +++ b/src/renderer/utils/rbac.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { apiResourceRecord, KubeResource } from "../../common/rbac"; +import type { KubeResource } from "../../common/rbac"; +import { apiResourceRecord } from "../../common/rbac"; export const ResourceNames: Record = { "namespaces": "Namespaces", diff --git a/src/renderer/utils/storageHelper.ts b/src/renderer/utils/storageHelper.ts index 6405aa232f..0a892172db 100755 --- a/src/renderer/utils/storageHelper.ts +++ b/src/renderer/utils/storageHelper.ts @@ -5,7 +5,8 @@ // Helper for working with storages (e.g. window.localStorage, NodeJS/file-system, etc.) import { action, comparer, computed, makeObservable, observable, toJS, when } from "mobx"; -import { produce, Draft, isDraft } from "immer"; +import type { Draft } from "immer"; +import { produce, isDraft } from "immer"; import { isEqual, isPlainObject } from "lodash"; import logger from "../../main/logger"; diff --git a/types/react-table.config.d.ts b/types/react-table.config.d.ts index 6a78ebcd09..c3d60eb9b5 100644 --- a/types/react-table.config.d.ts +++ b/types/react-table.config.d.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { +import type { UseColumnOrderInstanceProps, UseColumnOrderState, UseExpandedHooks,