fix(key-value): lost url_params after long-url feature (apache#18846)

(cherry picked from commit 4c16586)
preset-io · Feb 22, 2022 · cbab107 · cbab107
1 parent 37de381
commit cbab107
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/superset-frontend/src/explore/components/ExploreViewContainer/index.jsx b/superset-frontend/src/explore/components/ExploreViewContainer/index.jsx
@@ -175,6 +175,19 @@ const updateHistory = debounce(
       additionalParam[URL_PARAMS.datasetId.name] = datasetId;
     }
 
+    const urlParams = payload?.url_params || {};
+    Object.entries(urlParams).forEach(([key, value]) => {
+      if (
+        ![
+          URL_PARAMS.sliceId.name,
+          URL_PARAMS.formDataKey.name,
+          URL_PARAMS.datasetId.name,
+        ].includes(key)
+      ) {
+        additionalParam[key] = value;
+      }
+    });
+
     try {
       let key;
       let stateModifier;

diff --git a/superset/views/core.py b/superset/views/core.py
@@ -744,8 +744,7 @@ def explore(
         if form_data_key:
             parameters = CommandParameters(actor=g.user, key=form_data_key,)
             value = GetFormDataCommand(parameters).run()
-            if value:
-                initial_form_data = json.loads(value)
+            initial_form_data = json.loads(value) if value else {}
 
         if not initial_form_data:
             slice_id = request.args.get("slice_id")