From 7da9a9c053d1f3c302108c86107b6f9a38ae5130 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <ville.v.brofeldt@gmail.com>
Date: Mon, 8 Feb 2021 16:29:36 +0200
Subject: [PATCH 1/2] fix(native-filters) set currentValue null when empty

---
 .../components/nativeFilters/FilterBar/CascadePopover.tsx    | 2 +-
 .../src/filters/components/Select/AntdSelectFilter.tsx       | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadePopover.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadePopover.tsx
index b5a9432b01b3f..0a51df05d5ad3 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadePopover.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadePopover.tsx
@@ -108,7 +108,7 @@ const CascadePopover: React.FC<CascadePopoverProps> = ({
         return activeChildren;
       }
 
-      if (currentValue) {
+      if (currentValue !== undefined && currentValue !== null) {
         return [filter];
       }
 
diff --git a/superset-frontend/src/filters/components/Select/AntdSelectFilter.tsx b/superset-frontend/src/filters/components/Select/AntdSelectFilter.tsx
index d9f89c9aec902..95dd4d5c17105 100644
--- a/superset-frontend/src/filters/components/Select/AntdSelectFilter.tsx
+++ b/superset-frontend/src/filters/components/Select/AntdSelectFilter.tsx
@@ -76,7 +76,10 @@ export default function AntdPluginFilterSelect(
       ),
       // @ts-ignore (add to superset-ui/core)
       currentState: {
-        value: resultValue,
+        value:
+          Array.isArray(resultValue) && resultValue.length === 0
+            ? null
+            : resultValue,
       },
     });
   };

From 8f483c73837639f962cc0483109d51f8b7984f4f Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <ville.v.brofeldt@gmail.com>
Date: Wed, 10 Feb 2021 12:06:35 +0200
Subject: [PATCH 2/2] remove redundant array check

---
 .../src/filters/components/Select/AntdSelectFilter.tsx       | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/superset-frontend/src/filters/components/Select/AntdSelectFilter.tsx b/superset-frontend/src/filters/components/Select/AntdSelectFilter.tsx
index 95dd4d5c17105..8197d28cfa60b 100644
--- a/superset-frontend/src/filters/components/Select/AntdSelectFilter.tsx
+++ b/superset-frontend/src/filters/components/Select/AntdSelectFilter.tsx
@@ -76,10 +76,7 @@ export default function AntdPluginFilterSelect(
       ),
       // @ts-ignore (add to superset-ui/core)
       currentState: {
-        value:
-          Array.isArray(resultValue) && resultValue.length === 0
-            ? null
-            : resultValue,
+        value: resultValue.length ? resultValue : null,
       },
     });
   };