fix: remove extras from all adhoc_filters controls (#21450)

Co-authored-by: Ville Brofeldt <ville.brofeldt@apple.com>
2026-04-19 08:04:53 +00:00 · 2022-09-13 14:52:21 +02:00
parent 9c285dafb4
commit e1e9fda72b
4 changed files with 113 additions and 13 deletions
--- a/tests/unit_tests/utils/test_core.py
+++ b/tests/unit_tests/utils/test_core.py
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from typing import Any, Dict
+
+import pytest
+
+from superset.utils.core import QueryObjectFilterClause, remove_extra_adhoc_filters
+
+ADHOC_FILTER: QueryObjectFilterClause = {
+    "col": "foo",
+    "op": "==",
+    "val": "bar",
+}
+
+EXTRA_FILTER: QueryObjectFilterClause = {
+    "col": "foo",
+    "op": "==",
+    "val": "bar",
+    "isExtra": True,
+}
+
+
+@pytest.mark.parametrize(
+    "original,expected",
+    [
+        ({"foo": "bar"}, {"foo": "bar"}),
+        (
+            {"foo": "bar", "adhoc_filters": [ADHOC_FILTER]},
+            {"foo": "bar", "adhoc_filters": [ADHOC_FILTER]},
+        ),
+        (
+            {"foo": "bar", "adhoc_filters": [EXTRA_FILTER]},
+            {"foo": "bar", "adhoc_filters": []},
+        ),
+        (
+            {
+                "foo": "bar",
+                "adhoc_filters": [ADHOC_FILTER, EXTRA_FILTER],
+            },
+            {"foo": "bar", "adhoc_filters": [ADHOC_FILTER]},
+        ),
+        (
+            {
+                "foo": "bar",
+                "adhoc_filters_b": [ADHOC_FILTER, EXTRA_FILTER],
+            },
+            {"foo": "bar", "adhoc_filters_b": [ADHOC_FILTER]},
+        ),
+        (
+            {
+                "foo": "bar",
+                "custom_adhoc_filters": [
+                    ADHOC_FILTER,
+                    EXTRA_FILTER,
+                ],
+            },
+            {
+                "foo": "bar",
+                "custom_adhoc_filters": [
+                    ADHOC_FILTER,
+                    EXTRA_FILTER,
+                ],
+            },
+        ),
+    ],
+)
+def test_remove_extra_adhoc_filters(
+    original: Dict[str, Any], expected: Dict[str, Any]
+) -> None:
+    remove_extra_adhoc_filters(original)
+    assert expected == original