From f300e6e74fbf4cfc5f23b29853560da8f18f7e9c Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 30 Nov 2022 09:40:49 -0500 Subject: [PATCH] Add quick namespace filtering to StatefulSets view Signed-off-by: Sebastian Malton --- .../+workloads-statefulsets/legacy-store.ts | 12 ----- .../+workloads-statefulsets/statefulsets.scss | 4 ++ .../+workloads-statefulsets/statefulsets.tsx | 47 +++++++++++++++++-- 3 files changed, 46 insertions(+), 17 deletions(-) delete mode 100644 src/renderer/components/+workloads-statefulsets/legacy-store.ts diff --git a/src/renderer/components/+workloads-statefulsets/legacy-store.ts b/src/renderer/components/+workloads-statefulsets/legacy-store.ts deleted file mode 100644 index b96347a78b..0000000000 --- a/src/renderer/components/+workloads-statefulsets/legacy-store.ts +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { asLegacyGlobalForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; -import statefulSetStoreInjectable from "./store.injectable"; - -/** - * @deprecated use `di.inject(statefulSetStoreInjectable)` instead - */ -export const statefulSetStore = asLegacyGlobalForExtensionApi(statefulSetStoreInjectable); diff --git a/src/renderer/components/+workloads-statefulsets/statefulsets.scss b/src/renderer/components/+workloads-statefulsets/statefulsets.scss index 55d49f4b49..23b4da9242 100644 --- a/src/renderer/components/+workloads-statefulsets/statefulsets.scss +++ b/src/renderer/components/+workloads-statefulsets/statefulsets.scss @@ -16,5 +16,9 @@ &.warning { @include table-cell-warning; } + + a.filterNamespace { + border-bottom: unset; + } } } diff --git a/src/renderer/components/+workloads-statefulsets/statefulsets.tsx b/src/renderer/components/+workloads-statefulsets/statefulsets.tsx index 0f849355a6..fb8d68702e 100644 --- a/src/renderer/components/+workloads-statefulsets/statefulsets.tsx +++ b/src/renderer/components/+workloads-statefulsets/statefulsets.tsx @@ -8,13 +8,20 @@ import "./statefulsets.scss"; import React from "react"; import { observer } from "mobx-react"; import type { StatefulSet } from "../../../common/k8s-api/endpoints"; -import { podStore } from "../+workloads-pods/legacy-store"; -import { statefulSetStore } from "./legacy-store"; -import { eventStore } from "../+events/legacy-store"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; +import type { StatefulSetStore } from "./store"; +import type { PodStore } from "../+workloads-pods/store"; +import type { EventStore } from "../+events/store"; +import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { withInjectables } from "@ogre-tools/injectable-react"; +import eventStoreInjectable from "../+events/store.injectable"; +import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import podStoreInjectable from "../+workloads-pods/store.injectable"; +import statefulSetStoreInjectable from "./store.injectable"; +import { prevDefault } from "../../utils"; enum columnId { name = "name", @@ -24,8 +31,15 @@ enum columnId { replicas = "replicas", } +interface Dependencies { + statefulSetStore: StatefulSetStore; + podStore: PodStore; + eventStore: EventStore; + filterByNamespace: FilterByNamespace; +} + @observer -export class StatefulSets extends React.Component { +class NonInjectedStatefulSets extends React.Component { renderPods(statefulSet: StatefulSet) { const { readyReplicas, currentReplicas } = statefulSet.status ?? {}; @@ -33,6 +47,13 @@ export class StatefulSets extends React.Component { } render() { + const { + eventStore, + filterByNamespace, + podStore, + statefulSetStore, + } = this.props; + return ( [ statefulSet.getName(), - statefulSet.getNs(), + filterByNamespace(statefulSet.getNs()))} + > + {statefulSet.getNs()} + , this.renderPods(statefulSet), statefulSet.getReplicas(), , @@ -72,3 +99,13 @@ export class StatefulSets extends React.Component { ); } } + +export const StatefulSets = withInjectables(NonInjectedStatefulSets, { + getProps: (di, props) => ({ + ...props, + eventStore: di.inject(eventStoreInjectable), + filterByNamespace: di.inject(filterByNamespaceInjectable), + podStore: di.inject(podStoreInjectable), + statefulSetStore: di.inject(statefulSetStoreInjectable), + }), +});