check for empty request

apache · Feb 8, 2022 · 9246e81 · 9246e81
1 parent ee93f12
commit 9246e81
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/superset/charts/data/api.py b/superset/charts/data/api.py
@@ -348,22 +348,25 @@ def _send_chart_response(
             if not security_manager.can_access("can_csv", "Superset"):
                 return self.response_403()
 
+            if not result["queries"]:
+                return self.response_400(_("Empty query result"))
+
             if len(result["queries"]) == 1:
                 # return single query results csv format
                 data = result["queries"][0]["data"]
                 return CsvResponse(data, headers=generate_download_headers("csv"))
-            else:
-                # return multi-query csv results bundled as a zip file
-                encoding = current_app.config["CSV_EXPORT"].get("encoding", "utf-8")
-                files = {
-                    f"query_{idx + 1}.csv": result["data"].encode(encoding)
-                    for idx, result in enumerate(result["queries"])
-                }
-                return Response(
-                    create_zip(files),
-                    headers=generate_download_headers("zip"),
-                    mimetype="application/zip",
-                )
+
+            # return multi-query csv results bundled as a zip file
+            encoding = current_app.config["CSV_EXPORT"].get("encoding", "utf-8")
+            files = {
+                f"query_{idx + 1}.csv": result["data"].encode(encoding)
+                for idx, result in enumerate(result["queries"])
+            }
+            return Response(
+                create_zip(files),
+                headers=generate_download_headers("zip"),
+                mimetype="application/zip",
+            )
 
         if result_format == ChartDataResultFormat.JSON:
             response_data = simplejson.dumps(

diff --git a/tests/integration_tests/charts/data/api_tests.py b/tests/integration_tests/charts/data/api_tests.py
@@ -238,6 +238,16 @@ def test_with_query_result_type__200(self):
         rv = self.post_assert_metric(CHART_DATA_URI, self.query_context_payload, "data")
         assert rv.status_code == 200
 
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_empty_request_with_csv_result_format(self):
+        """
+        Chart data API: Test empty chart data with CSV result format
+        """
+        self.query_context_payload["result_format"] = "csv"
+        self.query_context_payload["queries"] = []
+        rv = self.post_assert_metric(CHART_DATA_URI, self.query_context_payload, "data")
+        assert rv.status_code == 400
+
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_with_csv_result_format(self):
         """