aminghadersohi commented on code in PR #42822: URL: https://github.com/apache/superset/pull/42822#discussion_r3786604911
########## superset/charts/data/form_data.py: ########## @@ -0,0 +1,63 @@ +# 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 __future__ import annotations + +from typing import Any, TYPE_CHECKING + +from flask import g + +if TYPE_CHECKING: + from superset.common.query_context import QueryContext + from superset.common.query_object import QueryObject + + +def set_form_data(form_data: dict[str, Any]) -> None: + """Expose chart data request fields to Jinja template macros.""" + g.form_data = form_data + + +def _serialize_query( + query: QueryObject, + form_data: dict[str, Any], +) -> dict[str, Any]: + """Serialize query fields consumed by the Jinja form-data fallback.""" + query_data = dict(query.to_dict()) + query_data["filters"] = query.filter Review Comment: This does not reproduce and no code change is needed. There are two distinct filter paths: ExtraCache._get_filters_from_query_context reads the template context key filter, while the Flask-global fallback used here goes through views.utils.get_form_data() and convert_legacy_filters_into_adhoc(), which explicitly consumes the plural filters key. QueryObject.to_dict() already retains the singular filter key, and this helper adds plural filters for that fallback. The regression tests use real QueryObject instances and verify both filter_values() and get_filters(); the human reviewer also re-ran those macros on this head and confirmed they resolve correctly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
