From 8a7b4be0d583af118dae9a4ede3e454cd34026fb Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sun, 24 Jan 2021 14:36:24 +0200 Subject: [PATCH] use import aliases for better readability Signed-off-by: Jari Kolehmainen --- .../__tests__/extension-discovery.test.ts | 2 +- src/extensions/cluster-feature.ts | 10 +- src/extensions/core-api/app.ts | 4 +- src/extensions/core-api/event-bus.ts | 4 +- src/extensions/core-api/utils.ts | 6 +- src/extensions/extension-discovery.ts | 6 +- src/extensions/extension-installer.ts | 2 +- src/extensions/extension-loader.ts | 6 +- src/extensions/extension-store.ts | 2 +- src/extensions/extensions-store.ts | 2 +- src/extensions/lens-extension.ts | 4 +- src/extensions/lens-main-extension.ts | 2 +- src/extensions/lens-renderer-extension.ts | 2 +- .../registries/page-menu-registry.ts | 2 +- src/extensions/registries/page-registry.ts | 4 +- src/extensions/renderer-api/components.ts | 60 ++++----- src/extensions/renderer-api/k8s-api.ts | 124 +++++++++--------- src/extensions/renderer-api/navigation.ts | 12 +- src/extensions/renderer-api/theming.ts | 4 +- src/extensions/stores/cluster-store.ts | 10 +- src/extensions/stores/workspace-store.ts | 6 +- src/main/__test__/cluster.test.ts | 6 +- src/main/__test__/kube-auth-proxy.test.ts | 4 +- src/main/__test__/kubeconfig-manager.test.ts | 2 +- .../cluster-detectors/detector-registry.ts | 4 +- src/main/cluster-manager.ts | 8 +- src/main/cluster.ts | 14 +- src/main/context-handler.ts | 4 +- src/main/exit-app.ts | 2 +- src/main/extension-filesystem.ts | 4 +- src/main/helm/helm-cli.ts | 2 +- src/main/helm/helm-release-manager.ts | 2 +- src/main/helm/helm-repo-manager.ts | 4 +- src/main/index.ts | 26 ++-- src/main/kube-auth-proxy.ts | 2 +- src/main/kubeconfig-manager.ts | 2 +- src/main/kubectl.ts | 8 +- src/main/kubectl_spec.ts | 4 +- src/main/lens-binary.ts | 2 +- src/main/lens-proxy.ts | 2 +- src/main/logger.ts | 2 +- src/main/menu.ts | 14 +- src/main/node-shell-session.ts | 2 +- src/main/resource-applier.ts | 4 +- src/main/router.ts | 2 +- src/main/routes/metrics-route.ts | 2 +- src/main/shell-session.ts | 8 +- src/main/tray.ts | 10 +- src/main/window-manager.ts | 10 +- src/renderer/api/endpoints/metrics.api.ts | 2 +- src/renderer/api/index.ts | 2 +- src/renderer/api/json-api.ts | 2 +- src/renderer/api/kube-api-parse.ts | 2 +- src/renderer/api/kube-api.ts | 4 +- .../api/kube-object-detail-registry.ts | 2 +- src/renderer/api/kube-watch-api.ts | 4 +- src/renderer/api/terminal-api.ts | 2 +- src/renderer/api/websocket-api.ts | 2 +- .../+add-cluster/add-cluster.route.ts | 2 +- .../components/+add-cluster/add-cluster.tsx | 14 +- .../+apps-helm-charts/helm-charts.route.ts | 4 +- .../+apps-releases/release.route.ts | 2 +- .../+apps-releases/release.store.ts | 2 +- src/renderer/components/+apps/apps.route.ts | 2 +- .../cluster-settings.route.ts | 2 +- .../+cluster-settings/cluster-settings.tsx | 8 +- .../components/+cluster-settings/features.tsx | 4 +- .../components/+cluster-settings/general.tsx | 4 +- .../components/+cluster-settings/removal.tsx | 4 +- .../components/+cluster-settings/status.tsx | 4 +- .../components/+cluster/cluster-overview.tsx | 4 +- .../components/+cluster/cluster.route.ts | 2 +- .../+config-autoscalers/hpa.route.ts | 2 +- .../limit-ranges.route.ts | 2 +- .../limit-ranges.store.ts | 2 +- .../+config-maps/config-maps.route.ts | 2 +- .../pod-disruption-budgets.route.ts | 2 +- .../resource-quotas.route.ts | 2 +- .../+config-secrets/secrets.route.ts | 2 +- .../components/+config/config.route.ts | 2 +- src/renderer/components/+config/config.tsx | 2 +- .../components/+custom-resources/crd.route.ts | 2 +- .../components/+events/events.route.ts | 2 +- .../+extensions/extensions.route.ts | 2 +- .../components/+extensions/extensions.tsx | 12 +- .../+landing-page/landing-page.route.ts | 2 +- .../components/+landing-page/landing-page.tsx | 4 +- .../components/+namespaces/namespace.store.ts | 4 +- .../+namespaces/namespaces.route.ts | 2 +- .../+network-endpoints/endpoints.route.ts | 2 +- .../+network-ingresses/ingresses.route.ts | 2 +- .../network-policies.route.ts | 2 +- .../+network-services/services.route.ts | 2 +- .../components/+network/network.route.ts | 2 +- src/renderer/components/+network/network.tsx | 2 +- src/renderer/components/+nodes/nodes.route.ts | 2 +- .../pod-security-policies.route.ts | 2 +- .../+preferences/add-helm-repo-dialog.tsx | 2 +- .../+preferences/kubectl-binaries.tsx | 4 +- .../+preferences/preferences.route.ts | 2 +- .../components/+preferences/preferences.tsx | 6 +- .../+storage-classes/storage-classes.route.ts | 2 +- .../volume-claims.route.ts | 2 +- .../+storage-volumes/volumes.route.ts | 2 +- .../components/+storage/storage.route.ts | 2 +- src/renderer/components/+storage/storage.tsx | 2 +- .../service-accounts.tsx | 2 +- .../+user-management/user-management.route.ts | 2 +- .../+user-management/user-management.tsx | 2 +- .../components/+whats-new/whats-new.route.ts | 2 +- .../components/+whats-new/whats-new.tsx | 2 +- .../+workloads-cronjobs/cronjobs.tsx | 2 +- .../+workloads-deployments/deployments.tsx | 2 +- .../+workloads-overview/overview-statuses.tsx | 2 +- .../+workloads-overview/overview.tsx | 2 +- .../+workloads-replicasets/replicasets.tsx | 2 +- .../+workloads-statefulsets/statefulsets.tsx | 2 +- .../components/+workloads/workloads.route.ts | 4 +- .../components/+workloads/workloads.stores.ts | 2 +- .../components/+workloads/workloads.tsx | 2 +- .../components/+workspaces/workspace-menu.tsx | 2 +- .../+workspaces/workspaces.route.ts | 2 +- .../components/+workspaces/workspaces.tsx | 4 +- src/renderer/components/app.tsx | 18 +-- .../components/clipboard/clipboard.tsx | 4 +- .../components/cluster-icon/cluster-icon.tsx | 4 +- .../cluster-manager/bottom-bar.test.tsx | 4 +- .../components/cluster-manager/bottom-bar.tsx | 4 +- .../cluster-manager/cluster-manager.tsx | 4 +- .../cluster-manager/cluster-status.tsx | 10 +- .../cluster-manager/cluster-view.route.ts | 2 +- .../cluster-manager/cluster-view.tsx | 4 +- .../cluster-manager/clusters-menu.tsx | 14 +- .../components/cluster-manager/lens-views.ts | 4 +- src/renderer/components/dock/log-list.tsx | 2 +- src/renderer/components/dock/log-search.tsx | 2 +- src/renderer/components/dock/log.store.ts | 2 +- src/renderer/components/dock/logs.tsx | 2 +- .../error-boundary/error-boundary.tsx | 2 +- .../components/input/drop-file-input.tsx | 2 +- .../item-object-list/item-list-layout.tsx | 4 +- .../kube-object-status-icon.tsx | 2 +- .../kube-object/kube-object-menu.tsx | 2 +- .../components/layout/main-layout-header.tsx | 4 +- .../components/layout/main-layout.tsx | 2 +- src/renderer/components/layout/sidebar.tsx | 4 +- src/renderer/navigation/events.ts | 6 +- src/renderer/utils/index.ts | 4 +- src/renderer/utils/rbac.ts | 2 +- tsconfig.json | 12 ++ webpack.extensions.ts | 6 + webpack.main.ts | 6 + webpack.renderer.ts | 6 + 153 files changed, 405 insertions(+), 375 deletions(-) diff --git a/src/extensions/__tests__/extension-discovery.test.ts b/src/extensions/__tests__/extension-discovery.test.ts index d0066c3a7e..4a7081a018 100644 --- a/src/extensions/__tests__/extension-discovery.test.ts +++ b/src/extensions/__tests__/extension-discovery.test.ts @@ -2,7 +2,7 @@ import { watch } from "chokidar"; import { join, normalize } from "path"; import { ExtensionDiscovery, InstalledExtension } from "../extension-discovery"; -jest.mock("../../common/ipc"); +jest.mock("@common/ipc"); jest.mock("fs-extra"); jest.mock("chokidar", () => ({ watch: jest.fn() diff --git a/src/extensions/cluster-feature.ts b/src/extensions/cluster-feature.ts index 36a2f0bfb8..ab74a447a8 100644 --- a/src/extensions/cluster-feature.ts +++ b/src/extensions/cluster-feature.ts @@ -2,12 +2,12 @@ import fs from "fs"; import path from "path"; import hb from "handlebars"; import { observable } from "mobx"; -import { ResourceApplier } from "../main/resource-applier"; -import { Cluster } from "../main/cluster"; -import logger from "../main/logger"; +import { ResourceApplier } from "@main/resource-applier"; +import { Cluster } from "@main/cluster"; +import logger from "@main/logger"; import { app } from "electron"; -import { requestMain } from "../common/ipc"; -import { clusterKubectlApplyAllHandler } from "../common/cluster-ipc"; +import { requestMain } from "@common/ipc"; +import { clusterKubectlApplyAllHandler } from "@common/cluster-ipc"; export interface ClusterFeatureStatus { /** feature's current version, as set by the implementation */ diff --git a/src/extensions/core-api/app.ts b/src/extensions/core-api/app.ts index 2c3a7a4f59..de6bb1a07c 100644 --- a/src/extensions/core-api/app.ts +++ b/src/extensions/core-api/app.ts @@ -1,8 +1,8 @@ -import { getAppVersion } from "../../common/utils"; +import { getAppVersion } from "@common/utils"; import { extensionsStore } from "../extensions-store"; export const version = getAppVersion(); -export { isSnap, isWindows, isMac, isLinux, appName, slackUrl, issuesTrackerUrl } from "../../common/vars"; +export { isSnap, isWindows, isMac, isLinux, appName, slackUrl, issuesTrackerUrl } from "@common/vars"; export function getEnabledExtensions(): string[] { return extensionsStore.enabledExtensions; diff --git a/src/extensions/core-api/event-bus.ts b/src/extensions/core-api/event-bus.ts index 1a7be58143..394b539654 100644 --- a/src/extensions/core-api/event-bus.ts +++ b/src/extensions/core-api/event-bus.ts @@ -1,2 +1,2 @@ -export { appEventBus } from "../../common/event-bus"; -export type { AppEvent } from "../../common/event-bus"; +export { appEventBus } from "@common/event-bus"; +export type { AppEvent } from "@common/event-bus"; diff --git a/src/extensions/core-api/utils.ts b/src/extensions/core-api/utils.ts index c249ff5238..b8bd8a9fd0 100644 --- a/src/extensions/core-api/utils.ts +++ b/src/extensions/core-api/utils.ts @@ -1,3 +1,3 @@ -export { Singleton, openExternal } from "../../common/utils"; -export { prevDefault, stopPropagation } from "../../renderer/utils/prevDefault"; -export { cssNames } from "../../renderer/utils/cssNames"; +export { Singleton, openExternal } from "@common/utils"; +export { prevDefault, stopPropagation } from "@renderer/utils/prevDefault"; +export { cssNames } from "@renderer/utils/cssNames"; diff --git a/src/extensions/extension-discovery.ts b/src/extensions/extension-discovery.ts index 0994f89995..0f511126b8 100644 --- a/src/extensions/extension-discovery.ts +++ b/src/extensions/extension-discovery.ts @@ -5,9 +5,9 @@ import fs from "fs-extra"; import { observable, reaction, toJS, when } from "mobx"; import os from "os"; import path from "path"; -import { broadcastMessage, handleRequest, requestMain, subscribeToBroadcast } from "../common/ipc"; -import { getBundledExtensions } from "../common/utils/app-version"; -import logger from "../main/logger"; +import { broadcastMessage, handleRequest, requestMain, subscribeToBroadcast } from "@common/ipc"; +import { getBundledExtensions } from "@common/utils/app-version"; +import logger from "@main/logger"; import { extensionInstaller, PackageJson } from "./extension-installer"; import { extensionsStore } from "./extensions-store"; import type { LensExtensionId, LensExtensionManifest } from "./lens-extension"; diff --git a/src/extensions/extension-installer.ts b/src/extensions/extension-installer.ts index 04b78bbe1a..0b44a877f1 100644 --- a/src/extensions/extension-installer.ts +++ b/src/extensions/extension-installer.ts @@ -2,7 +2,7 @@ import AwaitLock from "await-lock"; import child_process from "child_process"; import fs from "fs-extra"; import path from "path"; -import logger from "../main/logger"; +import logger from "@main/logger"; import { extensionPackagesRoot } from "./extension-loader"; const logModule = "[EXTENSION-INSTALLER]"; diff --git a/src/extensions/extension-loader.ts b/src/extensions/extension-loader.ts index 98697d252c..71755e4918 100644 --- a/src/extensions/extension-loader.ts +++ b/src/extensions/extension-loader.ts @@ -3,9 +3,9 @@ import { EventEmitter } from "events"; import { isEqual } from "lodash"; import { action, computed, observable, reaction, toJS, when } from "mobx"; import path from "path"; -import { getHostedCluster } from "../common/cluster-store"; -import { broadcastMessage, handleRequest, requestMain, subscribeToBroadcast } from "../common/ipc"; -import logger from "../main/logger"; +import { getHostedCluster } from "@common/cluster-store"; +import { broadcastMessage, handleRequest, requestMain, subscribeToBroadcast } from "@common/ipc"; +import logger from "@main/logger"; import type { InstalledExtension } from "./extension-discovery"; import { extensionsStore } from "./extensions-store"; import type { LensExtension, LensExtensionConstructor, LensExtensionId } from "./lens-extension"; diff --git a/src/extensions/extension-store.ts b/src/extensions/extension-store.ts index c1a1e62bd8..b2470d5213 100644 --- a/src/extensions/extension-store.ts +++ b/src/extensions/extension-store.ts @@ -1,4 +1,4 @@ -import { BaseStore } from "../common/base-store"; +import { BaseStore } from "@common/base-store"; import * as path from "path"; import { LensExtension } from "./lens-extension"; diff --git a/src/extensions/extensions-store.ts b/src/extensions/extensions-store.ts index 0885bbb730..46dcf7da09 100644 --- a/src/extensions/extensions-store.ts +++ b/src/extensions/extensions-store.ts @@ -1,5 +1,5 @@ import type { LensExtensionId } from "./lens-extension"; -import { BaseStore } from "../common/base-store"; +import { BaseStore } from "@common/base-store"; import { action, computed, observable, toJS } from "mobx"; export interface LensExtensionsStoreModel { diff --git a/src/extensions/lens-extension.ts b/src/extensions/lens-extension.ts index aaa6f60ac5..59e6229df8 100644 --- a/src/extensions/lens-extension.ts +++ b/src/extensions/lens-extension.ts @@ -1,7 +1,7 @@ import type { InstalledExtension } from "./extension-discovery"; import { action, observable, reaction } from "mobx"; -import { filesystemProvisionerStore } from "../main/extension-filesystem"; -import logger from "../main/logger"; +import { filesystemProvisionerStore } from "@main/extension-filesystem"; +import logger from "@main/logger"; export type LensExtensionId = string; // path to manifest (package.json) export type LensExtensionConstructor = new (...args: ConstructorParameters) => LensExtension; diff --git a/src/extensions/lens-main-extension.ts b/src/extensions/lens-main-extension.ts index f0e943540d..37eba83245 100644 --- a/src/extensions/lens-main-extension.ts +++ b/src/extensions/lens-main-extension.ts @@ -1,6 +1,6 @@ import type { MenuRegistration } from "./registries/menu-registry"; import { LensExtension } from "./lens-extension"; -import { WindowManager } from "../main/window-manager"; +import { WindowManager } from "@main/window-manager"; import { getExtensionPageUrl } from "./registries/page-registry"; export class LensMainExtension extends LensExtension { diff --git a/src/extensions/lens-renderer-extension.ts b/src/extensions/lens-renderer-extension.ts index 25afaa76fe..e8cef3ac1c 100644 --- a/src/extensions/lens-renderer-extension.ts +++ b/src/extensions/lens-renderer-extension.ts @@ -1,5 +1,5 @@ import type { AppPreferenceRegistration, ClusterFeatureRegistration, ClusterPageMenuRegistration, KubeObjectDetailRegistration, KubeObjectMenuRegistration, KubeObjectStatusRegistration, PageMenuRegistration, PageRegistration, StatusBarRegistration, } from "./registries"; -import type { Cluster } from "../main/cluster"; +import type { Cluster } from "@main/cluster"; import { LensExtension } from "./lens-extension"; import { getExtensionPageUrl } from "./registries/page-registry"; diff --git a/src/extensions/registries/page-menu-registry.ts b/src/extensions/registries/page-menu-registry.ts index 8fe5b68b3b..b622ee2e65 100644 --- a/src/extensions/registries/page-menu-registry.ts +++ b/src/extensions/registries/page-menu-registry.ts @@ -1,5 +1,5 @@ // Extensions-api -> Register page menu items -import type { IconProps } from "../../renderer/components/icon"; +import type { IconProps } from "@renderer/components/icon"; import type React from "react"; import type { PageTarget, RegisteredPage } from "./page-registry"; import { action } from "mobx"; diff --git a/src/extensions/registries/page-registry.ts b/src/extensions/registries/page-registry.ts index 0ec6f27da0..e11af6817d 100644 --- a/src/extensions/registries/page-registry.ts +++ b/src/extensions/registries/page-registry.ts @@ -4,8 +4,8 @@ import React from "react"; import { observer } from "mobx-react"; import { BaseRegistry } from "./base-registry"; import { LensExtension, sanitizeExtensionName } from "../lens-extension"; -import { PageParam, PageParamInit } from "../../renderer/navigation/page-param"; -import { createPageParam } from "../../renderer/navigation/helpers"; +import { PageParam, PageParamInit } from "@renderer/navigation/page-param"; +import { createPageParam } from "@renderer/navigation/helpers"; export interface PageRegistration { /** diff --git a/src/extensions/renderer-api/components.ts b/src/extensions/renderer-api/components.ts index a9a519498b..a314d12e92 100644 --- a/src/extensions/renderer-api/components.ts +++ b/src/extensions/renderer-api/components.ts @@ -1,41 +1,41 @@ // Common UI components // layouts -export * from "../../renderer/components/layout/page-layout"; -export * from "../../renderer/components/layout/wizard-layout"; -export * from "../../renderer/components/layout/tab-layout"; +export * from "@renderer/components/layout/page-layout"; +export * from "@renderer/components/layout/wizard-layout"; +export * from "@renderer/components/layout/tab-layout"; // form-controls -export * from "../../renderer/components/button"; -export * from "../../renderer/components/checkbox"; -export * from "../../renderer/components/radio"; -export * from "../../renderer/components/select"; -export * from "../../renderer/components/slider"; -export * from "../../renderer/components/input/input"; +export * from "@renderer/components/button"; +export * from "@renderer/components/checkbox"; +export * from "@renderer/components/radio"; +export * from "@renderer/components/select"; +export * from "@renderer/components/slider"; +export * from "@renderer/components/input/input"; // other components -export * from "../../renderer/components/icon"; -export * from "../../renderer/components/tooltip"; -export * from "../../renderer/components/tabs"; -export * from "../../renderer/components/table"; -export * from "../../renderer/components/badge"; -export * from "../../renderer/components/drawer"; -export * from "../../renderer/components/dialog"; -export * from "../../renderer/components/confirm-dialog"; -export * from "../../renderer/components/line-progress"; -export * from "../../renderer/components/menu"; -export * from "../../renderer/components/notifications"; -export * from "../../renderer/components/spinner"; -export * from "../../renderer/components/stepper"; -export * from "../../renderer/components/wizard"; -export * from "../../renderer/components/+workloads-pods/pod-details-list"; -export * from "../../renderer/components/+namespaces/namespace-select"; +export * from "@renderer/components/icon"; +export * from "@renderer/components/tooltip"; +export * from "@renderer/components/tabs"; +export * from "@renderer/components/table"; +export * from "@renderer/components/badge"; +export * from "@renderer/components/drawer"; +export * from "@renderer/components/dialog"; +export * from "@renderer/components/confirm-dialog"; +export * from "@renderer/components/line-progress"; +export * from "@renderer/components/menu"; +export * from "@renderer/components/notifications"; +export * from "@renderer/components/spinner"; +export * from "@renderer/components/stepper"; +export * from "@renderer/components/wizard"; +export * from "@renderer/components/+workloads-pods/pod-details-list"; +export * from "@renderer/components/+namespaces/namespace-select"; // kube helpers -export * from "../../renderer/components/kube-object"; -export * from "../../renderer/components/+events/kube-event-details"; +export * from "@renderer/components/kube-object"; +export * from "@renderer/components/+events/kube-event-details"; // specific exports -export * from "../../renderer/components/status-brick"; -export { terminalStore, createTerminalTab } from "../../renderer/components/dock/terminal.store"; -export { createPodLogsTab } from "../../renderer/components/dock/log.store"; +export * from "@renderer/components/status-brick"; +export { terminalStore, createTerminalTab } from "@renderer/components/dock/terminal.store"; +export { createPodLogsTab } from "@renderer/components/dock/log.store"; diff --git a/src/extensions/renderer-api/k8s-api.ts b/src/extensions/renderer-api/k8s-api.ts index 071d8365ab..a9cfdc6eae 100644 --- a/src/extensions/renderer-api/k8s-api.ts +++ b/src/extensions/renderer-api/k8s-api.ts @@ -1,65 +1,65 @@ -export { isAllowedResource } from "../../common/rbac"; -export { apiManager } from "../../renderer/api/api-manager"; -export { KubeObjectStore } from "../../renderer/kube-object.store"; -export { KubeApi, forCluster, IKubeApiCluster } from "../../renderer/api/kube-api"; -export { KubeObject } from "../../renderer/api/kube-object"; -export { Pod, podsApi, PodsApi, IPodContainer, IPodContainerStatus } from "../../renderer/api/endpoints"; -export { Node, nodesApi, NodesApi } from "../../renderer/api/endpoints"; -export { Deployment, deploymentApi, DeploymentApi } from "../../renderer/api/endpoints"; -export { DaemonSet, daemonSetApi } from "../../renderer/api/endpoints"; -export { StatefulSet, statefulSetApi } from "../../renderer/api/endpoints"; -export { Job, jobApi } from "../../renderer/api/endpoints"; -export { CronJob, cronJobApi } from "../../renderer/api/endpoints"; -export { ConfigMap, configMapApi } from "../../renderer/api/endpoints"; -export { Secret, secretsApi, ISecretRef } from "../../renderer/api/endpoints"; -export { ReplicaSet, replicaSetApi } from "../../renderer/api/endpoints"; -export { ResourceQuota, resourceQuotaApi } from "../../renderer/api/endpoints"; -export { LimitRange, limitRangeApi } from "../../renderer/api/endpoints"; -export { HorizontalPodAutoscaler, hpaApi } from "../../renderer/api/endpoints"; -export { PodDisruptionBudget, pdbApi } from "../../renderer/api/endpoints"; -export { Service, serviceApi } from "../../renderer/api/endpoints"; -export { Endpoint, endpointApi } from "../../renderer/api/endpoints"; -export { Ingress, ingressApi, IngressApi } from "../../renderer/api/endpoints"; -export { NetworkPolicy, networkPolicyApi } from "../../renderer/api/endpoints"; -export { PersistentVolume, persistentVolumeApi } from "../../renderer/api/endpoints"; -export { PersistentVolumeClaim, pvcApi, PersistentVolumeClaimsApi } from "../../renderer/api/endpoints"; -export { StorageClass, storageClassApi } from "../../renderer/api/endpoints"; -export { Namespace, namespacesApi } from "../../renderer/api/endpoints"; -export { KubeEvent, eventApi } from "../../renderer/api/endpoints"; -export { ServiceAccount, serviceAccountsApi } from "../../renderer/api/endpoints"; -export { Role, roleApi } from "../../renderer/api/endpoints"; -export { RoleBinding, roleBindingApi } from "../../renderer/api/endpoints"; -export { ClusterRole, clusterRoleApi } from "../../renderer/api/endpoints"; -export { ClusterRoleBinding, clusterRoleBindingApi } from "../../renderer/api/endpoints"; -export { CustomResourceDefinition, crdApi } from "../../renderer/api/endpoints"; +export { isAllowedResource } from "@common/rbac"; +export { apiManager } from "@renderer/api/api-manager"; +export { KubeObjectStore } from "@renderer/kube-object.store"; +export { KubeApi, forCluster, IKubeApiCluster } from "@renderer/api/kube-api"; +export { KubeObject } from "@renderer/api/kube-object"; +export { Pod, podsApi, PodsApi, IPodContainer, IPodContainerStatus } from "@renderer/api/endpoints"; +export { Node, nodesApi, NodesApi } from "@renderer/api/endpoints"; +export { Deployment, deploymentApi, DeploymentApi } from "@renderer/api/endpoints"; +export { DaemonSet, daemonSetApi } from "@renderer/api/endpoints"; +export { StatefulSet, statefulSetApi } from "@renderer/api/endpoints"; +export { Job, jobApi } from "@renderer/api/endpoints"; +export { CronJob, cronJobApi } from "@renderer/api/endpoints"; +export { ConfigMap, configMapApi } from "@renderer/api/endpoints"; +export { Secret, secretsApi, ISecretRef } from "@renderer/api/endpoints"; +export { ReplicaSet, replicaSetApi } from "@renderer/api/endpoints"; +export { ResourceQuota, resourceQuotaApi } from "@renderer/api/endpoints"; +export { LimitRange, limitRangeApi } from "@renderer/api/endpoints"; +export { HorizontalPodAutoscaler, hpaApi } from "@renderer/api/endpoints"; +export { PodDisruptionBudget, pdbApi } from "@renderer/api/endpoints"; +export { Service, serviceApi } from "@renderer/api/endpoints"; +export { Endpoint, endpointApi } from "@renderer/api/endpoints"; +export { Ingress, ingressApi, IngressApi } from "@renderer/api/endpoints"; +export { NetworkPolicy, networkPolicyApi } from "@renderer/api/endpoints"; +export { PersistentVolume, persistentVolumeApi } from "@renderer/api/endpoints"; +export { PersistentVolumeClaim, pvcApi, PersistentVolumeClaimsApi } from "@renderer/api/endpoints"; +export { StorageClass, storageClassApi } from "@renderer/api/endpoints"; +export { Namespace, namespacesApi } from "@renderer/api/endpoints"; +export { KubeEvent, eventApi } from "@renderer/api/endpoints"; +export { ServiceAccount, serviceAccountsApi } from "@renderer/api/endpoints"; +export { Role, roleApi } from "@renderer/api/endpoints"; +export { RoleBinding, roleBindingApi } from "@renderer/api/endpoints"; +export { ClusterRole, clusterRoleApi } from "@renderer/api/endpoints"; +export { ClusterRoleBinding, clusterRoleBindingApi } from "@renderer/api/endpoints"; +export { CustomResourceDefinition, crdApi } from "@renderer/api/endpoints"; export { KubeObjectStatus, KubeObjectStatusLevel } from "./kube-object-status"; // stores -export type { EventStore } from "../../renderer/components/+events/event.store"; -export type { PodsStore } from "../../renderer/components/+workloads-pods/pods.store"; -export type { NodesStore } from "../../renderer/components/+nodes/nodes.store"; -export type { DeploymentStore } from "../../renderer/components/+workloads-deployments/deployments.store"; -export type { DaemonSetStore } from "../../renderer/components/+workloads-daemonsets/daemonsets.store"; -export type { StatefulSetStore } from "../../renderer/components/+workloads-statefulsets/statefulset.store"; -export type { JobStore } from "../../renderer/components/+workloads-jobs/job.store"; -export type { CronJobStore } from "../../renderer/components/+workloads-cronjobs/cronjob.store"; -export type { ConfigMapsStore } from "../../renderer/components/+config-maps/config-maps.store"; -export type { SecretsStore } from "../../renderer/components/+config-secrets/secrets.store"; -export type { ReplicaSetStore } from "../../renderer/components/+workloads-replicasets/replicasets.store"; -export type { ResourceQuotasStore } from "../../renderer/components/+config-resource-quotas/resource-quotas.store"; -export type { LimitRangesStore } from "../../renderer/components/+config-limit-ranges/limit-ranges.store"; -export type { HPAStore } from "../../renderer/components/+config-autoscalers/hpa.store"; -export type { PodDisruptionBudgetsStore } from "../../renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.store"; -export type { ServiceStore } from "../../renderer/components/+network-services/services.store"; -export type { EndpointStore } from "../../renderer/components/+network-endpoints/endpoints.store"; -export type { IngressStore } from "../../renderer/components/+network-ingresses/ingress.store"; -export type { NetworkPolicyStore } from "../../renderer/components/+network-policies/network-policy.store"; -export type { PersistentVolumesStore } from "../../renderer/components/+storage-volumes/volumes.store"; -export type { VolumeClaimStore } from "../../renderer/components/+storage-volume-claims/volume-claim.store"; -export type { StorageClassStore } from "../../renderer/components/+storage-classes/storage-class.store"; -export type { NamespaceStore } from "../../renderer/components/+namespaces/namespace.store"; -export type { ServiceAccountsStore } from "../../renderer/components/+user-management-service-accounts/service-accounts.store"; -export type { RolesStore } from "../../renderer/components/+user-management-roles/roles.store"; -export type { RoleBindingsStore } from "../../renderer/components/+user-management-roles-bindings/role-bindings.store"; -export type { CRDStore } from "../../renderer/components/+custom-resources/crd.store"; -export type { CRDResourceStore } from "../../renderer/components/+custom-resources/crd-resource.store"; +export type { EventStore } from "@renderer/components/+events/event.store"; +export type { PodsStore } from "@renderer/components/+workloads-pods/pods.store"; +export type { NodesStore } from "@renderer/components/+nodes/nodes.store"; +export type { DeploymentStore } from "@renderer/components/+workloads-deployments/deployments.store"; +export type { DaemonSetStore } from "@renderer/components/+workloads-daemonsets/daemonsets.store"; +export type { StatefulSetStore } from "@renderer/components/+workloads-statefulsets/statefulset.store"; +export type { JobStore } from "@renderer/components/+workloads-jobs/job.store"; +export type { CronJobStore } from "@renderer/components/+workloads-cronjobs/cronjob.store"; +export type { ConfigMapsStore } from "@renderer/components/+config-maps/config-maps.store"; +export type { SecretsStore } from "@renderer/components/+config-secrets/secrets.store"; +export type { ReplicaSetStore } from "@renderer/components/+workloads-replicasets/replicasets.store"; +export type { ResourceQuotasStore } from "@renderer/components/+config-resource-quotas/resource-quotas.store"; +export type { LimitRangesStore } from "@renderer/components/+config-limit-ranges/limit-ranges.store"; +export type { HPAStore } from "@renderer/components/+config-autoscalers/hpa.store"; +export type { PodDisruptionBudgetsStore } from "@renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.store"; +export type { ServiceStore } from "@renderer/components/+network-services/services.store"; +export type { EndpointStore } from "@renderer/components/+network-endpoints/endpoints.store"; +export type { IngressStore } from "@renderer/components/+network-ingresses/ingress.store"; +export type { NetworkPolicyStore } from "@renderer/components/+network-policies/network-policy.store"; +export type { PersistentVolumesStore } from "@renderer/components/+storage-volumes/volumes.store"; +export type { VolumeClaimStore } from "@renderer/components/+storage-volume-claims/volume-claim.store"; +export type { StorageClassStore } from "@renderer/components/+storage-classes/storage-class.store"; +export type { NamespaceStore } from "@renderer/components/+namespaces/namespace.store"; +export type { ServiceAccountsStore } from "@renderer/components/+user-management-service-accounts/service-accounts.store"; +export type { RolesStore } from "@renderer/components/+user-management-roles/roles.store"; +export type { RoleBindingsStore } from "@renderer/components/+user-management-roles-bindings/role-bindings.store"; +export type { CRDStore } from "@renderer/components/+custom-resources/crd.store"; +export type { CRDResourceStore } from "@renderer/components/+custom-resources/crd-resource.store"; diff --git a/src/extensions/renderer-api/navigation.ts b/src/extensions/renderer-api/navigation.ts index fd1f9196cc..3858596892 100644 --- a/src/extensions/renderer-api/navigation.ts +++ b/src/extensions/renderer-api/navigation.ts @@ -1,10 +1,10 @@ -import { PageParam, PageParamInit } from "../../renderer/navigation/page-param"; -import { navigation } from "../../renderer/navigation"; +import { PageParam, PageParamInit } from "@renderer/navigation/page-param"; +import { navigation } from "@renderer/navigation"; -export type { PageParamInit, PageParam } from "../../renderer/navigation/page-param"; -export { navigate, isActiveRoute } from "../../renderer/navigation/helpers"; -export { hideDetails, showDetails, getDetailsUrl } from "../../renderer/components/kube-object/kube-object-details"; -export { IURLParams } from "../../common/utils/buildUrl"; +export type { PageParamInit, PageParam } from "@renderer/navigation/page-param"; +export { navigate, isActiveRoute } from "@renderer/navigation/helpers"; +export { hideDetails, showDetails, getDetailsUrl } from "@renderer/components/kube-object/kube-object-details"; +export { IURLParams } from "@common/utils/buildUrl"; // exporting to extensions-api version of helper without `isSystem` flag export function createPageParam(init: PageParamInit) { diff --git a/src/extensions/renderer-api/theming.ts b/src/extensions/renderer-api/theming.ts index f819036803..1b71bcb737 100644 --- a/src/extensions/renderer-api/theming.ts +++ b/src/extensions/renderer-api/theming.ts @@ -1,5 +1,5 @@ -import { themeStore } from "../../renderer/theme.store"; +import { themeStore } from "@renderer/theme.store"; export function getActiveTheme() { return themeStore.activeTheme; -} \ No newline at end of file +} diff --git a/src/extensions/stores/cluster-store.ts b/src/extensions/stores/cluster-store.ts index b2aba41c06..11fb9c5dc8 100644 --- a/src/extensions/stores/cluster-store.ts +++ b/src/extensions/stores/cluster-store.ts @@ -1,11 +1,11 @@ -import { clusterStore as internalClusterStore, ClusterId } from "../../common/cluster-store"; -import type { ClusterModel } from "../../common/cluster-store"; -import { Cluster } from "../../main/cluster"; +import { clusterStore as internalClusterStore, ClusterId } from "@common/cluster-store"; +import type { ClusterModel } from "@common/cluster-store"; +import { Cluster } from "@main/cluster"; import { Singleton } from "../core-api/utils"; import { ObservableMap } from "mobx"; -export { Cluster } from "../../main/cluster"; -export type { ClusterModel, ClusterId } from "../../common/cluster-store"; +export { Cluster } from "@main/cluster"; +export type { ClusterModel, ClusterId } from "@common/cluster-store"; /** * Store for all added clusters diff --git a/src/extensions/stores/workspace-store.ts b/src/extensions/stores/workspace-store.ts index 2ff4a830fd..0ff5e2e0cf 100644 --- a/src/extensions/stores/workspace-store.ts +++ b/src/extensions/stores/workspace-store.ts @@ -1,9 +1,9 @@ import { Singleton } from "../core-api/utils"; -import { workspaceStore as internalWorkspaceStore, WorkspaceStore as InternalWorkspaceStore, Workspace, WorkspaceId } from "../../common/workspace-store"; +import { workspaceStore as internalWorkspaceStore, WorkspaceStore as InternalWorkspaceStore, Workspace, WorkspaceId } from "@common/workspace-store"; import { ObservableMap } from "mobx"; -export { Workspace } from "../../common/workspace-store"; -export type { WorkspaceId, WorkspaceModel } from "../../common/workspace-store"; +export { Workspace } from "@common/workspace-store"; +export type { WorkspaceId, WorkspaceModel } from "@common/workspace-store"; /** * Stores all workspaces diff --git a/src/main/__test__/cluster.test.ts b/src/main/__test__/cluster.test.ts index b3f0442cc2..44b7067d6b 100644 --- a/src/main/__test__/cluster.test.ts +++ b/src/main/__test__/cluster.test.ts @@ -24,19 +24,19 @@ jest.mock("winston", () => ({ })); -jest.mock("../../common/ipc"); +jest.mock("@common/ipc"); jest.mock("../context-handler"); jest.mock("request"); jest.mock("request-promise-native"); import { Console } from "console"; import mockFs from "mock-fs"; -import { workspaceStore } from "../../common/workspace-store"; +import { workspaceStore } from "@common/workspace-store"; import { Cluster } from "../cluster"; import { ContextHandler } from "../context-handler"; import { getFreePort } from "../port"; import { V1ResourceAttributes } from "@kubernetes/client-node"; -import { apiResources } from "../../common/rbac"; +import { apiResources } from "@common/rbac"; import request from "request-promise-native"; import { Kubectl } from "../kubectl"; diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts index b161372555..b296b793e2 100644 --- a/src/main/__test__/kube-auth-proxy.test.ts +++ b/src/main/__test__/kube-auth-proxy.test.ts @@ -23,14 +23,14 @@ jest.mock("winston", () => ({ } })); -jest.mock("../../common/ipc"); +jest.mock("@common/ipc"); jest.mock("child_process"); jest.mock("tcp-port-used"); import { Cluster } from "../cluster"; import { KubeAuthProxy } from "../kube-auth-proxy"; import { getFreePort } from "../port"; -import { broadcastMessage } from "../../common/ipc"; +import { broadcastMessage } from "@common/ipc"; import { ChildProcess, spawn } from "child_process"; import { bundledKubectlPath, Kubectl } from "../kubectl"; import { mock, MockProxy } from "jest-mock-extended"; diff --git a/src/main/__test__/kubeconfig-manager.test.ts b/src/main/__test__/kubeconfig-manager.test.ts index 89c882b109..9bd8c14826 100644 --- a/src/main/__test__/kubeconfig-manager.test.ts +++ b/src/main/__test__/kubeconfig-manager.test.ts @@ -26,7 +26,7 @@ jest.mock("winston", () => ({ import { KubeconfigManager } from "../kubeconfig-manager"; import mockFs from "mock-fs"; import { Cluster } from "../cluster"; -import { workspaceStore } from "../../common/workspace-store"; +import { workspaceStore } from "@common/workspace-store"; import { ContextHandler } from "../context-handler"; import { getFreePort } from "../port"; import fse from "fs-extra"; diff --git a/src/main/cluster-detectors/detector-registry.ts b/src/main/cluster-detectors/detector-registry.ts index 43c56153c9..d255b9ca2d 100644 --- a/src/main/cluster-detectors/detector-registry.ts +++ b/src/main/cluster-detectors/detector-registry.ts @@ -1,5 +1,5 @@ import { observable } from "mobx"; -import { ClusterMetadata } from "../../common/cluster-store"; +import { ClusterMetadata } from "@common/cluster-store"; import { Cluster } from "../cluster"; import { BaseClusterDetector, ClusterDetectionResult } from "./base-cluster-detector"; import { ClusterIdDetector } from "./cluster-id-detector"; @@ -48,4 +48,4 @@ detectorRegistry.add(ClusterIdDetector); detectorRegistry.add(LastSeenDetector); detectorRegistry.add(VersionDetector); detectorRegistry.add(DistributionDetector); -detectorRegistry.add(NodesCountDetector); \ No newline at end of file +detectorRegistry.add(NodesCountDetector); diff --git a/src/main/cluster-manager.ts b/src/main/cluster-manager.ts index 1b468e3bb6..98dd24bcc0 100644 --- a/src/main/cluster-manager.ts +++ b/src/main/cluster-manager.ts @@ -1,12 +1,12 @@ -import "../common/cluster-ipc"; +import "@common/cluster-ipc"; import type http from "http"; import { ipcMain } from "electron"; import { autorun } from "mobx"; -import { clusterStore, getClusterIdFromHost } from "../common/cluster-store"; +import { clusterStore, getClusterIdFromHost } from "@common/cluster-store"; import { Cluster } from "./cluster"; import logger from "./logger"; -import { apiKubePrefix } from "../common/vars"; -import { Singleton } from "../common/utils"; +import { apiKubePrefix } from "@common/vars"; +import { Singleton } from "@common/utils"; export class ClusterManager extends Singleton { constructor(public readonly port: number) { diff --git a/src/main/cluster.ts b/src/main/cluster.ts index c6c14f6406..86f1b994e4 100644 --- a/src/main/cluster.ts +++ b/src/main/cluster.ts @@ -1,17 +1,17 @@ import { ipcMain } from "electron"; -import type { ClusterId, ClusterMetadata, ClusterModel, ClusterPreferences, ClusterPrometheusPreferences } from "../common/cluster-store"; -import type { IMetricsReqParams } from "../renderer/api/endpoints/metrics.api"; -import type { WorkspaceId } from "../common/workspace-store"; +import type { ClusterId, ClusterMetadata, ClusterModel, ClusterPreferences, ClusterPrometheusPreferences } from "@common/cluster-store"; +import type { IMetricsReqParams } from "@renderer/api/endpoints/metrics.api"; +import type { WorkspaceId } from "@common/workspace-store"; import { action, comparer, computed, observable, reaction, toJS, when } from "mobx"; -import { apiKubePrefix } from "../common/vars"; -import { broadcastMessage } from "../common/ipc"; +import { apiKubePrefix } from "@common/vars"; +import { broadcastMessage } from "@common/ipc"; import { ContextHandler } from "./context-handler"; import { AuthorizationV1Api, CoreV1Api, KubeConfig, V1ResourceAttributes } from "@kubernetes/client-node"; import { Kubectl } from "./kubectl"; import { KubeconfigManager } from "./kubeconfig-manager"; -import { loadConfig } from "../common/kube-helpers"; +import { loadConfig } from "@common/kube-helpers"; import request, { RequestPromiseOptions } from "request-promise-native"; -import { apiResources, KubeApiResource } from "../common/rbac"; +import { apiResources, KubeApiResource } from "@common/rbac"; import logger from "./logger"; import { VersionDetector } from "./cluster-detectors/version-detector"; import { detectorRegistry } from "./cluster-detectors/detector-registry"; diff --git a/src/main/context-handler.ts b/src/main/context-handler.ts index d67c495a84..76fc178f40 100644 --- a/src/main/context-handler.ts +++ b/src/main/context-handler.ts @@ -1,10 +1,10 @@ import type { PrometheusProvider, PrometheusService } from "./prometheus/provider-registry"; -import type { ClusterPrometheusPreferences } from "../common/cluster-store"; +import type { ClusterPrometheusPreferences } from "@common/cluster-store"; import type { Cluster } from "./cluster"; import type httpProxy from "http-proxy"; import url, { UrlWithStringQuery } from "url"; import { CoreV1Api } from "@kubernetes/client-node"; -import { prometheusProviders } from "../common/prometheus-providers"; +import { prometheusProviders } from "@common/prometheus-providers"; import logger from "./logger"; import { getFreePort } from "./port"; import { KubeAuthProxy } from "./kube-auth-proxy"; diff --git a/src/main/exit-app.ts b/src/main/exit-app.ts index eb035eff96..c494efe647 100644 --- a/src/main/exit-app.ts +++ b/src/main/exit-app.ts @@ -1,6 +1,6 @@ import { app } from "electron"; import { WindowManager } from "./window-manager"; -import { appEventBus } from "../common/event-bus"; +import { appEventBus } from "@common/event-bus"; import { ClusterManager } from "./cluster-manager"; import logger from "./logger"; diff --git a/src/main/extension-filesystem.ts b/src/main/extension-filesystem.ts index eddb7b747f..5d55c5b12d 100644 --- a/src/main/extension-filesystem.ts +++ b/src/main/extension-filesystem.ts @@ -4,8 +4,8 @@ import { app, remote } from "electron"; import fse from "fs-extra"; import { action, observable, toJS } from "mobx"; import path from "path"; -import { BaseStore } from "../common/base-store"; -import { LensExtensionId } from "../extensions/lens-extension"; +import { BaseStore } from "@common/base-store"; +import { LensExtensionId } from "@extensions/lens-extension"; interface FSProvisionModel { extensions: Record; // extension names to paths diff --git a/src/main/helm/helm-cli.ts b/src/main/helm/helm-cli.ts index ca6f755896..f20b638411 100644 --- a/src/main/helm/helm-cli.ts +++ b/src/main/helm/helm-cli.ts @@ -1,7 +1,7 @@ import packageInfo from "../../../package.json"; import path from "path"; import { LensBinary, LensBinaryOpts } from "../lens-binary"; -import { isProduction } from "../../common/vars"; +import { isProduction } from "@common/vars"; export class HelmCli extends LensBinary { diff --git a/src/main/helm/helm-release-manager.ts b/src/main/helm/helm-release-manager.ts index 220d665ae0..f5e9f20593 100644 --- a/src/main/helm/helm-release-manager.ts +++ b/src/main/helm/helm-release-manager.ts @@ -4,7 +4,7 @@ import * as yaml from "js-yaml"; import { promiseExec} from "../promise-exec"; import { helmCli } from "./helm-cli"; import { Cluster } from "../cluster"; -import { toCamelCase } from "../../common/utils/camelCase"; +import { toCamelCase } from "@common/utils/camelCase"; export class HelmReleaseManager { diff --git a/src/main/helm/helm-repo-manager.ts b/src/main/helm/helm-repo-manager.ts index 74afb166b1..7dfdc44b58 100644 --- a/src/main/helm/helm-repo-manager.ts +++ b/src/main/helm/helm-repo-manager.ts @@ -2,8 +2,8 @@ import yaml from "js-yaml"; import { readFile } from "fs-extra"; import { promiseExec } from "../promise-exec"; import { helmCli } from "./helm-cli"; -import { Singleton } from "../../common/utils/singleton"; -import { customRequestPromise } from "../../common/request"; +import { Singleton } from "@common/utils/singleton"; +import { customRequestPromise } from "@common/request"; import orderBy from "lodash/orderBy"; import logger from "../logger"; diff --git a/src/main/index.ts b/src/main/index.ts index 265c91f6d4..dcf78c5df5 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -1,11 +1,11 @@ // Main process -import "../common/system-ca"; -import "../common/prometheus-providers"; +import "@common/system-ca"; +import "@common/prometheus-providers"; import * as Mobx from "mobx"; -import * as LensExtensions from "../extensions/core-api"; +import * as LensExtensions from "@extensions/core-api"; import { app, dialog, powerMonitor } from "electron"; -import { appName } from "../common/vars"; +import { appName } from "@common/vars"; import path from "path"; import { LensProxy } from "./lens-proxy"; import { WindowManager } from "./window-manager"; @@ -14,16 +14,16 @@ import { AppUpdater } from "./app-updater"; import { shellSync } from "./shell-sync"; import { getFreePort } from "./port"; import { mangleProxyEnv } from "./proxy-env"; -import { registerFileProtocol } from "../common/register-protocol"; +import { registerFileProtocol } from "@common/register-protocol"; import logger from "./logger"; -import { clusterStore } from "../common/cluster-store"; -import { userStore } from "../common/user-store"; -import { workspaceStore } from "../common/workspace-store"; -import { appEventBus } from "../common/event-bus"; -import { extensionLoader } from "../extensions/extension-loader"; -import { extensionsStore } from "../extensions/extensions-store"; -import { InstalledExtension, extensionDiscovery } from "../extensions/extension-discovery"; -import type { LensExtensionId } from "../extensions/lens-extension"; +import { clusterStore } from "@common/cluster-store"; +import { userStore } from "@common/user-store"; +import { workspaceStore } from "@common/workspace-store"; +import { appEventBus } from "@common/event-bus"; +import { extensionLoader } from "@extensions/extension-loader"; +import { extensionsStore } from "@extensions/extensions-store"; +import { InstalledExtension, extensionDiscovery } from "@extensions/extension-discovery"; +import type { LensExtensionId } from "@extensions/lens-extension"; import { installDeveloperTools } from "./developer-tools"; import { filesystemProvisionerStore } from "./extension-filesystem"; diff --git a/src/main/kube-auth-proxy.ts b/src/main/kube-auth-proxy.ts index 589fe8fa16..53b2179274 100644 --- a/src/main/kube-auth-proxy.ts +++ b/src/main/kube-auth-proxy.ts @@ -1,6 +1,6 @@ import { ChildProcess, spawn } from "child_process"; import { waitUntilUsed } from "tcp-port-used"; -import { broadcastMessage } from "../common/ipc"; +import { broadcastMessage } from "@common/ipc"; import type { Cluster } from "./cluster"; import { Kubectl } from "./kubectl"; import logger from "./logger"; diff --git a/src/main/kubeconfig-manager.ts b/src/main/kubeconfig-manager.ts index bd1b32c1f5..418fd03df5 100644 --- a/src/main/kubeconfig-manager.ts +++ b/src/main/kubeconfig-manager.ts @@ -4,7 +4,7 @@ import type { ContextHandler } from "./context-handler"; import { app } from "electron"; import path from "path"; import fs from "fs-extra"; -import { dumpConfigYaml, loadConfig } from "../common/kube-helpers"; +import { dumpConfigYaml, loadConfig } from "@common/kube-helpers"; import logger from "./logger"; export class KubeconfigManager { diff --git a/src/main/kubectl.ts b/src/main/kubectl.ts index ebfd2a6a98..16e6ba3af6 100644 --- a/src/main/kubectl.ts +++ b/src/main/kubectl.ts @@ -6,10 +6,10 @@ import logger from "./logger"; import { ensureDir, pathExists } from "fs-extra"; import * as lockFile from "proper-lockfile"; import { helmCli } from "./helm/helm-cli"; -import { userStore } from "../common/user-store"; -import { customRequest } from "../common/request"; -import { getBundledKubectlVersion } from "../common/utils/app-version"; -import { isDevelopment, isWindows, isTestEnv } from "../common/vars"; +import { userStore } from "@common/user-store"; +import { customRequest } from "@common/request"; +import { getBundledKubectlVersion } from "@common/utils/app-version"; +import { isDevelopment, isWindows, isTestEnv } from "@common/vars"; const bundledVersion = getBundledKubectlVersion(); const kubectlMap: Map = new Map([ diff --git a/src/main/kubectl_spec.ts b/src/main/kubectl_spec.ts index 50d0b11374..63abf2c256 100644 --- a/src/main/kubectl_spec.ts +++ b/src/main/kubectl_spec.ts @@ -1,9 +1,9 @@ import packageInfo from "../../package.json"; import path from "path"; import { Kubectl } from "../../src/main/kubectl"; -import { isWindows } from "../common/vars"; +import { isWindows } from "@common/vars"; -jest.mock("../common/user-store"); +jest.mock("@common/user-store"); describe("kubectlVersion", () => { it("returns bundled version if exactly same version used", async () => { diff --git a/src/main/lens-binary.ts b/src/main/lens-binary.ts index 3cf5a5fce7..b2d5d31618 100644 --- a/src/main/lens-binary.ts +++ b/src/main/lens-binary.ts @@ -3,7 +3,7 @@ import fs from "fs"; import request from "request"; import { ensureDir, pathExists } from "fs-extra"; import * as tar from "tar"; -import { isWindows } from "../common/vars"; +import { isWindows } from "@common/vars"; import winston from "winston"; export type LensBinaryOpts = { diff --git a/src/main/lens-proxy.ts b/src/main/lens-proxy.ts index e4f6ab4a34..9736e03bbf 100644 --- a/src/main/lens-proxy.ts +++ b/src/main/lens-proxy.ts @@ -4,7 +4,7 @@ import spdy from "spdy"; import httpProxy from "http-proxy"; import url from "url"; import * as WebSocket from "ws"; -import { apiPrefix, apiKubePrefix } from "../common/vars"; +import { apiPrefix, apiKubePrefix } from "@common/vars"; import { openShell } from "./node-shell-session"; import { Router } from "./router"; import { ClusterManager } from "./cluster-manager"; diff --git a/src/main/logger.ts b/src/main/logger.ts index 0ddc7bb1f7..80c346a96a 100644 --- a/src/main/logger.ts +++ b/src/main/logger.ts @@ -1,6 +1,6 @@ import { app, remote } from "electron"; import winston from "winston"; -import { isDebugging } from "../common/vars"; +import { isDebugging } from "@common/vars"; const logLevel = process.env.LOG_LEVEL ? process.env.LOG_LEVEL : isDebugging ? "debug" : "info"; const consoleOptions: winston.transports.ConsoleTransportOptions = { diff --git a/src/main/menu.ts b/src/main/menu.ts index 2cddbb1b01..a8a67455fb 100644 --- a/src/main/menu.ts +++ b/src/main/menu.ts @@ -1,13 +1,13 @@ import { app, BrowserWindow, dialog, ipcMain, IpcMainEvent, Menu, MenuItem, MenuItemConstructorOptions, webContents, shell } from "electron"; import { autorun } from "mobx"; import { WindowManager } from "./window-manager"; -import { appName, isMac, isWindows, isTestEnv, docsUrl, supportUrl } from "../common/vars"; -import { addClusterURL } from "../renderer/components/+add-cluster/add-cluster.route"; -import { preferencesURL } from "../renderer/components/+preferences/preferences.route"; -import { whatsNewURL } from "../renderer/components/+whats-new/whats-new.route"; -import { clusterSettingsURL } from "../renderer/components/+cluster-settings/cluster-settings.route"; -import { extensionsURL } from "../renderer/components/+extensions/extensions.route"; -import { menuRegistry } from "../extensions/registries/menu-registry"; +import { appName, isMac, isWindows, isTestEnv, docsUrl, supportUrl } from "@common/vars"; +import { addClusterURL } from "@renderer/components/+add-cluster/add-cluster.route"; +import { preferencesURL } from "@renderer/components/+preferences/preferences.route"; +import { whatsNewURL } from "@renderer/components/+whats-new/whats-new.route"; +import { clusterSettingsURL } from "@renderer/components/+cluster-settings/cluster-settings.route"; +import { extensionsURL } from "@renderer/components/+extensions/extensions.route"; +import { menuRegistry } from "@extensions/registries/menu-registry"; import logger from "./logger"; import { exitApp } from "./exit-app"; diff --git a/src/main/node-shell-session.ts b/src/main/node-shell-session.ts index b67e776725..7492437d9e 100644 --- a/src/main/node-shell-session.ts +++ b/src/main/node-shell-session.ts @@ -6,7 +6,7 @@ import * as k8s from "@kubernetes/client-node"; import { KubeConfig } from "@kubernetes/client-node"; import { Cluster } from "./cluster"; import logger from "./logger"; -import { appEventBus } from "../common/event-bus"; +import { appEventBus } from "@common/event-bus"; export class NodeShellSession extends ShellSession { protected nodeName: string; diff --git a/src/main/resource-applier.ts b/src/main/resource-applier.ts index d4070f2378..cd4aeec1be 100644 --- a/src/main/resource-applier.ts +++ b/src/main/resource-applier.ts @@ -6,8 +6,8 @@ import * as yaml from "js-yaml"; import path from "path"; import * as tempy from "tempy"; import logger from "./logger"; -import { appEventBus } from "../common/event-bus"; -import { cloneJsonObject } from "../common/utils"; +import { appEventBus } from "@common/event-bus"; +import { cloneJsonObject } from "@common/utils"; export class ResourceApplier { constructor(protected cluster: Cluster) { diff --git a/src/main/router.ts b/src/main/router.ts index 896893a592..7ed0ec8e5e 100644 --- a/src/main/router.ts +++ b/src/main/router.ts @@ -4,7 +4,7 @@ import http from "http"; import path from "path"; import { readFile } from "fs-extra"; import { Cluster } from "./cluster"; -import { apiPrefix, appName, publicPath, isDevelopment, webpackDevServerPort } from "../common/vars"; +import { apiPrefix, appName, publicPath, isDevelopment, webpackDevServerPort } from "@common/vars"; import { helmRoute, kubeconfigRoute, metricsRoute, portForwardRoute, resourceApplierRoute, watchRoute } from "./routes"; import logger from "./logger"; diff --git a/src/main/routes/metrics-route.ts b/src/main/routes/metrics-route.ts index d132f7b0ae..c8f1fc9e6f 100644 --- a/src/main/routes/metrics-route.ts +++ b/src/main/routes/metrics-route.ts @@ -2,7 +2,7 @@ import _ from "lodash"; import { LensApiRequest } from "../router"; import { LensApi } from "../lens-api"; import { Cluster, ClusterMetadataKey } from "../cluster"; -import { ClusterPrometheusMetadata } from "../../common/cluster-store"; +import { ClusterPrometheusMetadata } from "@common/cluster-store"; import logger from "../logger"; export type IMetricsQuery = string | string[] | { diff --git a/src/main/shell-session.ts b/src/main/shell-session.ts index be04649a31..d8f5d5b744 100644 --- a/src/main/shell-session.ts +++ b/src/main/shell-session.ts @@ -6,11 +6,11 @@ import shellEnv from "shell-env"; import { app } from "electron"; import { Kubectl } from "./kubectl"; import { Cluster } from "./cluster"; -import { ClusterPreferences } from "../common/cluster-store"; +import { ClusterPreferences } from "@common/cluster-store"; import { helmCli } from "./helm/helm-cli"; -import { isWindows } from "../common/vars"; -import { appEventBus } from "../common/event-bus"; -import { userStore } from "../common/user-store"; +import { isWindows } from "@common/vars"; +import { appEventBus } from "@common/event-bus"; +import { userStore } from "@common/user-store"; export class ShellSession extends EventEmitter { static shellEnvs: Map = new Map(); diff --git a/src/main/tray.ts b/src/main/tray.ts index 47f641ad72..ed4a993726 100644 --- a/src/main/tray.ts +++ b/src/main/tray.ts @@ -5,12 +5,12 @@ import { autorun } from "mobx"; import { showAbout } from "./menu"; import { AppUpdater } from "./app-updater"; import { WindowManager } from "./window-manager"; -import { clusterStore } from "../common/cluster-store"; -import { workspaceStore } from "../common/workspace-store"; -import { preferencesURL } from "../renderer/components/+preferences/preferences.route"; -import { clusterViewURL } from "../renderer/components/cluster-manager/cluster-view.route"; +import { clusterStore } from "@common/cluster-store"; +import { workspaceStore } from "@common/workspace-store"; +import { preferencesURL } from "@renderer/components/+preferences/preferences.route"; +import { clusterViewURL } from "@renderer/components/cluster-manager/cluster-view.route"; import logger from "./logger"; -import { isDevelopment, isWindows } from "../common/vars"; +import { isDevelopment, isWindows } from "@common/vars"; import { exitApp } from "./exit-app"; // note: instance of Tray should be saved somewhere, otherwise it disappears diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts index bf7458afa0..dde66da06f 100644 --- a/src/main/window-manager.ts +++ b/src/main/window-manager.ts @@ -1,13 +1,13 @@ -import type { ClusterId } from "../common/cluster-store"; +import type { ClusterId } from "@common/cluster-store"; import { observable } from "mobx"; import { app, BrowserWindow, dialog, shell, webContents } from "electron"; import windowStateKeeper from "electron-window-state"; -import { appEventBus } from "../common/event-bus"; -import { subscribeToBroadcast } from "../common/ipc"; +import { appEventBus } from "@common/event-bus"; +import { subscribeToBroadcast } from "@common/ipc"; import { initMenu } from "./menu"; import { initTray } from "./tray"; -import { Singleton } from "../common/utils"; -import { ClusterFrameInfo, clusterFrameMap } from "../common/cluster-frames"; +import { Singleton } from "@common/utils"; +import { ClusterFrameInfo, clusterFrameMap } from "@common/cluster-frames"; export class WindowManager extends Singleton { protected mainWindow: BrowserWindow; diff --git a/src/renderer/api/endpoints/metrics.api.ts b/src/renderer/api/endpoints/metrics.api.ts index 9c3ee74adc..cb7a20bfa0 100644 --- a/src/renderer/api/endpoints/metrics.api.ts +++ b/src/renderer/api/endpoints/metrics.api.ts @@ -2,7 +2,7 @@ import moment from "moment"; import { apiBase } from "../index"; -import type { IMetricsQuery } from "../../../main/routes/metrics-route"; +import type { IMetricsQuery } from "@main/routes/metrics-route"; export interface IMetrics { status: string; diff --git a/src/renderer/api/index.ts b/src/renderer/api/index.ts index 1a82ce45f8..10c4175f01 100644 --- a/src/renderer/api/index.ts +++ b/src/renderer/api/index.ts @@ -1,7 +1,7 @@ import { JsonApi, JsonApiErrorParsed } from "./json-api"; import { KubeJsonApi } from "./kube-json-api"; import { Notifications } from "../components/notifications"; -import { apiKubePrefix, apiPrefix, isDevelopment } from "../../common/vars"; +import { apiKubePrefix, apiPrefix, isDevelopment } from "@common/vars"; export const apiBase = new JsonApi({ apiBase: apiPrefix, diff --git a/src/renderer/api/json-api.ts b/src/renderer/api/json-api.ts index 49c2cb1a28..fcc4156b5d 100644 --- a/src/renderer/api/json-api.ts +++ b/src/renderer/api/json-api.ts @@ -1,7 +1,7 @@ // Base http-service / json-api class import { stringify } from "querystring"; -import { EventEmitter } from "../../common/event-emitter"; +import { EventEmitter } from "@common/event-emitter"; import { cancelableFetch } from "../utils/cancelableFetch"; export interface JsonApiData { diff --git a/src/renderer/api/kube-api-parse.ts b/src/renderer/api/kube-api-parse.ts index 285610bece..ec492babb7 100644 --- a/src/renderer/api/kube-api-parse.ts +++ b/src/renderer/api/kube-api-parse.ts @@ -1,7 +1,7 @@ // Parse kube-api path and get api-version, group, etc. import type { KubeObject } from "./kube-object"; -import { splitArray } from "../../common/utils"; +import { splitArray } from "@common/utils"; import { apiManager } from "./api-manager"; export interface IKubeObjectRef { diff --git a/src/renderer/api/kube-api.ts b/src/renderer/api/kube-api.ts index 8a3a2517c2..8be692b016 100644 --- a/src/renderer/api/kube-api.ts +++ b/src/renderer/api/kube-api.ts @@ -2,8 +2,8 @@ import merge from "lodash/merge"; import { stringify } from "querystring"; -import { apiKubePrefix, isDevelopment, isTestEnv } from "../../common/vars"; -import logger from "../../main/logger"; +import { apiKubePrefix, isDevelopment, isTestEnv } from "@common/vars"; +import logger from "@main/logger"; import { apiManager } from "./api-manager"; import { apiKube } from "./index"; import { createKubeApiURL, parseKubeApi } from "./kube-api-parse"; diff --git a/src/renderer/api/kube-object-detail-registry.ts b/src/renderer/api/kube-object-detail-registry.ts index 5246254532..3624e58cab 100644 --- a/src/renderer/api/kube-object-detail-registry.ts +++ b/src/renderer/api/kube-object-detail-registry.ts @@ -1 +1 @@ -export { kubeObjectDetailRegistry } from "../../extensions/registries/kube-object-detail-registry"; +export { kubeObjectDetailRegistry } from "@extensions/registries/kube-object-detail-registry"; diff --git a/src/renderer/api/kube-watch-api.ts b/src/renderer/api/kube-watch-api.ts index 78ca25256e..5fc660bb53 100644 --- a/src/renderer/api/kube-watch-api.ts +++ b/src/renderer/api/kube-watch-api.ts @@ -7,8 +7,8 @@ import { KubeJsonApiData } from "./kube-json-api"; import type { KubeObjectStore } from "../kube-object.store"; import { ensureObjectSelfLink, KubeApi } from "./kube-api"; import { apiManager } from "./api-manager"; -import { apiPrefix, isDevelopment } from "../../common/vars"; -import { getHostedCluster } from "../../common/cluster-store"; +import { apiPrefix, isDevelopment } from "@common/vars"; +import { getHostedCluster } from "@common/cluster-store"; export interface IKubeWatchEvent { type: "ADDED" | "MODIFIED" | "DELETED"; diff --git a/src/renderer/api/terminal-api.ts b/src/renderer/api/terminal-api.ts index 1a94052586..b54847ff22 100644 --- a/src/renderer/api/terminal-api.ts +++ b/src/renderer/api/terminal-api.ts @@ -2,7 +2,7 @@ import { stringify } from "querystring"; import { autobind, base64, EventEmitter } from "../utils"; import { WebSocketApi } from "./websocket-api"; import isEqual from "lodash/isEqual"; -import { isDevelopment } from "../../common/vars"; +import { isDevelopment } from "@common/vars"; export enum TerminalChannels { STDIN = 0, diff --git a/src/renderer/api/websocket-api.ts b/src/renderer/api/websocket-api.ts index 79a92cf99e..ea3be82bca 100644 --- a/src/renderer/api/websocket-api.ts +++ b/src/renderer/api/websocket-api.ts @@ -1,5 +1,5 @@ import { observable } from "mobx"; -import { EventEmitter } from "../../common/event-emitter"; +import { EventEmitter } from "@common/event-emitter"; interface IParams { url?: string; // connection url, starts with ws:// or wss:// diff --git a/src/renderer/components/+add-cluster/add-cluster.route.ts b/src/renderer/components/+add-cluster/add-cluster.route.ts index 3f1e36be9e..078037b787 100644 --- a/src/renderer/components/+add-cluster/add-cluster.route.ts +++ b/src/renderer/components/+add-cluster/add-cluster.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const addClusterRoute: RouteProps = { path: "/add-cluster" diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx index ae4a3e6ace..e23f2e6e51 100644 --- a/src/renderer/components/+add-cluster/add-cluster.tsx +++ b/src/renderer/components/+add-cluster/add-cluster.tsx @@ -10,20 +10,20 @@ import { DropFileInput, Input } from "../input"; import { AceEditor } from "../ace-editor"; import { Button } from "../button"; import { Icon } from "../icon"; -import { kubeConfigDefaultPath, loadConfig, splitConfig, validateConfig, validateKubeConfig } from "../../../common/kube-helpers"; -import { ClusterModel, ClusterStore, clusterStore } from "../../../common/cluster-store"; -import { workspaceStore } from "../../../common/workspace-store"; +import { kubeConfigDefaultPath, loadConfig, splitConfig, validateConfig, validateKubeConfig } from "@common/kube-helpers"; +import { ClusterModel, ClusterStore, clusterStore } from "@common/cluster-store"; +import { workspaceStore } from "@common/workspace-store"; import { v4 as uuid } from "uuid"; import { navigate } from "../../navigation"; -import { userStore } from "../../../common/user-store"; +import { userStore } from "@common/user-store"; import { clusterViewURL } from "../cluster-manager/cluster-view.route"; import { cssNames } from "../../utils"; import { Notifications } from "../notifications"; import { Tab, Tabs } from "../tabs"; -import { ExecValidationNotFoundError } from "../../../common/custom-errors"; -import { appEventBus } from "../../../common/event-bus"; +import { ExecValidationNotFoundError } from "@common/custom-errors"; +import { appEventBus } from "@common/event-bus"; import { PageLayout } from "../layout/page-layout"; -import { docsUrl } from "../../../common/vars"; +import { docsUrl } from "@common/vars"; enum KubeConfigSourceTab { FILE = "file", diff --git a/src/renderer/components/+apps-helm-charts/helm-charts.route.ts b/src/renderer/components/+apps-helm-charts/helm-charts.route.ts index 9b8aecc499..4855d4c39d 100644 --- a/src/renderer/components/+apps-helm-charts/helm-charts.route.ts +++ b/src/renderer/components/+apps-helm-charts/helm-charts.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; import { appsRoute } from "../+apps/apps.route"; export const helmChartsRoute: RouteProps = { @@ -11,4 +11,4 @@ export interface IHelmChartsRouteParams { repo?: string; } -export const helmChartsURL = buildURL(helmChartsRoute.path); \ No newline at end of file +export const helmChartsURL = buildURL(helmChartsRoute.path); diff --git a/src/renderer/components/+apps-releases/release.route.ts b/src/renderer/components/+apps-releases/release.route.ts index 61c41b37ff..ac5b6f8df7 100644 --- a/src/renderer/components/+apps-releases/release.route.ts +++ b/src/renderer/components/+apps-releases/release.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; import { appsRoute } from "../+apps/apps.route"; export const releaseRoute: RouteProps = { diff --git a/src/renderer/components/+apps-releases/release.store.ts b/src/renderer/components/+apps-releases/release.store.ts index b6d5c2fb5f..b3dff541c0 100644 --- a/src/renderer/components/+apps-releases/release.store.ts +++ b/src/renderer/components/+apps-releases/release.store.ts @@ -5,7 +5,7 @@ import { HelmRelease, helmReleasesApi, IReleaseCreatePayload, IReleaseUpdatePayl import { ItemStore } from "../../item.store"; import { Secret } from "../../api/endpoints"; import { secretsStore } from "../+config-secrets/secrets.store"; -import { getHostedCluster } from "../../../common/cluster-store"; +import { getHostedCluster } from "@common/cluster-store"; @autobind() export class ReleaseStore extends ItemStore { diff --git a/src/renderer/components/+apps/apps.route.ts b/src/renderer/components/+apps/apps.route.ts index 5ed0671ace..63740c6b34 100644 --- a/src/renderer/components/+apps/apps.route.ts +++ b/src/renderer/components/+apps/apps.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const appsRoute: RouteProps = { path: "/apps", diff --git a/src/renderer/components/+cluster-settings/cluster-settings.route.ts b/src/renderer/components/+cluster-settings/cluster-settings.route.ts index 11a373dcdb..e847a69e33 100644 --- a/src/renderer/components/+cluster-settings/cluster-settings.route.ts +++ b/src/renderer/components/+cluster-settings/cluster-settings.route.ts @@ -1,6 +1,6 @@ import type { IClusterViewRouteParams } from "../cluster-manager/cluster-view.route"; import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export interface IClusterSettingsRouteParams extends IClusterViewRouteParams { } diff --git a/src/renderer/components/+cluster-settings/cluster-settings.tsx b/src/renderer/components/+cluster-settings/cluster-settings.tsx index 0cde390c47..36820a6bca 100644 --- a/src/renderer/components/+cluster-settings/cluster-settings.tsx +++ b/src/renderer/components/+cluster-settings/cluster-settings.tsx @@ -8,13 +8,13 @@ import { Features } from "./features"; import { Removal } from "./removal"; import { Status } from "./status"; import { General } from "./general"; -import { Cluster } from "../../../main/cluster"; +import { Cluster } from "@main/cluster"; import { ClusterIcon } from "../cluster-icon"; import { IClusterSettingsRouteParams } from "./cluster-settings.route"; -import { clusterStore } from "../../../common/cluster-store"; +import { clusterStore } from "@common/cluster-store"; import { PageLayout } from "../layout/page-layout"; -import { requestMain } from "../../../common/ipc"; -import { clusterActivateHandler, clusterRefreshHandler } from "../../../common/cluster-ipc"; +import { requestMain } from "@common/ipc"; +import { clusterActivateHandler, clusterRefreshHandler } from "@common/cluster-ipc"; interface Props extends RouteComponentProps { } diff --git a/src/renderer/components/+cluster-settings/features.tsx b/src/renderer/components/+cluster-settings/features.tsx index d43ecd9568..5ce06b9a1f 100644 --- a/src/renderer/components/+cluster-settings/features.tsx +++ b/src/renderer/components/+cluster-settings/features.tsx @@ -1,8 +1,8 @@ import React from "react"; -import { Cluster } from "../../../main/cluster"; +import { Cluster } from "@main/cluster"; import { InstallFeature } from "./components/install-feature"; import { SubTitle } from "../layout/sub-title"; -import { clusterFeatureRegistry } from "../../../extensions/registries/cluster-feature-registry"; +import { clusterFeatureRegistry } from "@extensions/registries/cluster-feature-registry"; interface Props { cluster: Cluster; diff --git a/src/renderer/components/+cluster-settings/general.tsx b/src/renderer/components/+cluster-settings/general.tsx index 1d498bc94b..b95c270cf8 100644 --- a/src/renderer/components/+cluster-settings/general.tsx +++ b/src/renderer/components/+cluster-settings/general.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Cluster } from "../../../main/cluster"; +import { Cluster } from "@main/cluster"; import { ClusterNameSetting } from "./components/cluster-name-setting"; import { ClusterWorkspaceSetting } from "./components/cluster-workspace-setting"; import { ClusterIconSetting } from "./components/cluster-icon-setting"; @@ -25,4 +25,4 @@ export class General extends React.Component { ; } -} \ No newline at end of file +} diff --git a/src/renderer/components/+cluster-settings/removal.tsx b/src/renderer/components/+cluster-settings/removal.tsx index 7d97e9c515..8c5bfc0414 100644 --- a/src/renderer/components/+cluster-settings/removal.tsx +++ b/src/renderer/components/+cluster-settings/removal.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Cluster } from "../../../main/cluster"; +import { Cluster } from "@main/cluster"; import { RemoveClusterButton } from "./components/remove-cluster-button"; interface Props { @@ -17,4 +17,4 @@ export class Removal extends React.Component { ); } -} \ No newline at end of file +} diff --git a/src/renderer/components/+cluster-settings/status.tsx b/src/renderer/components/+cluster-settings/status.tsx index 7f21d19aba..407bc319b3 100644 --- a/src/renderer/components/+cluster-settings/status.tsx +++ b/src/renderer/components/+cluster-settings/status.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Cluster } from "../../../main/cluster"; +import { Cluster } from "@main/cluster"; import { SubTitle } from "../layout/sub-title"; import { Table, TableCell, TableRow } from "../table"; import { autobind } from "../../utils"; @@ -58,4 +58,4 @@ export class Status extends React.Component { ; } -} \ No newline at end of file +} diff --git a/src/renderer/components/+cluster/cluster-overview.tsx b/src/renderer/components/+cluster/cluster-overview.tsx index 104c6fd022..7b6b059598 100644 --- a/src/renderer/components/+cluster/cluster-overview.tsx +++ b/src/renderer/components/+cluster/cluster-overview.tsx @@ -7,8 +7,8 @@ import { disposeOnUnmount, observer } from "mobx-react"; import { eventStore } from "../+events/event.store"; import { nodesStore } from "../+nodes/nodes.store"; import { podsStore } from "../+workloads-pods/pods.store"; -import { getHostedCluster } from "../../../common/cluster-store"; -import { isAllowedResource } from "../../../common/rbac"; +import { getHostedCluster } from "@common/cluster-store"; +import { isAllowedResource } from "@common/rbac"; import { KubeObjectStore } from "../../kube-object.store"; import { interval } from "../../utils"; import { TabLayout } from "../layout/tab-layout"; diff --git a/src/renderer/components/+cluster/cluster.route.ts b/src/renderer/components/+cluster/cluster.route.ts index f9cf7a390c..2a837316db 100644 --- a/src/renderer/components/+cluster/cluster.route.ts +++ b/src/renderer/components/+cluster/cluster.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const clusterRoute: RouteProps = { path: "/cluster" diff --git a/src/renderer/components/+config-autoscalers/hpa.route.ts b/src/renderer/components/+config-autoscalers/hpa.route.ts index 404bab8f88..47d102349e 100644 --- a/src/renderer/components/+config-autoscalers/hpa.route.ts +++ b/src/renderer/components/+config-autoscalers/hpa.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const hpaRoute: RouteProps = { path: "/hpa" diff --git a/src/renderer/components/+config-limit-ranges/limit-ranges.route.ts b/src/renderer/components/+config-limit-ranges/limit-ranges.route.ts index 09e3052350..34bb826184 100644 --- a/src/renderer/components/+config-limit-ranges/limit-ranges.route.ts +++ b/src/renderer/components/+config-limit-ranges/limit-ranges.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const limitRangesRoute: RouteProps = { path: "/limitranges" 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 bd760efadd..db4cb52b5a 100644 --- a/src/renderer/components/+config-limit-ranges/limit-ranges.store.ts +++ b/src/renderer/components/+config-limit-ranges/limit-ranges.store.ts @@ -1,4 +1,4 @@ -import { autobind } from "../../../common/utils/autobind"; +import { autobind } from "@common/utils/autobind"; import { KubeObjectStore } from "../../kube-object.store"; import { apiManager } from "../../api/api-manager"; import { LimitRange, limitRangeApi } from "../../api/endpoints/limit-range.api"; diff --git a/src/renderer/components/+config-maps/config-maps.route.ts b/src/renderer/components/+config-maps/config-maps.route.ts index 1cffe95c34..dc26384cdc 100644 --- a/src/renderer/components/+config-maps/config-maps.route.ts +++ b/src/renderer/components/+config-maps/config-maps.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const configMapsRoute: RouteProps = { path: "/configmaps" diff --git a/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.route.ts b/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.route.ts index ea443a841b..8efc9a393b 100644 --- a/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.route.ts +++ b/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const pdbRoute: RouteProps = { path: "/poddisruptionbudgets" diff --git a/src/renderer/components/+config-resource-quotas/resource-quotas.route.ts b/src/renderer/components/+config-resource-quotas/resource-quotas.route.ts index f36468f656..34f8fb0cb3 100644 --- a/src/renderer/components/+config-resource-quotas/resource-quotas.route.ts +++ b/src/renderer/components/+config-resource-quotas/resource-quotas.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const resourceQuotaRoute: RouteProps = { path: "/resourcequotas" diff --git a/src/renderer/components/+config-secrets/secrets.route.ts b/src/renderer/components/+config-secrets/secrets.route.ts index a7eb422be5..e1958bf393 100644 --- a/src/renderer/components/+config-secrets/secrets.route.ts +++ b/src/renderer/components/+config-secrets/secrets.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const secretsRoute: RouteProps = { path: "/secrets" diff --git a/src/renderer/components/+config/config.route.ts b/src/renderer/components/+config/config.route.ts index 8ea637c505..c44ac46e74 100644 --- a/src/renderer/components/+config/config.route.ts +++ b/src/renderer/components/+config/config.route.ts @@ -1,6 +1,6 @@ import { RouteProps } from "react-router"; import { Config } from "./config"; -import { IURLParams } from "../../../common/utils/buildUrl"; +import { IURLParams } from "@common/utils/buildUrl"; import { configMapsURL } from "../+config-maps/config-maps.route"; export const configRoute: RouteProps = { diff --git a/src/renderer/components/+config/config.tsx b/src/renderer/components/+config/config.tsx index e3158459ba..fb4b95d30c 100644 --- a/src/renderer/components/+config/config.tsx +++ b/src/renderer/components/+config/config.tsx @@ -7,7 +7,7 @@ import { namespaceUrlParam } from "../+namespaces/namespace.store"; import { resourceQuotaRoute, ResourceQuotas, resourceQuotaURL } from "../+config-resource-quotas"; import { pdbRoute, pdbURL, PodDisruptionBudgets } from "../+config-pod-disruption-budgets"; import { HorizontalPodAutoscalers, hpaRoute, hpaURL } from "../+config-autoscalers"; -import { isAllowedResource } from "../../../common/rbac"; +import { isAllowedResource } from "@common/rbac"; import { LimitRanges, limitRangesRoute, limitRangeURL } from "../+config-limit-ranges"; @observer diff --git a/src/renderer/components/+custom-resources/crd.route.ts b/src/renderer/components/+custom-resources/crd.route.ts index 573f8e6446..56639b0983 100644 --- a/src/renderer/components/+custom-resources/crd.route.ts +++ b/src/renderer/components/+custom-resources/crd.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const crdRoute: RouteProps = { path: "/crd" diff --git a/src/renderer/components/+events/events.route.ts b/src/renderer/components/+events/events.route.ts index 6ae3a9a10b..b80e6eafd0 100644 --- a/src/renderer/components/+events/events.route.ts +++ b/src/renderer/components/+events/events.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const eventRoute: RouteProps = { path: "/events" diff --git a/src/renderer/components/+extensions/extensions.route.ts b/src/renderer/components/+extensions/extensions.route.ts index 04708ca5d4..d7b28dd616 100644 --- a/src/renderer/components/+extensions/extensions.route.ts +++ b/src/renderer/components/+extensions/extensions.route.ts @@ -1,5 +1,5 @@ import { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const extensionsRoute: RouteProps = { path: "/extensions" diff --git a/src/renderer/components/+extensions/extensions.tsx b/src/renderer/components/+extensions/extensions.tsx index f30168145a..2c871ae479 100644 --- a/src/renderer/components/+extensions/extensions.tsx +++ b/src/renderer/components/+extensions/extensions.tsx @@ -5,12 +5,12 @@ import { disposeOnUnmount, observer } from "mobx-react"; import os from "os"; import path from "path"; import React from "react"; -import { downloadFile, extractTar, listTarEntries, readFileFromTar } from "../../../common/utils"; -import { docsUrl } from "../../../common/vars"; -import { extensionDiscovery, InstalledExtension, manifestFilename } from "../../../extensions/extension-discovery"; -import { extensionLoader } from "../../../extensions/extension-loader"; -import { extensionDisplayName, LensExtensionManifest, sanitizeExtensionName } from "../../../extensions/lens-extension"; -import logger from "../../../main/logger"; +import { downloadFile, extractTar, listTarEntries, readFileFromTar } from "@common/utils"; +import { docsUrl } from "@common/vars"; +import { extensionDiscovery, InstalledExtension, manifestFilename } from "@extensions/extension-discovery"; +import { extensionLoader } from "@extensions/extension-loader"; +import { extensionDisplayName, LensExtensionManifest, sanitizeExtensionName } from "@extensions/lens-extension"; +import logger from "@main/logger"; import { prevDefault } from "../../utils"; import { Button } from "../button"; import { ConfirmDialog } from "../confirm-dialog"; diff --git a/src/renderer/components/+landing-page/landing-page.route.ts b/src/renderer/components/+landing-page/landing-page.route.ts index 5fa9f2321e..28edcac3c6 100644 --- a/src/renderer/components/+landing-page/landing-page.route.ts +++ b/src/renderer/components/+landing-page/landing-page.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const landingRoute: RouteProps = { path: "/landing" diff --git a/src/renderer/components/+landing-page/landing-page.tsx b/src/renderer/components/+landing-page/landing-page.tsx index ea0b24bb87..95fa2022e9 100644 --- a/src/renderer/components/+landing-page/landing-page.tsx +++ b/src/renderer/components/+landing-page/landing-page.tsx @@ -2,8 +2,8 @@ import "./landing-page.scss"; import React from "react"; import { observable } from "mobx"; import { observer } from "mobx-react"; -import { clusterStore } from "../../../common/cluster-store"; -import { workspaceStore } from "../../../common/workspace-store"; +import { clusterStore } from "@common/cluster-store"; +import { workspaceStore } from "@common/workspace-store"; @observer export class LandingPage extends React.Component { diff --git a/src/renderer/components/+namespaces/namespace.store.ts b/src/renderer/components/+namespaces/namespace.store.ts index ad02dd137c..a6dd96243d 100644 --- a/src/renderer/components/+namespaces/namespace.store.ts +++ b/src/renderer/components/+namespaces/namespace.store.ts @@ -4,8 +4,8 @@ import { KubeObjectStore } from "../../kube-object.store"; import { Namespace, namespacesApi } from "../../api/endpoints"; import { createPageParam } from "../../navigation"; import { apiManager } from "../../api/api-manager"; -import { isAllowedResource } from "../../../common/rbac"; -import { getHostedCluster } from "../../../common/cluster-store"; +import { isAllowedResource } from "@common/rbac"; +import { getHostedCluster } from "@common/cluster-store"; const storage = createStorage("context_namespaces", []); diff --git a/src/renderer/components/+namespaces/namespaces.route.ts b/src/renderer/components/+namespaces/namespaces.route.ts index 38c2d575d9..c4bc8428b5 100644 --- a/src/renderer/components/+namespaces/namespaces.route.ts +++ b/src/renderer/components/+namespaces/namespaces.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const namespacesRoute: RouteProps = { path: "/namespaces" diff --git a/src/renderer/components/+network-endpoints/endpoints.route.ts b/src/renderer/components/+network-endpoints/endpoints.route.ts index f350b7868e..8f41c7dae7 100644 --- a/src/renderer/components/+network-endpoints/endpoints.route.ts +++ b/src/renderer/components/+network-endpoints/endpoints.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const endpointRoute: RouteProps = { path: "/endpoints" diff --git a/src/renderer/components/+network-ingresses/ingresses.route.ts b/src/renderer/components/+network-ingresses/ingresses.route.ts index 827707bcef..cb2be7db4d 100644 --- a/src/renderer/components/+network-ingresses/ingresses.route.ts +++ b/src/renderer/components/+network-ingresses/ingresses.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const ingressRoute: RouteProps = { path: "/ingresses" diff --git a/src/renderer/components/+network-policies/network-policies.route.ts b/src/renderer/components/+network-policies/network-policies.route.ts index 16b507cd55..06db919eba 100644 --- a/src/renderer/components/+network-policies/network-policies.route.ts +++ b/src/renderer/components/+network-policies/network-policies.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const networkPoliciesRoute: RouteProps = { path: "/network-policies" diff --git a/src/renderer/components/+network-services/services.route.ts b/src/renderer/components/+network-services/services.route.ts index b23087829d..2a9a79dac8 100644 --- a/src/renderer/components/+network-services/services.route.ts +++ b/src/renderer/components/+network-services/services.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const servicesRoute: RouteProps = { path: "/services" diff --git a/src/renderer/components/+network/network.route.ts b/src/renderer/components/+network/network.route.ts index de36bfc77a..0182c2fe59 100644 --- a/src/renderer/components/+network/network.route.ts +++ b/src/renderer/components/+network/network.route.ts @@ -1,7 +1,7 @@ import { RouteProps } from "react-router"; import { Network } from "./network"; import { servicesURL } from "../+network-services"; -import { IURLParams } from "../../../common/utils/buildUrl"; +import { IURLParams } from "@common/utils/buildUrl"; export const networkRoute: RouteProps = { get path() { diff --git a/src/renderer/components/+network/network.tsx b/src/renderer/components/+network/network.tsx index 638e2b3f11..2474850fd4 100644 --- a/src/renderer/components/+network/network.tsx +++ b/src/renderer/components/+network/network.tsx @@ -8,7 +8,7 @@ import { endpointRoute, Endpoints, endpointURL } from "../+network-endpoints"; import { Ingresses, ingressRoute, ingressURL } from "../+network-ingresses"; import { NetworkPolicies, networkPoliciesRoute, networkPoliciesURL } from "../+network-policies"; import { namespaceUrlParam } from "../+namespaces/namespace.store"; -import { isAllowedResource } from "../../../common/rbac"; +import { isAllowedResource } from "@common/rbac"; @observer export class Network extends React.Component { diff --git a/src/renderer/components/+nodes/nodes.route.ts b/src/renderer/components/+nodes/nodes.route.ts index 972bdababe..a79276e48d 100644 --- a/src/renderer/components/+nodes/nodes.route.ts +++ b/src/renderer/components/+nodes/nodes.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const nodesRoute: RouteProps = { path: "/nodes" diff --git a/src/renderer/components/+pod-security-policies/pod-security-policies.route.ts b/src/renderer/components/+pod-security-policies/pod-security-policies.route.ts index 8bee44985e..6f09430d69 100644 --- a/src/renderer/components/+pod-security-policies/pod-security-policies.route.ts +++ b/src/renderer/components/+pod-security-policies/pod-security-policies.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const podSecurityPoliciesRoute: RouteProps = { path: "/pod-security-policies" diff --git a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx b/src/renderer/components/+preferences/add-helm-repo-dialog.tsx index f2c8388247..fcd6f2cf95 100644 --- a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx +++ b/src/renderer/components/+preferences/add-helm-repo-dialog.tsx @@ -13,7 +13,7 @@ import { systemName, isUrl, isPath } from "../input/input_validators"; import { SubTitle } from "../layout/sub-title"; import { Icon } from "../icon"; import { Notifications } from "../notifications"; -import { HelmRepo, repoManager } from "../../../main/helm/helm-repo-manager"; +import { HelmRepo, repoManager } from "@main/helm/helm-repo-manager"; interface Props extends Partial { onAddRepo: Function diff --git a/src/renderer/components/+preferences/kubectl-binaries.tsx b/src/renderer/components/+preferences/kubectl-binaries.tsx index aebe2e7063..44843382e9 100644 --- a/src/renderer/components/+preferences/kubectl-binaries.tsx +++ b/src/renderer/components/+preferences/kubectl-binaries.tsx @@ -2,9 +2,9 @@ import React, { useState } from "react"; import { Checkbox } from "../checkbox"; import { Input, InputValidators } from "../input"; import { SubTitle } from "../layout/sub-title"; -import { UserPreferences, userStore } from "../../../common/user-store"; +import { UserPreferences, userStore } from "@common/user-store"; import { observer } from "mobx-react"; -import { bundledKubectlPath } from "../../../main/kubectl"; +import { bundledKubectlPath } from "@main/kubectl"; import { SelectOption, Select } from "../select"; export const KubectlBinaries = observer(({ preferences }: { preferences: UserPreferences }) => { diff --git a/src/renderer/components/+preferences/preferences.route.ts b/src/renderer/components/+preferences/preferences.route.ts index 7c880bd5fc..6d118fa257 100644 --- a/src/renderer/components/+preferences/preferences.route.ts +++ b/src/renderer/components/+preferences/preferences.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const preferencesRoute: RouteProps = { path: "/preferences" diff --git a/src/renderer/components/+preferences/preferences.tsx b/src/renderer/components/+preferences/preferences.tsx index 56e881d9f5..e21e872385 100644 --- a/src/renderer/components/+preferences/preferences.tsx +++ b/src/renderer/components/+preferences/preferences.tsx @@ -5,8 +5,8 @@ import { observer } from "mobx-react"; import { action, computed, observable } from "mobx"; import { Icon } from "../icon"; import { Select, SelectOption } from "../select"; -import { userStore } from "../../../common/user-store"; -import { HelmRepo, repoManager } from "../../../main/helm/helm-repo-manager"; +import { userStore } from "@common/user-store"; +import { HelmRepo, repoManager } from "@main/helm/helm-repo-manager"; import { Input } from "../input"; import { Checkbox } from "../checkbox"; import { Notifications } from "../notifications"; @@ -15,7 +15,7 @@ import { Button } from "../button"; import { themeStore } from "../../theme.store"; import { Tooltip } from "../tooltip"; import { KubectlBinaries } from "./kubectl-binaries"; -import { appPreferenceRegistry } from "../../../extensions/registries/app-preference-registry"; +import { appPreferenceRegistry } from "@extensions/registries/app-preference-registry"; import { PageLayout } from "../layout/page-layout"; import { AddHelmRepoDialog } from "./add-helm-repo-dialog"; diff --git a/src/renderer/components/+storage-classes/storage-classes.route.ts b/src/renderer/components/+storage-classes/storage-classes.route.ts index c75d7dd0b8..ccf6ea6638 100644 --- a/src/renderer/components/+storage-classes/storage-classes.route.ts +++ b/src/renderer/components/+storage-classes/storage-classes.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const storageClassesRoute: RouteProps = { path: "/storage-classes" diff --git a/src/renderer/components/+storage-volume-claims/volume-claims.route.ts b/src/renderer/components/+storage-volume-claims/volume-claims.route.ts index 0e49681bc3..447ab54d9c 100644 --- a/src/renderer/components/+storage-volume-claims/volume-claims.route.ts +++ b/src/renderer/components/+storage-volume-claims/volume-claims.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const volumeClaimsRoute: RouteProps = { path: "/persistent-volume-claims" diff --git a/src/renderer/components/+storage-volumes/volumes.route.ts b/src/renderer/components/+storage-volumes/volumes.route.ts index 596f51f23e..27c5456766 100644 --- a/src/renderer/components/+storage-volumes/volumes.route.ts +++ b/src/renderer/components/+storage-volumes/volumes.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const volumesRoute: RouteProps = { path: "/persistent-volumes" diff --git a/src/renderer/components/+storage/storage.route.ts b/src/renderer/components/+storage/storage.route.ts index 6ad17a4fdf..bd74bb0b92 100644 --- a/src/renderer/components/+storage/storage.route.ts +++ b/src/renderer/components/+storage/storage.route.ts @@ -1,7 +1,7 @@ import { RouteProps } from "react-router"; import { volumeClaimsURL } from "../+storage-volume-claims"; import { Storage } from "./storage"; -import { IURLParams } from "../../../common/utils/buildUrl"; +import { IURLParams } from "@common/utils/buildUrl"; export const storageRoute: RouteProps = { get path() { diff --git a/src/renderer/components/+storage/storage.tsx b/src/renderer/components/+storage/storage.tsx index 83f0bf255a..91d325e275 100644 --- a/src/renderer/components/+storage/storage.tsx +++ b/src/renderer/components/+storage/storage.tsx @@ -7,7 +7,7 @@ import { PersistentVolumes, volumesRoute, volumesURL } from "../+storage-volumes import { StorageClasses, storageClassesRoute, storageClassesURL } from "../+storage-classes"; import { PersistentVolumeClaims, volumeClaimsRoute, volumeClaimsURL } from "../+storage-volume-claims"; import { namespaceUrlParam } from "../+namespaces/namespace.store"; -import { isAllowedResource } from "../../../common/rbac"; +import { isAllowedResource } from "@common/rbac"; @observer export class Storage extends React.Component { diff --git a/src/renderer/components/+user-management-service-accounts/service-accounts.tsx b/src/renderer/components/+user-management-service-accounts/service-accounts.tsx index 37bed40ba9..baf022c5a8 100644 --- a/src/renderer/components/+user-management-service-accounts/service-accounts.tsx +++ b/src/renderer/components/+user-management-service-accounts/service-accounts.tsx @@ -12,7 +12,7 @@ import { KubeObjectListLayout } from "../kube-object"; import { IServiceAccountsRouteParams } from "../+user-management"; import { serviceAccountsStore } from "./service-accounts.store"; import { CreateServiceAccountDialog } from "./create-service-account-dialog"; -import { kubeObjectMenuRegistry } from "../../../extensions/registries/kube-object-menu-registry"; +import { kubeObjectMenuRegistry } from "@extensions/registries/kube-object-menu-registry"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; enum sortBy { diff --git a/src/renderer/components/+user-management/user-management.route.ts b/src/renderer/components/+user-management/user-management.route.ts index 9dc17cbbd8..0ff567c02c 100644 --- a/src/renderer/components/+user-management/user-management.route.ts +++ b/src/renderer/components/+user-management/user-management.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL, IURLParams } from "../../../common/utils/buildUrl"; +import { buildURL, IURLParams } from "@common/utils/buildUrl"; import { UserManagement } from "./user-management"; export const usersManagementRoute: RouteProps = { diff --git a/src/renderer/components/+user-management/user-management.tsx b/src/renderer/components/+user-management/user-management.tsx index e851d50424..695320c5cc 100644 --- a/src/renderer/components/+user-management/user-management.tsx +++ b/src/renderer/components/+user-management/user-management.tsx @@ -8,7 +8,7 @@ import { ServiceAccounts } from "../+user-management-service-accounts"; import { roleBindingsRoute, roleBindingsURL, rolesRoute, rolesURL, serviceAccountsRoute, serviceAccountsURL } from "./user-management.route"; import { namespaceUrlParam } from "../+namespaces/namespace.store"; import { PodSecurityPolicies, podSecurityPoliciesRoute, podSecurityPoliciesURL } from "../+pod-security-policies"; -import { isAllowedResource } from "../../../common/rbac"; +import { isAllowedResource } from "@common/rbac"; @observer export class UserManagement extends React.Component { diff --git a/src/renderer/components/+whats-new/whats-new.route.ts b/src/renderer/components/+whats-new/whats-new.route.ts index e73fd20fca..77de19e81e 100644 --- a/src/renderer/components/+whats-new/whats-new.route.ts +++ b/src/renderer/components/+whats-new/whats-new.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const whatsNewRoute: RouteProps = { path: "/what-s-new" diff --git a/src/renderer/components/+whats-new/whats-new.tsx b/src/renderer/components/+whats-new/whats-new.tsx index aa132cc178..2c3519cd4c 100644 --- a/src/renderer/components/+whats-new/whats-new.tsx +++ b/src/renderer/components/+whats-new/whats-new.tsx @@ -3,7 +3,7 @@ import fs from "fs"; import path from "path"; import React from "react"; import { observer } from "mobx-react"; -import { userStore } from "../../../common/user-store"; +import { userStore } from "@common/user-store"; import { navigate } from "../../navigation"; import { Button } from "../button"; import marked from "marked"; diff --git a/src/renderer/components/+workloads-cronjobs/cronjobs.tsx b/src/renderer/components/+workloads-cronjobs/cronjobs.tsx index 19d35e4b3a..3320f2cf90 100644 --- a/src/renderer/components/+workloads-cronjobs/cronjobs.tsx +++ b/src/renderer/components/+workloads-cronjobs/cronjobs.tsx @@ -13,7 +13,7 @@ import { KubeObjectMenuProps } from "../kube-object/kube-object-menu"; import { ICronJobsRouteParams } from "../+workloads"; import { KubeObjectListLayout } from "../kube-object"; import { CronJobTriggerDialog } from "./cronjob-trigger-dialog"; -import { kubeObjectMenuRegistry } from "../../../extensions/registries/kube-object-menu-registry"; +import { kubeObjectMenuRegistry } from "@extensions/registries/kube-object-menu-registry"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { ConfirmDialog } from "../confirm-dialog/confirm-dialog"; import { Notifications } from "../notifications/notifications"; diff --git a/src/renderer/components/+workloads-deployments/deployments.tsx b/src/renderer/components/+workloads-deployments/deployments.tsx index b84cd7b340..1244c931dc 100644 --- a/src/renderer/components/+workloads-deployments/deployments.tsx +++ b/src/renderer/components/+workloads-deployments/deployments.tsx @@ -19,7 +19,7 @@ import { IDeploymentsRouteParams } from "../+workloads"; import { cssNames } from "../../utils"; import kebabCase from "lodash/kebabCase"; import orderBy from "lodash/orderBy"; -import { kubeObjectMenuRegistry } from "../../../extensions/registries/kube-object-menu-registry"; +import { kubeObjectMenuRegistry } from "@extensions/registries/kube-object-menu-registry"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { Notifications } from "../notifications"; diff --git a/src/renderer/components/+workloads-overview/overview-statuses.tsx b/src/renderer/components/+workloads-overview/overview-statuses.tsx index 78adecb6df..e7983a0e2c 100644 --- a/src/renderer/components/+workloads-overview/overview-statuses.tsx +++ b/src/renderer/components/+workloads-overview/overview-statuses.tsx @@ -8,7 +8,7 @@ import { workloadURL, workloadStores } from "../+workloads"; import { namespaceStore } from "../+namespaces/namespace.store"; import { PageFiltersList } from "../item-object-list/page-filters-list"; import { NamespaceSelectFilter } from "../+namespaces/namespace-select"; -import { isAllowedResource, KubeResource } from "../../../common/rbac"; +import { isAllowedResource, KubeResource } from "@common/rbac"; import { ResourceNames } from "../../../renderer/utils/rbac"; import { autobind } from "../../utils"; diff --git a/src/renderer/components/+workloads-overview/overview.tsx b/src/renderer/components/+workloads-overview/overview.tsx index 318ad53f77..f52892b65d 100644 --- a/src/renderer/components/+workloads-overview/overview.tsx +++ b/src/renderer/components/+workloads-overview/overview.tsx @@ -16,7 +16,7 @@ import { jobStore } from "../+workloads-jobs/job.store"; import { cronJobStore } from "../+workloads-cronjobs/cronjob.store"; import { Events } from "../+events"; import { KubeObjectStore } from "../../kube-object.store"; -import { isAllowedResource } from "../../../common/rbac"; +import { isAllowedResource } from "@common/rbac"; interface Props extends RouteComponentProps { } diff --git a/src/renderer/components/+workloads-replicasets/replicasets.tsx b/src/renderer/components/+workloads-replicasets/replicasets.tsx index 55f607e3c3..52a1e21b4b 100644 --- a/src/renderer/components/+workloads-replicasets/replicasets.tsx +++ b/src/renderer/components/+workloads-replicasets/replicasets.tsx @@ -11,7 +11,7 @@ import { IReplicaSetsRouteParams } from "../+workloads/workloads.route"; import { KubeObjectListLayout } from "../kube-object/kube-object-list-layout"; import { MenuItem } from "../menu/menu"; import { Icon } from "../icon/icon"; -import { kubeObjectMenuRegistry } from "../../../extensions/registries/kube-object-menu-registry"; +import { kubeObjectMenuRegistry } from "@extensions/registries/kube-object-menu-registry"; import { ReplicaSetScaleDialog } from "./replicaset-scale-dialog"; enum sortBy { diff --git a/src/renderer/components/+workloads-statefulsets/statefulsets.tsx b/src/renderer/components/+workloads-statefulsets/statefulsets.tsx index 9e6011e156..84fb41385c 100644 --- a/src/renderer/components/+workloads-statefulsets/statefulsets.tsx +++ b/src/renderer/components/+workloads-statefulsets/statefulsets.tsx @@ -15,7 +15,7 @@ import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { StatefulSetScaleDialog } from "./statefulset-scale-dialog"; import { MenuItem } from "../menu/menu"; import { Icon } from "../icon/icon"; -import { kubeObjectMenuRegistry } from "../../../extensions/registries/kube-object-menu-registry"; +import { kubeObjectMenuRegistry } from "@extensions/registries/kube-object-menu-registry"; enum sortBy { name = "name", diff --git a/src/renderer/components/+workloads/workloads.route.ts b/src/renderer/components/+workloads/workloads.route.ts index 44c43c5ef9..3a3471d972 100644 --- a/src/renderer/components/+workloads/workloads.route.ts +++ b/src/renderer/components/+workloads/workloads.route.ts @@ -1,6 +1,6 @@ import type { RouteProps } from "react-router"; -import { buildURL, IURLParams } from "../../../common/utils/buildUrl"; -import { KubeResource } from "../../../common/rbac"; +import { buildURL, IURLParams } from "@common/utils/buildUrl"; +import { KubeResource } from "@common/rbac"; import { Workloads } from "./workloads"; export const workloadsRoute: RouteProps = { diff --git a/src/renderer/components/+workloads/workloads.stores.ts b/src/renderer/components/+workloads/workloads.stores.ts index 79828c5fd0..babb69757f 100644 --- a/src/renderer/components/+workloads/workloads.stores.ts +++ b/src/renderer/components/+workloads/workloads.stores.ts @@ -5,7 +5,7 @@ import { daemonSetStore } from "../+workloads-daemonsets/daemonsets.store"; import { statefulSetStore } from "../+workloads-statefulsets/statefulset.store"; import { jobStore } from "../+workloads-jobs/job.store"; import { cronJobStore } from "../+workloads-cronjobs/cronjob.store"; -import { KubeResource } from "../../../common/rbac"; +import { KubeResource } from "@common/rbac"; import { replicaSetStore } from "../+workloads-replicasets/replicasets.store"; export const workloadStores: Partial> = { diff --git a/src/renderer/components/+workloads/workloads.tsx b/src/renderer/components/+workloads/workloads.tsx index ac896ff281..e8ea5da85f 100644 --- a/src/renderer/components/+workloads/workloads.tsx +++ b/src/renderer/components/+workloads/workloads.tsx @@ -12,7 +12,7 @@ import { DaemonSets } from "../+workloads-daemonsets"; import { StatefulSets } from "../+workloads-statefulsets"; import { Jobs } from "../+workloads-jobs"; import { CronJobs } from "../+workloads-cronjobs"; -import { isAllowedResource } from "../../../common/rbac"; +import { isAllowedResource } from "@common/rbac"; import { ReplicaSets } from "../+workloads-replicasets"; @observer diff --git a/src/renderer/components/+workspaces/workspace-menu.tsx b/src/renderer/components/+workspaces/workspace-menu.tsx index 30a68cc081..f44118c7d5 100644 --- a/src/renderer/components/+workspaces/workspace-menu.tsx +++ b/src/renderer/components/+workspaces/workspace-menu.tsx @@ -6,7 +6,7 @@ import { workspacesURL } from "./workspaces.route"; import { Menu, MenuItem, MenuProps } from "../menu"; import { Icon } from "../icon"; import { observable } from "mobx"; -import { WorkspaceId, workspaceStore } from "../../../common/workspace-store"; +import { WorkspaceId, workspaceStore } from "@common/workspace-store"; import { cssNames } from "../../utils"; import { navigate } from "../../navigation"; import { clusterViewURL } from "../cluster-manager/cluster-view.route"; diff --git a/src/renderer/components/+workspaces/workspaces.route.ts b/src/renderer/components/+workspaces/workspaces.route.ts index 2429c5315e..8cab4c8615 100644 --- a/src/renderer/components/+workspaces/workspaces.route.ts +++ b/src/renderer/components/+workspaces/workspaces.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export const workspacesRoute: RouteProps = { path: "/workspaces" diff --git a/src/renderer/components/+workspaces/workspaces.tsx b/src/renderer/components/+workspaces/workspaces.tsx index 932306adab..0a97579ce0 100644 --- a/src/renderer/components/+workspaces/workspaces.tsx +++ b/src/renderer/components/+workspaces/workspaces.tsx @@ -3,7 +3,7 @@ import React, { Fragment } from "react"; import { observer } from "mobx-react"; import { computed, observable, toJS } from "mobx"; import { WizardLayout } from "../layout/wizard-layout"; -import { Workspace, WorkspaceId, workspaceStore } from "../../../common/workspace-store"; +import { Workspace, WorkspaceId, workspaceStore } from "@common/workspace-store"; import { v4 as uuid } from "uuid"; import { ConfirmDialog } from "../confirm-dialog"; import { Icon } from "../icon"; @@ -11,7 +11,7 @@ import { Input } from "../input"; import { cssNames, prevDefault } from "../../utils"; import { Button } from "../button"; import { isRequired, InputValidator } from "../input/input_validators"; -import { clusterStore } from "../../../common/cluster-store"; +import { clusterStore } from "@common/cluster-store"; @observer export class Workspaces extends React.Component { diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx index 495182b2a9..c714eb57aa 100755 --- a/src/renderer/components/app.tsx +++ b/src/renderer/components/app.tsx @@ -25,20 +25,20 @@ import { DeploymentScaleDialog } from "./+workloads-deployments/deployment-scale import { CronJobTriggerDialog } from "./+workloads-cronjobs/cronjob-trigger-dialog"; import { CustomResources } from "./+custom-resources/custom-resources"; import { crdRoute } from "./+custom-resources"; -import { isAllowedResource } from "../../common/rbac"; +import { isAllowedResource } from "@common/rbac"; import { MainLayout } from "./layout/main-layout"; import { ErrorBoundary } from "./error-boundary"; import { Terminal } from "./dock/terminal"; -import { getHostedCluster, getHostedClusterId } from "../../common/cluster-store"; -import logger from "../../main/logger"; +import { getHostedCluster, getHostedClusterId } from "@common/cluster-store"; +import logger from "@main/logger"; import { webFrame } from "electron"; -import { clusterPageRegistry, getExtensionPageUrl } from "../../extensions/registries/page-registry"; -import { extensionLoader } from "../../extensions/extension-loader"; -import { appEventBus } from "../../common/event-bus"; -import { broadcastMessage, requestMain } from "../../common/ipc"; +import { clusterPageRegistry, getExtensionPageUrl } from "@extensions/registries/page-registry"; +import { extensionLoader } from "@extensions/extension-loader"; +import { appEventBus } from "@common/event-bus"; +import { broadcastMessage, requestMain } from "@common/ipc"; import whatInput from "what-input"; -import { clusterSetFrameIdHandler } from "../../common/cluster-ipc"; -import { ClusterPageMenuRegistration, clusterPageMenuRegistry } from "../../extensions/registries"; +import { clusterSetFrameIdHandler } from "@common/cluster-ipc"; +import { ClusterPageMenuRegistration, clusterPageMenuRegistry } from "@extensions/registries"; import { TabLayout, TabLayoutRoute } from "./layout/tab-layout"; import { StatefulSetScaleDialog } from "./+workloads-statefulsets/statefulset-scale-dialog"; import { eventStore } from "./+events/event.store"; diff --git a/src/renderer/components/clipboard/clipboard.tsx b/src/renderer/components/clipboard/clipboard.tsx index f387b487d6..e2a5067a61 100644 --- a/src/renderer/components/clipboard/clipboard.tsx +++ b/src/renderer/components/clipboard/clipboard.tsx @@ -1,10 +1,10 @@ import "./clipboard.scss"; import React from "react"; import { findDOMNode } from "react-dom"; -import { autobind } from "../../../common/utils"; +import { autobind } from "@common/utils"; import { Notifications } from "../notifications"; import { copyToClipboard } from "../../utils/copyToClipboard"; -import logger from "../../../main/logger"; +import logger from "@main/logger"; import { cssNames } from "../../utils"; export interface CopyToClipboardProps { diff --git a/src/renderer/components/cluster-icon/cluster-icon.tsx b/src/renderer/components/cluster-icon/cluster-icon.tsx index c1b0ef3577..4bb1b3becd 100644 --- a/src/renderer/components/cluster-icon/cluster-icon.tsx +++ b/src/renderer/components/cluster-icon/cluster-icon.tsx @@ -4,11 +4,11 @@ import React, { DOMAttributes } from "react"; import { disposeOnUnmount, observer } from "mobx-react"; import { Params as HashiconParams } from "@emeraldpay/hashicon"; import { Hashicon } from "@emeraldpay/hashicon-react"; -import { Cluster } from "../../../main/cluster"; +import { Cluster } from "@main/cluster"; import { cssNames, IClassName } from "../../utils"; import { Badge } from "../badge"; import { Tooltip } from "../tooltip"; -import { subscribeToBroadcast } from "../../../common/ipc"; +import { subscribeToBroadcast } from "@common/ipc"; import { observable } from "mobx"; interface Props extends DOMAttributes { diff --git a/src/renderer/components/cluster-manager/bottom-bar.test.tsx b/src/renderer/components/cluster-manager/bottom-bar.test.tsx index 6578f4ac20..b66c449e3c 100644 --- a/src/renderer/components/cluster-manager/bottom-bar.test.tsx +++ b/src/renderer/components/cluster-manager/bottom-bar.test.tsx @@ -3,8 +3,8 @@ import { render } from "@testing-library/react"; import "@testing-library/jest-dom/extend-expect"; import { BottomBar } from "./bottom-bar"; -jest.mock("../../../extensions/registries"); -import { statusBarRegistry } from "../../../extensions/registries"; +jest.mock("@extensions/registries"); +import { statusBarRegistry } from "@extensions/registries"; describe("", () => { diff --git a/src/renderer/components/cluster-manager/bottom-bar.tsx b/src/renderer/components/cluster-manager/bottom-bar.tsx index 489d90769f..40dd6b9d25 100644 --- a/src/renderer/components/cluster-manager/bottom-bar.tsx +++ b/src/renderer/components/cluster-manager/bottom-bar.tsx @@ -4,8 +4,8 @@ import React from "react"; import { observer } from "mobx-react"; import { Icon } from "../icon"; import { WorkspaceMenu } from "../+workspaces/workspace-menu"; -import { workspaceStore } from "../../../common/workspace-store"; -import { statusBarRegistry } from "../../../extensions/registries"; +import { workspaceStore } from "@common/workspace-store"; +import { statusBarRegistry } from "@extensions/registries"; @observer export class BottomBar extends React.Component { diff --git a/src/renderer/components/cluster-manager/cluster-manager.tsx b/src/renderer/components/cluster-manager/cluster-manager.tsx index 68a358766c..89f4870e8b 100644 --- a/src/renderer/components/cluster-manager/cluster-manager.tsx +++ b/src/renderer/components/cluster-manager/cluster-manager.tsx @@ -13,9 +13,9 @@ import { AddCluster, addClusterRoute } from "../+add-cluster"; import { ClusterView } from "./cluster-view"; import { ClusterSettings, clusterSettingsRoute } from "../+cluster-settings"; import { clusterViewRoute, clusterViewURL } from "./cluster-view.route"; -import { clusterStore } from "../../../common/cluster-store"; +import { clusterStore } from "@common/cluster-store"; import { hasLoadedView, initView, lensViews, refreshViews } from "./lens-views"; -import { globalPageRegistry } from "../../../extensions/registries/page-registry"; +import { globalPageRegistry } from "@extensions/registries/page-registry"; import { Extensions, extensionsRoute } from "../+extensions"; import { getMatchedClusterId } from "../../navigation"; diff --git a/src/renderer/components/cluster-manager/cluster-status.tsx b/src/renderer/components/cluster-manager/cluster-status.tsx index 3e17eb3e4c..201d79f4f8 100644 --- a/src/renderer/components/cluster-manager/cluster-status.tsx +++ b/src/renderer/components/cluster-manager/cluster-status.tsx @@ -1,18 +1,18 @@ -import type { KubeAuthProxyLog } from "../../../main/kube-auth-proxy"; +import type { KubeAuthProxyLog } from "@main/kube-auth-proxy"; import "./cluster-status.scss"; import React from "react"; import { observer } from "mobx-react"; import { ipcRenderer } from "electron"; import { computed, observable } from "mobx"; -import { requestMain, subscribeToBroadcast } from "../../../common/ipc"; +import { requestMain, subscribeToBroadcast } from "@common/ipc"; import { Icon } from "../icon"; import { Button } from "../button"; import { cssNames, IClassName } from "../../utils"; -import { Cluster } from "../../../main/cluster"; -import { ClusterId, clusterStore } from "../../../common/cluster-store"; +import { Cluster } from "@main/cluster"; +import { ClusterId, clusterStore } from "@common/cluster-store"; import { CubeSpinner } from "../spinner"; -import { clusterActivateHandler } from "../../../common/cluster-ipc"; +import { clusterActivateHandler } from "@common/cluster-ipc"; interface Props { className?: IClassName; diff --git a/src/renderer/components/cluster-manager/cluster-view.route.ts b/src/renderer/components/cluster-manager/cluster-view.route.ts index f31077a571..bc0caa5fb2 100644 --- a/src/renderer/components/cluster-manager/cluster-view.route.ts +++ b/src/renderer/components/cluster-manager/cluster-view.route.ts @@ -1,5 +1,5 @@ import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; +import { buildURL } from "@common/utils/buildUrl"; export interface IClusterViewRouteParams { clusterId: string; diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx index ddedf145e7..4b21c60e1a 100644 --- a/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/src/renderer/components/cluster-manager/cluster-view.tsx @@ -6,8 +6,8 @@ import { RouteComponentProps } from "react-router"; import { IClusterViewRouteParams } from "./cluster-view.route"; import { ClusterStatus } from "./cluster-status"; import { hasLoadedView } from "./lens-views"; -import { Cluster } from "../../../main/cluster"; -import { clusterStore } from "../../../common/cluster-store"; +import { Cluster } from "@main/cluster"; +import { clusterStore } from "@common/cluster-store"; interface Props extends RouteComponentProps { } diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx index 1e79b64f85..ff65583e9e 100644 --- a/src/renderer/components/cluster-manager/clusters-menu.tsx +++ b/src/renderer/components/cluster-manager/clusters-menu.tsx @@ -2,13 +2,13 @@ import "./clusters-menu.scss"; import React from "react"; import { remote } from "electron"; -import { requestMain } from "../../../common/ipc"; -import type { Cluster } from "../../../main/cluster"; +import { requestMain } from "@common/ipc"; +import type { Cluster } from "@main/cluster"; import { DragDropContext, Draggable, DraggableProvided, Droppable, DroppableProvided, DropResult } from "react-beautiful-dnd"; import { observer } from "mobx-react"; -import { userStore } from "../../../common/user-store"; -import { ClusterId, clusterStore } from "../../../common/cluster-store"; -import { workspaceStore } from "../../../common/workspace-store"; +import { userStore } from "@common/user-store"; +import { ClusterId, clusterStore } from "@common/cluster-store"; +import { workspaceStore } from "@common/workspace-store"; import { ClusterIcon } from "../cluster-icon"; import { Icon } from "../icon"; import { autobind, cssNames, IClassName } from "../../utils"; @@ -20,8 +20,8 @@ import { landingURL } from "../+landing-page"; import { Tooltip } from "../tooltip"; import { ConfirmDialog } from "../confirm-dialog"; import { clusterViewURL } from "./cluster-view.route"; -import { getExtensionPageUrl, globalPageMenuRegistry, globalPageRegistry } from "../../../extensions/registries"; -import { clusterDisconnectHandler } from "../../../common/cluster-ipc"; +import { getExtensionPageUrl, globalPageMenuRegistry, globalPageRegistry } from "@extensions/registries"; +import { clusterDisconnectHandler } from "@common/cluster-ipc"; interface Props { className?: IClassName; diff --git a/src/renderer/components/cluster-manager/lens-views.ts b/src/renderer/components/cluster-manager/lens-views.ts index 17e6c9f00d..1c13d95c23 100644 --- a/src/renderer/components/cluster-manager/lens-views.ts +++ b/src/renderer/components/cluster-manager/lens-views.ts @@ -1,7 +1,7 @@ import { observable, when } from "mobx"; -import { ClusterId, clusterStore, getClusterFrameUrl } from "../../../common/cluster-store"; +import { ClusterId, clusterStore, getClusterFrameUrl } from "@common/cluster-store"; import { getMatchedClusterId } from "../../navigation"; -import logger from "../../../main/logger"; +import logger from "@main/logger"; export interface LensView { isLoaded?: boolean diff --git a/src/renderer/components/dock/log-list.tsx b/src/renderer/components/dock/log-list.tsx index 74d64d2f58..279ff4a02d 100644 --- a/src/renderer/components/dock/log-list.tsx +++ b/src/renderer/components/dock/log-list.tsx @@ -8,7 +8,7 @@ import { action, computed, observable } from "mobx"; import { observer } from "mobx-react"; import { Align, ListOnScrollProps } from "react-window"; -import { searchStore } from "../../../common/search-store"; +import { searchStore } from "@common/search-store"; import { cssNames } from "../../utils"; import { Button } from "../button"; import { Icon } from "../icon"; diff --git a/src/renderer/components/dock/log-search.tsx b/src/renderer/components/dock/log-search.tsx index a770b78592..1a1a9a0ee7 100644 --- a/src/renderer/components/dock/log-search.tsx +++ b/src/renderer/components/dock/log-search.tsx @@ -3,7 +3,7 @@ import "./log-search.scss"; import React, { useEffect } from "react"; import { observer } from "mobx-react"; import { SearchInput } from "../input"; -import { searchStore } from "../../../common/search-store"; +import { searchStore } from "@common/search-store"; import { Icon } from "../icon"; export interface PodLogSearchProps { diff --git a/src/renderer/components/dock/log.store.ts b/src/renderer/components/dock/log.store.ts index 4dcfccf981..d3a1723ba0 100644 --- a/src/renderer/components/dock/log.store.ts +++ b/src/renderer/components/dock/log.store.ts @@ -3,7 +3,7 @@ import { Pod, IPodContainer, podsApi, IPodLogsQuery } from "../../api/endpoints" import { autobind, interval } from "../../utils"; import { DockTabStore } from "./dock-tab.store"; import { dockStore, IDockTab, TabKind } from "./dock.store"; -import { searchStore } from "../../../common/search-store"; +import { searchStore } from "@common/search-store"; export interface IPodLogsData { pod: Pod; diff --git a/src/renderer/components/dock/logs.tsx b/src/renderer/components/dock/logs.tsx index c8ccd6d249..9bc7c500e5 100644 --- a/src/renderer/components/dock/logs.tsx +++ b/src/renderer/components/dock/logs.tsx @@ -2,7 +2,7 @@ import React from "react"; import { observable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; -import { searchStore } from "../../../common/search-store"; +import { searchStore } from "@common/search-store"; import { autobind } from "../../utils"; import { IDockTab } from "./dock.store"; import { InfoPanel } from "./info-panel"; diff --git a/src/renderer/components/error-boundary/error-boundary.tsx b/src/renderer/components/error-boundary/error-boundary.tsx index d0476bf225..2746dd766a 100644 --- a/src/renderer/components/error-boundary/error-boundary.tsx +++ b/src/renderer/components/error-boundary/error-boundary.tsx @@ -5,7 +5,7 @@ import { reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import { Button } from "../button"; import { navigation } from "../../navigation"; -import { issuesTrackerUrl, slackUrl } from "../../../common/vars"; +import { issuesTrackerUrl, slackUrl } from "@common/vars"; interface Props { } diff --git a/src/renderer/components/input/drop-file-input.tsx b/src/renderer/components/input/drop-file-input.tsx index a462a117d3..1d5476c260 100644 --- a/src/renderer/components/input/drop-file-input.tsx +++ b/src/renderer/components/input/drop-file-input.tsx @@ -3,7 +3,7 @@ import React from "react"; import { autobind, cssNames, IClassName } from "../../utils"; import { observable } from "mobx"; import { observer } from "mobx-react"; -import logger from "../../../main/logger"; +import logger from "@main/logger"; export interface DropFileInputProps extends React.DOMAttributes { className?: IClassName; diff --git a/src/renderer/components/item-object-list/item-list-layout.tsx b/src/renderer/components/item-object-list/item-list-layout.tsx index 38e0e0218d..6dca8f8a9e 100644 --- a/src/renderer/components/item-object-list/item-list-layout.tsx +++ b/src/renderer/components/item-object-list/item-list-layout.tsx @@ -22,8 +22,8 @@ import { themeStore } from "../../theme.store"; import { MenuActions} from "../menu/menu-actions"; import { MenuItem } from "../menu"; import { Checkbox } from "../checkbox"; -import { userStore } from "../../../common/user-store"; -import logger from "../../../main/logger"; +import { userStore } from "@common/user-store"; +import logger from "@main/logger"; // todo: refactor, split to small re-usable components 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 2fdb9bff6f..7165bfe384 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 @@ -4,7 +4,7 @@ import React from "react"; import { Icon } from "../icon"; import { KubeObject } from "../../api/kube-object"; import { cssNames, formatDuration } from "../../utils"; -import { KubeObjectStatusRegistration, kubeObjectStatusRegistry } from "../../../extensions/registries/kube-object-status-registry"; +import { KubeObjectStatusRegistration, kubeObjectStatusRegistry } from "@extensions/registries/kube-object-status-registry"; import { KubeObjectStatus, KubeObjectStatusLevel } from "../../..//extensions/renderer-api/k8s-api"; import { computed } from "mobx"; diff --git a/src/renderer/components/kube-object/kube-object-menu.tsx b/src/renderer/components/kube-object/kube-object-menu.tsx index 036f0679db..189847d990 100644 --- a/src/renderer/components/kube-object/kube-object-menu.tsx +++ b/src/renderer/components/kube-object/kube-object-menu.tsx @@ -5,7 +5,7 @@ import { editResourceTab } from "../dock/edit-resource.store"; import { MenuActions, MenuActionsProps } from "../menu/menu-actions"; import { hideDetails } from "./kube-object-details"; import { apiManager } from "../../api/api-manager"; -import { kubeObjectMenuRegistry } from "../../../extensions/registries/kube-object-menu-registry"; +import { kubeObjectMenuRegistry } from "@extensions/registries/kube-object-menu-registry"; export interface KubeObjectMenuProps extends MenuActionsProps { object: T; diff --git a/src/renderer/components/layout/main-layout-header.tsx b/src/renderer/components/layout/main-layout-header.tsx index 6753f8d262..a705a473d7 100644 --- a/src/renderer/components/layout/main-layout-header.tsx +++ b/src/renderer/components/layout/main-layout-header.tsx @@ -1,8 +1,8 @@ import React from "react"; import { clusterSettingsURL } from "../+cluster-settings"; -import { broadcastMessage } from "../../../common/ipc"; -import { Cluster } from "../../../main/cluster"; +import { broadcastMessage } from "@common/ipc"; +import { Cluster } from "@main/cluster"; import { cssNames } from "../../utils"; import { Icon } from "../icon"; diff --git a/src/renderer/components/layout/main-layout.tsx b/src/renderer/components/layout/main-layout.tsx index 7be6148e3e..67ae5da3ae 100755 --- a/src/renderer/components/layout/main-layout.tsx +++ b/src/renderer/components/layout/main-layout.tsx @@ -3,7 +3,7 @@ import "./main-layout.scss"; import React from "react"; import { observable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; -import { getHostedCluster } from "../../../common/cluster-store"; +import { getHostedCluster } from "@common/cluster-store"; import { autobind, createStorage, cssNames } from "../../utils"; import { Dock } from "../dock"; import { ErrorBoundary } from "../error-boundary"; diff --git a/src/renderer/components/layout/sidebar.tsx b/src/renderer/components/layout/sidebar.tsx index b44dd4a759..b3dbf35cdc 100644 --- a/src/renderer/components/layout/sidebar.tsx +++ b/src/renderer/components/layout/sidebar.tsx @@ -25,9 +25,9 @@ import { crdStore } from "../+custom-resources/crd.store"; import { CrdList, crdResourcesRoute, crdRoute, crdURL } from "../+custom-resources"; import { CustomResources } from "../+custom-resources/custom-resources"; import { isActiveRoute } from "../../navigation"; -import { isAllowedResource } from "../../../common/rbac"; +import { isAllowedResource } from "@common/rbac"; import { Spinner } from "../spinner"; -import { ClusterPageMenuRegistration, clusterPageMenuRegistry, clusterPageRegistry, getExtensionPageUrl } from "../../../extensions/registries"; +import { ClusterPageMenuRegistration, clusterPageMenuRegistry, clusterPageRegistry, getExtensionPageUrl } from "@extensions/registries"; import { SidebarNavItem } from "./sidebar-nav-item"; import { SidebarContext } from "./sidebar-context"; diff --git a/src/renderer/navigation/events.ts b/src/renderer/navigation/events.ts index 971465706d..bedf9f20df 100644 --- a/src/renderer/navigation/events.ts +++ b/src/renderer/navigation/events.ts @@ -1,8 +1,8 @@ import { ipcRenderer } from "electron"; import { reaction } from "mobx"; import { getMatchedClusterId, navigate } from "./helpers"; -import { broadcastMessage, subscribeToBroadcast } from "../../common/ipc"; -import logger from "../../main/logger"; +import { broadcastMessage, subscribeToBroadcast } from "@common/ipc"; +import logger from "@main/logger"; export function bindEvents() { if (!ipcRenderer) { @@ -28,4 +28,4 @@ export function bindEvents() { subscribeToBroadcast("renderer:reload", () => { location.reload(); }); -} \ No newline at end of file +} diff --git a/src/renderer/utils/index.ts b/src/renderer/utils/index.ts index 517fd8f359..269b1b8372 100755 --- a/src/renderer/utils/index.ts +++ b/src/renderer/utils/index.ts @@ -2,11 +2,11 @@ export const isElectron = !!navigator.userAgent.match(/Electron/); -export * from "../../common/utils"; +export * from "@common/utils"; +export * from "@common/event-emitter"; export * from "./cssVar"; export * from "./cssNames"; -export * from "../../common/event-emitter"; export * from "./saveFile"; export * from "./prevDefault"; export * from "./createStorage"; diff --git a/src/renderer/utils/rbac.ts b/src/renderer/utils/rbac.ts index 36737ccf3a..5144d8e929 100644 --- a/src/renderer/utils/rbac.ts +++ b/src/renderer/utils/rbac.ts @@ -1,4 +1,4 @@ -import { KubeResource } from "../../common/rbac"; +import { KubeResource } from "@common/rbac"; export const ResourceNames: Record = { "namespaces": "Namespaces", diff --git a/tsconfig.json b/tsconfig.json index b2cb7376ef..5b33250d04 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,6 +24,18 @@ "traceResolution": false, "resolveJsonModule": true, "paths": { + "@main/*": [ + "src/main/*" + ], + "@common/*": [ + "src/common/*" + ], + "@renderer/*": [ + "src/renderer/*" + ], + "@extensions/*": [ + "src/extensions/*" + ], "*": [ "node_modules/*", "types/*" diff --git a/webpack.extensions.ts b/webpack.extensions.ts index 0c2829a406..93090ab786 100644 --- a/webpack.extensions.ts +++ b/webpack.extensions.ts @@ -73,6 +73,12 @@ export default function (): webpack.Configuration { ] }, resolve: { + alias: { + "@common": path.resolve(__dirname, "src/common"), + "@main": path.resolve(__dirname, "src/main"), + "@renderer": path.resolve(__dirname, "src/renderer"), + "@extensions": path.resolve(__dirname, "src/extensions"), + }, extensions: [".ts", ".tsx", ".js"] }, plugins: [ diff --git a/webpack.main.ts b/webpack.main.ts index 6972c92457..793e05b45e 100755 --- a/webpack.main.ts +++ b/webpack.main.ts @@ -23,6 +23,12 @@ export default function (): webpack.Configuration { path: buildDir, }, resolve: { + alias: { + "@common": path.resolve(__dirname, "src/common"), + "@main": path.resolve(__dirname, "src/main"), + "@renderer": path.resolve(__dirname, "src/renderer"), + "@extensions": path.resolve(__dirname, "src/extensions"), + }, extensions: [".json", ".js", ".ts"] }, externals: [ diff --git a/webpack.renderer.ts b/webpack.renderer.ts index c0169bb3a0..39c8b303be 100755 --- a/webpack.renderer.ts +++ b/webpack.renderer.ts @@ -53,6 +53,12 @@ export function webpackLensRenderer({ showVars = true } = {}): webpack.Configura ] }, resolve: { + alias: { + "@common": path.resolve(__dirname, "src/common"), + "@main": path.resolve(__dirname, "src/main"), + "@renderer": path.resolve(__dirname, "src/renderer"), + "@extensions": path.resolve(__dirname, "src/extensions"), + }, extensions: [ ".js", ".jsx", ".json", ".ts", ".tsx",