Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion superset/common/query_context_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def __init__(self) -> None:
def create( # pylint: disable=too-many-arguments
self,
*,
current_slice: Slice | None = None,
datasource: DatasourceDict,
queries: list[dict[str, Any]],
form_data: dict[str, Any] | None = None,
Expand All @@ -58,7 +59,9 @@ def create( # pylint: disable=too-many-arguments
datasource_model_instance = self._convert_to_model(datasource)

slice_ = None
if form_data and form_data.get("slice_id") is not None:
if isinstance(current_slice, Slice):
slice_ = current_slice
elif form_data and form_data.get("slice_id") is not None:
slice_ = self._get_slice(form_data.get("slice_id"))

result_type = result_type or ChartDataResultType.FULL
Expand Down
2 changes: 1 addition & 1 deletion superset/models/slice.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ def get_query_context(self) -> QueryContext | None:
if self.query_context:
try:
return self.get_query_context_factory().create(
**json.loads(self.query_context)
**{**json.loads(self.query_context), "current_slice": self}
)
except json.JSONDecodeError as ex:
logger.error("Malformed json in slice's query context", exc_info=True)
Expand Down
Loading