QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-18 23:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): apply dashboard filter to get dash charts API (#13173)

Browse Source 
* fix(api): apply dashboard filter to get dash charts API

* lint
This commit is contained in:
Daniel Vaz Gaspar
2021-02-17 21:42:07 +00:00
committed by GitHub
parent 2d95bfcd99
commit 4c544500a7
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
superset/dashboards/dao.py
View File

@@ -18,6 +18,7 @@ import json
import logging import logging
from typing import Any, Dict, List, Optional from typing import Any, Dict, List, Optional
from flask_appbuilder.models.sqla.interface import SQLAInterface
from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.orm import contains_eager from sqlalchemy.orm import contains_eager
@@ -46,6 +47,11 @@ class DashboardDAO(BaseDAO):
.filter(Dashboard.id == dashboard_id) .filter(Dashboard.id == dashboard_id)
.options(contains_eager(Dashboard.slices)) .options(contains_eager(Dashboard.slices))
) )
# Apply dashboard base filters
query = DashboardFilter("id", SQLAInterface(Dashboard, db.session)).apply(
query, None
)
dashboard = query.one_or_none() dashboard = query.one_or_none()
if not dashboard: if not dashboard:
raise DashboardNotFoundError() raise DashboardNotFoundError()

12
tests/dashboards/api_tests.py
View File

@@ -174,6 +174,7 @@ class TestDashboardApi(SupersetTestCase, ApiOwnersTestCaseMixin, InsertChartMixi
""" """
Dashboard API: Test getting charts belonging to a dashboard Dashboard API: Test getting charts belonging to a dashboard
""" """
self.login(username="admin")
dashboard = self.dashboards[0] dashboard = self.dashboards[0]
uri = f"api/v1/dashboard/{dashboard.id}/charts" uri = f"api/v1/dashboard/{dashboard.id}/charts"
response = self.get_assert_metric(uri, "get_charts") response = self.get_assert_metric(uri, "get_charts")
@@ -195,6 +196,17 @@ class TestDashboardApi(SupersetTestCase, ApiOwnersTestCaseMixin, InsertChartMixi
response = self.get_assert_metric(uri, "get_charts") response = self.get_assert_metric(uri, "get_charts")
self.assertEqual(response.status_code, 404) self.assertEqual(response.status_code, 404)
@pytest.mark.usefixtures("create_dashboards")
def test_get_dashboard_charts_not_allowed(self):
"""
Dashboard API: Test getting charts on a dashboard a user does not have access to
"""
self.login(username="gamma")
dashboard = self.dashboards[0]
uri = f"api/v1/dashboard/{dashboard.id}/charts"
response = self.get_assert_metric(uri, "get_charts")
self.assertEqual(response.status_code, 404)
@pytest.mark.usefixtures("create_dashboards") @pytest.mark.usefixtures("create_dashboards")
def test_get_dashboard_charts_empty(self): def test_get_dashboard_charts_empty(self):
""" """