From f0c0d7492c770b32cad6701081ce8edbd56a36f0 Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com>
Date: Tue, 13 Jul 2021 08:38:32 -0300
Subject: [PATCH] chore: Reverts reset form in native filters (#15644)

---
 .../FiltersConfigModal/FiltersConfigModal.tsx          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
index bde38f250a..fe248e0916 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
@@ -164,6 +164,15 @@ export function FiltersConfigModal({
     addFilter,
   );
 
+  // After this, it should be as if the modal was just opened fresh.
+  // Called when the modal is closed.
+  const resetForm = () => {
+    setNewFilterIds([]);
+    setCurrentFilterId(initialCurrentFilterId);
+    setRemovedFilters({});
+    setSaveAlertVisible(false);
+  };
+
   const getFilterTitle = (id: string) =>
     formValues.filters[id]?.name ??
     filterConfigMap[id]?.name ??
@@ -208,6 +217,7 @@ export function FiltersConfigModal({
   };
 
   const handleConfirmCancel = () => {
+    resetForm();
     onCancel();
   };