hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Consolidate way of passing items to ItemListLayout (#4850)

Browse Source
This commit is contained in:
Janne Savolainen 2022-02-11 16:32:14 +02:00 committed by GitHub
parent e626cc91d4
commit 668ac58cb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/renderer/components/+helm-charts/helm-charts.tsx
View File

@ -73,6 +73,7 @@ export class HelmCharts extends Component<Props> {
tableId="helm_charts" tableId="helm_charts"
className="HelmCharts" className="HelmCharts"
store={helmChartStore} store={helmChartStore}
getItems={() => helmChartStore.items}
isSelectable={false} isSelectable={false}
sortingCallbacks={{ sortingCallbacks={{
[columnId.name]: chart => chart.getName(), [columnId.name]: chart => chart.getName(),

1
src/renderer/components/+helm-releases/releases.tsx
View File

@ -147,6 +147,7 @@ class NonInjectedHelmReleases extends Component<Dependencies & Props> {
<> <>
<ItemListLayout <ItemListLayout
store={legacyReleaseStore} store={legacyReleaseStore}
getItems={() => legacyReleaseStore.items}
preloadStores={false} preloadStores={false}
isConfigurable isConfigurable
tableId="helm_releases" tableId="helm_releases"

4
src/renderer/components/+network-port-forwards/port-forwards.tsx
View File

@ -86,7 +86,9 @@ class NonInjectedPortForwards extends React.Component<Props & Dependencies> {
<ItemListLayout <ItemListLayout
isConfigurable isConfigurable
tableId="port_forwards" tableId="port_forwards"
className="PortForwards" store={this.props.portForwardStore} className="PortForwards"
store={this.props.portForwardStore}
getItems={() => this.props.portForwardStore.items}
sortingCallbacks={{ sortingCallbacks={{
[columnId.name]: item => item.getName(), [columnId.name]: item => item.getName(),
[columnId.namespace]: item => item.getNs(), [columnId.namespace]: item => item.getNs(),

5
src/renderer/components/item-object-list/list-layout.tsx
View File

@ -41,8 +41,7 @@ export type HeaderCustomizer = (placeholders: HeaderPlaceholders) => HeaderPlace
export interface ItemListLayoutProps<I extends ItemObject> { export interface ItemListLayoutProps<I extends ItemObject> {
tableId?: string; tableId?: string;
className: IClassName; className: IClassName;
items?: I[]; getItems: () => I[];
getItems?: () => I[];
store: ItemStore<I>; store: ItemStore<I>;
dependentStores?: ItemStore<ItemObject>[]; dependentStores?: ItemStore<ItemObject>[];
preloadStores?: boolean; preloadStores?: boolean;
@ -213,7 +212,7 @@ class NonInjectedItemListLayout<I extends ItemObject> extends React.Component<It
} }
} }
const items = this.props.getItems?.() ?? this.props.items ?? this.props.store.items; const items = this.props.getItems();
return applyFilters(filterItems.concat(this.props.filterItems), items); return applyFilters(filterItems.concat(this.props.filterItems), items);
} }

9
src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx
View File

@ -21,11 +21,14 @@ import { TooltipPosition } from "../tooltip";
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import type { ClusterFrameContext } from "../../cluster-frame-context/cluster-frame-context"; import type { ClusterFrameContext } from "../../cluster-frame-context/cluster-frame-context";
import clusterFrameContextInjectable from "../../cluster-frame-context/cluster-frame-context.injectable"; import clusterFrameContextInjectable from "../../cluster-frame-context/cluster-frame-context.injectable";
import kubeWatchApiInjectable import kubeWatchApiInjectable from "../../kube-watch-api/kube-watch-api.injectable";
from "../../kube-watch-api/kube-watch-api.injectable";
import type { KubeWatchSubscribeStoreOptions } from "../../kube-watch-api/kube-watch-api"; import type { KubeWatchSubscribeStoreOptions } from "../../kube-watch-api/kube-watch-api";
export interface KubeObjectListLayoutProps<K extends KubeObject> extends ItemListLayoutProps<K> { type ItemListLayoutPropsWithoutGetItems<K extends KubeObject> = Omit<ItemListLayoutProps<K>, "getItems">;
export interface KubeObjectListLayoutProps<K extends KubeObject> extends ItemListLayoutPropsWithoutGetItems<K> {
items?: K[];
getItems?: () => K[];
store: KubeObjectStore<K>; store: KubeObjectStore<K>;
dependentStores?: KubeObjectStore<KubeObject>[]; dependentStores?: KubeObjectStore<KubeObject>[];
subscribeStores?: boolean; subscribeStores?: boolean;