From eee6b9bb172d3e056d24d1d5f4ac853706f8589a Mon Sep 17 00:00:00 2001
From: GITHUB_USERNAME <EMAIL>
Date: Fri, 3 Feb 2023 10:53:29 -0500
Subject: [PATCH 1/3] value set to empty list instead of undefined

---
 .../components/Adhoc/AdhocFilterPlugin.tsx     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/superset-frontend/src/filters/components/Adhoc/AdhocFilterPlugin.tsx b/superset-frontend/src/filters/components/Adhoc/AdhocFilterPlugin.tsx
index dbb6f6e7ea95d..bdc2e3a2805a6 100644
--- a/superset-frontend/src/filters/components/Adhoc/AdhocFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/Adhoc/AdhocFilterPlugin.tsx
@@ -58,7 +58,7 @@ type DataMaskAction =
       filterState: {
         label?: string;
         filters?: AdhocFilter[];
-        value: AdhocFilter[];
+        value?: AdhocFilter[];
       };
     };
 
@@ -184,13 +184,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,
         },
       });
     },

From fba5e3ea84ab584b145a10b45799489ff70396b7 Mon Sep 17 00:00:00 2001
From: GITHUB_USERNAME <EMAIL>
Date: Mon, 6 Feb 2023 08:31:32 -0500
Subject: [PATCH 2/3] updating base image

---
 cccs-build/superset/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cccs-build/superset/Dockerfile b/cccs-build/superset/Dockerfile
index 034ad4433c2c6..a632f4069cbce 100644
--- a/cccs-build/superset/Dockerfile
+++ b/cccs-build/superset/Dockerfile
@@ -1,7 +1,7 @@
 # Vault CA container import
 ARG VAULT_CA_CONTAINER=uchimera.azurecr.io/cccs/hogwarts/vault-ca:master_2921_22315d60
 FROM $VAULT_CA_CONTAINER AS vault_ca
-FROM uchimera.azurecr.io/cccs/superset-base:cccs-2.0_20230117193544_b6002
+FROM uchimera.azurecr.io/cccs/superset-base:CLDN-1928-filter-incorrectly-displays-as-applied_20230203161428_b6147
 
 
 

From 6538a683b3291016f79a98bcb9e6cf292338cdc4 Mon Sep 17 00:00:00 2001
From: cccs-RyanK <102618419+cccs-RyanK@users.noreply.github.com>
Date: Mon, 6 Feb 2023 12:40:48 -0500
Subject: [PATCH 3/3] Update Dockerfile

---
 cccs-build/superset/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cccs-build/superset/Dockerfile b/cccs-build/superset/Dockerfile
index a632f4069cbce..034ad4433c2c6 100644
--- a/cccs-build/superset/Dockerfile
+++ b/cccs-build/superset/Dockerfile
@@ -1,7 +1,7 @@
 # Vault CA container import
 ARG VAULT_CA_CONTAINER=uchimera.azurecr.io/cccs/hogwarts/vault-ca:master_2921_22315d60
 FROM $VAULT_CA_CONTAINER AS vault_ca
-FROM uchimera.azurecr.io/cccs/superset-base:CLDN-1928-filter-incorrectly-displays-as-applied_20230203161428_b6147
+FROM uchimera.azurecr.io/cccs/superset-base:cccs-2.0_20230117193544_b6002