diff --git a/src/renderer/components/+network-port-forwards/port-forwards.scss b/src/renderer/components/+network-port-forwards/port-forwards.scss index d9518987e3..ede9873736 100644 --- a/src/renderer/components/+network-port-forwards/port-forwards.scss +++ b/src/renderer/components/+network-port-forwards/port-forwards.scss @@ -13,5 +13,9 @@ @include port-forward-status-colors; flex: 0.6; } + + a.filterNamespace { + border-bottom: unset; + } } } diff --git a/src/renderer/components/+network-port-forwards/port-forwards.tsx b/src/renderer/components/+network-port-forwards/port-forwards.tsx index fc6b4c4735..8010bf9545 100644 --- a/src/renderer/components/+network-port-forwards/port-forwards.tsx +++ b/src/renderer/components/+network-port-forwards/port-forwards.tsx @@ -19,6 +19,9 @@ import { computed, makeObservable } from "mobx"; import portForwardsRouteParametersInjectable from "./port-forwards-route-parameters.injectable"; import type { NavigateToPortForwards } from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable"; import navigateToPortForwardsInjectable from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable"; +import { prevDefault } from "../../utils"; +import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; enum columnId { name = "name", @@ -34,6 +37,7 @@ interface Dependencies { portForwardStore: PortForwardStore; forwardport: IComputedValue; navigateToPortForwards: NavigateToPortForwards; + filterByNamespace: FilterByNamespace; } @observer @@ -128,7 +132,13 @@ class NonInjectedPortForwards extends React.Component { ]} renderTableContents={item => [ item.getName(), - item.getNs(), + this.props.filterByNamespace(item.getNs()))} + > + {item.getNs()} + , item.getKind(), item.getPort(), item.getForwardPort(), @@ -158,19 +168,12 @@ class NonInjectedPortForwards extends React.Component { } } -export const PortForwards = withInjectables( - NonInjectedPortForwards, - - { - getProps: (di) => { - const routeParameters = di.inject(portForwardsRouteParametersInjectable); - - return { - portForwardStore: di.inject(portForwardStoreInjectable), - forwardport: routeParameters.forwardport, - navigateToPortForwards: di.inject(navigateToPortForwardsInjectable), - }; - }, - }, -); +export const PortForwards = withInjectables(NonInjectedPortForwards, { + getProps: (di) => ({ + portForwardStore: di.inject(portForwardStoreInjectable), + ...di.inject(portForwardsRouteParametersInjectable), + navigateToPortForwards: di.inject(navigateToPortForwardsInjectable), + filterByNamespace: di.inject(filterByNamespaceInjectable), + }), +});