fix(plugin-chart-echarts): Apply temporary filters to Query B in explore (#18998)

* fix(explore): Extra filters not applied to query b in mixed timeseries

* Add return type

* Apply review comment

* Fix non-dnd filters
This commit is contained in:
Kamil Gabryjelski
2022-03-04 17:48:41 +01:00
committed by GitHub
parent 5a5ff99c37
commit 9f834e8317
4 changed files with 93 additions and 7 deletions

View File

@@ -1081,11 +1081,13 @@ def merge_extra_form_data(form_data: Dict[str, Any]) -> None:
{"isExtra": True, **fltr} for fltr in append_adhoc_filters # type: ignore
)
if append_filters:
adhoc_filters.extend(
simple_filter_to_adhoc({"isExtra": True, **fltr}) # type: ignore
for fltr in append_filters
if fltr
)
for key, value in form_data.items():
if re.match("adhoc_filter.*", key):
value.extend(
simple_filter_to_adhoc({"isExtra": True, **fltr}) # type: ignore
for fltr in append_filters
if fltr
)
def merge_extra_filters(form_data: Dict[str, Any]) -> None: