chore: Remove leading '+' on some directory names

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

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";

packages/core/src/renderer/components/config-horizontal-pod-autoscalers/list-view.tsx

@@ -18,7 +18,7 @@ import type { HorizontalPodAutoscalerStore } from "./store";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import horizontalPodAutoscalerStoreInjectable from "./store.injectable";
 import getHorizontalPodAutoscalerMetrics from "./get-metrics.injectable";
-import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
+import { NamespaceSelectBadge } from "../namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",

packages/core/src/renderer/components/config-horizontal-pod-autoscalers/sidebar-items.injectable.tsx

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
 import horizontalPodAutoscalersRouteInjectable from "../../../common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/horizontal-pod-autoscalers-route.injectable";
-import { configSidebarItemId } from "../+config/config-sidebar-items.injectable";
+import { configSidebarItemId } from "../config/config-sidebar-items.injectable";
 import type { SidebarItemRegistration } from "../layout/sidebar-items.injectable";
 import { sidebarItemsInjectionToken } from "../layout/sidebar-items.injectable";
 import routeIsActiveInjectable from "../../routes/route-is-active.injectable";