Vitor-Avila commented on code in PR #30443:
URL: https://github.com/apache/superset/pull/30443#discussion_r1796040428
##########
superset/jinja_context.py:
##########
@@ -846,35 +846,45 @@ def dataset_macro(
def get_dataset_id_from_context(metric_key: str) -> int:
"""
- Retrives the Dataset ID from the request context.
+ Retrieves the Dataset ID from the request context.
:param metric_key: the metric key.
:returns: the dataset ID.
"""
# pylint: disable=import-outside-toplevel
from superset.daos.chart import ChartDAO
- from superset.views.utils import get_form_data
+ from superset.views.utils import loads_request_json
+ form_data: dict[str, Any] = {}
exc_message = _(
"Please specify the Dataset ID for the ``%(name)s`` metric in the
Jinja macro.",
name=metric_key,
)
- form_data, chart = get_form_data()
- if not (form_data or chart):
- raise SupersetTemplateException(exc_message)
+ if has_request_context():
+ if payload := request.get_json(cache=True) if request.is_json else
None:
+ if dataset_id := payload.get("datasource", {}).get("id"):
+ return dataset_id
+ form_data.update(payload.get("form_data", {}))
+ request_form = loads_request_json(request.form.get("form_data"))
+ form_data.update(request_form)
+ request_args = loads_request_json(request.args.get("form_data"))
+ form_data.update(request_args)
+
+ if final_form_data := (form_data or getattr(g, "form_data", {})):
Review Comment:
you're right, we don't need an additional variable here. Let me fix that. 🙏
--
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]
