From 7b5eaa911ee3424f8558b1606a890381f4e52e6a Mon Sep 17 00:00:00 2001
From: justinpark <justin.hojun.park@gmail.com>
Date: Mon, 24 Jun 2024 09:48:27 -0700
Subject: [PATCH] fix(explore): restored hidden field values has discarded

---
 .../src/explore/reducers/exploreReducer.js    |  2 +-
 .../explore/reducers/exploreReducer.test.js   | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 superset-frontend/src/explore/reducers/exploreReducer.test.js

diff --git a/superset-frontend/src/explore/reducers/exploreReducer.js b/superset-frontend/src/explore/reducers/exploreReducer.js
index 9eddd2f678cf5..8985f032c7db1 100644
--- a/superset-frontend/src/explore/reducers/exploreReducer.js
+++ b/superset-frontend/src/explore/reducers/exploreReducer.js
@@ -267,7 +267,7 @@ export default function exploreReducer(state = {}, action) {
           ...form_data,
           ...restoredField,
         },
-        hiddenFormData,
+        hiddenFormData: omit(hiddenFormData, fieldNames),
       };
     },
     [actions.SLICE_UPDATED]() {
diff --git a/superset-frontend/src/explore/reducers/exploreReducer.test.js b/superset-frontend/src/explore/reducers/exploreReducer.test.js
new file mode 100644
index 0000000000000..37f072d9e7325
--- /dev/null
+++ b/superset-frontend/src/explore/reducers/exploreReducer.test.js
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import exploreReducer from './exploreReducer';
+import { setStashFormData } from '../actions/exploreActions';
+
+test('reset hiddenFormData on SET_STASH_FORM_DATA', () => {
+  const initialState = {
+    form_data: { a: 3, c: 4 },
+  };
+  const action = setStashFormData(true, ['a', 'c']);
+  const newState = exploreReducer(initialState, action);
+  expect(newState.form_data).toEqual({});
+  expect(newState.hiddenFormData).toEqual({ a: 3, c: 4 });
+  const restoreAction = setStashFormData(false, ['c']);
+  const newState2 = exploreReducer(newState, restoreAction);
+  expect(newState2.form_data).toEqual({ c: 4 });
+  expect(newState2.hiddenFormData).toEqual({ a: 3 });
+});