This is an automated email from the ASF dual-hosted git repository. beto pushed a commit to branch fix_import in repository https://gitbox.apache.org/repos/asf/superset.git
commit 65f0178490e2b7d0cdf1fdb1138f985e5b299042 Author: Beto Dealmeida <[email protected]> AuthorDate: Tue Sep 26 16:52:19 2023 -0700 fix: chart import --- superset/charts/commands/importers/v1/utils.py | 4 ++-- tests/unit_tests/charts/commands/importers/v1/utils_test.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/superset/charts/commands/importers/v1/utils.py b/superset/charts/commands/importers/v1/utils.py index d3f90f7ff4..3ef0a2ed78 100644 --- a/superset/charts/commands/importers/v1/utils.py +++ b/superset/charts/commands/importers/v1/utils.py @@ -99,8 +99,8 @@ def migrate_chart(config: dict[str, Any]) -> dict[str, Any]: # also update `query_context` try: - query_context = json.loads(output.get("query_context", "{}")) - except json.decoder.JSONDecodeError: + query_context = json.loads(output.get("query_context") or "{}") + except (json.decoder.JSONDecodeError, TypeError): query_context = {} if "form_data" in query_context: query_context["form_data"] = output["params"] diff --git a/tests/unit_tests/charts/commands/importers/v1/utils_test.py b/tests/unit_tests/charts/commands/importers/v1/utils_test.py index c99ecaf6d6..77d31e7d77 100644 --- a/tests/unit_tests/charts/commands/importers/v1/utils_test.py +++ b/tests/unit_tests/charts/commands/importers/v1/utils_test.py @@ -32,6 +32,7 @@ def test_migrate_chart_area() -> None: "certified_by": None, "certification_details": None, "viz_type": "area", + "query_context": None, "params": json.dumps( { "adhoc_filters": [],
