chore: Start moving namespace-select-filter to own folder

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

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

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 {

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

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

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;
 

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

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 {

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 type { NamespaceStore } from "../namespaces/store";
-import namespaceStoreInjectable from "./store.injectable";
+import namespaceStoreInjectable from "../namespaces/store.injectable";
 
 function createNamespace(name: string): Namespace {
   return new Namespace({

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 type { NamespaceSelectFilterModel, NamespaceSelectFilterOption } from "./namespace-select-filter-model";
-import { selectAllNamespaces } from "./namespace-select-filter-model/namespace-select-filter-model";
+import { selectAllNamespaces } from "./namespace-select-filter-model";
-import namespaceSelectFilterModelInjectable from "./namespace-select-filter-model/namespace-select-filter-model.injectable";
+import namespaceSelectFilterModelInjectable from "./namespace-select-filter-model.injectable";
 import { VariableSizeList } from "react-window";
 import { Icon } from "../icon";
 import { cssNames, prevDefault } from "@k8slens/utilities";

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;
 

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 {
+import type { FilterByNamespace } from "./filter-by-namespace.injectable";
-  FilterByNamespace,
+import filterByNamespaceInjectable from "./filter-by-namespace.injectable";
-} from "./namespace-select-filter-model/filter-by-namespace.injectable";
-import filterByNamespaceInjectable
-  from "./namespace-select-filter-model/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<Dependencies, NamespaceSelectBadgeProps>(NamespaceSelectBadgeNonInjected, {
-  getProps(di, props) {
+  getProps: (di, props) => ({
-    return {
+    ...props,
-      ...props,
+    filterByNamespace: di.inject(filterByNamespaceInjectable),
-      filterByNamespace: di.inject(filterByNamespaceInjectable),
+  }),
-    };
-  },
 });

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