diff --git a/packages/core/src/extensions/renderer-api/components.ts b/packages/core/src/extensions/renderer-api/components.ts index 36ce3bba0a..594c2751b9 100644 --- a/packages/core/src/extensions/renderer-api/components.ts +++ b/packages/core/src/extensions/renderer-api/components.ts @@ -94,7 +94,7 @@ 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/namespace-select-filter/namespace-select-filter"; export * from "../../renderer/components/layout/sub-title"; export * from "../../renderer/components/input/search-input"; export * from "../../renderer/components/chart/bar-chart"; diff --git a/packages/core/src/renderer/components/config-vertical-pod-autoscalers/vpa.tsx b/packages/core/src/renderer/components/config-vertical-pod-autoscalers/vpa.tsx index 242c66a7d2..9cffbd95ac 100644 --- a/packages/core/src/renderer/components/config-vertical-pod-autoscalers/vpa.tsx +++ b/packages/core/src/renderer/components/config-vertical-pod-autoscalers/vpa.tsx @@ -14,9 +14,9 @@ import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { VerticalPodAutoscalerStore } from "./store"; -import type { FilterByNamespace } from "../namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import type { FilterByNamespace } from "../namespaces/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import filterByNamespaceInjectable from "../namespaces/filter-by-namespace.injectable"; import verticalPodAutoscalerStoreInjectable from "./store.injectable"; enum columnId { diff --git a/packages/core/src/renderer/components/helm-releases/releases.tsx b/packages/core/src/renderer/components/helm-releases/releases.tsx index 514e7593e7..b6a58155e1 100644 --- a/packages/core/src/renderer/components/helm-releases/releases.tsx +++ b/packages/core/src/renderer/components/helm-releases/releases.tsx @@ -11,7 +11,7 @@ import type { HelmRelease } from "../../../common/k8s-api/endpoints/helm-release import { withInjectables } from "@ogre-tools/injectable-react"; import type { ItemListStore } from "../item-object-list"; import { ItemListLayout } from "../item-object-list"; -import { NamespaceSelectFilter } from "../namespaces/namespace-select-filter"; +import { NamespaceSelectFilter } from "../namespace-select-filter/namespace-select-filter"; import { kebabCase } from "lodash/fp"; import { HelmReleaseMenu } from "./release-menu"; import { ReleaseRollbackDialog } from "./dialog/dialog"; diff --git a/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx b/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx index 9280d55ac8..52c79ccbe2 100644 --- a/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx +++ b/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx @@ -14,7 +14,7 @@ import type { KubeJsonApiDataFor, KubeObject } from "@k8slens/kube-object"; import type { ItemListLayoutProps, ItemListStore } from "../item-object-list/list-layout"; import { ItemListLayout } from "../item-object-list/list-layout"; import { KubeObjectMenu } from "../kube-object-menu"; -import { NamespaceSelectFilter } from "../namespaces/namespace-select-filter"; +import { NamespaceSelectFilter } from "../namespace-select-filter/namespace-select-filter"; import { ResourceKindMap, ResourceNames } from "../../utils/rbac"; import { Icon } from "@k8slens/icon"; import { TooltipPosition } from "@k8slens/tooltip"; diff --git a/packages/core/src/renderer/components/namespaces/namespace-select-filter-model/is-selection-key.injectable.ts b/packages/core/src/renderer/components/namespace-select-filter/is-selection-key.injectable.ts similarity index 89% rename from packages/core/src/renderer/components/namespaces/namespace-select-filter-model/is-selection-key.injectable.ts rename to packages/core/src/renderer/components/namespace-select-filter/is-selection-key.injectable.ts index 3562b8a166..28393ddc48 100644 --- a/packages/core/src/renderer/components/namespaces/namespace-select-filter-model/is-selection-key.injectable.ts +++ b/packages/core/src/renderer/components/namespace-select-filter/is-selection-key.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type React from "react"; -import isMacInjectable from "../../../../common/vars/is-mac.injectable"; +import isMacInjectable from "../../../common/vars/is-mac.injectable"; export type IsMultiSelectionKey = (event: React.KeyboardEvent) => boolean; diff --git a/packages/core/src/renderer/components/namespaces/namespace-select-filter-model/namespace-select-filter-model.injectable.ts b/packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter-model.injectable.ts similarity index 85% rename from packages/core/src/renderer/components/namespaces/namespace-select-filter-model/namespace-select-filter-model.injectable.ts rename to packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter-model.injectable.ts index d84292410b..b73b339ff2 100644 --- a/packages/core/src/renderer/components/namespaces/namespace-select-filter-model/namespace-select-filter-model.injectable.ts +++ b/packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter-model.injectable.ts @@ -4,9 +4,9 @@ */ import { namespaceSelectFilterModelFor } from "./namespace-select-filter-model"; import { getInjectable } from "@ogre-tools/injectable"; -import namespaceStoreInjectable from "../store.injectable"; +import namespaceStoreInjectable from "../namespaces/store.injectable"; import isMultiSelectionKeyInjectable from "./is-selection-key.injectable"; -import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable"; +import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; const namespaceSelectFilterModelInjectable = getInjectable({ id: "namespace-select-filter-model", diff --git a/packages/core/src/renderer/components/namespaces/namespace-select-filter-model/namespace-select-filter-model.tsx b/packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter-model.tsx similarity index 97% rename from packages/core/src/renderer/components/namespaces/namespace-select-filter-model/namespace-select-filter-model.tsx rename to packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter-model.tsx index 8a3cac363c..ae56cdc40a 100644 --- a/packages/core/src/renderer/components/namespaces/namespace-select-filter-model/namespace-select-filter-model.tsx +++ b/packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter-model.tsx @@ -5,10 +5,10 @@ import type React from "react"; import type { IComputedValue, IObservableValue } from "mobx"; import { observable, action, computed, comparer } from "mobx"; -import type { NamespaceStore } from "../store"; +import type { NamespaceStore } from "../namespaces/store"; import { observableCrate } from "@k8slens/utilities"; import type { IsMultiSelectionKey } from "./is-selection-key.injectable"; -import type { ClusterContext } from "../../../cluster-frame-context/cluster-frame-context"; +import type { ClusterContext } from "../../cluster-frame-context/cluster-frame-context"; import GlobToRegExp from "glob-to-regexp"; interface Dependencies { diff --git a/packages/core/src/renderer/components/namespaces/namespace-select-filter.scss b/packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter.scss similarity index 100% rename from packages/core/src/renderer/components/namespaces/namespace-select-filter.scss rename to packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter.scss diff --git a/packages/core/src/renderer/components/namespaces/namespace-select-filter.test.tsx b/packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter.test.tsx similarity index 98% rename from packages/core/src/renderer/components/namespaces/namespace-select-filter.test.tsx rename to packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter.test.tsx index a07bb6c981..c5567e2da6 100644 --- a/packages/core/src/renderer/components/namespaces/namespace-select-filter.test.tsx +++ b/packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter.test.tsx @@ -24,8 +24,8 @@ import type { Disposer } from "@k8slens/utilities"; import { disposer } from "@k8slens/utilities"; import { renderFor } from "../test-utils/renderFor"; import { NamespaceSelectFilter } from "./namespace-select-filter"; -import type { NamespaceStore } from "./store"; -import namespaceStoreInjectable from "./store.injectable"; +import type { NamespaceStore } from "../namespaces/store"; +import namespaceStoreInjectable from "../namespaces/store.injectable"; function createNamespace(name: string): Namespace { return new Namespace({ diff --git a/packages/core/src/renderer/components/namespaces/namespace-select-filter.tsx b/packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter.tsx similarity index 97% rename from packages/core/src/renderer/components/namespaces/namespace-select-filter.tsx rename to packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter.tsx index b22ba43114..884188507d 100644 --- a/packages/core/src/renderer/components/namespaces/namespace-select-filter.tsx +++ b/packages/core/src/renderer/components/namespace-select-filter/namespace-select-filter.tsx @@ -8,9 +8,9 @@ import "./namespace-select-filter.scss"; import React, { useEffect, useRef } from "react"; import { observer } from "mobx-react"; import { withInjectables } from "@ogre-tools/injectable-react"; -import type { NamespaceSelectFilterModel, NamespaceSelectFilterOption } from "./namespace-select-filter-model/namespace-select-filter-model"; -import { selectAllNamespaces } from "./namespace-select-filter-model/namespace-select-filter-model"; -import namespaceSelectFilterModelInjectable from "./namespace-select-filter-model/namespace-select-filter-model.injectable"; +import type { NamespaceSelectFilterModel, NamespaceSelectFilterOption } from "./namespace-select-filter-model"; +import { selectAllNamespaces } from "./namespace-select-filter-model"; +import namespaceSelectFilterModelInjectable from "./namespace-select-filter-model.injectable"; import { VariableSizeList } from "react-window"; import { Icon } from "../icon"; import { cssNames, prevDefault } from "@k8slens/utilities"; diff --git a/packages/core/src/renderer/components/namespaces/namespace-select-filter-model/filter-by-namespace.injectable.ts b/packages/core/src/renderer/components/namespaces/filter-by-namespace.injectable.ts similarity index 90% rename from packages/core/src/renderer/components/namespaces/namespace-select-filter-model/filter-by-namespace.injectable.ts rename to packages/core/src/renderer/components/namespaces/filter-by-namespace.injectable.ts index fff1c37202..4848cb5624 100644 --- a/packages/core/src/renderer/components/namespaces/namespace-select-filter-model/filter-by-namespace.injectable.ts +++ b/packages/core/src/renderer/components/namespaces/filter-by-namespace.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import namespaceStoreInjectable from "../store.injectable"; +import namespaceStoreInjectable from "./store.injectable"; export type FilterByNamespace = (namespace: string) => void; diff --git a/packages/core/src/renderer/components/namespaces/namespace-select-badge.tsx b/packages/core/src/renderer/components/namespaces/namespace-select-badge.tsx index 088cfe603e..97020e0288 100644 --- a/packages/core/src/renderer/components/namespaces/namespace-select-badge.tsx +++ b/packages/core/src/renderer/components/namespaces/namespace-select-badge.tsx @@ -8,11 +8,8 @@ import React from "react"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { BadgeProps } from "../badge"; import { Badge } from "../badge"; -import type { - FilterByNamespace, -} from "./namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable - from "./namespace-select-filter-model/filter-by-namespace.injectable"; +import type { FilterByNamespace } from "./filter-by-namespace.injectable"; +import filterByNamespaceInjectable from "./filter-by-namespace.injectable"; import { prevDefault, cssNames } from "@k8slens/utilities"; export interface NamespaceSelectBadgeProps extends BadgeProps { @@ -49,10 +46,8 @@ export function NamespaceSelectBadgeNonInjected( } export const NamespaceSelectBadge = withInjectables(NamespaceSelectBadgeNonInjected, { - getProps(di, props) { - return { - ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), - }; - }, + getProps: (di, props) => ({ + ...props, + filterByNamespace: di.inject(filterByNamespaceInjectable), + }), }); diff --git a/packages/core/src/renderer/components/workloads-overview/overview.tsx b/packages/core/src/renderer/components/workloads-overview/overview.tsx index 3ea0a8c2d7..39d4601fef 100644 --- a/packages/core/src/renderer/components/workloads-overview/overview.tsx +++ b/packages/core/src/renderer/components/workloads-overview/overview.tsx @@ -13,7 +13,7 @@ import type { JobStore } from "../workloads-jobs/store"; import type { CronJobStore } from "../workloads-cronjobs/store"; import type { IComputedValue } from "mobx"; import { makeObservable, observable, reaction } from "mobx"; -import { NamespaceSelectFilter } from "../namespaces/namespace-select-filter"; +import { NamespaceSelectFilter } from "../namespace-select-filter/namespace-select-filter"; import { Icon } from "@k8slens/icon"; import { TooltipPosition } from "@k8slens/tooltip"; import { withInjectables } from "@ogre-tools/injectable-react";