fix: import metrics with extra (apache#15047)

* fix: import metrics with extra * Fix test
preset-io · Jun 9, 2021 · 42cb526 · 42cb526
1 parent 3f527c7
commit 42cb526
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/superset/datasets/commands/importers/v1/utils.py b/superset/datasets/commands/importers/v1/utils.py
@@ -98,11 +98,12 @@ def import_dataset(
             except TypeError:
                 logger.info("Unable to encode `%s` field: %s", key, config[key])
     for metric in config.get("metrics", []):
-        if metric.get("extra"):
+        if metric.get("extra") is not None:
             try:
                 metric["extra"] = json.dumps(metric["extra"])
             except TypeError:
                 logger.info("Unable to encode `extra` field: %s", metric["extra"])
+                metric["extra"] = None
 
     # should we delete columns and metrics not present in the current import?
     sync = ["columns", "metrics"] if overwrite else []

diff --git a/tests/datasets/commands_tests.py b/tests/datasets/commands_tests.py
@@ -328,7 +328,7 @@ def test_import_v1_dataset(self):
         assert metric.expression == "count(1)"
         assert metric.description is None
         assert metric.d3format is None
-        assert metric.extra is None
+        assert metric.extra == "{}"
         assert metric.warning_text is None
 
         assert len(dataset.columns) == 1

diff --git a/tests/fixtures/importexport.py b/tests/fixtures/importexport.py
@@ -384,7 +384,7 @@
             "expression": "count(1)",
             "description": None,
             "d3format": None,
-            "extra": None,
+            "extra": {},
             "warning_text": None,
         },
     ],