From 668ac58cb30548dcdd66efaddbea7f905cfdf1a7 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Fri, 11 Feb 2022 16:32:14 +0200
Subject: [PATCH] Consolidate way of passing items to ItemListLayout (#4850)

---
 src/renderer/components/+helm-charts/helm-charts.tsx     | 1 +
 src/renderer/components/+helm-releases/releases.tsx      | 1 +
 .../components/+network-port-forwards/port-forwards.tsx  | 4 +++-
 src/renderer/components/item-object-list/list-layout.tsx | 5 ++---
 .../kube-object-list-layout/kube-object-list-layout.tsx  | 9 ++++++---
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/renderer/components/+helm-charts/helm-charts.tsx b/src/renderer/components/+helm-charts/helm-charts.tsx
index 49f885a093..0665416323 100644
--- a/src/renderer/components/+helm-charts/helm-charts.tsx
+++ b/src/renderer/components/+helm-charts/helm-charts.tsx
@@ -73,6 +73,7 @@ export class HelmCharts extends Component<Props> {
           tableId="helm_charts"
           className="HelmCharts"
           store={helmChartStore}
+          getItems={() => helmChartStore.items}
           isSelectable={false}
           sortingCallbacks={{
             [columnId.name]: chart => chart.getName(),
diff --git a/src/renderer/components/+helm-releases/releases.tsx b/src/renderer/components/+helm-releases/releases.tsx
index 0017fa1ba8..896e826a90 100644
--- a/src/renderer/components/+helm-releases/releases.tsx
+++ b/src/renderer/components/+helm-releases/releases.tsx
@@ -147,6 +147,7 @@ class NonInjectedHelmReleases extends Component<Dependencies & Props> {
       <>
         <ItemListLayout
           store={legacyReleaseStore}
+          getItems={() => legacyReleaseStore.items}
           preloadStores={false}
           isConfigurable
           tableId="helm_releases"
diff --git a/src/renderer/components/+network-port-forwards/port-forwards.tsx b/src/renderer/components/+network-port-forwards/port-forwards.tsx
index 9ceeadba38..878943cc9b 100644
--- a/src/renderer/components/+network-port-forwards/port-forwards.tsx
+++ b/src/renderer/components/+network-port-forwards/port-forwards.tsx
@@ -86,7 +86,9 @@ class NonInjectedPortForwards extends React.Component<Props & Dependencies> {
         <ItemListLayout
           isConfigurable
           tableId="port_forwards"
-          className="PortForwards" store={this.props.portForwardStore}
+          className="PortForwards"
+          store={this.props.portForwardStore}
+          getItems={() => this.props.portForwardStore.items}
           sortingCallbacks={{
             [columnId.name]: item => item.getName(),
             [columnId.namespace]: item => item.getNs(),
diff --git a/src/renderer/components/item-object-list/list-layout.tsx b/src/renderer/components/item-object-list/list-layout.tsx
index ca8a4b1293..9af91fc755 100644
--- a/src/renderer/components/item-object-list/list-layout.tsx
+++ b/src/renderer/components/item-object-list/list-layout.tsx
@@ -41,8 +41,7 @@ export type HeaderCustomizer = (placeholders: HeaderPlaceholders) => HeaderPlace
 export interface ItemListLayoutProps<I extends ItemObject> {
   tableId?: string;
   className: IClassName;
-  items?: I[];
-  getItems?: () => I[];
+  getItems: () => I[];
   store: ItemStore<I>;
   dependentStores?: ItemStore<ItemObject>[];
   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);
   }
diff --git a/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx b/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx
index 5ecf4f1425..c084c17ce7 100644
--- a/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx
+++ b/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx
@@ -21,11 +21,14 @@ import { TooltipPosition } from "../tooltip";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import type { ClusterFrameContext } from "../../cluster-frame-context/cluster-frame-context";
 import clusterFrameContextInjectable from "../../cluster-frame-context/cluster-frame-context.injectable";
-import kubeWatchApiInjectable
-  from "../../kube-watch-api/kube-watch-api.injectable";
+import kubeWatchApiInjectable from "../../kube-watch-api/kube-watch-api.injectable";
 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>;
   dependentStores?: KubeObjectStore<KubeObject>[];
   subscribeStores?: boolean;