chore: Remove leading '+' on some directory names

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/src/common/catalog/catalog-entity.ts

@@ -9,7 +9,7 @@ import { observable, makeObservable } from "mobx";
 import { once } from "lodash";
 import type { Disposer } from "@k8slens/utilities";
 import { iter } from "@k8slens/utilities";
-import type { CategoryColumnRegistration, TitleCellProps } from "../../renderer/components/+catalog/custom-category-columns";
+import type { CategoryColumnRegistration, TitleCellProps } from "../../renderer/components/catalog/custom-category-columns";
 
 export type { CategoryColumnRegistration, TitleCellProps };
 

packages/core/src/extensions/common-api/k8s-api.ts

@@ -32,7 +32,7 @@ import type { KubeJsonApi as InternalKubeJsonApi } from "../../common/k8s-api/ku
 import createKubeJsonApiInjectable from "../../common/k8s-api/create-kube-json-api.injectable";
 import type { RequestInit } from "@k8slens/node-fetch";
 import createKubeJsonApiForClusterInjectable from "../../common/k8s-api/create-kube-json-api-for-cluster.injectable";
-import getPodsByOwnerIdInjectable from "../../renderer/components/+workloads-pods/get-pods-by-owner-id.injectable";
+import getPodsByOwnerIdInjectable from "../../renderer/components/workloads-pods/get-pods-by-owner-id.injectable";
 
 export const apiManager = asLegacyGlobalForExtensionApi(apiManagerInjectable);
 export const forCluster = asLegacyGlobalFunctionForExtensionApi(createKubeApiForClusterInjectable);

packages/core/src/extensions/common-api/types.ts

@@ -16,7 +16,7 @@ export type { KubeObjectStatusRegistration } from "../../renderer/components/kub
 export type { PageRegistration, RegisteredPage, PageParams, PageComponentProps, PageComponents, PageTarget } from "../../renderer/routes/page-registration";
 export type { ClusterPageMenuRegistration, ClusterPageMenuComponents } from "../../renderer/components/layout/cluster-page-menu";
 export type { ProtocolHandlerRegistration, RouteParams as ProtocolRouteParams, RouteHandler as ProtocolRouteHandler } from "../../common/protocol-handler/registration";
-export type { CustomCategoryViewProps, CustomCategoryViewComponents, CustomCategoryViewRegistration } from "../../renderer/components/+catalog/custom-views";
+export type { CustomCategoryViewProps, CustomCategoryViewComponents, CustomCategoryViewRegistration } from "../../renderer/components/catalog/custom-views";
 export type { ShellEnvModifier, ShellEnvContext } from "../../main/shell-session/shell-env-modifier/shell-env-modifier-registration";
 export type { KubeObjectContextMenuItem, KubeObjectOnContextMenuOpenContext, KubeObjectOnContextMenuOpen, KubeObjectHandlers, KubeObjectHandlerRegistration } from "../../renderer/kube-object/handler";
 export type { TrayMenuRegistration } from "../../main/tray/tray-menu-registration";

packages/core/src/extensions/lens-renderer-extension.ts

@@ -10,15 +10,15 @@ import type { CatalogEntity, CategoryFilter, CatalogCategoryRegistry } from "../
 import type { EntityFilter, CatalogEntityRegistry } from "../renderer/api/catalog/entity/registry";
 import type { TopBarRegistration } from "../renderer/components/layout/top-bar/top-bar-registration";
 import type { KubernetesCluster } from "../common/catalog-entities";
-import type { WelcomeMenuRegistration } from "../renderer/components/+welcome/welcome-menu-items/welcome-menu-registration";
-import type { WelcomeBannerRegistration } from "../renderer/components/+welcome/welcome-banner-items/welcome-banner-registration";
+import type { WelcomeMenuRegistration } from "../renderer/components/welcome/welcome-menu-items/welcome-menu-registration";
+import type { WelcomeBannerRegistration } from "../renderer/components/welcome/welcome-banner-items/welcome-banner-registration";
 import type { CommandRegistration } from "../renderer/components/command-palette/registered-commands/commands";
 import type { AppPreferenceRegistration } from "../features/preferences/renderer/compliance-for-legacy-extension-api/app-preference-registration";
-import type { AdditionalCategoryColumnRegistration } from "../renderer/components/+catalog/custom-category-columns";
-import type { CustomCategoryViewRegistration } from "../renderer/components/+catalog/custom-views";
+import type { AdditionalCategoryColumnRegistration } from "../renderer/components/catalog/custom-category-columns";
+import type { CustomCategoryViewRegistration } from "../renderer/components/catalog/custom-views";
 import type { StatusBarRegistration } from "../renderer/components/status-bar/status-bar-registration";
 import type { KubeObjectMenuRegistration } from "../renderer/components/kube-object-menu/kube-object-menu-registration";
-import type { WorkloadsOverviewDetailRegistration } from "../renderer/components/+workloads-overview/workloads-overview-detail-registration";
+import type { WorkloadsOverviewDetailRegistration } from "../renderer/components/workloads-overview/workloads-overview-detail-registration";
 import type { KubeObjectStatusRegistration } from "../renderer/components/kube-object-status-icon/kube-object-status-registration";
 import { fromPairs, map, matches, toPairs } from "lodash/fp";
 import { pipeline } from "@ogre-tools/fp";
@@ -27,8 +27,8 @@ import type { KubeObjectHandlerRegistration } from "../renderer/kube-object/hand
 import type { AppPreferenceTabRegistration } from "../features/preferences/renderer/compliance-for-legacy-extension-api/app-preference-tab-registration";
 import type { KubeObjectDetailRegistration } from "../renderer/components/kube-object-details/kube-object-detail-registration";
 import type { ClusterFrameChildComponent } from "../renderer/frames/cluster-frame/cluster-frame-child-component-injection-token";
-import type { EntitySettingRegistration } from "../renderer/components/+entity-settings/extension-registrator.injectable";
-import type { CatalogEntityDetailRegistration } from "../renderer/components/+catalog/entity-details/token";
+import type { EntitySettingRegistration } from "../renderer/components/entity-settings/extension-registrator.injectable";
+import type { CatalogEntityDetailRegistration } from "../renderer/components/catalog/entity-details/token";
 import type { PageRegistration } from "../renderer/routes/page-registration";
 import type { ClusterPageMenuRegistration } from "../renderer/components/layout/cluster-page-menu";
 import type { IComputedValue } from "mobx";

packages/core/src/extensions/renderer-api/components.ts

@@ -19,7 +19,7 @@ import type { ConfirmDialogBooleanParams, ConfirmDialogParams, ConfirmDialogProp
 import openConfirmDialogInjectable from "../../renderer/components/confirm-dialog/open.injectable";
 import confirmInjectable from "../../renderer/components/confirm-dialog/confirm.injectable";
 import notificationsStoreInjectable from "../../renderer/components/notifications/notifications-store.injectable";
-import podStoreInjectable from "../../renderer/components/+workloads-pods/store.injectable";
+import podStoreInjectable from "../../renderer/components/workloads-pods/store.injectable";
 import getDetailsUrlInjectable from "../../renderer/components/kube-detail-params/get-details-url.injectable";
 import showDetailsInjectable from "../../renderer/components/kube-detail-params/show-details.injectable";
 import showCheckedErrorNotificationInjectable from "../../renderer/components/notifications/show-checked-error.injectable";
@@ -50,7 +50,7 @@ export const CommandOverlay = asLegacyGlobalForExtensionApi(commandOverlayInject
 export type {
   CategoryColumnRegistration,
   AdditionalCategoryColumnRegistration,
-} from "../../renderer/components/+catalog/custom-category-columns";
+} from "../../renderer/components/catalog/custom-category-columns";
 
 // other components
 export type {
@@ -94,9 +94,9 @@ export const 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";
@@ -107,7 +107,7 @@ export {
   type MonacoTheme, type MonacoCustomTheme,
 } from "../../renderer/components/monaco-editor";
 export * from "../../renderer/components/resource-metrics/resource-metrics";
-export * from "../../renderer/components/+workloads-pods/pod-charts";
+export * from "../../renderer/components/workloads-pods/pod-charts";
 
 /**
  * @deprecated Use `Renderer.Navigation.getDetailsUrl`
@@ -124,7 +124,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";

packages/core/src/extensions/renderer-api/k8s-api.ts

@@ -112,40 +112,40 @@ export {
 } from "../../common/k8s-api/kube-object-status";
 
 // stores
-export type { EventStore } from "../../renderer/components/+events/store";
-export type { PodStore as PodsStore } from "../../renderer/components/+workloads-pods/store";
-export type { NodeStore as NodesStore } from "../../renderer/components/+nodes/store";
-export type { DeploymentStore } from "../../renderer/components/+workloads-deployments/store";
-export type { DaemonSetStore } from "../../renderer/components/+workloads-daemonsets/store";
-export type { StatefulSetStore } from "../../renderer/components/+workloads-statefulsets/store";
-export type { JobStore } from "../../renderer/components/+workloads-jobs/store";
-export type { CronJobStore } from "../../renderer/components/+workloads-cronjobs/store";
-export type { ConfigMapStore as ConfigMapsStore } from "../../renderer/components/+config-maps/store";
-export type { SecretStore as SecretsStore } from "../../renderer/components/+config-secrets/store";
-export type { ReplicaSetStore } from "../../renderer/components/+workloads-replicasets/store";
-export type { ResourceQuotaStore as ResourceQuotasStore } from "../../renderer/components/+config-resource-quotas/store";
-export type { LimitRangeStore as LimitRangesStore } from "../../renderer/components/+config-limit-ranges/store";
+export type { EventStore } from "../../renderer/components/events/store";
+export type { PodStore as PodsStore } from "../../renderer/components/workloads-pods/store";
+export type { NodeStore as NodesStore } from "../../renderer/components/nodes/store";
+export type { DeploymentStore } from "../../renderer/components/workloads-deployments/store";
+export type { DaemonSetStore } from "../../renderer/components/workloads-daemonsets/store";
+export type { StatefulSetStore } from "../../renderer/components/workloads-statefulsets/store";
+export type { JobStore } from "../../renderer/components/workloads-jobs/store";
+export type { CronJobStore } from "../../renderer/components/workloads-cronjobs/store";
+export type { ConfigMapStore as ConfigMapsStore } from "../../renderer/components/config-maps/store";
+export type { SecretStore as SecretsStore } from "../../renderer/components/config-secrets/store";
+export type { ReplicaSetStore } from "../../renderer/components/workloads-replicasets/store";
+export type { ResourceQuotaStore as ResourceQuotasStore } from "../../renderer/components/config-resource-quotas/store";
+export type { LimitRangeStore as LimitRangesStore } from "../../renderer/components/config-limit-ranges/store";
 export type {
   /**
    * @deprecated
    */
   HorizontalPodAutoscalerStore as HPAStore,
   HorizontalPodAutoscalerStore,
-} from "../../renderer/components/+config-horizontal-pod-autoscalers/store";
-export type { VerticalPodAutoscalerStore } from "../../renderer/components/+config-vertical-pod-autoscalers/store";
-export type { PodDisruptionBudgetStore as PodDisruptionBudgetsStore } from "../../renderer/components/+config-pod-disruption-budgets/store";
-export type { PriorityClassStore as PriorityClassStoreStore } from "../../renderer/components/+config-priority-classes/store";
-export type { ServiceStore } from "../../renderer/components/+network-services/store";
-export type { EndpointsStore as EndpointStore } from "../../renderer/components/+network-endpoints/store";
-export type { IngressStore } from "../../renderer/components/+network-ingresses/ingress-store";
-export type { IngressClassStore } from "../../renderer/components/+network-ingresses/ingress-class-store";
-export type { NetworkPolicyStore } from "../../renderer/components/+network-policies/store";
-export type { PersistentVolumeStore as PersistentVolumesStore } from "../../renderer/components/+storage-volumes/store";
-export type { PersistentVolumeClaimStore as VolumeClaimStore } from "../../renderer/components/+storage-volume-claims/store";
-export type { StorageClassStore } from "../../renderer/components/+storage-classes/store";
-export type { NamespaceStore } from "../../renderer/components/+namespaces/store";
-export type { ServiceAccountStore as ServiceAccountsStore } from "../../renderer/components/+user-management/+service-accounts/store";
-export type { RoleStore as RolesStore } from "../../renderer/components/+user-management/+roles/store";
-export type { RoleBindingStore as RoleBindingsStore } from "../../renderer/components/+user-management/+role-bindings/store";
-export type { CustomResourceDefinitionStore as CRDStore } from "../../renderer/components/+custom-resources/definition.store";
+} from "../../renderer/components/config-horizontal-pod-autoscalers/store";
+export type { VerticalPodAutoscalerStore } from "../../renderer/components/config-vertical-pod-autoscalers/store";
+export type { PodDisruptionBudgetStore as PodDisruptionBudgetsStore } from "../../renderer/components/config-pod-disruption-budgets/store";
+export type { PriorityClassStore as PriorityClassStoreStore } from "../../renderer/components/config-priority-classes/store";
+export type { ServiceStore } from "../../renderer/components/network-services/store";
+export type { EndpointsStore as EndpointStore } from "../../renderer/components/network-endpoints/store";
+export type { IngressStore } from "../../renderer/components/network-ingresses/ingress-store";
+export type { IngressClassStore } from "../../renderer/components/network-ingresses/ingress-class-store";
+export type { NetworkPolicyStore } from "../../renderer/components/network-policies/store";
+export type { PersistentVolumeStore as PersistentVolumesStore } from "../../renderer/components/storage-volumes/store";
+export type { PersistentVolumeClaimStore as VolumeClaimStore } from "../../renderer/components/storage-volume-claims/store";
+export type { StorageClassStore } from "../../renderer/components/storage-classes/store";
+export type { NamespaceStore } from "../../renderer/components/namespaces/store";
+export type { ServiceAccountStore as ServiceAccountsStore } from "../../renderer/components/user-management/service-accounts/store";
+export type { RoleStore as RolesStore } from "../../renderer/components/user-management/roles/store";
+export type { RoleBindingStore as RoleBindingsStore } from "../../renderer/components/user-management/role-bindings/store";
+export type { CustomResourceDefinitionStore as CRDStore } from "../../renderer/components/custom-resources/definition.store";
 export type { CustomResourceStore as CRDResourceStore } from "../../common/k8s-api/api-manager/resource.store";

packages/core/src/extensions/renderer-api/navigation.ts

@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import hideEntityDetailsInjectable from "../../renderer/components/+catalog/entity-details/hide.injectable";
-import showEntityDetailsInjectable from "../../renderer/components/+catalog/entity-details/show.injectable";
+import hideEntityDetailsInjectable from "../../renderer/components/catalog/entity-details/hide.injectable";
+import showEntityDetailsInjectable from "../../renderer/components/catalog/entity-details/show.injectable";
 import getDetailsUrlInjectable from "../../renderer/components/kube-detail-params/get-details-url.injectable";
 import hideDetailsInjectable from "../../renderer/components/kube-detail-params/hide-details.injectable";
 import showDetailsInjectable from "../../renderer/components/kube-detail-params/show-details.injectable";

packages/core/src/features/catalog/opening-entity-details.test.tsx

@@ -9,7 +9,7 @@ import { KubernetesCluster, WebLink } from "../../common/catalog-entities";
 import navigateToCatalogInjectable from "../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
 import { advanceFakeTime } from "../../test-utils/use-fake-time";
 import catalogEntityRegistryInjectable from "../../renderer/api/catalog/entity/registry.injectable";
-import showEntityDetailsInjectable from "../../renderer/components/+catalog/entity-details/show.injectable";
+import showEntityDetailsInjectable from "../../renderer/components/catalog/entity-details/show.injectable";
 import { type ApplicationBuilder, getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import writeJsonFileInjectable from "../../common/fs/write-json-file.injectable";
 import addClusterInjectable from "../cluster/storage/common/add.injectable";

packages/core/src/features/cluster/workloads/overview/extension-api/order-of-workload-overview-details.test.tsx

@@ -6,7 +6,7 @@ import type { RenderResult } from "@testing-library/react";
 import { getApplicationBuilder } from "../../../../../renderer/components/test-utils/get-application-builder";
 import React from "react";
 import getRandomIdInjectable from "../../../../../common/utils/get-random-id.injectable";
-import { workloadOverviewDetailInjectionToken } from "../../../../../renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-injection-token";
+import { workloadOverviewDetailInjectionToken } from "../../../../../renderer/components/workloads-overview/workload-overview-details/workload-overview-detail-injection-token";
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed, runInAction } from "mobx";
 

packages/core/src/features/cluster/workloads/pods.test.tsx

@@ -6,7 +6,7 @@
 import type { RenderResult } from "@testing-library/react";
 import navigateToPodsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/pods/navigate-to-pods.injectable";
 import { type ApplicationBuilder, getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
-import podStoreInjectable from "../../../renderer/components/+workloads-pods/store.injectable";
+import podStoreInjectable from "../../../renderer/components/workloads-pods/store.injectable";
 import type { PodMetrics } from "../../../common/k8s-api/endpoints";
 import { Pod } from "../../../common/k8s-api/endpoints";
 import podMetricsApiInjectable from "../../../common/k8s-api/endpoints/pod-metrics.api.injectable";
@@ -26,7 +26,7 @@ describe("workloads / pods", () => {
         apiName: "pods",
         group: "",
       });
-      
+
       windowDi.override(podMetricsApiInjectable, () => ({
         list: async () => podMetrics,
       } as any));
@@ -43,11 +43,11 @@ describe("workloads / pods", () => {
       beforeEach(async () => {
         applicationBuilder.afterWindowStart(({ windowDi }) => {
           const podStore = windowDi.inject(podStoreInjectable);
-          
+
           podStore.items.clear();
           podStore.isLoaded = false;
           podStore.isLoading = true;
-        }); 
+        });
 
         rendered = await applicationBuilder.render();
         applicationBuilder.navigateWith(navigateToPodsInjectable);
@@ -66,10 +66,10 @@ describe("workloads / pods", () => {
       beforeEach(async () => {
         applicationBuilder.afterWindowStart(({ windowDi }) => {
           const podStore = windowDi.inject(podStoreInjectable);
-          
+
           podStore.items.clear();
           podStore.isLoaded = true;
-        }); 
+        });
 
         rendered = await applicationBuilder.render();
         applicationBuilder.navigateWith(navigateToPodsInjectable);
@@ -88,9 +88,9 @@ describe("workloads / pods", () => {
       beforeEach(async () => {
         applicationBuilder.afterWindowStart(({ windowDi }) => {
           windowDi.override(requestMetricsInjectable, () => () => ({} as any));
-          
+
           const podStore = windowDi.inject(podStoreInjectable);
-          
+
           podStore.items.push(new Pod({
             apiVersion: "v1",
             kind: "Pod",
@@ -114,7 +114,7 @@ describe("workloads / pods", () => {
             status: {} as any,
           }));
           podStore.isLoaded = true;
-        }); 
+        });
 
         rendered = await applicationBuilder.render();
         applicationBuilder.navigateWith(navigateToPodsInjectable);

packages/core/src/features/helm-charts/child-features/preferences/renderer/helm-charts.tsx

@@ -14,7 +14,7 @@ import type { HelmRepositoriesErrorState } from "./helm-repositories-error-state
 import helmRepositoriesErrorStateInjectable from "./helm-repositories-error-state.injectable";
 import type { IObservableValue } from "mobx";
 import { observer } from "mobx-react";
-import { Notice } from "../../../../../renderer/components/+extensions/notice";
+import { Notice } from "../../../../../renderer/components/extensions/notice";
 
 interface Dependencies {
   helmRepositoriesErrorState: IObservableValue<HelmRepositoriesErrorState>;

packages/core/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts

@@ -26,8 +26,8 @@ import requestHelmChartsInjectable from "../../../common/k8s-api/endpoints/helm-
 import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
 import requestHelmChartReadmeInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable";
 import requestHelmChartValuesInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable";
-import type { RequestDetailedHelmRelease } from "../../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
-import requestDetailedHelmReleaseInjectable from "../../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
+import type { RequestDetailedHelmRelease } from "../../../renderer/components/helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
+import requestDetailedHelmReleaseInjectable from "../../../renderer/components/helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
 import type { RequestHelmReleases } from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable";
 import requestHelmReleasesInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable";
 import { flushPromises } from "@k8slens/test-utils";

packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts

@@ -15,8 +15,8 @@ import type { RequestHelmReleaseConfiguration } from "../../common/k8s-api/endpo
 import requestHelmReleaseConfigurationInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable";
 import type { RequestHelmReleaseUpdate } from "../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable";
 import requestHelmReleaseUpdateInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable";
-import type { RequestDetailedHelmRelease } from "../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
-import requestDetailedHelmReleaseInjectable from "../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
+import type { RequestDetailedHelmRelease } from "../../renderer/components/helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
+import requestDetailedHelmReleaseInjectable from "../../renderer/components/helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
 import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable";
 import showCheckedErrorInjectable from "../../renderer/components/notifications/show-checked-error.injectable";
 import getRandomUpgradeChartTabIdInjectable from "../../renderer/components/dock/upgrade-chart/get-random-upgrade-chart-tab-id.injectable";

packages/core/src/features/metrics/metrics-feature.ts

@@ -5,19 +5,19 @@
 import { getFeature } from "@k8slens/feature-core";
 import { clusterOverviewUIBlockInjectionToken, daemonSetDetailsMetricsInjectionToken, deploymentDetailsMetricsInjectionToken, jobDetailsMetricsInjectionToken, namespaceDetailsMetricsInjectionToken, ingressDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, persistentVolumeClaimDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken, replicaSetDetailsMetricsInjectionToken, statefulSetDetailsMetricsInjectionToken } from "@k8slens/metrics";
 import { getInjectable } from "@ogre-tools/injectable";
-import { ClusterMetrics } from "../../renderer/components/+cluster/cluster-metrics";
-import { ClusterPieCharts } from "../../renderer/components/+cluster/cluster-pie-charts";
-import { NamespaceMetricsDetailsComponent } from "../../renderer/components/+namespaces/metrics-details-component";
-import { NodeMetricsDetailsComponent } from "../../renderer/components/+nodes/metrics-details-component";
-import { PersistentVolumeClaimMetricsDetailsComponent } from "../../renderer/components/+storage-volume-claims/metrics-details-component";
-import { DaemonSetMetricsDetailsComponent } from "../../renderer/components/+workloads-daemonsets/metrics-details-component";
-import { DeploymentMetricsDetailsComponent } from "../../renderer/components/+workloads-deployments/metrics-details-component";
-import { JobMetricsDetailsComponent } from "../../renderer/components/+workloads-jobs/metrics-details-component";
-import { PodDetailsContainerMetrics } from "../../renderer/components/+workloads-pods/pod-details-container-metrics";
-import PodMetricsDetailsComponent from "../../renderer/components/+workloads-pods/pod-metrics-details-component";
-import { ReplicaSetMetricsDetailsComponent } from "../../renderer/components/+workloads-replicasets/metrics-details-component";
-import { StatefulSetMetricsDetailsComponent } from "../../renderer/components/+workloads-statefulsets/metrics-details-component";
-import { IngressMetricsDetailsComponent } from "../../renderer/components/+network-ingresses/metrics-details-component";
+import { ClusterMetrics } from "../../renderer/components/cluster/cluster-metrics";
+import { ClusterPieCharts } from "../../renderer/components/cluster/cluster-pie-charts";
+import { NamespaceMetricsDetailsComponent } from "../../renderer/components/namespaces/metrics-details-component";
+import { NodeMetricsDetailsComponent } from "../../renderer/components/nodes/metrics-details-component";
+import { PersistentVolumeClaimMetricsDetailsComponent } from "../../renderer/components/storage-volume-claims/metrics-details-component";
+import { DaemonSetMetricsDetailsComponent } from "../../renderer/components/workloads-daemonsets/metrics-details-component";
+import { DeploymentMetricsDetailsComponent } from "../../renderer/components/workloads-deployments/metrics-details-component";
+import { JobMetricsDetailsComponent } from "../../renderer/components/workloads-jobs/metrics-details-component";
+import { PodDetailsContainerMetrics } from "../../renderer/components/workloads-pods/pod-details-container-metrics";
+import PodMetricsDetailsComponent from "../../renderer/components/workloads-pods/pod-metrics-details-component";
+import { ReplicaSetMetricsDetailsComponent } from "../../renderer/components/workloads-replicasets/metrics-details-component";
+import { StatefulSetMetricsDetailsComponent } from "../../renderer/components/workloads-statefulsets/metrics-details-component";
+import { IngressMetricsDetailsComponent } from "../../renderer/components/network-ingresses/metrics-details-component";
 
 const clusterPieChartsClusterOverviewInjectable = getInjectable({
   id: "cluster-pie-charts-cluster-overview",

packages/core/src/features/namespaces/route-with-sub-namespaces.test.tsx

@@ -7,10 +7,10 @@ import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import type { RenderResult } from "@testing-library/react";
 import navigateToNamespacesInjectable from "../../common/front-end-routing/routes/cluster/namespaces/navigate-to-namespaces.injectable";
-import type { RequestDeleteNormalNamespace } from "../../renderer/components/+namespaces/request-delete-normal-namespace.injectable";
-import requestDeleteNormalNamespaceInjectable from "../../renderer/components/+namespaces/request-delete-normal-namespace.injectable";
-import type { RequestDeleteSubNamespaceAnchor } from "../../renderer/components/+namespaces/request-delete-sub-namespace.injectable";
-import requestDeleteSubNamespaceAnchorInjectable from "../../renderer/components/+namespaces/request-delete-sub-namespace.injectable";
+import type { RequestDeleteNormalNamespace } from "../../renderer/components/namespaces/request-delete-normal-namespace.injectable";
+import requestDeleteNormalNamespaceInjectable from "../../renderer/components/namespaces/request-delete-normal-namespace.injectable";
+import type { RequestDeleteSubNamespaceAnchor } from "../../renderer/components/namespaces/request-delete-sub-namespace.injectable";
+import requestDeleteSubNamespaceAnchorInjectable from "../../renderer/components/namespaces/request-delete-sub-namespace.injectable";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 

packages/core/src/features/pod-logs/download-logs.test.tsx

@@ -5,8 +5,8 @@
 
 import type { RenderResult } from "@testing-library/react";
 import { act, waitFor } from "@testing-library/react";
-import getPodByIdInjectable from "../../renderer/components/+workloads-pods/get-pod-by-id.injectable";
-import getPodsByOwnerIdInjectable from "../../renderer/components/+workloads-pods/get-pods-by-owner-id.injectable";
+import getPodByIdInjectable from "../../renderer/components/workloads-pods/get-pod-by-id.injectable";
+import getPodsByOwnerIdInjectable from "../../renderer/components/workloads-pods/get-pods-by-owner-id.injectable";
 import openSaveFileDialogInjectable from "../../renderer/utils/save-file.injectable";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";

packages/core/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx

@@ -6,7 +6,7 @@ import { withInjectables } from "@ogre-tools/injectable-react";
 import { computed, makeObservable, observable, reaction } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
 import React from "react";
-import { Notice } from "../../../../../../renderer/components/+extensions/notice";
+import { Notice } from "../../../../../../renderer/components/extensions/notice";
 import { iter, tuple } from "@k8slens/utilities";
 import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
 import { PathPicker } from "../../../../../../renderer/components/path-picker/path-picker";

packages/core/src/features/welcome/banners-from-extension.test.tsx

@@ -6,7 +6,7 @@
 import React from "react";
 import type { RenderResult } from "@testing-library/react";
 import { screen } from "@testing-library/react";
-import { defaultWidth } from "../../renderer/components/+welcome/welcome";
+import { defaultWidth } from "../../renderer/components/welcome/welcome";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 

packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts

@@ -11,7 +11,7 @@ import { KubeObject } from "../../../common/k8s-api/kube-object";
 import maybeKubeApiInjectable from "../../../common/k8s-api/maybe-kube-api.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
 import { injectableDifferencingRegistratorWith } from "../../../common/utils/registrator-helper";
-import customResourceDefinitionStoreInjectable from "../../components/+custom-resources/definition.store.injectable";
+import customResourceDefinitionStoreInjectable from "../../components/custom-resources/definition.store.injectable";
 import { beforeClusterFrameStartsSecondInjectionToken } from "../tokens";
 
 const setupAutoCrdApiCreationsInjectable = getInjectable({

packages/core/src/renderer/cluster-frame-context/for-namespaced-resources.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import type { ClusterContext } from "./cluster-frame-context";
-import namespaceStoreInjectable from "../components/+namespaces/store.injectable";
+import namespaceStoreInjectable from "../components/namespaces/store.injectable";
 import hostedClusterInjectable from "./hosted-cluster.injectable";
 import assert from "assert";
 import { computed } from "mobx";

packages/core/src/renderer/components/__tests__/cronjob.store.test.ts

@@ -2,8 +2,8 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { CronJobStore } from "../+workloads-cronjobs/store";
-import cronJobStoreInjectable from "../+workloads-cronjobs/store.injectable";
+import type { CronJobStore } from "../workloads-cronjobs/store";
+import cronJobStoreInjectable from "../workloads-cronjobs/store.injectable";
 import { CronJob } from "../../../common/k8s-api/endpoints";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";

packages/core/src/renderer/components/__tests__/daemonset.store.test.ts

@@ -4,9 +4,9 @@
  */
 
 import { observable } from "mobx";
-import type { DaemonSetStore } from "../+workloads-daemonsets/store";
-import daemonSetStoreInjectable from "../+workloads-daemonsets/store.injectable";
-import podStoreInjectable from "../+workloads-pods/store.injectable";
+import type { DaemonSetStore } from "../workloads-daemonsets/store";
+import daemonSetStoreInjectable from "../workloads-daemonsets/store.injectable";
+import podStoreInjectable from "../workloads-pods/store.injectable";
 import { DaemonSet, Pod } from "../../../common/k8s-api/endpoints";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";

packages/core/src/renderer/components/__tests__/deployments.store.test.ts

@@ -4,9 +4,9 @@
  */
 
 import { observable } from "mobx";
-import type { DeploymentStore } from "../+workloads-deployments/store";
-import deploymentStoreInjectable from "../+workloads-deployments/store.injectable";
-import podStoreInjectable from "../+workloads-pods/store.injectable";
+import type { DeploymentStore } from "../workloads-deployments/store";
+import deploymentStoreInjectable from "../workloads-deployments/store.injectable";
+import podStoreInjectable from "../workloads-pods/store.injectable";
 import type { PodSpec } from "../../../common/k8s-api/endpoints";
 import { Deployment, Pod } from "../../../common/k8s-api/endpoints";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";

packages/core/src/renderer/components/__tests__/job.store.test.ts

@@ -4,9 +4,9 @@
  */
 
 import { observable } from "mobx";
-import type { JobStore } from "../+workloads-jobs/store";
-import jobStoreInjectable from "../+workloads-jobs/store.injectable";
-import podStoreInjectable from "../+workloads-pods/store.injectable";
+import type { JobStore } from "../workloads-jobs/store";
+import jobStoreInjectable from "../workloads-jobs/store.injectable";
+import podStoreInjectable from "../workloads-pods/store.injectable";
 import { Job, Pod } from "../../../common/k8s-api/endpoints";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";

packages/core/src/renderer/components/__tests__/pods.store.test.ts

@@ -4,8 +4,8 @@
  */
 
 import { Pod } from "../../../common/k8s-api/endpoints";
-import type { PodStore } from "../+workloads-pods/store";
-import podStoreInjectable from "../+workloads-pods/store.injectable";
+import type { PodStore } from "../workloads-pods/store";
+import podStoreInjectable from "../workloads-pods/store.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
 import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";

packages/core/src/renderer/components/__tests__/replicaset.store.test.ts

@@ -4,9 +4,9 @@
  */
 
 import { observable } from "mobx";
-import podStoreInjectable from "../+workloads-pods/store.injectable";
-import replicasetsStoreInjectable from "../+workloads-replicasets/store.injectable";
-import type { ReplicaSetStore } from "../+workloads-replicasets/store";
+import podStoreInjectable from "../workloads-pods/store.injectable";
+import replicasetsStoreInjectable from "../workloads-replicasets/store.injectable";
+import type { ReplicaSetStore } from "../workloads-replicasets/store";
 import { ReplicaSet, Pod } from "../../../common/k8s-api/endpoints";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";

packages/core/src/renderer/components/__tests__/statefulset.store.test.ts

@@ -4,9 +4,9 @@
  */
 
 import { observable } from "mobx";
-import podStoreInjectable from "../+workloads-pods/store.injectable";
-import type { StatefulSetStore } from "../+workloads-statefulsets/store";
-import statefulSetStoreInjectable from "../+workloads-statefulsets/store.injectable";
+import podStoreInjectable from "../workloads-pods/store.injectable";
+import type { StatefulSetStore } from "../workloads-statefulsets/store";
+import statefulSetStoreInjectable from "../workloads-statefulsets/store.injectable";
 import { StatefulSet, Pod } from "../../../common/k8s-api/endpoints";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";

packages/core/src/renderer/components/cluster-settings/kubeconfig.tsx

@@ -8,7 +8,7 @@ import type { Cluster } from "../../../common/cluster/cluster";
 import { observer } from "mobx-react";
 import { SubTitle } from "../layout/sub-title";
 import { shell } from "electron";
-import { Notice } from "../+extensions/notice";
+import { Notice } from "../extensions/notice";
 
 export interface ClusterKubeconfigProps {
   cluster: Cluster;

packages/core/src/renderer/components/cluster-settings/show-metrics.tsx

@@ -9,7 +9,7 @@ import type { Cluster } from "../../../common/cluster/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";
 
 export interface ShowMetricsSettingProps {
   cluster: Cluster;

packages/core/src/renderer/components/cluster/cluster-issues.tsx

@@ -18,11 +18,11 @@ import { Spinner } from "../spinner";
 import type { ApiManager } from "../../../common/k8s-api/api-manager";
 import { KubeObjectAge } from "../kube-object/age";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import type { NodeStore } from "../+nodes/store";
-import type { EventStore } from "../+events/store";
+import type { NodeStore } from "../nodes/store";
+import type { EventStore } from "../events/store";
 import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable";
-import eventStoreInjectable from "../+events/store.injectable";
-import nodeStoreInjectable from "../+nodes/store.injectable";
+import eventStoreInjectable from "../events/store.injectable";
+import nodeStoreInjectable from "../nodes/store.injectable";
 import type { PageParam } from "../../navigation/page-param";
 import type { ToggleKubeDetailsPane } from "../kube-detail-params/toggle-details.injectable";
 import kubeSelectedUrlParamInjectable from "../kube-detail-params/kube-selected-url.injectable";

packages/core/src/renderer/components/cluster/cluster-metric-switchers.tsx

@@ -5,13 +5,13 @@
 
 import React from "react";
 import { observer } from "mobx-react";
-import type { NodeStore } from "../+nodes/store";
+import type { NodeStore } from "../nodes/store";
 import { Radio, RadioGroup } from "../radio";
 import type { ClusterOverviewStore } from "./cluster-overview-store/cluster-overview-store";
 import { MetricNodeRole, MetricType } from "./cluster-overview-store/cluster-overview-store";
 import clusterOverviewStoreInjectable from "./cluster-overview-store/cluster-overview-store.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import nodeStoreInjectable from "../+nodes/store.injectable";
+import nodeStoreInjectable from "../nodes/store.injectable";
 import { normalizeMetrics } from "../../../common/k8s-api/endpoints/metrics.api";
 
 interface Dependencies {

packages/core/src/renderer/components/cluster/cluster-overview-store/cluster-overview-store.injectable.ts

@@ -11,7 +11,7 @@ import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-ma
 import clusterApiInjectable from "../../../../common/k8s-api/endpoints/cluster.api.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable";
 import assert from "assert";
-import nodeStoreInjectable from "../../+nodes/store.injectable";
+import nodeStoreInjectable from "../../nodes/store.injectable";
 import requestClusterMetricsByNodeNamesInjectable from "../../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable";
 import loggerInjectable from "../../../../common/logger.injectable";

packages/core/src/renderer/components/cluster/cluster-overview-store/cluster-overview-store.ts

@@ -8,7 +8,7 @@ import type { KubeObjectStoreDependencies } from "../../../../common/k8s-api/kub
 import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store";
 import type { Cluster, ClusterApi } from "../../../../common/k8s-api/endpoints";
 import type { StorageLayer } from "../../../utils/storage-helper";
-import type { NodeStore } from "../../+nodes/store";
+import type { NodeStore } from "../../nodes/store";
 import type { ClusterMetricData, RequestClusterMetricsByNodeNames } from "../../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";
 import type { RequestMetricsParams } from "../../../../common/k8s-api/endpoints/metrics.api/request-metrics.injectable";
 import { normalizeMetrics } from "../../../../common/k8s-api/endpoints/metrics.api";

packages/core/src/renderer/components/cluster/cluster-overview.tsx

@@ -9,22 +9,22 @@ import React from "react";
 import type { IComputedValue } from "mobx";
 import { reaction } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
-import type { NodeStore } from "../+nodes/store";
-import type { PodStore } from "../+workloads-pods/store";
+import type { NodeStore } from "../nodes/store";
+import type { PodStore } from "../workloads-pods/store";
 import { interval } from "@k8slens/utilities";
 import { TabLayout } from "../layout/tab-layout";
 import { Spinner } from "../spinner";
 import { ClusterIssues } from "./cluster-issues";
 import type { ClusterOverviewStore } from "./cluster-overview-store/cluster-overview-store";
 import { ClusterMetricsResourceType } from "../../../common/cluster-types";
-import type { EventStore } from "../+events/store";
+import type { EventStore } from "../events/store";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import clusterOverviewStoreInjectable from "./cluster-overview-store/cluster-overview-store.injectable";
 import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
-import podStoreInjectable from "../+workloads-pods/store.injectable";
-import eventStoreInjectable from "../+events/store.injectable";
-import nodeStoreInjectable from "../+nodes/store.injectable";
+import podStoreInjectable from "../workloads-pods/store.injectable";
+import eventStoreInjectable from "../events/store.injectable";
+import nodeStoreInjectable from "../nodes/store.injectable";
 import enabledMetricsInjectable from "../../api/catalog/entity/metrics-enabled.injectable";
 import type { ClusterOverviewUIBlock } from "@k8slens/metrics";
 import { clusterOverviewUIBlockInjectionToken } from "@k8slens/metrics";

packages/core/src/renderer/components/cluster/cluster-pie-charts.tsx

@@ -11,7 +11,7 @@ import type { ClusterOverviewStore } from "./cluster-overview-store/cluster-over
 import { MetricNodeRole } from "./cluster-overview-store/cluster-overview-store";
 import { Spinner } from "../spinner";
 import { Icon } from "../icon";
-import type { NodeStore } from "../+nodes/store";
+import type { NodeStore } from "../nodes/store";
 import type { PieChartData } from "../chart";
 import { PieChart } from "../chart";
 import { ClusterNoMetrics } from "./cluster-no-metrics";
@@ -20,7 +20,7 @@ import type { LensTheme } from "../../themes/lens-theme";
 import { getMetricLastPoints } from "../../../common/k8s-api/endpoints/metrics.api";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import clusterOverviewStoreInjectable from "./cluster-overview-store/cluster-overview-store.injectable";
-import nodeStoreInjectable from "../+nodes/store.injectable";
+import nodeStoreInjectable from "../nodes/store.injectable";
 import type { IComputedValue } from "mobx";
 import activeThemeInjectable from "../../themes/active.injectable";
 import type { ClusterMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";

packages/core/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx

@@ -39,8 +39,8 @@ import navigateToEntitySettingsInjectable from "../../../../common/front-end-rou
 
 // TODO: Importing from features is not OK. Make commands to comply with Open Closed Principle to allow moving implementation under a feature
 import navigateToPreferencesInjectable from "../../../../features/preferences/common/navigate-to-preferences.injectable";
-import type { HasCatalogEntitySettingItems } from "../../+entity-settings/has-settings.injectable";
-import hasCatalogEntitySettingItemsInjectable from "../../+entity-settings/has-settings.injectable";
+import type { HasCatalogEntitySettingItems } from "../../entity-settings/has-settings.injectable";
+import hasCatalogEntitySettingItemsInjectable from "../../entity-settings/has-settings.injectable";
 
 export function isKubernetesClusterActive(context: CommandContext): boolean {
   return context.entity?.kind === "KubernetesCluster";

packages/core/src/renderer/components/command-palette/registered-commands/registered-commands.injectable.ts

@@ -7,7 +7,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import type { IComputedValue } from "mobx";
 import { computed } from "mobx";
 import type { CustomResourceDefinition } from "../../../../common/k8s-api/endpoints";
-import customResourceDefinitionsInjectable from "../../+custom-resources/custom-resources.injectable";
+import customResourceDefinitionsInjectable from "../../custom-resources/custom-resources.injectable";
 import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
 import rendererExtensionsInjectable from "../../../../extensions/renderer-extensions.injectable";
 import type { CommandRegistration, RegisteredCommand } from "./commands";