Add actionable error for country map vis

apache · Apr 9, 2021 · 0e6ddb4 · 0e6ddb4
1 parent 1805732
commit 0e6ddb4
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/superset/viz.py b/superset/viz.py
@@ -1951,8 +1951,16 @@ class CountryMapViz(BaseViz):
 
     def query_obj(self) -> QueryObjectDict:
         qry = super().query_obj()
-        qry["metrics"] = [self.form_data["metric"]]
-        qry["groupby"] = [self.form_data["entity"]]
+        metric = self.form_data.get("metric")
+        entity = self.form_data.get("entity")
+        if not self.form_data.get("select_country"):
+            raise QueryObjectValidationError("Must specify a country")
+        if not metric:
+            raise QueryObjectValidationError("Must specify a metric")
+        if not entity:
+            raise QueryObjectValidationError("Must provide ISO codes")
+        qry["metrics"] = [metric]
+        qry["groupby"] = [entity]
         return qry
 
     def get_data(self, df: pd.DataFrame) -> VizData: