From 4ae21bf30be7fbc368b3293e40dbaa4bebf6c6cd Mon Sep 17 00:00:00 2001
From: Beto Dealmeida <roberto@dealmeida.net>
Date: Fri, 18 Dec 2020 07:54:11 -0800
Subject: [PATCH] fix: remove keys in dashboard export (#12115)

---
 superset/dashboards/commands/export.py             | 6 +++---
 superset/dashboards/commands/importers/v1/utils.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/superset/dashboards/commands/export.py b/superset/dashboards/commands/export.py
index 9a1af4721f..33fcc7d045 100644
--- a/superset/dashboards/commands/export.py
+++ b/superset/dashboards/commands/export.py
@@ -20,7 +20,7 @@ import json
 import logging
 import random
 import string
-from typing import Any, Dict, Iterator, List, Tuple
+from typing import Any, Dict, Iterator, List, Optional, Tuple
 
 import yaml
 from werkzeug.utils import secure_filename
@@ -108,8 +108,8 @@ class ExportDashboardsCommand(ExportModelsCommand):
         # TODO (betodealmeida): move this logic to export_to_dict once this
         # becomes the default export endpoint
         for key, new_name in JSON_KEYS.items():
-            if payload.get(key):
-                value = payload.pop(key)
+            value: Optional[str] = payload.pop(key, None)
+            if value:
                 try:
                     payload[new_name] = json.loads(value)
                 except (TypeError, json.decoder.JSONDecodeError):
diff --git a/superset/dashboards/commands/importers/v1/utils.py b/superset/dashboards/commands/importers/v1/utils.py
index e9c584c057..1a910b0c87 100644
--- a/superset/dashboards/commands/importers/v1/utils.py
+++ b/superset/dashboards/commands/importers/v1/utils.py
@@ -54,7 +54,7 @@ def update_id_refs(config: Dict[str, Any], chart_ids: Dict[str, int]) -> Dict[st
     id_map = {old_id: chart_ids[uuid] for uuid, old_id in old_ids.items()}
 
     # fix metadata
-    metadata = fixed["metadata"]
+    metadata = fixed.get("metadata", {})
     if "timed_refresh_immune_slices" in metadata:
         metadata["timed_refresh_immune_slices"] = [
             id_map[old_id] for old_id in metadata["timed_refresh_immune_slices"]
@@ -82,7 +82,7 @@ def update_id_refs(config: Dict[str, Any], chart_ids: Dict[str, int]) -> Dict[st
         }
 
     # fix position
-    position = fixed["position"]
+    position = fixed.get("position", {})
     for child in position.values():
         if (
             isinstance(child, dict)