fix: import dataset/dashboard empty keys (#13979)

apache · Apr 7, 2021 · 3b11654 · 3b11654
1 parent ab0f5e3
commit 3b11654
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/superset/dashboards/commands/importers/v1/utils.py b/superset/dashboards/commands/importers/v1/utils.py
@@ -115,7 +115,7 @@ def import_dashboard(
     # TODO (betodealmeida): move this logic to import_from_dict
     config = config.copy()
     for key, new_name in JSON_KEYS.items():
-        if config.get(key):
+        if config.get(key) is not None:
             value = config.pop(key)
             try:
                 config[new_name] = json.dumps(value)

diff --git a/superset/datasets/commands/importers/v1/utils.py b/superset/datasets/commands/importers/v1/utils.py
@@ -92,7 +92,7 @@ def import_dataset(
     # TODO (betodealmeida): move this logic to import_from_dict
     config = config.copy()
     for key in JSON_KEYS:
-        if config.get(key):
+        if config.get(key) is not None:
             try:
                 config[key] = json.dumps(config[key])
             except TypeError:

diff --git a/tests/datasets/commands_tests.py b/tests/datasets/commands_tests.py
@@ -312,7 +312,7 @@ def test_import_v1_dataset(self):
         assert dataset.schema == ""
         assert dataset.sql == ""
         assert dataset.params is None
-        assert dataset.template_params is None
+        assert dataset.template_params == "{}"
         assert dataset.filter_select_enabled
         assert dataset.fetch_values_predicate is None
         assert dataset.extra is None

diff --git a/tests/fixtures/importexport.py b/tests/fixtures/importexport.py
@@ -368,7 +368,7 @@
     "schema": "",
     "sql": "",
     "params": None,
-    "template_params": None,
+    "template_params": {},
     "filter_select_enabled": True,
     "fetch_values_predicate": None,
     "extra": None,