From bc4c837da324d2ca95c320e5996481e1649219ad Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Sat, 13 Feb 2021 21:01:12 +0200
Subject: [PATCH] fix(native-filters): set currentValue null when empty
 (#13000)

---
 .../components/nativeFilters/FilterBar/CascadePopover.tsx       | 2 +-
 .../src/filters/components/Select/AntdSelectFilter.tsx          | 2 +-
 2 files changed, 2 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 b5a9432b0..0a51df05d 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 85f567ac5..01d6f2d7c 100644
--- a/superset-frontend/src/filters/components/Select/AntdSelectFilter.tsx
+++ b/superset-frontend/src/filters/components/Select/AntdSelectFilter.tsx
@@ -74,7 +74,7 @@ export default function AntdPluginFilterSelect(
         inverseSelection,
       ),
       currentState: {
-        value: resultValue,
+        value: resultValue.length ? resultValue : null,
       },
     });
   };