Merge pull request #252 from CybercentreCanada/CLDN-1928-filter-incor…

…rectly-displays-as-applied fix: CLDN-1928-Adhoc Filter displays as not applied when empty
CybercentreCanada · Feb 6, 2023 · aa4db47 · aa4db47
2 parents 22c8982 + cf3eea4
commit aa4db47
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/superset-frontend/src/filters/components/Adhoc/AdhocFilterPlugin.tsx b/superset-frontend/src/filters/components/Adhoc/AdhocFilterPlugin.tsx
@@ -54,7 +54,7 @@ type DataMaskAction =
       filterState: {
         label?: string;
         filters?: AdhocFilter[];
-        value: AdhocFilter[];
+        value?: AdhocFilter[];
       };
     };
 
@@ -182,13 +182,15 @@ export default function PluginFilterAdhoc(props: PluginFilterAdhocProps) {
         ),
         filterState: {
           ...filterState,
-          label: (adhoc_filters || [])
-            .map(f =>
-              f.sqlExpression ? String(f.sqlExpression) : labelString(f),
-            )
-            .join(', '),
-          value: adhoc_filters,
-          filters: adhoc_filters,
+          label: adhoc_filters?.length
+            ? (adhoc_filters || [])
+                .map(f =>
+                  f.sqlExpression ? String(f.sqlExpression) : labelString(f),
+                )
+                .join(', ')
+            : undefined,
+          value: adhoc_filters?.length ? adhoc_filters : undefined,
+          filters: adhoc_filters?.length ? adhoc_filters : undefined,
         },
       });
     },