diff --git a/src/renderer/components/+network-policies/legacy-store.ts b/src/renderer/components/+network-policies/legacy-store.ts deleted file mode 100644 index b8da3f6081..0000000000 --- a/src/renderer/components/+network-policies/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 networkPolicyStoreInjectable from "./store.injectable"; - -/** - * @deprecated use `di.inject(networkPolicyStoreInjectable)` instead - */ -export const networkPolicyStore = asLegacyGlobalForExtensionApi(networkPolicyStoreInjectable); diff --git a/src/renderer/components/+network-policies/network-policies.scss b/src/renderer/components/+network-policies/network-policies.scss index 6b0c3c1920..d9170a4cb4 100644 --- a/src/renderer/components/+network-policies/network-policies.scss +++ b/src/renderer/components/+network-policies/network-policies.scss @@ -8,5 +8,9 @@ &.warning { @include table-cell-warning; } + + a.filterNamespace { + border-bottom: unset; + } } } diff --git a/src/renderer/components/+network-policies/network-policies.tsx b/src/renderer/components/+network-policies/network-policies.tsx index 88b1425802..a4aeac21f7 100644 --- a/src/renderer/components/+network-policies/network-policies.tsx +++ b/src/renderer/components/+network-policies/network-policies.tsx @@ -8,10 +8,15 @@ import "./network-policies.scss"; import React from "react"; import { observer } from "mobx-react"; import { KubeObjectListLayout } from "../kube-object-list-layout"; -import { networkPolicyStore } from "./legacy-store"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; +import type { NetworkPolicyStore } from "./store"; +import { prevDefault } from "../../utils"; +import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { withInjectables } from "@ogre-tools/injectable-react"; +import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import networkPolicyStoreInjectable from "./store.injectable"; enum columnId { name = "name", @@ -20,8 +25,13 @@ enum columnId { age = "age", } +interface Dependencies { + networkPolicyStore: NetworkPolicyStore; + filterByNamespace: FilterByNamespace; +} + @observer -export class NetworkPolicies extends React.Component { +class NonInjectedNetworkPolicies extends React.Component { render() { return ( @@ -29,7 +39,7 @@ export class NetworkPolicies extends React.Component { isConfigurable tableId="network_policies" className="NetworkPolicies" - store={networkPolicyStore} + store={this.props.networkPolicyStore} sortingCallbacks={{ [columnId.name]: networkPolicy => networkPolicy.getName(), [columnId.namespace]: networkPolicy => networkPolicy.getNs(), @@ -49,7 +59,13 @@ export class NetworkPolicies extends React.Component { renderTableContents={networkPolicy => [ networkPolicy.getName(), , - networkPolicy.getNs(), + this.props.filterByNamespace(networkPolicy.getNs()))} + > + {networkPolicy.getNs()} + , networkPolicy.getTypes().join(", "), , ]} @@ -58,3 +74,11 @@ export class NetworkPolicies extends React.Component { ); } } + +export const NetworkPolicies = withInjectables(NonInjectedNetworkPolicies, { + getProps: (di, props) => ({ + ...props, + filterByNamespace: di.inject(filterByNamespaceInjectable), + networkPolicyStore: di.inject(networkPolicyStoreInjectable), + }), +});