You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by mi...@apache.org on 2026/04/13 19:05:17 UTC

(superset) 12/45: fix(filterReports): _generate_native_filter() crashes on null/empty filterValues (#38954)

This is an automated email from the ASF dual-hosted git repository.

michaelsmolina pushed a commit to branch 6.1
in repository https://gitbox.apache.org/repos/asf/superset.git

commit c41894ac0b251fea18e2ac7a21505bbd39cd01f3
Author: Alexandru Soare <37...@users.noreply.github.com>
AuthorDate: Wed Apr 8 13:53:18 2026 +0300

    fix(filterReports): _generate_native_filter() crashes on null/empty filterValues (#38954)
    
    (cherry picked from commit 4f695e1b4d23beb67473b39d2f0ab71df56378b3)
---
 superset/reports/models.py             | 16 +++++++++++++++-
 tests/unit_tests/reports/model_test.py |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/superset/reports/models.py b/superset/reports/models.py
index 66f37eefddd..c9bb544ba88 100644
--- a/superset/reports/models.py
+++ b/superset/reports/models.py
@@ -245,8 +245,22 @@ class ReportSchedule(AuditMixinNullable, ExtraJSONMixin, Model):
             A tuple of (filter_config, warning_message). If the filter type is
             unrecognized, returns an empty dict and a warning message.
         """
+        # Filter types that require at least one value
+        requires_values = (
+            "filter_time",
+            "filter_timegrain",
+            "filter_timecolumn",
+            "filter_range",
+        )
+        if filter_type in requires_values and not values:
+            warning_msg = (
+                f"Skipping {filter_type} with empty filterValues "
+                f"(filter_id: {native_filter_id})"
+            )
+            logger.warning(warning_msg)
+            return {}, warning_msg
+
         if filter_type == "filter_time":
-            # For select filters, we need to use the "IN" operator
             return (
                 {
                     native_filter_id or "": {
diff --git a/tests/unit_tests/reports/model_test.py b/tests/unit_tests/reports/model_test.py
index 33ad3461dbf..f86537e4f5a 100644
--- a/tests/unit_tests/reports/model_test.py
+++ b/tests/unit_tests/reports/model_test.py
@@ -91,7 +91,7 @@ def test_report_generate_native_filter_no_values():
     native_filter_id = "filter_id"
     column_name = "column_name"
     filter_type = "filter_select"
-    values = None
+    values: list[str | None] = []
 
     result, warning = report_schedule._generate_native_filter(
         native_filter_id, filter_type, column_name, values