pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(logs context): Adding dashboard id to logs context (#27298)

This commit is contained in:
Vitor Avila 2024-02-29 18:28:54 -03:00 committed by GitHub
parent eb2561f80c
commit 9beee92da1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
superset/charts/data/api.py
View File

@ -431,6 +431,7 @@ class ChartDataRestApi(ChartRestApi):
self, form_data: dict[str, Any]
) -> dict[str, Any]:
return {
"dashboard_id": form_data.get("form_data", {}).get("dashboardId"),
"dataset_id": form_data.get("datasource", {}).get("id")
if isinstance(form_data.get("datasource"), dict)
and form_data.get("datasource", {}).get("type")

36
tests/integration_tests/charts/data/api_tests.py
View File

@ -134,7 +134,7 @@ class TestPostChartDataApi(BaseTestChartDataApi):
ChartDataRestApi, self.query_context_payload
)
# assert
assert response == {"dataset_id": 1, "slice_id": None}
assert response == {"dashboard_id": None, "dataset_id": 1, "slice_id": None}
# takes malformed content without raising an error
self.query_context_payload["datasource"] = "1__table"
@ -143,7 +143,7 @@ class TestPostChartDataApi(BaseTestChartDataApi):
ChartDataRestApi, self.query_context_payload
)
# assert
assert response == {"dataset_id": None, "slice_id": None}
assert response == {"dashboard_id": None, "dataset_id": None, "slice_id": None}
# takes a slice id
self.query_context_payload["datasource"] = None
@ -153,7 +153,7 @@ class TestPostChartDataApi(BaseTestChartDataApi):
ChartDataRestApi, self.query_context_payload
)
# assert
assert response == {"dataset_id": None, "slice_id": 1}
assert response == {"dashboard_id": None, "dataset_id": None, "slice_id": 1}
# takes missing slice id
self.query_context_payload["datasource"] = None
@ -163,7 +163,35 @@ class TestPostChartDataApi(BaseTestChartDataApi):
ChartDataRestApi, self.query_context_payload
)
# assert
assert response == {"dataset_id": None, "slice_id": None}
assert response == {"dashboard_id": None, "dataset_id": None, "slice_id": None}
# takes a dashboard id
self.query_context_payload["form_data"] = {"dashboardId": 1}
# act
response = ChartDataRestApi._map_form_data_datasource_to_dataset_id(
ChartDataRestApi, self.query_context_payload
)
# assert
assert response == {"dashboard_id": 1, "dataset_id": None, "slice_id": None}
# takes a dashboard id and a slice id
self.query_context_payload["form_data"] = {"dashboardId": 1, "slice_id": 2}
# act
response = ChartDataRestApi._map_form_data_datasource_to_dataset_id(
ChartDataRestApi, self.query_context_payload
)
# assert
assert response == {"dashboard_id": 1, "dataset_id": None, "slice_id": 2}
# takes a dashboard id, slice id and a dataset id
self.query_context_payload["datasource"] = {"id": 3, "type": "table"}
self.query_context_payload["form_data"] = {"dashboardId": 1, "slice_id": 2}
# act
response = ChartDataRestApi._map_form_data_datasource_to_dataset_id(
ChartDataRestApi, self.query_context_payload
)
# assert
assert response == {"dashboard_id": 1, "dataset_id": 3, "slice_id": 2}
@pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
@mock.patch("superset.utils.decorators.g")