From b8b51139bfa8d212eb7321825aaaae0d82c2702e Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 26 Aug 2021 11:18:06 -0400 Subject: [PATCH] Rename imports Signed-off-by: Sebastian Malton --- .../k8s-api/__tests__/api-manager.test.ts | 2 +- .../k8s-api/endpoints/helm-releases.api.ts | 2 +- src/extensions/extension-discovery.ts | 2 +- src/extensions/renderer-api/components.ts | 8 +-- src/extensions/renderer-api/k8s-api.ts | 56 ++++++++--------- src/renderer/bootstrap.tsx | 2 +- .../__tests__/cronjob.store.test.ts | 2 +- .../__tests__/daemonset.store.test.ts | 4 +- .../__tests__/deployments.store.test.ts | 4 +- .../components/__tests__/job.store.test.ts | 4 +- .../components/__tests__/pods.store.test.ts | 2 +- .../__tests__/replicaset.store.test.ts | 4 +- .../__tests__/statefulset.store.test.ts | 4 +- src/renderer/components/app.tsx | 40 ++++++------ .../apps-releases/release-details.tsx | 2 +- .../components/apps-releases/release.store.ts | 4 +- .../components/apps-releases/releases.tsx | 6 +- src/renderer/components/apps/apps.tsx | 4 +- .../cluster-manager/cluster-manager.tsx | 12 ++-- .../cluster-manager/cluster-topbar.tsx | 2 +- .../cluster-manager/cluster-view.tsx | 2 +- .../components/cluster-kubeconfig.tsx | 2 +- .../components/cluster-show-metrics.tsx | 2 +- .../components/cluster/cluster-issues.tsx | 4 +- .../cluster/cluster-metric-switchers.tsx | 2 +- .../cluster/cluster-overview.store.ts | 2 +- .../components/cluster/cluster-overview.tsx | 4 +- .../components/cluster/cluster-pie-charts.tsx | 2 +- .../add-quota-dialog.tsx | 2 +- .../config-secrets/add-secret-dialog.tsx | 2 +- src/renderer/components/config/config.tsx | 12 ++-- src/renderer/components/context.ts | 2 +- .../dock/__test__/log-tab.store.test.ts | 2 +- .../components/dock/install-chart.tsx | 4 +- .../components/dock/log-resource-selector.tsx | 2 +- src/renderer/components/dock/log-tab.store.ts | 2 +- .../components/dock/upgrade-chart.store.ts | 2 +- .../components/dock/upgrade-chart.tsx | 4 +- src/renderer/components/events/event.store.ts | 2 +- .../item-object-list/item-list-layout.tsx | 2 +- .../kube-object-details.tsx | 4 +- .../kube-object-list-layout.tsx | 2 +- src/renderer/components/layout/sidebar.tsx | 16 ++--- .../namespaces/namespace-details.tsx | 6 +- .../service-details-endpoint.tsx | 2 +- .../network-services/service-details.tsx | 2 +- src/renderer/components/network/network.tsx | 8 +-- .../components/nodes/node-details.tsx | 4 +- src/renderer/components/nodes/nodes.tsx | 2 +- .../components/preferences/helm-charts.tsx | 2 +- .../preferences/kubeconfig-syncs.tsx | 2 +- .../storage-classes/storage-class-details.tsx | 4 +- .../storage-classes/storage-class.store.ts | 2 +- .../volume-claim-details.tsx | 2 +- .../storage-volume-claims/volume-claims.tsx | 2 +- src/renderer/components/storage/storage.tsx | 6 +- .../details.scss | 0 .../details.tsx | 0 .../dialog.scss | 0 .../dialog.tsx | 4 +- .../hashers.ts | 0 .../index.ts | 0 .../store.ts | 0 .../view.scss | 0 .../view.tsx | 4 +- .../add-dialog.scss | 0 .../add-dialog.tsx | 0 .../details.scss | 0 .../details.tsx | 0 .../index.ts | 0 .../store.ts | 0 .../view.scss | 0 .../view.tsx | 0 .../details.scss | 0 .../details.tsx | 0 .../dialog.scss | 0 .../dialog.tsx | 8 +-- .../hashers.ts | 0 .../index.ts | 0 .../store.ts | 0 .../view.scss | 0 .../view.tsx | 6 +- .../{+roles => roles}/add-dialog.scss | 0 .../{+roles => roles}/add-dialog.tsx | 2 +- .../{+roles => roles}/details.scss | 0 .../{+roles => roles}/details.tsx | 0 .../{+roles => roles}/index.ts | 0 .../{+roles => roles}/store.ts | 0 .../{+roles => roles}/view.scss | 0 .../{+roles => roles}/view.tsx | 0 .../create-dialog.scss | 0 .../create-dialog.tsx | 2 +- .../details.scss | 0 .../details.tsx | 2 +- .../index.ts | 0 .../secret.scss | 0 .../secret.tsx | 0 .../store.ts | 0 .../view.scss | 0 .../view.tsx | 0 .../user-management/user-management.tsx | 12 ++-- .../workloads-cronjobs/cronjob-details.tsx | 2 +- .../workloads-cronjobs/cronjob.store.ts | 2 +- .../workloads-cronjobs/cronjobs.tsx | 4 +- .../daemonset-details.tsx | 12 ++-- .../workloads-daemonsets/daemonsets.store.ts | 2 +- .../workloads-daemonsets/daemonsets.tsx | 6 +- .../deployment-details.tsx | 12 ++-- .../deployment-replicasets.tsx | 2 +- .../deployments.store.ts | 2 +- .../workloads-deployments/deployments.tsx | 8 +-- .../components/workloads-jobs/job-details.tsx | 12 ++-- .../components/workloads-jobs/job.store.ts | 2 +- .../components/workloads-jobs/jobs.tsx | 4 +- .../workloads-overview/overview-statuses.tsx | 6 +- .../workloads-overview/overview.tsx | 16 ++--- .../workloads-pods/pod-container-env.tsx | 4 +- .../components/workloads-pods/pods.tsx | 4 +- .../replicaset-details.tsx | 12 ++-- .../replicasets.store.ts | 2 +- .../statefulset-details.tsx | 12 ++-- .../statefulset.store.ts | 2 +- .../workloads-statefulsets/statefulsets.tsx | 6 +- .../components/workloads/workloads.stores.ts | 14 ++--- .../components/workloads/workloads.tsx | 16 ++--- .../catalog-category-registry.tsx | 2 +- .../kube-object-detail-registry.tsx | 62 +++++++++---------- .../initializers/kube-object-menu-registry.ts | 10 +-- .../workloads-overview-detail-registry.tsx | 4 +- .../protocol-handler/app-handlers.tsx | 2 +- 130 files changed, 287 insertions(+), 287 deletions(-) rename src/renderer/components/user-management/{+cluster-role-bindings => cluster-role-bindings}/details.scss (100%) rename src/renderer/components/user-management/{+cluster-role-bindings => cluster-role-bindings}/details.tsx (100%) rename src/renderer/components/user-management/{+cluster-role-bindings => cluster-role-bindings}/dialog.scss (100%) rename src/renderer/components/user-management/{+cluster-role-bindings => cluster-role-bindings}/dialog.tsx (98%) rename src/renderer/components/user-management/{+cluster-role-bindings => cluster-role-bindings}/hashers.ts (100%) rename src/renderer/components/user-management/{+cluster-role-bindings => cluster-role-bindings}/index.ts (100%) rename src/renderer/components/user-management/{+cluster-role-bindings => cluster-role-bindings}/store.ts (100%) rename src/renderer/components/user-management/{+cluster-role-bindings => cluster-role-bindings}/view.scss (100%) rename src/renderer/components/user-management/{+cluster-role-bindings => cluster-role-bindings}/view.tsx (96%) rename src/renderer/components/user-management/{+cluster-roles => cluster-roles}/add-dialog.scss (100%) rename src/renderer/components/user-management/{+cluster-roles => cluster-roles}/add-dialog.tsx (100%) rename src/renderer/components/user-management/{+cluster-roles => cluster-roles}/details.scss (100%) rename src/renderer/components/user-management/{+cluster-roles => cluster-roles}/details.tsx (100%) rename src/renderer/components/user-management/{+cluster-roles => cluster-roles}/index.ts (100%) rename src/renderer/components/user-management/{+cluster-roles => cluster-roles}/store.ts (100%) rename src/renderer/components/user-management/{+cluster-roles => cluster-roles}/view.scss (100%) rename src/renderer/components/user-management/{+cluster-roles => cluster-roles}/view.tsx (100%) rename src/renderer/components/user-management/{+role-bindings => role-bindings}/details.scss (100%) rename src/renderer/components/user-management/{+role-bindings => role-bindings}/details.tsx (100%) rename src/renderer/components/user-management/{+role-bindings => role-bindings}/dialog.scss (100%) rename src/renderer/components/user-management/{+role-bindings => role-bindings}/dialog.tsx (97%) rename src/renderer/components/user-management/{+role-bindings => role-bindings}/hashers.ts (100%) rename src/renderer/components/user-management/{+role-bindings => role-bindings}/index.ts (100%) rename src/renderer/components/user-management/{+role-bindings => role-bindings}/store.ts (100%) rename src/renderer/components/user-management/{+role-bindings => role-bindings}/view.scss (100%) rename src/renderer/components/user-management/{+role-bindings => role-bindings}/view.tsx (95%) rename src/renderer/components/user-management/{+roles => roles}/add-dialog.scss (100%) rename src/renderer/components/user-management/{+roles => roles}/add-dialog.tsx (98%) rename src/renderer/components/user-management/{+roles => roles}/details.scss (100%) rename src/renderer/components/user-management/{+roles => roles}/details.tsx (100%) rename src/renderer/components/user-management/{+roles => roles}/index.ts (100%) rename src/renderer/components/user-management/{+roles => roles}/store.ts (100%) rename src/renderer/components/user-management/{+roles => roles}/view.scss (100%) rename src/renderer/components/user-management/{+roles => roles}/view.tsx (100%) rename src/renderer/components/user-management/{+service-accounts => service-accounts}/create-dialog.scss (100%) rename src/renderer/components/user-management/{+service-accounts => service-accounts}/create-dialog.tsx (98%) rename src/renderer/components/user-management/{+service-accounts => service-accounts}/details.scss (100%) rename src/renderer/components/user-management/{+service-accounts => service-accounts}/details.tsx (98%) rename src/renderer/components/user-management/{+service-accounts => service-accounts}/index.ts (100%) rename src/renderer/components/user-management/{+service-accounts => service-accounts}/secret.scss (100%) rename src/renderer/components/user-management/{+service-accounts => service-accounts}/secret.tsx (100%) rename src/renderer/components/user-management/{+service-accounts => service-accounts}/store.ts (100%) rename src/renderer/components/user-management/{+service-accounts => service-accounts}/view.scss (100%) rename src/renderer/components/user-management/{+service-accounts => service-accounts}/view.tsx (100%) diff --git a/src/common/k8s-api/__tests__/api-manager.test.ts b/src/common/k8s-api/__tests__/api-manager.test.ts index 27c2575341..1c5f6e3abf 100644 --- a/src/common/k8s-api/__tests__/api-manager.test.ts +++ b/src/common/k8s-api/__tests__/api-manager.test.ts @@ -19,7 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { ingressStore } from "../../../renderer/components/+network-ingresses/ingress.store"; +import { ingressStore } from "../../../renderer/components/network-ingresses/ingress.store"; import { apiManager } from "../api-manager"; import { KubeApi } from "../kube-api"; import { KubeObject } from "../kube-object"; diff --git a/src/common/k8s-api/endpoints/helm-releases.api.ts b/src/common/k8s-api/endpoints/helm-releases.api.ts index 301e077e4e..59a6502e0d 100644 --- a/src/common/k8s-api/endpoints/helm-releases.api.ts +++ b/src/common/k8s-api/endpoints/helm-releases.api.ts @@ -23,7 +23,7 @@ import jsYaml from "js-yaml"; import { autoBind, formatDuration } from "../../utils"; import capitalize from "lodash/capitalize"; import { apiBase } from "../index"; -import { helmChartStore } from "../../../renderer/components/+apps-helm-charts/helm-chart.store"; +import { helmChartStore } from "../../../renderer/components/apps-helm-charts/helm-chart.store"; import type { ItemObject } from "../../item.store"; import { KubeObject } from "../kube-object"; import type { JsonApiData } from "../json-api"; diff --git a/src/extensions/extension-discovery.ts b/src/extensions/extension-discovery.ts index 077f29d694..e7dc43d6c6 100644 --- a/src/extensions/extension-discovery.ts +++ b/src/extensions/extension-discovery.ts @@ -29,7 +29,7 @@ import path from "path"; import { broadcastMessage, ipcMainHandle, ipcRendererOn, requestMain } from "../common/ipc"; import { Singleton, toJS } from "../common/utils"; import logger from "../main/logger"; -import { ExtensionInstallationStateStore } from "../renderer/components/+extensions/extension-install.store"; +import { ExtensionInstallationStateStore } from "../renderer/components/extensions/extension-install.store"; import { extensionInstaller } from "./extension-installer"; import { ExtensionsStore } from "./extensions-store"; import { ExtensionLoader } from "./extension-loader"; diff --git a/src/extensions/renderer-api/components.ts b/src/extensions/renderer-api/components.ts index 7173b592b3..0ff3f8dbb1 100644 --- a/src/extensions/renderer-api/components.ts +++ b/src/extensions/renderer-api/components.ts @@ -53,9 +53,9 @@ 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/+namespaces/namespace-select-filter"; +export * from "../../renderer/components/workloads-pods/pod-details-list"; +export * from "../../renderer/components/namespaces/namespace-select"; +export * from "../../renderer/components/namespaces/namespace-select-filter"; export * from "../../renderer/components/layout/sub-title"; export * from "../../renderer/components/input/search-input"; export * from "../../renderer/components/chart/bar-chart"; @@ -67,7 +67,7 @@ export * from "../../renderer/components/kube-object-details"; export * from "../../renderer/components/kube-object-list-layout"; export * from "../../renderer/components/kube-object-menu"; export * from "../../renderer/components/kube-object-meta"; -export * from "../../renderer/components/+events/kube-event-details"; +export * from "../../renderer/components/events/kube-event-details"; // specific exports export * from "../../renderer/components/status-brick"; diff --git a/src/extensions/renderer-api/k8s-api.ts b/src/extensions/renderer-api/k8s-api.ts index 1622dd6f3d..b2abd81e6f 100644 --- a/src/extensions/renderer-api/k8s-api.ts +++ b/src/extensions/renderer-api/k8s-api.ts @@ -63,31 +63,31 @@ export type { ISecretRef } from "../../common/k8s-api/endpoints"; export type { KubeObjectStatus } 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/store"; -export type { RolesStore } from "../../renderer/components/+user-management/+roles/store"; -export type { RoleBindingsStore } from "../../renderer/components/+user-management/+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/store"; +export type { RolesStore } from "../../renderer/components/user-management/roles/store"; +export type { RoleBindingsStore } from "../../renderer/components/user-management/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/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx index b6b97cfc6b..b03e6bc599 100644 --- a/src/renderer/bootstrap.tsx +++ b/src/renderer/bootstrap.tsx @@ -39,7 +39,7 @@ import { ExtensionLoader } from "../extensions/extension-loader"; import { App } from "./components/app"; import { LensApp } from "./lens-app"; import { HelmRepoManager } from "../main/helm/helm-repo-manager"; -import { ExtensionInstallationStateStore } from "./components/+extensions/extension-install.store"; +import { ExtensionInstallationStateStore } from "./components/extensions/extension-install.store"; import { DefaultProps } from "./mui-base-theme"; import configurePackages from "../common/configure-packages"; import * as initializers from "./initializers"; diff --git a/src/renderer/components/__tests__/cronjob.store.test.ts b/src/renderer/components/__tests__/cronjob.store.test.ts index 35531b2ec2..5cf9db108b 100644 --- a/src/renderer/components/__tests__/cronjob.store.test.ts +++ b/src/renderer/components/__tests__/cronjob.store.test.ts @@ -18,7 +18,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { cronJobStore } from "../+workloads-cronjobs/cronjob.store"; +import { cronJobStore } from "../workloads-cronjobs/cronjob.store"; import { CronJob } from "../../../common/k8s-api/endpoints"; const spec = { diff --git a/src/renderer/components/__tests__/daemonset.store.test.ts b/src/renderer/components/__tests__/daemonset.store.test.ts index 65ea991d9b..3ed5ff07c1 100644 --- a/src/renderer/components/__tests__/daemonset.store.test.ts +++ b/src/renderer/components/__tests__/daemonset.store.test.ts @@ -20,8 +20,8 @@ */ import { observable } from "mobx"; -import { daemonSetStore } from "../+workloads-daemonsets/daemonsets.store"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { daemonSetStore } from "../workloads-daemonsets/daemonsets.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { DaemonSet, Pod } from "../../../common/k8s-api/endpoints"; const runningDaemonSet = new DaemonSet({ diff --git a/src/renderer/components/__tests__/deployments.store.test.ts b/src/renderer/components/__tests__/deployments.store.test.ts index 7742b55313..a0f89eb6bb 100644 --- a/src/renderer/components/__tests__/deployments.store.test.ts +++ b/src/renderer/components/__tests__/deployments.store.test.ts @@ -20,8 +20,8 @@ */ import { observable } from "mobx"; -import { deploymentStore } from "../+workloads-deployments/deployments.store"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { deploymentStore } from "../workloads-deployments/deployments.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { Deployment, Pod } from "../../../common/k8s-api/endpoints"; const spec = { diff --git a/src/renderer/components/__tests__/job.store.test.ts b/src/renderer/components/__tests__/job.store.test.ts index f3d850e3dc..9fb00de4d0 100644 --- a/src/renderer/components/__tests__/job.store.test.ts +++ b/src/renderer/components/__tests__/job.store.test.ts @@ -20,8 +20,8 @@ */ import { observable } from "mobx"; -import { jobStore } from "../+workloads-jobs/job.store"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { jobStore } from "../workloads-jobs/job.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { Job, Pod } from "../../../common/k8s-api/endpoints"; const runningJob = new Job({ diff --git a/src/renderer/components/__tests__/pods.store.test.ts b/src/renderer/components/__tests__/pods.store.test.ts index 74fe9de9f6..94c14edc18 100644 --- a/src/renderer/components/__tests__/pods.store.test.ts +++ b/src/renderer/components/__tests__/pods.store.test.ts @@ -20,7 +20,7 @@ */ import { Pod } from "../../../common/k8s-api/endpoints"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; const runningPod = new Pod({ apiVersion: "foo", diff --git a/src/renderer/components/__tests__/replicaset.store.test.ts b/src/renderer/components/__tests__/replicaset.store.test.ts index 3114290bc7..cc58282124 100644 --- a/src/renderer/components/__tests__/replicaset.store.test.ts +++ b/src/renderer/components/__tests__/replicaset.store.test.ts @@ -20,8 +20,8 @@ */ import { observable } from "mobx"; -import { podsStore } from "../+workloads-pods/pods.store"; -import { replicaSetStore } from "../+workloads-replicasets/replicasets.store"; +import { podsStore } from "../workloads-pods/pods.store"; +import { replicaSetStore } from "../workloads-replicasets/replicasets.store"; import { ReplicaSet, Pod } from "../../../common/k8s-api/endpoints"; const runningReplicaSet = new ReplicaSet({ diff --git a/src/renderer/components/__tests__/statefulset.store.test.ts b/src/renderer/components/__tests__/statefulset.store.test.ts index 4121be6c58..c9f897b3f4 100644 --- a/src/renderer/components/__tests__/statefulset.store.test.ts +++ b/src/renderer/components/__tests__/statefulset.store.test.ts @@ -20,8 +20,8 @@ */ import { observable } from "mobx"; -import { podsStore } from "../+workloads-pods/pods.store"; -import { statefulSetStore } from "../+workloads-statefulsets/statefulset.store"; +import { podsStore } from "../workloads-pods/pods.store"; +import { statefulSetStore } from "../workloads-statefulsets/statefulset.store"; import { StatefulSet, Pod } from "../../../common/k8s-api/endpoints"; const runningStatefulSet = new StatefulSet({ diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx index 46e285969a..3c2d60ed90 100755 --- a/src/renderer/components/app.tsx +++ b/src/renderer/components/app.tsx @@ -23,14 +23,14 @@ import { observable, makeObservable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import { Redirect, Route, Router, Switch } from "react-router"; import { history } from "../navigation"; -import { NotFound } from "./+404"; -import { UserManagement } from "./+user-management/user-management"; +import { NotFound } from "./404"; +import { UserManagement } from "./user-management/user-management"; import { ConfirmDialog } from "./confirm-dialog"; -import { ClusterOverview } from "./+cluster/cluster-overview"; -import { Events } from "./+events/events"; -import { DeploymentScaleDialog } from "./+workloads-deployments/deployment-scale-dialog"; -import { CronJobTriggerDialog } from "./+workloads-cronjobs/cronjob-trigger-dialog"; -import { CustomResources } from "./+custom-resources/custom-resources"; +import { ClusterOverview } from "./cluster/cluster-overview"; +import { Events } from "./events/events"; +import { DeploymentScaleDialog } from "./workloads-deployments/deployment-scale-dialog"; +import { CronJobTriggerDialog } from "./workloads-cronjobs/cronjob-trigger-dialog"; +import { CustomResources } from "./custom-resources/custom-resources"; import { isAllowedResource } from "../../common/utils/allowed-resource"; import logger from "../../main/logger"; import { webFrame } from "electron"; @@ -41,12 +41,12 @@ import { requestMain } from "../../common/ipc"; import whatInput from "what-input"; import { clusterSetFrameIdHandler } from "../../common/cluster-ipc"; import { ClusterPageMenuRegistration, ClusterPageMenuRegistry } from "../../extensions/registries"; -import { StatefulSetScaleDialog } from "./+workloads-statefulsets/statefulset-scale-dialog"; -import { eventStore } from "./+events/event.store"; -import { nodesStore } from "./+nodes/nodes.store"; -import { podsStore } from "./+workloads-pods/pods.store"; +import { StatefulSetScaleDialog } from "./workloads-statefulsets/statefulset-scale-dialog"; +import { eventStore } from "./events/event.store"; +import { nodesStore } from "./nodes/nodes.store"; +import { podsStore } from "./workloads-pods/pods.store"; import { kubeWatchApi } from "../../common/k8s-api/kube-watch-api"; -import { ReplicaSetScaleDialog } from "./+workloads-replicasets/replicaset-scale-dialog"; +import { ReplicaSetScaleDialog } from "./workloads-replicasets/replicaset-scale-dialog"; import { CommandContainer } from "./command-palette/command-container"; import { KubeObjectStore } from "../../common/k8s-api/kube-object.store"; import { clusterContext } from "./context"; @@ -58,16 +58,16 @@ import { Notifications } from "./notifications"; import { KubeObjectDetails } from "./kube-object-details"; import { KubeConfigDialog } from "./kubeconfig-dialog"; import { Terminal } from "./dock/terminal"; -import { namespaceStore } from "./+namespaces/namespace.store"; +import { namespaceStore } from "./namespaces/namespace.store"; import { Sidebar } from "./layout/sidebar"; import { Dock } from "./dock"; -import { Apps } from "./+apps"; -import { Namespaces } from "./+namespaces"; -import { Network } from "./+network"; -import { Nodes } from "./+nodes"; -import { Workloads } from "./+workloads"; -import { Config } from "./+config"; -import { Storage } from "./+storage"; +import { Apps } from "./apps"; +import { Namespaces } from "./namespaces"; +import { Network } from "./network"; +import { Nodes } from "./nodes"; +import { Workloads } from "./workloads"; +import { Config } from "./config"; +import { Storage } from "./storage"; import { catalogEntityRegistry } from "../api/catalog-entity-registry"; import { getHostedClusterId } from "../utils"; import { ClusterStore } from "../../common/cluster-store"; diff --git a/src/renderer/components/apps-releases/release-details.tsx b/src/renderer/components/apps-releases/release-details.tsx index 4e93136c03..ae71cf5599 100644 --- a/src/renderer/components/apps-releases/release-details.tsx +++ b/src/renderer/components/apps-releases/release-details.tsx @@ -42,7 +42,7 @@ import { createUpgradeChartTab } from "../dock/upgrade-chart.store"; import { ThemeStore } from "../../theme.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { SubTitle } from "../layout/sub-title"; -import { secretsStore } from "../+config-secrets/secrets.store"; +import { secretsStore } from "../config-secrets/secrets.store"; import { Secret } from "../../../common/k8s-api/endpoints"; import { getDetailsUrl } from "../kube-detail-params"; import { Checkbox } from "../checkbox"; diff --git a/src/renderer/components/apps-releases/release.store.ts b/src/renderer/components/apps-releases/release.store.ts index 93b5cf5eef..5c76db923b 100644 --- a/src/renderer/components/apps-releases/release.store.ts +++ b/src/renderer/components/apps-releases/release.store.ts @@ -25,8 +25,8 @@ import { autoBind } from "../../utils"; import { createRelease, deleteRelease, HelmRelease, IReleaseCreatePayload, IReleaseUpdatePayload, listReleases, rollbackRelease, updateRelease } from "../../../common/k8s-api/endpoints/helm-releases.api"; import { ItemStore } from "../../../common/item.store"; import type { Secret } from "../../../common/k8s-api/endpoints"; -import { secretsStore } from "../+config-secrets/secrets.store"; -import { namespaceStore } from "../+namespaces/namespace.store"; +import { secretsStore } from "../config-secrets/secrets.store"; +import { namespaceStore } from "../namespaces/namespace.store"; import { Notifications } from "../notifications"; export class ReleaseStore extends ItemStore { diff --git a/src/renderer/components/apps-releases/releases.tsx b/src/renderer/components/apps-releases/releases.tsx index d43174cc10..4c935adbf6 100644 --- a/src/renderer/components/apps-releases/releases.tsx +++ b/src/renderer/components/apps-releases/releases.tsx @@ -32,11 +32,11 @@ import { ReleaseRollbackDialog } from "./release-rollback-dialog"; import { navigation } from "../../navigation"; import { ItemListLayout } from "../item-object-list/item-list-layout"; import { HelmReleaseMenu } from "./release-menu"; -import { secretsStore } from "../+config-secrets/secrets.store"; -import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter"; +import { secretsStore } from "../config-secrets/secrets.store"; +import { NamespaceSelectFilter } from "../namespaces/namespace-select-filter"; import type { ReleaseRouteParams } from "../../../common/routes"; import { releaseURL } from "../../../common/routes"; -import { namespaceStore } from "../+namespaces/namespace.store"; +import { namespaceStore } from "../namespaces/namespace.store"; enum columnId { name = "name", diff --git a/src/renderer/components/apps/apps.tsx b/src/renderer/components/apps/apps.tsx index b12faa7ee7..f3a9f44a90 100644 --- a/src/renderer/components/apps/apps.tsx +++ b/src/renderer/components/apps/apps.tsx @@ -22,8 +22,8 @@ import React from "react"; import { observer } from "mobx-react"; import { TabLayout, TabLayoutRoute } from "../layout/tab-layout"; -import { HelmCharts } from "../+apps-helm-charts"; -import { HelmReleases } from "../+apps-releases"; +import { HelmCharts } from "../apps-helm-charts"; +import { HelmReleases } from "../apps-releases"; import { helmChartsURL, helmChartsRoute, releaseURL, releaseRoute } from "../../../common/routes"; @observer diff --git a/src/renderer/components/cluster-manager/cluster-manager.tsx b/src/renderer/components/cluster-manager/cluster-manager.tsx index 4bd14e7805..bb36a4691f 100644 --- a/src/renderer/components/cluster-manager/cluster-manager.tsx +++ b/src/renderer/components/cluster-manager/cluster-manager.tsx @@ -25,15 +25,15 @@ import React from "react"; import { Redirect, Route, Switch } from "react-router"; import { observer } from "mobx-react"; import { BottomBar } from "./bottom-bar"; -import { Catalog } from "../+catalog"; -import { Preferences } from "../+preferences"; -import { AddCluster } from "../+add-cluster"; +import { Catalog } from "../catalog"; +import { Preferences } from "../preferences"; +import { AddCluster } from "../add-cluster"; import { ClusterView } from "./cluster-view"; import { GlobalPageRegistry } from "../../../extensions/registries/page-registry"; -import { Extensions } from "../+extensions"; +import { Extensions } from "../extensions"; import { HotbarMenu } from "../hotbar/hotbar-menu"; -import { EntitySettings } from "../+entity-settings"; -import { Welcome } from "../+welcome"; +import { EntitySettings } from "../entity-settings"; +import { Welcome } from "../welcome"; import * as routes from "../../../common/routes"; @observer diff --git a/src/renderer/components/cluster-manager/cluster-topbar.tsx b/src/renderer/components/cluster-manager/cluster-topbar.tsx index 20a6120ba1..b6d3fb68a5 100644 --- a/src/renderer/components/cluster-manager/cluster-topbar.tsx +++ b/src/renderer/components/cluster-manager/cluster-topbar.tsx @@ -21,7 +21,7 @@ import { observer } from "mobx-react"; import React from "react"; -import { previousActiveTab } from "../+catalog"; +import { previousActiveTab } from "../catalog"; import { ClusterStore } from "../../../common/cluster-store"; import { catalogURL } from "../../../common/routes"; import { navigate } from "../../navigation"; diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx index 3d0fea8e55..ce37bb45cd 100644 --- a/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/src/renderer/components/cluster-manager/cluster-view.tsx @@ -33,7 +33,7 @@ import { clusterActivateHandler } from "../../../common/cluster-ipc"; import { catalogEntityRegistry } from "../../api/catalog-entity-registry"; import { navigate } from "../../navigation"; import { catalogURL, ClusterViewRouteParams } from "../../../common/routes"; -import { previousActiveTab } from "../+catalog"; +import { previousActiveTab } from "../catalog"; import { ClusterTopbar } from "./cluster-topbar"; interface Props extends RouteComponentProps { diff --git a/src/renderer/components/cluster-settings/components/cluster-kubeconfig.tsx b/src/renderer/components/cluster-settings/components/cluster-kubeconfig.tsx index 583b44237a..e1d5355a6c 100644 --- a/src/renderer/components/cluster-settings/components/cluster-kubeconfig.tsx +++ b/src/renderer/components/cluster-settings/components/cluster-kubeconfig.tsx @@ -25,7 +25,7 @@ import { observer } from "mobx-react"; import { SubTitle } from "../../layout/sub-title"; import { boundMethod } from "../../../../common/utils"; import { shell } from "electron"; -import { Notice } from "../../+extensions/notice"; +import { Notice } from "../../extensions/notice"; interface Props { cluster: Cluster; diff --git a/src/renderer/components/cluster-settings/components/cluster-show-metrics.tsx b/src/renderer/components/cluster-settings/components/cluster-show-metrics.tsx index effdc16160..f10a2914f4 100644 --- a/src/renderer/components/cluster-settings/components/cluster-show-metrics.tsx +++ b/src/renderer/components/cluster-settings/components/cluster-show-metrics.tsx @@ -25,7 +25,7 @@ import type { Cluster } from "../../../../main/cluster"; import { observable, reaction, makeObservable } from "mobx"; import { Badge } from "../../badge/badge"; import { Icon } from "../../icon/icon"; -import { Notice } from "../../+extensions/notice"; +import { Notice } from "../../extensions/notice"; interface Props { cluster: Cluster; diff --git a/src/renderer/components/cluster/cluster-issues.tsx b/src/renderer/components/cluster/cluster-issues.tsx index 9b5f73b9a6..86aff6c899 100644 --- a/src/renderer/components/cluster/cluster-issues.tsx +++ b/src/renderer/components/cluster/cluster-issues.tsx @@ -27,8 +27,8 @@ import { computed, makeObservable } from "mobx"; import { Icon } from "../icon"; import { SubHeader } from "../layout/sub-header"; import { Table, TableCell, TableHead, TableRow } from "../table"; -import { nodesStore } from "../+nodes/nodes.store"; -import { eventStore } from "../+events/event.store"; +import { nodesStore } from "../nodes/nodes.store"; +import { eventStore } from "../events/event.store"; import { boundMethod, cssNames, prevDefault } from "../../utils"; import type { ItemObject } from "../../../common/item.store"; import { Spinner } from "../spinner"; diff --git a/src/renderer/components/cluster/cluster-metric-switchers.tsx b/src/renderer/components/cluster/cluster-metric-switchers.tsx index b80dd10527..31abdb101d 100644 --- a/src/renderer/components/cluster/cluster-metric-switchers.tsx +++ b/src/renderer/components/cluster/cluster-metric-switchers.tsx @@ -23,7 +23,7 @@ import "./cluster-metric-switchers.scss"; import React from "react"; import { observer } from "mobx-react"; -import { nodesStore } from "../+nodes/nodes.store"; +import { nodesStore } from "../nodes/nodes.store"; import { cssNames } from "../../utils"; import { Radio, RadioGroup } from "../radio"; import { clusterOverviewStore, MetricNodeRole, MetricType } from "./cluster-overview.store"; diff --git a/src/renderer/components/cluster/cluster-overview.store.ts b/src/renderer/components/cluster/cluster-overview.store.ts index 17cc100109..b218cd5117 100644 --- a/src/renderer/components/cluster/cluster-overview.store.ts +++ b/src/renderer/components/cluster/cluster-overview.store.ts @@ -24,7 +24,7 @@ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { Cluster, clusterApi, getMetricsByNodeNames, IClusterMetrics } from "../../../common/k8s-api/endpoints"; import { autoBind, createStorage } from "../../utils"; import { IMetricsReqParams, normalizeMetrics } from "../../../common/k8s-api/endpoints/metrics.api"; -import { nodesStore } from "../+nodes/nodes.store"; +import { nodesStore } from "../nodes/nodes.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; export enum MetricType { diff --git a/src/renderer/components/cluster/cluster-overview.tsx b/src/renderer/components/cluster/cluster-overview.tsx index e68c2f752f..bd02955b71 100644 --- a/src/renderer/components/cluster/cluster-overview.tsx +++ b/src/renderer/components/cluster/cluster-overview.tsx @@ -24,8 +24,8 @@ import "./cluster-overview.scss"; import React from "react"; import { reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; -import { nodesStore } from "../+nodes/nodes.store"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { nodesStore } from "../nodes/nodes.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { getHostedClusterId, interval } from "../../utils"; import { TabLayout } from "../layout/tab-layout"; import { Spinner } from "../spinner"; diff --git a/src/renderer/components/cluster/cluster-pie-charts.tsx b/src/renderer/components/cluster/cluster-pie-charts.tsx index 76bb6967f6..412bc36003 100644 --- a/src/renderer/components/cluster/cluster-pie-charts.tsx +++ b/src/renderer/components/cluster/cluster-pie-charts.tsx @@ -26,7 +26,7 @@ import { observer } from "mobx-react"; import { clusterOverviewStore, MetricNodeRole } from "./cluster-overview.store"; import { Spinner } from "../spinner"; import { Icon } from "../icon"; -import { nodesStore } from "../+nodes/nodes.store"; +import { nodesStore } from "../nodes/nodes.store"; import { ChartData, PieChart } from "../chart"; import { ClusterNoMetrics } from "./cluster-no-metrics"; import { bytesToUnits } from "../../utils"; diff --git a/src/renderer/components/config-resource-quotas/add-quota-dialog.tsx b/src/renderer/components/config-resource-quotas/add-quota-dialog.tsx index 0fc2149e45..c33426faef 100644 --- a/src/renderer/components/config-resource-quotas/add-quota-dialog.tsx +++ b/src/renderer/components/config-resource-quotas/add-quota-dialog.tsx @@ -33,7 +33,7 @@ import { Select } from "../select"; import { Icon } from "../icon"; import { Button } from "../button"; import { Notifications } from "../notifications"; -import { NamespaceSelect } from "../+namespaces/namespace-select"; +import { NamespaceSelect } from "../namespaces/namespace-select"; import { SubTitle } from "../layout/sub-title"; interface Props extends DialogProps { diff --git a/src/renderer/components/config-secrets/add-secret-dialog.tsx b/src/renderer/components/config-secrets/add-secret-dialog.tsx index d74a523dc5..4ce3450a5c 100644 --- a/src/renderer/components/config-secrets/add-secret-dialog.tsx +++ b/src/renderer/components/config-secrets/add-secret-dialog.tsx @@ -30,7 +30,7 @@ import { Input } from "../input"; import { systemName } from "../input/input_validators"; import { Secret, secretsApi, SecretType } from "../../../common/k8s-api/endpoints"; import { SubTitle } from "../layout/sub-title"; -import { NamespaceSelect } from "../+namespaces/namespace-select"; +import { NamespaceSelect } from "../namespaces/namespace-select"; import { Select, SelectOption } from "../select"; import { Icon } from "../icon"; import type { KubeObjectMetadata } from "../../../common/k8s-api/kube-object"; diff --git a/src/renderer/components/config/config.tsx b/src/renderer/components/config/config.tsx index 24d84cff34..4e251bac75 100644 --- a/src/renderer/components/config/config.tsx +++ b/src/renderer/components/config/config.tsx @@ -22,13 +22,13 @@ import React from "react"; import { observer } from "mobx-react"; import { TabLayout, TabLayoutRoute } from "../layout/tab-layout"; -import { ConfigMaps } from "../+config-maps"; -import { Secrets } from "../+config-secrets"; -import { ResourceQuotas } from "../+config-resource-quotas"; -import { PodDisruptionBudgets } from "../+config-pod-disruption-budgets"; -import { HorizontalPodAutoscalers } from "../+config-autoscalers"; +import { ConfigMaps } from "../config-maps"; +import { Secrets } from "../config-secrets"; +import { ResourceQuotas } from "../config-resource-quotas"; +import { PodDisruptionBudgets } from "../config-pod-disruption-budgets"; +import { HorizontalPodAutoscalers } from "../config-autoscalers"; import { isAllowedResource } from "../../../common/utils/allowed-resource"; -import { LimitRanges } from "../+config-limit-ranges"; +import { LimitRanges } from "../config-limit-ranges"; import * as routes from "../../../common/routes"; @observer diff --git a/src/renderer/components/context.ts b/src/renderer/components/context.ts index 6e37aabdce..606074ab43 100755 --- a/src/renderer/components/context.ts +++ b/src/renderer/components/context.ts @@ -22,7 +22,7 @@ import { ClusterStore } from "../../common/cluster-store"; import type { Cluster } from "../../main/cluster"; import { getHostedClusterId } from "../utils"; -import { namespaceStore } from "./+namespaces/namespace.store"; +import { namespaceStore } from "./namespaces/namespace.store"; import type { ClusterContext } from "../../common/k8s-api/cluster-context"; export const clusterContext: ClusterContext = { diff --git a/src/renderer/components/dock/__test__/log-tab.store.test.ts b/src/renderer/components/dock/__test__/log-tab.store.test.ts index 8eea8ce970..425289b4bb 100644 --- a/src/renderer/components/dock/__test__/log-tab.store.test.ts +++ b/src/renderer/components/dock/__test__/log-tab.store.test.ts @@ -19,7 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { podsStore } from "../../+workloads-pods/pods.store"; +import { podsStore } from "../../workloads-pods/pods.store"; import { UserStore } from "../../../../common/user-store"; import { Pod } from "../../../../common/k8s-api/endpoints"; import { ThemeStore } from "../../../theme.store"; diff --git a/src/renderer/components/dock/install-chart.tsx b/src/renderer/components/dock/install-chart.tsx index b0113018ea..9d7e702adb 100644 --- a/src/renderer/components/dock/install-chart.tsx +++ b/src/renderer/components/dock/install-chart.tsx @@ -27,13 +27,13 @@ import { observer } from "mobx-react"; import { dockStore, DockTab } from "./dock.store"; import { InfoPanel } from "./info-panel"; import { Badge } from "../badge"; -import { NamespaceSelect } from "../+namespaces/namespace-select"; +import { NamespaceSelect } from "../namespaces/namespace-select"; import { boundMethod, prevDefault } from "../../utils"; import { IChartInstallData, installChartStore } from "./install-chart.store"; import { Spinner } from "../spinner"; import { Icon } from "../icon"; import { Button } from "../button"; -import { releaseStore } from "../+apps-releases/release.store"; +import { releaseStore } from "../apps-releases/release.store"; import { LogsDialog } from "../dialog/logs-dialog"; import { Select, SelectOption } from "../select"; import { Input } from "../input"; diff --git a/src/renderer/components/dock/log-resource-selector.tsx b/src/renderer/components/dock/log-resource-selector.tsx index ab7a7560ed..4247393bb1 100644 --- a/src/renderer/components/dock/log-resource-selector.tsx +++ b/src/renderer/components/dock/log-resource-selector.tsx @@ -28,7 +28,7 @@ import { Pod } from "../../../common/k8s-api/endpoints"; import { Badge } from "../badge"; import { Select, SelectOption } from "../select"; import { LogTabData, logTabStore } from "./log-tab.store"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import type { TabId } from "./dock.store"; interface Props { diff --git a/src/renderer/components/dock/log-tab.store.ts b/src/renderer/components/dock/log-tab.store.ts index 5b6b73904f..a3ae69a81f 100644 --- a/src/renderer/components/dock/log-tab.store.ts +++ b/src/renderer/components/dock/log-tab.store.ts @@ -21,7 +21,7 @@ import uniqueId from "lodash/uniqueId"; import { reaction } from "mobx"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { IPodContainer, Pod } from "../../../common/k8s-api/endpoints"; import type { WorkloadKubeObject } from "../../../common/k8s-api/workload-kube-object"; diff --git a/src/renderer/components/dock/upgrade-chart.store.ts b/src/renderer/components/dock/upgrade-chart.store.ts index dfbfc2bc47..47837e461a 100644 --- a/src/renderer/components/dock/upgrade-chart.store.ts +++ b/src/renderer/components/dock/upgrade-chart.store.ts @@ -23,7 +23,7 @@ import { action, autorun, computed, IReactionDisposer, reaction, makeObservable import { dockStore, DockTab, DockTabCreateSpecific, TabId, TabKind } from "./dock.store"; import { DockTabStore } from "./dock-tab.store"; import { getReleaseValues, HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api"; -import { releaseStore } from "../+apps-releases/release.store"; +import { releaseStore } from "../apps-releases/release.store"; import { iter } from "../../utils"; import { monacoModelsManager } from "./monaco-model-manager"; diff --git a/src/renderer/components/dock/upgrade-chart.tsx b/src/renderer/components/dock/upgrade-chart.tsx index 582bd6b8e0..f78e3795c0 100644 --- a/src/renderer/components/dock/upgrade-chart.tsx +++ b/src/renderer/components/dock/upgrade-chart.tsx @@ -29,10 +29,10 @@ import type { DockTab } from "./dock.store"; import { InfoPanel } from "./info-panel"; import { upgradeChartStore } from "./upgrade-chart.store"; import { Spinner } from "../spinner"; -import { releaseStore } from "../+apps-releases/release.store"; +import { releaseStore } from "../apps-releases/release.store"; import { Badge } from "../badge"; import { EditorPanel } from "./editor-panel"; -import { helmChartStore, IChartVersion } from "../+apps-helm-charts/helm-chart.store"; +import { helmChartStore, IChartVersion } from "../apps-helm-charts/helm-chart.store"; import type { HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api"; import { Select, SelectOption } from "../select"; diff --git a/src/renderer/components/events/event.store.ts b/src/renderer/components/events/event.store.ts index b655e7f611..8d023867f0 100644 --- a/src/renderer/components/events/event.store.ts +++ b/src/renderer/components/events/event.store.ts @@ -26,7 +26,7 @@ import { autoBind } from "../../utils"; import { eventApi, KubeEvent } from "../../../common/k8s-api/endpoints/events.api"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; import { Pod } from "../../../common/k8s-api/endpoints/pods.api"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class EventStore extends KubeObjectStore { 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 d19e9d20c8..f84adeb96d 100644 --- a/src/renderer/components/item-object-list/item-list-layout.tsx +++ b/src/renderer/components/item-object-list/item-list-layout.tsx @@ -40,7 +40,7 @@ import { MenuActions } from "../menu/menu-actions"; import { MenuItem } from "../menu"; import { Checkbox } from "../checkbox"; import { UserStore } from "../../../common/user-store"; -import { namespaceStore } from "../+namespaces/namespace.store"; +import { namespaceStore } from "../namespaces/namespace.store"; diff --git a/src/renderer/components/kube-object-details/kube-object-details.tsx b/src/renderer/components/kube-object-details/kube-object-details.tsx index be888c6505..e1a0da1923 100644 --- a/src/renderer/components/kube-object-details/kube-object-details.tsx +++ b/src/renderer/components/kube-object-details/kube-object-details.tsx @@ -28,11 +28,11 @@ import { Drawer } from "../drawer"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; import { Spinner } from "../spinner"; import { apiManager } from "../../../common/k8s-api/api-manager"; -import { crdStore } from "../+custom-resources/crd.store"; +import { crdStore } from "../custom-resources/crd.store"; import { KubeObjectMenu } from "../kube-object-menu"; import { KubeObjectDetailRegistry } from "../../api/kube-object-detail-registry"; import logger from "../../../main/logger"; -import { CrdResourceDetails } from "../+custom-resources"; +import { CrdResourceDetails } from "../custom-resources"; import { KubeObjectMeta } from "../kube-object-meta"; import { hideDetails, kubeDetailsUrlParam } from "../kube-detail-params"; diff --git a/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx b/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx index d55e30b28f..56a81748dd 100644 --- a/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx +++ b/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx @@ -29,7 +29,7 @@ import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store" import { KubeObjectMenu } from "../kube-object-menu"; import { kubeWatchApi } from "../../../common/k8s-api/kube-watch-api"; import { clusterContext } from "../context"; -import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter"; +import { NamespaceSelectFilter } from "../namespaces/namespace-select-filter"; import { ResourceKindMap, ResourceNames } from "../../utils/rbac"; import { kubeSelectedUrlParam, showDetails } from "../kube-detail-params"; diff --git a/src/renderer/components/layout/sidebar.tsx b/src/renderer/components/layout/sidebar.tsx index 44e57e9202..8e9a22dd0a 100644 --- a/src/renderer/components/layout/sidebar.tsx +++ b/src/renderer/components/layout/sidebar.tsx @@ -26,20 +26,20 @@ import React from "react"; import { observer } from "mobx-react"; import { cssNames } from "../../utils"; import { Icon } from "../icon"; -import { Workloads } from "../+workloads"; -import { UserManagement } from "../+user-management"; -import { Storage } from "../+storage"; -import { Network } from "../+network"; -import { crdStore } from "../+custom-resources/crd.store"; -import { CustomResources } from "../+custom-resources/custom-resources"; +import { Workloads } from "../workloads"; +import { UserManagement } from "../user-management"; +import { Storage } from "../storage"; +import { Network } from "../network"; +import { crdStore } from "../custom-resources/crd.store"; +import { CustomResources } from "../custom-resources/custom-resources"; import { isActiveRoute } from "../../navigation"; import { isAllowedResource } from "../../../common/utils/allowed-resource"; import { Spinner } from "../spinner"; import { ClusterPageMenuRegistration, ClusterPageMenuRegistry, ClusterPageRegistry, getExtensionPageUrl } from "../../../extensions/registries"; import { SidebarItem } from "./sidebar-item"; -import { Apps } from "../+apps"; +import { Apps } from "../apps"; import * as routes from "../../../common/routes"; -import { Config } from "../+config"; +import { Config } from "../config"; interface Props { className?: string; diff --git a/src/renderer/components/namespaces/namespace-details.tsx b/src/renderer/components/namespaces/namespace-details.tsx index 08493e7a6b..7ade8ee753 100644 --- a/src/renderer/components/namespaces/namespace-details.tsx +++ b/src/renderer/components/namespaces/namespace-details.tsx @@ -30,11 +30,11 @@ import { getMetricsForNamespace, IPodMetrics, Namespace } from "../../../common/ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { Link } from "react-router-dom"; import { Spinner } from "../spinner"; -import { resourceQuotaStore } from "../+config-resource-quotas/resource-quotas.store"; +import { resourceQuotaStore } from "../config-resource-quotas/resource-quotas.store"; import { KubeObjectMeta } from "../kube-object-meta"; -import { limitRangeStore } from "../+config-limit-ranges/limit-ranges.store"; +import { limitRangeStore } from "../config-limit-ranges/limit-ranges.store"; import { ResourceMetrics } from "../resource-metrics"; -import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts"; +import { PodCharts, podMetricTabs } from "../workloads-pods/pod-charts"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { getDetailsUrl } from "../kube-detail-params"; diff --git a/src/renderer/components/network-services/service-details-endpoint.tsx b/src/renderer/components/network-services/service-details-endpoint.tsx index a36425afb6..54cdea919d 100644 --- a/src/renderer/components/network-services/service-details-endpoint.tsx +++ b/src/renderer/components/network-services/service-details-endpoint.tsx @@ -24,7 +24,7 @@ import { observer } from "mobx-react"; import React from "react"; import { Table, TableHead, TableCell, TableRow } from "../table"; import { prevDefault } from "../../utils"; -import { endpointStore } from "../+network-endpoints/endpoints.store"; +import { endpointStore } from "../network-endpoints/endpoints.store"; import { Spinner } from "../spinner"; import { showDetails } from "../kube-detail-params"; diff --git a/src/renderer/components/network-services/service-details.tsx b/src/renderer/components/network-services/service-details.tsx index 66a09672a1..29ed217e76 100644 --- a/src/renderer/components/network-services/service-details.tsx +++ b/src/renderer/components/network-services/service-details.tsx @@ -29,7 +29,7 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import type { Service } from "../../../common/k8s-api/endpoints"; import { KubeObjectMeta } from "../kube-object-meta"; import { ServicePortComponent } from "./service-port-component"; -import { endpointStore } from "../+network-endpoints/endpoints.store"; +import { endpointStore } from "../network-endpoints/endpoints.store"; import { ServiceDetailsEndpoint } from "./service-details-endpoint"; import { kubeWatchApi } from "../../../common/k8s-api/kube-watch-api"; diff --git a/src/renderer/components/network/network.tsx b/src/renderer/components/network/network.tsx index 7c177ee2a3..9a5f6adba4 100644 --- a/src/renderer/components/network/network.tsx +++ b/src/renderer/components/network/network.tsx @@ -24,10 +24,10 @@ import "./network.scss"; import React from "react"; import { observer } from "mobx-react"; import { TabLayout, TabLayoutRoute } from "../layout/tab-layout"; -import { Services } from "../+network-services"; -import { Endpoints } from "../+network-endpoints"; -import { Ingresses } from "../+network-ingresses"; -import { NetworkPolicies } from "../+network-policies"; +import { Services } from "../network-services"; +import { Endpoints } from "../network-endpoints"; +import { Ingresses } from "../network-ingresses"; +import { NetworkPolicies } from "../network-policies"; import { isAllowedResource } from "../../../common/utils/allowed-resource"; import * as routes from "../../../common/routes"; diff --git a/src/renderer/components/nodes/node-details.tsx b/src/renderer/components/nodes/node-details.tsx index cc858cba46..ced3714541 100644 --- a/src/renderer/components/nodes/node-details.tsx +++ b/src/renderer/components/nodes/node-details.tsx @@ -28,12 +28,12 @@ import { disposeOnUnmount, observer } from "mobx-react"; import { DrawerItem, DrawerItemLabels } from "../drawer"; import { Badge } from "../badge"; import { ResourceMetrics } from "../resource-metrics"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { getMetricsByNodeNames, IClusterMetrics, Node } from "../../../common/k8s-api/endpoints"; import { NodeCharts } from "./node-charts"; import { makeObservable, observable, reaction } from "mobx"; -import { PodDetailsList } from "../+workloads-pods/pod-details-list"; +import { PodDetailsList } from "../workloads-pods/pod-details-list"; import { KubeObjectMeta } from "../kube-object-meta"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; diff --git a/src/renderer/components/nodes/nodes.tsx b/src/renderer/components/nodes/nodes.tsx index e8a70b99d0..e57f0f8b03 100644 --- a/src/renderer/components/nodes/nodes.tsx +++ b/src/renderer/components/nodes/nodes.tsx @@ -35,7 +35,7 @@ import kebabCase from "lodash/kebabCase"; import upperFirst from "lodash/upperFirst"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { Badge } from "../badge/badge"; -import { eventStore } from "../+events/event.store"; +import { eventStore } from "../events/event.store"; import type { NodesRouteParams } from "../../../common/routes"; import { makeObservable, observable } from "mobx"; import isEmpty from "lodash/isEmpty"; diff --git a/src/renderer/components/preferences/helm-charts.tsx b/src/renderer/components/preferences/helm-charts.tsx index d0dd47e464..1fe68a7f8b 100644 --- a/src/renderer/components/preferences/helm-charts.tsx +++ b/src/renderer/components/preferences/helm-charts.tsx @@ -32,7 +32,7 @@ import { Select, SelectOption } from "../select"; import { AddHelmRepoDialog } from "./add-helm-repo-dialog"; import { observer } from "mobx-react"; import { RemovableItem } from "./removable-item"; -import { Notice } from "../+extensions/notice"; +import { Notice } from "../extensions/notice"; import { Spinner } from "../spinner"; @observer diff --git a/src/renderer/components/preferences/kubeconfig-syncs.tsx b/src/renderer/components/preferences/kubeconfig-syncs.tsx index 35b3d88b04..c3cb70d609 100644 --- a/src/renderer/components/preferences/kubeconfig-syncs.tsx +++ b/src/renderer/components/preferences/kubeconfig-syncs.tsx @@ -22,7 +22,7 @@ import fse from "fs-extra"; import { action, computed, makeObservable, observable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import React from "react"; -import { Notice } from "../+extensions/notice"; +import { Notice } from "../extensions/notice"; import { KubeconfigSyncEntry, KubeconfigSyncValue, UserStore } from "../../../common/user-store"; import { isWindows } from "../../../common/vars"; diff --git a/src/renderer/components/storage-classes/storage-class-details.tsx b/src/renderer/components/storage-classes/storage-class-details.tsx index 2e8eae63bb..66b8601d14 100644 --- a/src/renderer/components/storage-classes/storage-class-details.tsx +++ b/src/renderer/components/storage-classes/storage-class-details.tsx @@ -30,8 +30,8 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import type { StorageClass } from "../../../common/k8s-api/endpoints"; import { KubeObjectMeta } from "../kube-object-meta"; import { storageClassStore } from "./storage-class.store"; -import { VolumeDetailsList } from "../+storage-volumes/volume-details-list"; -import { volumesStore } from "../+storage-volumes/volumes.store"; +import { VolumeDetailsList } from "../storage-volumes/volume-details-list"; +import { volumesStore } from "../storage-volumes/volumes.store"; interface Props extends KubeObjectDetailsProps { } diff --git a/src/renderer/components/storage-classes/storage-class.store.ts b/src/renderer/components/storage-classes/storage-class.store.ts index 67c7d33f6b..023d6405f9 100644 --- a/src/renderer/components/storage-classes/storage-class.store.ts +++ b/src/renderer/components/storage-classes/storage-class.store.ts @@ -23,7 +23,7 @@ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; import { StorageClass, storageClassApi } from "../../../common/k8s-api/endpoints/storage-class.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; -import { volumesStore } from "../+storage-volumes/volumes.store"; +import { volumesStore } from "../storage-volumes/volumes.store"; export class StorageClassStore extends KubeObjectStore { api = storageClassApi; diff --git a/src/renderer/components/storage-volume-claims/volume-claim-details.tsx b/src/renderer/components/storage-volume-claims/volume-claim-details.tsx index 4d515a0056..0248fa1f0c 100644 --- a/src/renderer/components/storage-volume-claims/volume-claim-details.tsx +++ b/src/renderer/components/storage-volume-claims/volume-claim-details.tsx @@ -26,7 +26,7 @@ import { makeObservable, observable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import { DrawerItem, DrawerTitle } from "../drawer"; import { Badge } from "../badge"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { Link } from "react-router-dom"; import { ResourceMetrics } from "../resource-metrics"; import { VolumeClaimDiskChart } from "./volume-claim-disk-chart"; diff --git a/src/renderer/components/storage-volume-claims/volume-claims.tsx b/src/renderer/components/storage-volume-claims/volume-claims.tsx index 798cce0e53..4d7bb4c6b9 100644 --- a/src/renderer/components/storage-volume-claims/volume-claims.tsx +++ b/src/renderer/components/storage-volume-claims/volume-claims.tsx @@ -25,7 +25,7 @@ import React from "react"; import { observer } from "mobx-react"; import { Link, RouteComponentProps } from "react-router-dom"; import { volumeClaimStore } from "./volume-claim.store"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { unitsToBytes } from "../../../common/utils/convertMemory"; import { stopPropagation } from "../../utils"; diff --git a/src/renderer/components/storage/storage.tsx b/src/renderer/components/storage/storage.tsx index cdc06a1e3c..014dfc1a21 100644 --- a/src/renderer/components/storage/storage.tsx +++ b/src/renderer/components/storage/storage.tsx @@ -24,9 +24,9 @@ import "./storage.scss"; import React from "react"; import { observer } from "mobx-react"; import { TabLayout, TabLayoutRoute } from "../layout/tab-layout"; -import { PersistentVolumes } from "../+storage-volumes"; -import { StorageClasses } from "../+storage-classes"; -import { PersistentVolumeClaims } from "../+storage-volume-claims"; +import { PersistentVolumes } from "../storage-volumes"; +import { StorageClasses } from "../storage-classes"; +import { PersistentVolumeClaims } from "../storage-volume-claims"; import { isAllowedResource } from "../../../common/utils/allowed-resource"; import * as routes from "../../../common/routes"; diff --git a/src/renderer/components/user-management/+cluster-role-bindings/details.scss b/src/renderer/components/user-management/cluster-role-bindings/details.scss similarity index 100% rename from src/renderer/components/user-management/+cluster-role-bindings/details.scss rename to src/renderer/components/user-management/cluster-role-bindings/details.scss diff --git a/src/renderer/components/user-management/+cluster-role-bindings/details.tsx b/src/renderer/components/user-management/cluster-role-bindings/details.tsx similarity index 100% rename from src/renderer/components/user-management/+cluster-role-bindings/details.tsx rename to src/renderer/components/user-management/cluster-role-bindings/details.tsx diff --git a/src/renderer/components/user-management/+cluster-role-bindings/dialog.scss b/src/renderer/components/user-management/cluster-role-bindings/dialog.scss similarity index 100% rename from src/renderer/components/user-management/+cluster-role-bindings/dialog.scss rename to src/renderer/components/user-management/cluster-role-bindings/dialog.scss diff --git a/src/renderer/components/user-management/+cluster-role-bindings/dialog.tsx b/src/renderer/components/user-management/cluster-role-bindings/dialog.tsx similarity index 98% rename from src/renderer/components/user-management/+cluster-role-bindings/dialog.tsx rename to src/renderer/components/user-management/cluster-role-bindings/dialog.tsx index b575068804..9b0c18366e 100644 --- a/src/renderer/components/user-management/+cluster-role-bindings/dialog.tsx +++ b/src/renderer/components/user-management/cluster-role-bindings/dialog.tsx @@ -25,7 +25,7 @@ import { action, computed, makeObservable, observable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import React from "react"; -import { serviceAccountsStore } from "../+service-accounts/store"; +import { serviceAccountsStore } from "../service-accounts/store"; import { ClusterRole, ClusterRoleBinding, ClusterRoleBindingSubject, ServiceAccount } from "../../../../common/k8s-api/endpoints"; import { Dialog, DialogProps } from "../../dialog"; import { EditableList } from "../../editable-list"; @@ -36,7 +36,7 @@ import { Notifications } from "../../notifications"; import { Select, SelectOption } from "../../select"; import { Wizard, WizardStep } from "../../wizard"; import { clusterRoleBindingsStore } from "./store"; -import { clusterRolesStore } from "../+cluster-roles/store"; +import { clusterRolesStore } from "../cluster-roles/store"; import { getRoleRefSelectOption, ServiceAccountOption } from "../select-options"; import { ObservableHashSet, nFircate } from "../../../utils"; import { Input } from "../../input"; diff --git a/src/renderer/components/user-management/+cluster-role-bindings/hashers.ts b/src/renderer/components/user-management/cluster-role-bindings/hashers.ts similarity index 100% rename from src/renderer/components/user-management/+cluster-role-bindings/hashers.ts rename to src/renderer/components/user-management/cluster-role-bindings/hashers.ts diff --git a/src/renderer/components/user-management/+cluster-role-bindings/index.ts b/src/renderer/components/user-management/cluster-role-bindings/index.ts similarity index 100% rename from src/renderer/components/user-management/+cluster-role-bindings/index.ts rename to src/renderer/components/user-management/cluster-role-bindings/index.ts diff --git a/src/renderer/components/user-management/+cluster-role-bindings/store.ts b/src/renderer/components/user-management/cluster-role-bindings/store.ts similarity index 100% rename from src/renderer/components/user-management/+cluster-role-bindings/store.ts rename to src/renderer/components/user-management/cluster-role-bindings/store.ts diff --git a/src/renderer/components/user-management/+cluster-role-bindings/view.scss b/src/renderer/components/user-management/cluster-role-bindings/view.scss similarity index 100% rename from src/renderer/components/user-management/+cluster-role-bindings/view.scss rename to src/renderer/components/user-management/cluster-role-bindings/view.scss diff --git a/src/renderer/components/user-management/+cluster-role-bindings/view.tsx b/src/renderer/components/user-management/cluster-role-bindings/view.tsx similarity index 96% rename from src/renderer/components/user-management/+cluster-role-bindings/view.tsx rename to src/renderer/components/user-management/cluster-role-bindings/view.tsx index edb65a07a8..6c9e83f49b 100644 --- a/src/renderer/components/user-management/+cluster-role-bindings/view.tsx +++ b/src/renderer/components/user-management/cluster-role-bindings/view.tsx @@ -28,8 +28,8 @@ import { KubeObjectListLayout } from "../../kube-object-list-layout"; import { KubeObjectStatusIcon } from "../../kube-object-status-icon"; import { ClusterRoleBindingDialog } from "./dialog"; import { clusterRoleBindingsStore } from "./store"; -import { clusterRolesStore } from "../+cluster-roles/store"; -import { serviceAccountsStore } from "../+service-accounts/store"; +import { clusterRolesStore } from "../cluster-roles/store"; +import { serviceAccountsStore } from "../service-accounts/store"; import type { ClusterRoleBindingsRouteParams } from "../../../../common/routes"; enum columnId { diff --git a/src/renderer/components/user-management/+cluster-roles/add-dialog.scss b/src/renderer/components/user-management/cluster-roles/add-dialog.scss similarity index 100% rename from src/renderer/components/user-management/+cluster-roles/add-dialog.scss rename to src/renderer/components/user-management/cluster-roles/add-dialog.scss diff --git a/src/renderer/components/user-management/+cluster-roles/add-dialog.tsx b/src/renderer/components/user-management/cluster-roles/add-dialog.tsx similarity index 100% rename from src/renderer/components/user-management/+cluster-roles/add-dialog.tsx rename to src/renderer/components/user-management/cluster-roles/add-dialog.tsx diff --git a/src/renderer/components/user-management/+cluster-roles/details.scss b/src/renderer/components/user-management/cluster-roles/details.scss similarity index 100% rename from src/renderer/components/user-management/+cluster-roles/details.scss rename to src/renderer/components/user-management/cluster-roles/details.scss diff --git a/src/renderer/components/user-management/+cluster-roles/details.tsx b/src/renderer/components/user-management/cluster-roles/details.tsx similarity index 100% rename from src/renderer/components/user-management/+cluster-roles/details.tsx rename to src/renderer/components/user-management/cluster-roles/details.tsx diff --git a/src/renderer/components/user-management/+cluster-roles/index.ts b/src/renderer/components/user-management/cluster-roles/index.ts similarity index 100% rename from src/renderer/components/user-management/+cluster-roles/index.ts rename to src/renderer/components/user-management/cluster-roles/index.ts diff --git a/src/renderer/components/user-management/+cluster-roles/store.ts b/src/renderer/components/user-management/cluster-roles/store.ts similarity index 100% rename from src/renderer/components/user-management/+cluster-roles/store.ts rename to src/renderer/components/user-management/cluster-roles/store.ts diff --git a/src/renderer/components/user-management/+cluster-roles/view.scss b/src/renderer/components/user-management/cluster-roles/view.scss similarity index 100% rename from src/renderer/components/user-management/+cluster-roles/view.scss rename to src/renderer/components/user-management/cluster-roles/view.scss diff --git a/src/renderer/components/user-management/+cluster-roles/view.tsx b/src/renderer/components/user-management/cluster-roles/view.tsx similarity index 100% rename from src/renderer/components/user-management/+cluster-roles/view.tsx rename to src/renderer/components/user-management/cluster-roles/view.tsx diff --git a/src/renderer/components/user-management/+role-bindings/details.scss b/src/renderer/components/user-management/role-bindings/details.scss similarity index 100% rename from src/renderer/components/user-management/+role-bindings/details.scss rename to src/renderer/components/user-management/role-bindings/details.scss diff --git a/src/renderer/components/user-management/+role-bindings/details.tsx b/src/renderer/components/user-management/role-bindings/details.tsx similarity index 100% rename from src/renderer/components/user-management/+role-bindings/details.tsx rename to src/renderer/components/user-management/role-bindings/details.tsx diff --git a/src/renderer/components/user-management/+role-bindings/dialog.scss b/src/renderer/components/user-management/role-bindings/dialog.scss similarity index 100% rename from src/renderer/components/user-management/+role-bindings/dialog.scss rename to src/renderer/components/user-management/role-bindings/dialog.scss diff --git a/src/renderer/components/user-management/+role-bindings/dialog.tsx b/src/renderer/components/user-management/role-bindings/dialog.tsx similarity index 97% rename from src/renderer/components/user-management/+role-bindings/dialog.tsx rename to src/renderer/components/user-management/role-bindings/dialog.tsx index 0f331ee698..e7905a0c78 100644 --- a/src/renderer/components/user-management/+role-bindings/dialog.tsx +++ b/src/renderer/components/user-management/role-bindings/dialog.tsx @@ -25,9 +25,9 @@ import { computed, observable, makeObservable, action } from "mobx"; import { observer } from "mobx-react"; import React from "react"; -import { rolesStore } from "../+roles/store"; -import { serviceAccountsStore } from "../+service-accounts/store"; -import { NamespaceSelect } from "../../+namespaces/namespace-select"; +import { rolesStore } from "../roles/store"; +import { serviceAccountsStore } from "../service-accounts/store"; +import { NamespaceSelect } from "../../namespaces/namespace-select"; import { ClusterRole, Role, roleApi, RoleBinding, RoleBindingSubject, ServiceAccount } from "../../../../common/k8s-api/endpoints"; import { Dialog, DialogProps } from "../../dialog"; import { EditableList } from "../../editable-list"; @@ -38,7 +38,7 @@ import { Notifications } from "../../notifications"; import { Select, SelectOption } from "../../select"; import { Wizard, WizardStep } from "../../wizard"; import { roleBindingsStore } from "./store"; -import { clusterRolesStore } from "../+cluster-roles/store"; +import { clusterRolesStore } from "../cluster-roles/store"; import { Input } from "../../input"; import { getRoleRefSelectOption, ServiceAccountOption } from "../select-options"; import { ObservableHashSet, nFircate } from "../../../utils"; diff --git a/src/renderer/components/user-management/+role-bindings/hashers.ts b/src/renderer/components/user-management/role-bindings/hashers.ts similarity index 100% rename from src/renderer/components/user-management/+role-bindings/hashers.ts rename to src/renderer/components/user-management/role-bindings/hashers.ts diff --git a/src/renderer/components/user-management/+role-bindings/index.ts b/src/renderer/components/user-management/role-bindings/index.ts similarity index 100% rename from src/renderer/components/user-management/+role-bindings/index.ts rename to src/renderer/components/user-management/role-bindings/index.ts diff --git a/src/renderer/components/user-management/+role-bindings/store.ts b/src/renderer/components/user-management/role-bindings/store.ts similarity index 100% rename from src/renderer/components/user-management/+role-bindings/store.ts rename to src/renderer/components/user-management/role-bindings/store.ts diff --git a/src/renderer/components/user-management/+role-bindings/view.scss b/src/renderer/components/user-management/role-bindings/view.scss similarity index 100% rename from src/renderer/components/user-management/+role-bindings/view.scss rename to src/renderer/components/user-management/role-bindings/view.scss diff --git a/src/renderer/components/user-management/+role-bindings/view.tsx b/src/renderer/components/user-management/role-bindings/view.tsx similarity index 95% rename from src/renderer/components/user-management/+role-bindings/view.tsx rename to src/renderer/components/user-management/role-bindings/view.tsx index 3eb60ad9ba..db9a94ff0c 100644 --- a/src/renderer/components/user-management/+role-bindings/view.tsx +++ b/src/renderer/components/user-management/role-bindings/view.tsx @@ -27,9 +27,9 @@ import { KubeObjectListLayout } from "../../kube-object-list-layout"; import { KubeObjectStatusIcon } from "../../kube-object-status-icon"; import { RoleBindingDialog } from "./dialog"; import { roleBindingsStore } from "./store"; -import { rolesStore } from "../+roles/store"; -import { clusterRolesStore } from "../+cluster-roles/store"; -import { serviceAccountsStore } from "../+service-accounts/store"; +import { rolesStore } from "../roles/store"; +import { clusterRolesStore } from "../cluster-roles/store"; +import { serviceAccountsStore } from "../service-accounts/store"; import type { RoleBindingsRouteParams } from "../../../../common/routes"; enum columnId { diff --git a/src/renderer/components/user-management/+roles/add-dialog.scss b/src/renderer/components/user-management/roles/add-dialog.scss similarity index 100% rename from src/renderer/components/user-management/+roles/add-dialog.scss rename to src/renderer/components/user-management/roles/add-dialog.scss diff --git a/src/renderer/components/user-management/+roles/add-dialog.tsx b/src/renderer/components/user-management/roles/add-dialog.tsx similarity index 98% rename from src/renderer/components/user-management/+roles/add-dialog.tsx rename to src/renderer/components/user-management/roles/add-dialog.tsx index 65d4505976..75f0db5099 100644 --- a/src/renderer/components/user-management/+roles/add-dialog.tsx +++ b/src/renderer/components/user-management/roles/add-dialog.tsx @@ -25,7 +25,7 @@ import React from "react"; import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import { NamespaceSelect } from "../../+namespaces/namespace-select"; +import { NamespaceSelect } from "../../namespaces/namespace-select"; import { Dialog, DialogProps } from "../../dialog"; import { Input } from "../../input"; import { showDetails } from "../../kube-detail-params"; diff --git a/src/renderer/components/user-management/+roles/details.scss b/src/renderer/components/user-management/roles/details.scss similarity index 100% rename from src/renderer/components/user-management/+roles/details.scss rename to src/renderer/components/user-management/roles/details.scss diff --git a/src/renderer/components/user-management/+roles/details.tsx b/src/renderer/components/user-management/roles/details.tsx similarity index 100% rename from src/renderer/components/user-management/+roles/details.tsx rename to src/renderer/components/user-management/roles/details.tsx diff --git a/src/renderer/components/user-management/+roles/index.ts b/src/renderer/components/user-management/roles/index.ts similarity index 100% rename from src/renderer/components/user-management/+roles/index.ts rename to src/renderer/components/user-management/roles/index.ts diff --git a/src/renderer/components/user-management/+roles/store.ts b/src/renderer/components/user-management/roles/store.ts similarity index 100% rename from src/renderer/components/user-management/+roles/store.ts rename to src/renderer/components/user-management/roles/store.ts diff --git a/src/renderer/components/user-management/+roles/view.scss b/src/renderer/components/user-management/roles/view.scss similarity index 100% rename from src/renderer/components/user-management/+roles/view.scss rename to src/renderer/components/user-management/roles/view.scss diff --git a/src/renderer/components/user-management/+roles/view.tsx b/src/renderer/components/user-management/roles/view.tsx similarity index 100% rename from src/renderer/components/user-management/+roles/view.tsx rename to src/renderer/components/user-management/roles/view.tsx diff --git a/src/renderer/components/user-management/+service-accounts/create-dialog.scss b/src/renderer/components/user-management/service-accounts/create-dialog.scss similarity index 100% rename from src/renderer/components/user-management/+service-accounts/create-dialog.scss rename to src/renderer/components/user-management/service-accounts/create-dialog.scss diff --git a/src/renderer/components/user-management/+service-accounts/create-dialog.tsx b/src/renderer/components/user-management/service-accounts/create-dialog.tsx similarity index 98% rename from src/renderer/components/user-management/+service-accounts/create-dialog.tsx rename to src/renderer/components/user-management/service-accounts/create-dialog.tsx index 5665835ff4..2d9cd93500 100644 --- a/src/renderer/components/user-management/+service-accounts/create-dialog.tsx +++ b/src/renderer/components/user-management/service-accounts/create-dialog.tsx @@ -25,7 +25,7 @@ import React from "react"; import { makeObservable, observable } from "mobx"; import { observer } from "mobx-react"; -import { NamespaceSelect } from "../../+namespaces/namespace-select"; +import { NamespaceSelect } from "../../namespaces/namespace-select"; import { Dialog, DialogProps } from "../../dialog"; import { Input } from "../../input"; import { systemName } from "../../input/input_validators"; diff --git a/src/renderer/components/user-management/+service-accounts/details.scss b/src/renderer/components/user-management/service-accounts/details.scss similarity index 100% rename from src/renderer/components/user-management/+service-accounts/details.scss rename to src/renderer/components/user-management/service-accounts/details.scss diff --git a/src/renderer/components/user-management/+service-accounts/details.tsx b/src/renderer/components/user-management/service-accounts/details.tsx similarity index 98% rename from src/renderer/components/user-management/+service-accounts/details.tsx rename to src/renderer/components/user-management/service-accounts/details.tsx index 3cc12dd24d..f73ba8a3f3 100644 --- a/src/renderer/components/user-management/+service-accounts/details.tsx +++ b/src/renderer/components/user-management/service-accounts/details.tsx @@ -26,7 +26,7 @@ import { disposeOnUnmount, observer } from "mobx-react"; import React from "react"; import { Link } from "react-router-dom"; -import { secretsStore } from "../../+config-secrets/secrets.store"; +import { secretsStore } from "../../config-secrets/secrets.store"; import { Secret, ServiceAccount } from "../../../../common/k8s-api/endpoints"; import { DrawerItem, DrawerTitle } from "../../drawer"; import { Icon } from "../../icon"; diff --git a/src/renderer/components/user-management/+service-accounts/index.ts b/src/renderer/components/user-management/service-accounts/index.ts similarity index 100% rename from src/renderer/components/user-management/+service-accounts/index.ts rename to src/renderer/components/user-management/service-accounts/index.ts diff --git a/src/renderer/components/user-management/+service-accounts/secret.scss b/src/renderer/components/user-management/service-accounts/secret.scss similarity index 100% rename from src/renderer/components/user-management/+service-accounts/secret.scss rename to src/renderer/components/user-management/service-accounts/secret.scss diff --git a/src/renderer/components/user-management/+service-accounts/secret.tsx b/src/renderer/components/user-management/service-accounts/secret.tsx similarity index 100% rename from src/renderer/components/user-management/+service-accounts/secret.tsx rename to src/renderer/components/user-management/service-accounts/secret.tsx diff --git a/src/renderer/components/user-management/+service-accounts/store.ts b/src/renderer/components/user-management/service-accounts/store.ts similarity index 100% rename from src/renderer/components/user-management/+service-accounts/store.ts rename to src/renderer/components/user-management/service-accounts/store.ts diff --git a/src/renderer/components/user-management/+service-accounts/view.scss b/src/renderer/components/user-management/service-accounts/view.scss similarity index 100% rename from src/renderer/components/user-management/+service-accounts/view.scss rename to src/renderer/components/user-management/service-accounts/view.scss diff --git a/src/renderer/components/user-management/+service-accounts/view.tsx b/src/renderer/components/user-management/service-accounts/view.tsx similarity index 100% rename from src/renderer/components/user-management/+service-accounts/view.tsx rename to src/renderer/components/user-management/service-accounts/view.tsx diff --git a/src/renderer/components/user-management/user-management.tsx b/src/renderer/components/user-management/user-management.tsx index 2b6191a13e..d1a2968476 100644 --- a/src/renderer/components/user-management/user-management.tsx +++ b/src/renderer/components/user-management/user-management.tsx @@ -24,14 +24,14 @@ import "./user-management.scss"; import React from "react"; import { observer } from "mobx-react"; import { TabLayout, TabLayoutRoute } from "../layout/tab-layout"; -import { PodSecurityPolicies } from "../+pod-security-policies"; +import { PodSecurityPolicies } from "../pod-security-policies"; import { isAllowedResource } from "../../../common/utils/allowed-resource"; import * as routes from "../../../common/routes"; -import { ClusterRoleBindings } from "./+cluster-role-bindings"; -import { ServiceAccounts } from "./+service-accounts"; -import { Roles } from "./+roles"; -import { RoleBindings } from "./+role-bindings"; -import { ClusterRoles } from "./+cluster-roles"; +import { ClusterRoleBindings } from "./cluster-role-bindings"; +import { ServiceAccounts } from "./service-accounts"; +import { Roles } from "./roles"; +import { RoleBindings } from "./role-bindings"; +import { ClusterRoles } from "./cluster-roles"; @observer export class UserManagement extends React.Component { diff --git a/src/renderer/components/workloads-cronjobs/cronjob-details.tsx b/src/renderer/components/workloads-cronjobs/cronjob-details.tsx index 108ec47012..1da0b8acee 100644 --- a/src/renderer/components/workloads-cronjobs/cronjob-details.tsx +++ b/src/renderer/components/workloads-cronjobs/cronjob-details.tsx @@ -26,7 +26,7 @@ import kebabCase from "lodash/kebabCase"; import { observer } from "mobx-react"; import { DrawerItem, DrawerTitle } from "../drawer"; import { Badge } from "../badge/badge"; -import { jobStore } from "../+workloads-jobs/job.store"; +import { jobStore } from "../workloads-jobs/job.store"; import { Link } from "react-router-dom"; import { cronJobStore } from "./cronjob.store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; diff --git a/src/renderer/components/workloads-cronjobs/cronjob.store.ts b/src/renderer/components/workloads-cronjobs/cronjob.store.ts index 4f46eaf60a..ba80121436 100644 --- a/src/renderer/components/workloads-cronjobs/cronjob.store.ts +++ b/src/renderer/components/workloads-cronjobs/cronjob.store.ts @@ -22,7 +22,7 @@ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; import { CronJob, cronJobApi } from "../../../common/k8s-api/endpoints/cron-job.api"; -import { jobStore } from "../+workloads-jobs/job.store"; +import { jobStore } from "../workloads-jobs/job.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class CronJobStore extends KubeObjectStore { diff --git a/src/renderer/components/workloads-cronjobs/cronjobs.tsx b/src/renderer/components/workloads-cronjobs/cronjobs.tsx index 40dcb481ba..8c6743ba5b 100644 --- a/src/renderer/components/workloads-cronjobs/cronjobs.tsx +++ b/src/renderer/components/workloads-cronjobs/cronjobs.tsx @@ -28,8 +28,8 @@ import { CronJob, cronJobApi } from "../../../common/k8s-api/endpoints/cron-job. import { MenuItem } from "../menu"; import { Icon } from "../icon"; import { cronJobStore } from "./cronjob.store"; -import { jobStore } from "../+workloads-jobs/job.store"; -import { eventStore } from "../+events/event.store"; +import { jobStore } from "../workloads-jobs/job.store"; +import { eventStore } from "../events/event.store"; import type { KubeObjectMenuProps } from "../kube-object-menu"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { CronJobTriggerDialog } from "./cronjob-trigger-dialog"; diff --git a/src/renderer/components/workloads-daemonsets/daemonset-details.tsx b/src/renderer/components/workloads-daemonsets/daemonset-details.tsx index 92615e54ef..73f5553c1f 100644 --- a/src/renderer/components/workloads-daemonsets/daemonset-details.tsx +++ b/src/renderer/components/workloads-daemonsets/daemonset-details.tsx @@ -25,17 +25,17 @@ import React from "react"; import { disposeOnUnmount, observer } from "mobx-react"; import { DrawerItem } from "../drawer"; import { Badge } from "../badge"; -import { PodDetailsStatuses } from "../+workloads-pods/pod-details-statuses"; -import { PodDetailsTolerations } from "../+workloads-pods/pod-details-tolerations"; -import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities"; +import { PodDetailsStatuses } from "../workloads-pods/pod-details-statuses"; +import { PodDetailsTolerations } from "../workloads-pods/pod-details-tolerations"; +import { PodDetailsAffinities } from "../workloads-pods/pod-details-affinities"; import { daemonSetStore } from "./daemonsets.store"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { DaemonSet, getMetricsForDaemonSets, IPodMetrics } from "../../../common/k8s-api/endpoints"; import { ResourceMetrics, ResourceMetricsText } from "../resource-metrics"; -import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts"; +import { PodCharts, podMetricTabs } from "../workloads-pods/pod-charts"; import { makeObservable, observable, reaction } from "mobx"; -import { PodDetailsList } from "../+workloads-pods/pod-details-list"; +import { PodDetailsList } from "../workloads-pods/pod-details-list"; import { KubeObjectMeta } from "../kube-object-meta"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; diff --git a/src/renderer/components/workloads-daemonsets/daemonsets.store.ts b/src/renderer/components/workloads-daemonsets/daemonsets.store.ts index 605aa65c93..2d7b29300f 100644 --- a/src/renderer/components/workloads-daemonsets/daemonsets.store.ts +++ b/src/renderer/components/workloads-daemonsets/daemonsets.store.ts @@ -20,7 +20,7 @@ */ import { makeObservable } from "mobx"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { DaemonSet, daemonSetApi, Pod, PodStatus } from "../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; diff --git a/src/renderer/components/workloads-daemonsets/daemonsets.tsx b/src/renderer/components/workloads-daemonsets/daemonsets.tsx index e9c4442b15..5a2a0bbcf6 100644 --- a/src/renderer/components/workloads-daemonsets/daemonsets.tsx +++ b/src/renderer/components/workloads-daemonsets/daemonsets.tsx @@ -25,10 +25,10 @@ import React from "react"; import { observer } from "mobx-react"; import type { RouteComponentProps } from "react-router"; import type { DaemonSet } from "../../../common/k8s-api/endpoints"; -import { eventStore } from "../+events/event.store"; +import { eventStore } from "../events/event.store"; import { daemonSetStore } from "./daemonsets.store"; -import { podsStore } from "../+workloads-pods/pods.store"; -import { nodesStore } from "../+nodes/nodes.store"; +import { podsStore } from "../workloads-pods/pods.store"; +import { nodesStore } from "../nodes/nodes.store"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { Badge } from "../badge"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; diff --git a/src/renderer/components/workloads-deployments/deployment-details.tsx b/src/renderer/components/workloads-deployments/deployment-details.tsx index 8f4a45a580..4980876994 100644 --- a/src/renderer/components/workloads-deployments/deployment-details.tsx +++ b/src/renderer/components/workloads-deployments/deployment-details.tsx @@ -27,17 +27,17 @@ import { disposeOnUnmount, observer } from "mobx-react"; import { DrawerItem } from "../drawer"; import { Badge } from "../badge"; import { Deployment, getMetricsForDeployments, IPodMetrics } from "../../../common/k8s-api/endpoints"; -import { PodDetailsTolerations } from "../+workloads-pods/pod-details-tolerations"; -import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { PodDetailsTolerations } from "../workloads-pods/pod-details-tolerations"; +import { PodDetailsAffinities } from "../workloads-pods/pod-details-affinities"; +import { podsStore } from "../workloads-pods/pods.store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { ResourceMetrics, ResourceMetricsText } from "../resource-metrics"; import { deploymentStore } from "./deployments.store"; -import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts"; +import { PodCharts, podMetricTabs } from "../workloads-pods/pod-charts"; import { makeObservable, observable, reaction } from "mobx"; -import { PodDetailsList } from "../+workloads-pods/pod-details-list"; +import { PodDetailsList } from "../workloads-pods/pod-details-list"; import { KubeObjectMeta } from "../kube-object-meta"; -import { replicaSetStore } from "../+workloads-replicasets/replicasets.store"; +import { replicaSetStore } from "../workloads-replicasets/replicasets.store"; import { DeploymentReplicaSets } from "./deployment-replicasets"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; diff --git a/src/renderer/components/workloads-deployments/deployment-replicasets.tsx b/src/renderer/components/workloads-deployments/deployment-replicasets.tsx index e332b19fe8..ca06661efc 100644 --- a/src/renderer/components/workloads-deployments/deployment-replicasets.tsx +++ b/src/renderer/components/workloads-deployments/deployment-replicasets.tsx @@ -30,7 +30,7 @@ import { prevDefault, stopPropagation } from "../../utils"; import { DrawerTitle } from "../drawer"; import { Table, TableCell, TableHead, TableRow } from "../table"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; -import { replicaSetStore } from "../+workloads-replicasets/replicasets.store"; +import { replicaSetStore } from "../workloads-replicasets/replicasets.store"; import { showDetails } from "../kube-detail-params"; diff --git a/src/renderer/components/workloads-deployments/deployments.store.ts b/src/renderer/components/workloads-deployments/deployments.store.ts index 64f349491e..0148142b40 100644 --- a/src/renderer/components/workloads-deployments/deployments.store.ts +++ b/src/renderer/components/workloads-deployments/deployments.store.ts @@ -20,7 +20,7 @@ */ import { makeObservable } from "mobx"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { Deployment, deploymentApi, PodStatus } from "../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; diff --git a/src/renderer/components/workloads-deployments/deployments.tsx b/src/renderer/components/workloads-deployments/deployments.tsx index 28705fd53d..9c131f3410 100644 --- a/src/renderer/components/workloads-deployments/deployments.tsx +++ b/src/renderer/components/workloads-deployments/deployments.tsx @@ -31,10 +31,10 @@ import { Icon } from "../icon"; import { DeploymentScaleDialog } from "./deployment-scale-dialog"; import { ConfirmDialog } from "../confirm-dialog"; import { deploymentStore } from "./deployments.store"; -import { replicaSetStore } from "../+workloads-replicasets/replicasets.store"; -import { podsStore } from "../+workloads-pods/pods.store"; -import { nodesStore } from "../+nodes/nodes.store"; -import { eventStore } from "../+events/event.store"; +import { replicaSetStore } from "../workloads-replicasets/replicasets.store"; +import { podsStore } from "../workloads-pods/pods.store"; +import { nodesStore } from "../nodes/nodes.store"; +import { eventStore } from "../events/event.store"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { cssNames } from "../../utils"; import kebabCase from "lodash/kebabCase"; diff --git a/src/renderer/components/workloads-jobs/job-details.tsx b/src/renderer/components/workloads-jobs/job-details.tsx index 6c4d9d3525..7d90169e03 100644 --- a/src/renderer/components/workloads-jobs/job-details.tsx +++ b/src/renderer/components/workloads-jobs/job-details.tsx @@ -26,18 +26,18 @@ import kebabCase from "lodash/kebabCase"; import { observer } from "mobx-react"; import { DrawerItem } from "../drawer"; import { Badge } from "../badge"; -import { PodDetailsStatuses } from "../+workloads-pods/pod-details-statuses"; +import { PodDetailsStatuses } from "../workloads-pods/pod-details-statuses"; import { Link } from "react-router-dom"; -import { PodDetailsTolerations } from "../+workloads-pods/pod-details-tolerations"; -import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { PodDetailsTolerations } from "../workloads-pods/pod-details-tolerations"; +import { PodDetailsAffinities } from "../workloads-pods/pod-details-affinities"; +import { podsStore } from "../workloads-pods/pods.store"; import { jobStore } from "./job.store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { getMetricsForJobs, IPodMetrics, Job } from "../../../common/k8s-api/endpoints"; -import { PodDetailsList } from "../+workloads-pods/pod-details-list"; +import { PodDetailsList } from "../workloads-pods/pod-details-list"; import { KubeObjectMeta } from "../kube-object-meta"; import { makeObservable, observable } from "mobx"; -import { podMetricTabs, PodCharts } from "../+workloads-pods/pod-charts"; +import { podMetricTabs, PodCharts } from "../workloads-pods/pod-charts"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ResourceMetrics } from "../resource-metrics"; diff --git a/src/renderer/components/workloads-jobs/job.store.ts b/src/renderer/components/workloads-jobs/job.store.ts index 71f854c6c3..ae8e76d585 100644 --- a/src/renderer/components/workloads-jobs/job.store.ts +++ b/src/renderer/components/workloads-jobs/job.store.ts @@ -23,7 +23,7 @@ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import { autoBind } from "../../utils"; import { Job, jobApi } from "../../../common/k8s-api/endpoints/job.api"; import { CronJob, Pod, PodStatus } from "../../../common/k8s-api/endpoints"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; export class JobStore extends KubeObjectStore { diff --git a/src/renderer/components/workloads-jobs/jobs.tsx b/src/renderer/components/workloads-jobs/jobs.tsx index 6dc2362604..7005d9e39e 100644 --- a/src/renderer/components/workloads-jobs/jobs.tsx +++ b/src/renderer/components/workloads-jobs/jobs.tsx @@ -24,9 +24,9 @@ import "./jobs.scss"; import React from "react"; import { observer } from "mobx-react"; import type { RouteComponentProps } from "react-router"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { jobStore } from "./job.store"; -import { eventStore } from "../+events/event.store"; +import { eventStore } from "../events/event.store"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import kebabCase from "lodash/kebabCase"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; diff --git a/src/renderer/components/workloads-overview/overview-statuses.tsx b/src/renderer/components/workloads-overview/overview-statuses.tsx index f20b9d25ff..523267e62a 100644 --- a/src/renderer/components/workloads-overview/overview-statuses.tsx +++ b/src/renderer/components/workloads-overview/overview-statuses.tsx @@ -25,9 +25,9 @@ import React from "react"; import { observer } from "mobx-react"; import { OverviewWorkloadStatus } from "./overview-workload-status"; import { Link } from "react-router-dom"; -import { workloadStores } from "../+workloads"; -import { namespaceStore } from "../+namespaces/namespace.store"; -import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter"; +import { workloadStores } from "../workloads"; +import { namespaceStore } from "../namespaces/namespace.store"; +import { NamespaceSelectFilter } from "../namespaces/namespace-select-filter"; import type { KubeResource } from "../../../common/rbac"; import { ResourceNames } from "../../utils/rbac"; import { boundMethod } from "../../utils"; diff --git a/src/renderer/components/workloads-overview/overview.tsx b/src/renderer/components/workloads-overview/overview.tsx index 695e3edf95..5b01c23244 100644 --- a/src/renderer/components/workloads-overview/overview.tsx +++ b/src/renderer/components/workloads-overview/overview.tsx @@ -24,14 +24,14 @@ import "./overview.scss"; import React from "react"; import { disposeOnUnmount, observer } from "mobx-react"; import type { RouteComponentProps } from "react-router"; -import { eventStore } from "../+events/event.store"; -import { podsStore } from "../+workloads-pods/pods.store"; -import { deploymentStore } from "../+workloads-deployments/deployments.store"; -import { daemonSetStore } from "../+workloads-daemonsets/daemonsets.store"; -import { statefulSetStore } from "../+workloads-statefulsets/statefulset.store"; -import { replicaSetStore } from "../+workloads-replicasets/replicasets.store"; -import { jobStore } from "../+workloads-jobs/job.store"; -import { cronJobStore } from "../+workloads-cronjobs/cronjob.store"; +import { eventStore } from "../events/event.store"; +import { podsStore } from "../workloads-pods/pods.store"; +import { deploymentStore } from "../workloads-deployments/deployments.store"; +import { daemonSetStore } from "../workloads-daemonsets/daemonsets.store"; +import { statefulSetStore } from "../workloads-statefulsets/statefulset.store"; +import { replicaSetStore } from "../workloads-replicasets/replicasets.store"; +import { jobStore } from "../workloads-jobs/job.store"; +import { cronJobStore } from "../workloads-cronjobs/cronjob.store"; import { kubeWatchApi } from "../../../common/k8s-api/kube-watch-api"; import { clusterContext } from "../context"; import { WorkloadsOverviewDetailRegistry } from "../../../extensions/registries"; diff --git a/src/renderer/components/workloads-pods/pod-container-env.tsx b/src/renderer/components/workloads-pods/pod-container-env.tsx index 4c847e68bb..66e66a1eb1 100644 --- a/src/renderer/components/workloads-pods/pod-container-env.tsx +++ b/src/renderer/components/workloads-pods/pod-container-env.tsx @@ -26,8 +26,8 @@ import { observer } from "mobx-react"; import type { IPodContainer, Secret } from "../../../common/k8s-api/endpoints"; import { DrawerItem } from "../drawer"; import { autorun } from "mobx"; -import { secretsStore } from "../+config-secrets/secrets.store"; -import { configMapsStore } from "../+config-maps/config-maps.store"; +import { secretsStore } from "../config-secrets/secrets.store"; +import { configMapsStore } from "../config-maps/config-maps.store"; import { Icon } from "../icon"; import { base64, cssNames, iter } from "../../utils"; import _ from "lodash"; diff --git a/src/renderer/components/workloads-pods/pods.tsx b/src/renderer/components/workloads-pods/pods.tsx index 448bfa75c8..ad5c7a3d38 100644 --- a/src/renderer/components/workloads-pods/pods.tsx +++ b/src/renderer/components/workloads-pods/pods.tsx @@ -26,8 +26,8 @@ import { observer } from "mobx-react"; import { Link } from "react-router-dom"; import { podsStore } from "./pods.store"; import type { RouteComponentProps } from "react-router"; -import { volumeClaimStore } from "../+storage-volume-claims/volume-claim.store"; -import { eventStore } from "../+events/event.store"; +import { volumeClaimStore } from "../storage-volume-claims/volume-claim.store"; +import { eventStore } from "../events/event.store"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { nodesApi, Pod } from "../../../common/k8s-api/endpoints"; import { StatusBrick } from "../status-brick"; diff --git a/src/renderer/components/workloads-replicasets/replicaset-details.tsx b/src/renderer/components/workloads-replicasets/replicaset-details.tsx index 7da1e22361..821f462b13 100644 --- a/src/renderer/components/workloads-replicasets/replicaset-details.tsx +++ b/src/renderer/components/workloads-replicasets/replicaset-details.tsx @@ -25,16 +25,16 @@ import { makeObservable, observable, reaction } from "mobx"; import { DrawerItem } from "../drawer"; import { Badge } from "../badge"; import { replicaSetStore } from "./replicasets.store"; -import { PodDetailsStatuses } from "../+workloads-pods/pod-details-statuses"; -import { PodDetailsTolerations } from "../+workloads-pods/pod-details-tolerations"; -import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities"; +import { PodDetailsStatuses } from "../workloads-pods/pod-details-statuses"; +import { PodDetailsTolerations } from "../workloads-pods/pod-details-tolerations"; +import { PodDetailsAffinities } from "../workloads-pods/pod-details-affinities"; import { disposeOnUnmount, observer } from "mobx-react"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { getMetricsForReplicaSets, IPodMetrics, ReplicaSet } from "../../../common/k8s-api/endpoints"; import { ResourceMetrics, ResourceMetricsText } from "../resource-metrics"; -import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts"; -import { PodDetailsList } from "../+workloads-pods/pod-details-list"; +import { PodCharts, podMetricTabs } from "../workloads-pods/pod-charts"; +import { PodDetailsList } from "../workloads-pods/pod-details-list"; import { KubeObjectMeta } from "../kube-object-meta"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; diff --git a/src/renderer/components/workloads-replicasets/replicasets.store.ts b/src/renderer/components/workloads-replicasets/replicasets.store.ts index 15c25c1e4e..28a749482b 100644 --- a/src/renderer/components/workloads-replicasets/replicasets.store.ts +++ b/src/renderer/components/workloads-replicasets/replicasets.store.ts @@ -20,7 +20,7 @@ */ import { makeObservable } from "mobx"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { Deployment, ReplicaSet, replicaSetApi } from "../../../common/k8s-api/endpoints"; import { PodStatus } from "../../../common/k8s-api/endpoints/pods.api"; diff --git a/src/renderer/components/workloads-statefulsets/statefulset-details.tsx b/src/renderer/components/workloads-statefulsets/statefulset-details.tsx index dc8581dec3..0ed31bf71a 100644 --- a/src/renderer/components/workloads-statefulsets/statefulset-details.tsx +++ b/src/renderer/components/workloads-statefulsets/statefulset-details.tsx @@ -26,16 +26,16 @@ import { disposeOnUnmount, observer } from "mobx-react"; import { makeObservable, observable, reaction } from "mobx"; import { Badge } from "../badge"; import { DrawerItem } from "../drawer"; -import { PodDetailsStatuses } from "../+workloads-pods/pod-details-statuses"; -import { PodDetailsTolerations } from "../+workloads-pods/pod-details-tolerations"; -import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { PodDetailsStatuses } from "../workloads-pods/pod-details-statuses"; +import { PodDetailsTolerations } from "../workloads-pods/pod-details-tolerations"; +import { PodDetailsAffinities } from "../workloads-pods/pod-details-affinities"; +import { podsStore } from "../workloads-pods/pods.store"; import { statefulSetStore } from "./statefulset.store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { getMetricsForStatefulSets, IPodMetrics, StatefulSet } from "../../../common/k8s-api/endpoints"; import { ResourceMetrics, ResourceMetricsText } from "../resource-metrics"; -import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts"; -import { PodDetailsList } from "../+workloads-pods/pod-details-list"; +import { PodCharts, podMetricTabs } from "../workloads-pods/pod-charts"; +import { PodDetailsList } from "../workloads-pods/pod-details-list"; import { KubeObjectMeta } from "../kube-object-meta"; import { getActiveClusterEntity } from "../../api/catalog-entity-registry"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; diff --git a/src/renderer/components/workloads-statefulsets/statefulset.store.ts b/src/renderer/components/workloads-statefulsets/statefulset.store.ts index cf5b8ea36d..23df2cb8f9 100644 --- a/src/renderer/components/workloads-statefulsets/statefulset.store.ts +++ b/src/renderer/components/workloads-statefulsets/statefulset.store.ts @@ -20,7 +20,7 @@ */ import { makeObservable } from "mobx"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { PodStatus, StatefulSet, statefulSetApi } from "../../../common/k8s-api/endpoints"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; diff --git a/src/renderer/components/workloads-statefulsets/statefulsets.tsx b/src/renderer/components/workloads-statefulsets/statefulsets.tsx index c3b5b0e023..a4edde77d3 100644 --- a/src/renderer/components/workloads-statefulsets/statefulsets.tsx +++ b/src/renderer/components/workloads-statefulsets/statefulsets.tsx @@ -25,10 +25,10 @@ import React from "react"; import { observer } from "mobx-react"; import type { RouteComponentProps } from "react-router"; import type { StatefulSet } from "../../../common/k8s-api/endpoints"; -import { podsStore } from "../+workloads-pods/pods.store"; +import { podsStore } from "../workloads-pods/pods.store"; import { statefulSetStore } from "./statefulset.store"; -import { nodesStore } from "../+nodes/nodes.store"; -import { eventStore } from "../+events/event.store"; +import { nodesStore } from "../nodes/nodes.store"; +import { eventStore } from "../events/event.store"; import type { KubeObjectMenuProps } from "../kube-object-menu"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; diff --git a/src/renderer/components/workloads/workloads.stores.ts b/src/renderer/components/workloads/workloads.stores.ts index d3d69c2a17..5d0824ae82 100644 --- a/src/renderer/components/workloads/workloads.stores.ts +++ b/src/renderer/components/workloads/workloads.stores.ts @@ -20,14 +20,14 @@ */ import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; -import { podsStore } from "../+workloads-pods/pods.store"; -import { deploymentStore } from "../+workloads-deployments/deployments.store"; -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 { podsStore } from "../workloads-pods/pods.store"; +import { deploymentStore } from "../workloads-deployments/deployments.store"; +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 type { KubeResource } from "../../../common/rbac"; -import { replicaSetStore } from "../+workloads-replicasets/replicasets.store"; +import { replicaSetStore } from "../workloads-replicasets/replicasets.store"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; export const workloadStores = new Map>([ diff --git a/src/renderer/components/workloads/workloads.tsx b/src/renderer/components/workloads/workloads.tsx index 71007b1195..8b6a7517ab 100644 --- a/src/renderer/components/workloads/workloads.tsx +++ b/src/renderer/components/workloads/workloads.tsx @@ -24,15 +24,15 @@ import "./workloads.scss"; import React from "react"; import { observer } from "mobx-react"; import { TabLayout, TabLayoutRoute } from "../layout/tab-layout"; -import { WorkloadsOverview } from "../+workloads-overview/overview"; -import { Pods } from "../+workloads-pods"; -import { Deployments } from "../+workloads-deployments"; -import { DaemonSets } from "../+workloads-daemonsets"; -import { StatefulSets } from "../+workloads-statefulsets"; -import { Jobs } from "../+workloads-jobs"; -import { CronJobs } from "../+workloads-cronjobs"; +import { WorkloadsOverview } from "../workloads-overview/overview"; +import { Pods } from "../workloads-pods"; +import { Deployments } from "../workloads-deployments"; +import { DaemonSets } from "../workloads-daemonsets"; +import { StatefulSets } from "../workloads-statefulsets"; +import { Jobs } from "../workloads-jobs"; +import { CronJobs } from "../workloads-cronjobs"; import { isAllowedResource } from "../../../common/utils/allowed-resource"; -import { ReplicaSets } from "../+workloads-replicasets"; +import { ReplicaSets } from "../workloads-replicasets"; import * as routes from "../../../common/routes"; @observer diff --git a/src/renderer/initializers/catalog-category-registry.tsx b/src/renderer/initializers/catalog-category-registry.tsx index 56eefc3c07..55159eb823 100644 --- a/src/renderer/initializers/catalog-category-registry.tsx +++ b/src/renderer/initializers/catalog-category-registry.tsx @@ -24,7 +24,7 @@ import { kubernetesClusterCategory } from "../../common/catalog-entities"; import { addClusterURL, kubernetesURL } from "../../common/routes"; import { multiSet } from "../utils"; import { UserStore } from "../../common/user-store"; -import { getAllEntries } from "../components/+preferences/kubeconfig-syncs"; +import { getAllEntries } from "../components/preferences/kubeconfig-syncs"; import { runInAction } from "mobx"; import { isWindows } from "../../common/vars"; import { PathPicker } from "../components/path-picker/path-picker"; diff --git a/src/renderer/initializers/kube-object-detail-registry.tsx b/src/renderer/initializers/kube-object-detail-registry.tsx index 592c1f5252..788d892dbb 100644 --- a/src/renderer/initializers/kube-object-detail-registry.tsx +++ b/src/renderer/initializers/kube-object-detail-registry.tsx @@ -21,37 +21,37 @@ import React from "react"; import { KubeObjectDetailRegistry } from "../api/kube-object-detail-registry"; -import { HpaDetails, HpaDetailsProps } from "../components/+config-autoscalers"; -import { LimitRangeDetails } from "../components/+config-limit-ranges"; -import { ConfigMapDetails } from "../components/+config-maps"; -import { PodDisruptionBudgetDetails } from "../components/+config-pod-disruption-budgets"; -import { ResourceQuotaDetails } from "../components/+config-resource-quotas"; -import { SecretDetails } from "../components/+config-secrets"; -import { CRDDetails } from "../components/+custom-resources"; -import { EventDetails } from "../components/+events"; -import { KubeEventDetails } from "../components/+events/kube-event-details"; -import { NamespaceDetails } from "../components/+namespaces"; -import { EndpointDetails } from "../components/+network-endpoints"; -import { IngressDetails } from "../components/+network-ingresses"; -import { NetworkPolicyDetails } from "../components/+network-policies"; -import { ServiceDetails } from "../components/+network-services"; -import { NodeDetails } from "../components/+nodes"; -import { PodSecurityPolicyDetails } from "../components/+pod-security-policies"; -import { StorageClassDetails } from "../components/+storage-classes"; -import { PersistentVolumeClaimDetails } from "../components/+storage-volume-claims"; -import { PersistentVolumeDetails } from "../components/+storage-volumes"; -import { ClusterRoleDetails } from "../components/+user-management/+cluster-roles"; -import { ClusterRoleBindingDetails } from "../components/+user-management/+cluster-role-bindings"; -import { RoleDetails } from "../components/+user-management/+roles"; -import { RoleBindingDetails } from "../components/+user-management/+role-bindings"; -import { ServiceAccountsDetails } from "../components/+user-management/+service-accounts"; -import { CronJobDetails } from "../components/+workloads-cronjobs"; -import { DaemonSetDetails } from "../components/+workloads-daemonsets"; -import { DeploymentDetails } from "../components/+workloads-deployments"; -import { JobDetails } from "../components/+workloads-jobs"; -import { PodDetails } from "../components/+workloads-pods"; -import { ReplicaSetDetails } from "../components/+workloads-replicasets"; -import { StatefulSetDetails } from "../components/+workloads-statefulsets"; +import { HpaDetails, HpaDetailsProps } from "../components/config-autoscalers"; +import { LimitRangeDetails } from "../components/config-limit-ranges"; +import { ConfigMapDetails } from "../components/config-maps"; +import { PodDisruptionBudgetDetails } from "../components/config-pod-disruption-budgets"; +import { ResourceQuotaDetails } from "../components/config-resource-quotas"; +import { SecretDetails } from "../components/config-secrets"; +import { CRDDetails } from "../components/custom-resources"; +import { EventDetails } from "../components/events"; +import { KubeEventDetails } from "../components/events/kube-event-details"; +import { NamespaceDetails } from "../components/namespaces"; +import { EndpointDetails } from "../components/network-endpoints"; +import { IngressDetails } from "../components/network-ingresses"; +import { NetworkPolicyDetails } from "../components/network-policies"; +import { ServiceDetails } from "../components/network-services"; +import { NodeDetails } from "../components/nodes"; +import { PodSecurityPolicyDetails } from "../components/pod-security-policies"; +import { StorageClassDetails } from "../components/storage-classes"; +import { PersistentVolumeClaimDetails } from "../components/storage-volume-claims"; +import { PersistentVolumeDetails } from "../components/storage-volumes"; +import { ClusterRoleDetails } from "../components/user-management/cluster-roles"; +import { ClusterRoleBindingDetails } from "../components/user-management/cluster-role-bindings"; +import { RoleDetails } from "../components/user-management/roles"; +import { RoleBindingDetails } from "../components/user-management/role-bindings"; +import { ServiceAccountsDetails } from "../components/user-management/service-accounts"; +import { CronJobDetails } from "../components/workloads-cronjobs"; +import { DaemonSetDetails } from "../components/workloads-daemonsets"; +import { DeploymentDetails } from "../components/workloads-deployments"; +import { JobDetails } from "../components/workloads-jobs"; +import { PodDetails } from "../components/workloads-pods"; +import { ReplicaSetDetails } from "../components/workloads-replicasets"; +import { StatefulSetDetails } from "../components/workloads-statefulsets"; import type { KubeObjectDetailsProps } from "../components/kube-object-details"; export function intiKubeObjectDetailRegistry() { diff --git a/src/renderer/initializers/kube-object-menu-registry.ts b/src/renderer/initializers/kube-object-menu-registry.ts index 6c4ecb8e15..2b0b3feca6 100644 --- a/src/renderer/initializers/kube-object-menu-registry.ts +++ b/src/renderer/initializers/kube-object-menu-registry.ts @@ -20,11 +20,11 @@ */ import { KubeObjectMenuRegistry } from "../../extensions/registries"; -import { ServiceAccountMenu } from "../components/+user-management/+service-accounts"; -import { CronJobMenu } from "../components/+workloads-cronjobs"; -import { DeploymentMenu } from "../components/+workloads-deployments"; -import { ReplicaSetMenu } from "../components/+workloads-replicasets"; -import { StatefulSetMenu } from "../components/+workloads-statefulsets"; +import { ServiceAccountMenu } from "../components/user-management/service-accounts"; +import { CronJobMenu } from "../components/workloads-cronjobs"; +import { DeploymentMenu } from "../components/workloads-deployments"; +import { ReplicaSetMenu } from "../components/workloads-replicasets"; +import { StatefulSetMenu } from "../components/workloads-statefulsets"; export function initKubeObjectMenuRegistry() { KubeObjectMenuRegistry.getInstance() diff --git a/src/renderer/initializers/workloads-overview-detail-registry.tsx b/src/renderer/initializers/workloads-overview-detail-registry.tsx index b8aec840bf..0ea1997ebc 100644 --- a/src/renderer/initializers/workloads-overview-detail-registry.tsx +++ b/src/renderer/initializers/workloads-overview-detail-registry.tsx @@ -22,8 +22,8 @@ import React from "react"; import { isAllowedResource } from "../../common/utils/allowed-resource"; import { WorkloadsOverviewDetailRegistry } from "../../extensions/registries"; -import { Events } from "../components/+events"; -import { OverviewStatuses } from "../components/+workloads-overview/overview-statuses"; +import { Events } from "../components/events"; +import { OverviewStatuses } from "../components/workloads-overview/overview-statuses"; export function initWorkloadsOverviewDetailRegistry() { WorkloadsOverviewDetailRegistry.getInstance() diff --git a/src/renderer/protocol-handler/app-handlers.tsx b/src/renderer/protocol-handler/app-handlers.tsx index 3ba192c0a6..e5bed9ee38 100644 --- a/src/renderer/protocol-handler/app-handlers.tsx +++ b/src/renderer/protocol-handler/app-handlers.tsx @@ -20,7 +20,7 @@ */ import React from "react"; -import { attemptInstallByInfo } from "../components/+extensions"; +import { attemptInstallByInfo } from "../components/extensions"; import { LensProtocolRouterRenderer } from "./router"; import { navigate } from "../navigation/helpers"; import { catalogEntityRegistry } from "../api/catalog-entity-registry";