From c6bfb7d1b84078c2cb70035abd34280cf8601111 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 3 Jun 2021 16:04:25 -0400
Subject: [PATCH] revert to simpler NamespaceSelectFilter fix

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../item-object-list/item-list-layout.tsx       | 17 +++++++++++++----
 .../kube-object/kube-object-list-layout.tsx     | 10 ----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/renderer/components/item-object-list/item-list-layout.tsx b/src/renderer/components/item-object-list/item-list-layout.tsx
index 775a8ac794..f894f90a4a 100644
--- a/src/renderer/components/item-object-list/item-list-layout.tsx
+++ b/src/renderer/components/item-object-list/item-list-layout.tsx
@@ -42,6 +42,8 @@ import { MenuItem } from "../menu";
 import { Checkbox } from "../checkbox";
 import { UserStore } from "../../../common/user-store";
 import { namespaceStore } from "../+namespaces/namespace.store";
+import { KubeObjectStore } from "../../kube-object.store";
+import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter";
 
 // todo: refactor, split to small re-usable components
 
@@ -390,15 +392,22 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
   renderHeader() {
     const { showHeader, customizeHeader, renderHeaderTitle, headerClassName } = this.props;
 
-    if (!showHeader) return null;
+    if (!showHeader) {
+      return null;
+    }
+
+    const showNamespaceSelectFilter = this.props.store instanceof KubeObjectStore && this.props.store.api.isNamespaced;
     const title = typeof renderHeaderTitle === "function" ? renderHeaderTitle(this) : renderHeaderTitle;
     const placeholders: IHeaderPlaceholders = {
       title: <h5 className="title">{title}</h5>,
       info: this.renderInfo(),
       filters: (
-        <PageFiltersSelect allowEmpty disableFilters={{
-          [FilterType.NAMESPACE]: true, // namespace-select used instead
-        }} />
+        <>
+          {showNamespaceSelectFilter && <NamespaceSelectFilter />}
+          <PageFiltersSelect allowEmpty disableFilters={{
+            [FilterType.NAMESPACE]: true, // namespace-select used instead
+          }} />
+        </>
       ),
       search: <SearchInputUrl />,
     };
diff --git a/src/renderer/components/kube-object/kube-object-list-layout.tsx b/src/renderer/components/kube-object/kube-object-list-layout.tsx
index 8c0bc067dc..52c886f6a2 100644
--- a/src/renderer/components/kube-object/kube-object-list-layout.tsx
+++ b/src/renderer/components/kube-object/kube-object-list-layout.tsx
@@ -30,7 +30,6 @@ import { KubeObjectMenu } from "./kube-object-menu";
 import { kubeSelectedUrlParam, showDetails } from "./kube-object-details";
 import { kubeWatchApi } from "../../api/kube-watch-api";
 import { clusterContext } from "../context";
-import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter";
 
 export interface KubeObjectListLayoutProps extends ItemListLayoutProps {
   store: KubeObjectStore;
@@ -77,15 +76,6 @@ export class KubeObjectListLayout extends React.Component<KubeObjectListLayoutPr
         items={items}
         preloadStores={false} // loading handled in kubeWatchApi.subscribeStores()
         detailsItem={this.selectedItem}
-        customizeHeader={({ filters, ...placeholders }) => ({
-          filters: (
-            <>
-              {store.api.isNamespaced && <NamespaceSelectFilter />}
-              {filters}
-            </>
-          ),
-          ...placeholders,
-        })}
         renderItemMenu={(item: KubeObject) => <KubeObjectMenu object={item} />} // safe because we are dealing with KubeObjects here
       />
     );