This is an automated email from the ASF dual-hosted git repository.
dpgaspar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new bb80cea [dashboards] Fix, update dashboard owners not propagating to
charts o… (#9484)
bb80cea is described below
commit bb80ceaccc6b134db0bb08b5d0d66ab15d59b360
Author: Daniel Vaz Gaspar <[email protected]>
AuthorDate: Thu Apr 9 09:37:37 2020 +0100
[dashboards] Fix, update dashboard owners not propagating to charts o…
(#9484)
* [dashboards] Fix, update dashboard owners not propagating to charts owners
* Add tests
* Fix tests
* better naming
---
superset/dashboards/commands/create.py | 3 ++-
superset/dashboards/commands/update.py | 3 ++-
superset/dashboards/dao.py | 9 +++++++
tests/dashboards/api_tests.py | 43 ++++++++++++++++++++++++++++++++++
4 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/superset/dashboards/commands/create.py
b/superset/dashboards/commands/create.py
index 73025cd..0aa1241 100644
--- a/superset/dashboards/commands/create.py
+++ b/superset/dashboards/commands/create.py
@@ -42,7 +42,8 @@ class CreateDashboardCommand(BaseCommand):
def run(self) -> Model:
self.validate()
try:
- dashboard = DashboardDAO.create(self._properties)
+ dashboard = DashboardDAO.create(self._properties, commit=False)
+ dashboard = DashboardDAO.update_charts_owners(dashboard,
commit=True)
except DAOCreateFailedError as ex:
logger.exception(ex.exception)
raise DashboardCreateFailedError()
diff --git a/superset/dashboards/commands/update.py
b/superset/dashboards/commands/update.py
index 56357c9..7746b7e 100644
--- a/superset/dashboards/commands/update.py
+++ b/superset/dashboards/commands/update.py
@@ -49,7 +49,8 @@ class UpdateDashboardCommand(BaseCommand):
def run(self) -> Model:
self.validate()
try:
- dashboard = DashboardDAO.update(self._model, self._properties)
+ dashboard = DashboardDAO.update(self._model, self._properties,
commit=False)
+ dashboard = DashboardDAO.update_charts_owners(dashboard,
commit=True)
except DAOUpdateFailedError as ex:
logger.exception(ex.exception)
raise DashboardUpdateFailedError()
diff --git a/superset/dashboards/dao.py b/superset/dashboards/dao.py
index d196290..6e12cd5 100644
--- a/superset/dashboards/dao.py
+++ b/superset/dashboards/dao.py
@@ -48,6 +48,15 @@ class DashboardDAO(BaseDAO):
return True
@staticmethod
+ def update_charts_owners(model: Dashboard, commit: bool = True) ->
Dashboard:
+ owners = [owner for owner in model.owners]
+ for slc in model.slices:
+ slc.owners = list(set(owners) | set(slc.owners))
+ if commit:
+ db.session.commit()
+ return model
+
+ @staticmethod
def bulk_delete(models: Optional[List[Dashboard]], commit: bool = True) ->
None:
item_ids = [model.id for model in models] if models else []
# bulk delete, first delete related data
diff --git a/tests/dashboards/api_tests.py b/tests/dashboards/api_tests.py
index fcd8d11..881e897 100644
--- a/tests/dashboards/api_tests.py
+++ b/tests/dashboards/api_tests.py
@@ -567,6 +567,49 @@ class DashboardApiTests(SupersetTestCase,
ApiOwnersTestCaseMixin):
db.session.delete(model)
db.session.commit()
+ def test_update_dashboard_chart_owners(self):
+ """
+ Dashboard API: Test update chart owners
+ """
+ user_alpha1 = self.create_user(
+ "alpha1", "password", "Alpha", email="[email protected]"
+ )
+ user_alpha2 = self.create_user(
+ "alpha2", "password", "Alpha", email="[email protected]"
+ )
+ admin = self.get_user("admin")
+ slices = []
+ slices.append(
+ db.session.query(Slice).filter_by(slice_name="Girl Name
Cloud").first()
+ )
+
slices.append(db.session.query(Slice).filter_by(slice_name="Trends").first())
+
slices.append(db.session.query(Slice).filter_by(slice_name="Boys").first())
+
+ dashboard = self.insert_dashboard("title1", "slug1", [admin.id],
slices=slices,)
+ self.login(username="admin")
+ uri = f"api/v1/dashboard/{dashboard.id}"
+ dashboard_data = {"owners": [user_alpha1.id, user_alpha2.id]}
+ rv = self.client.put(uri, json=dashboard_data)
+ self.assertEqual(rv.status_code, 200)
+
+ # verify slices owners include alpha1 and alpha2 users
+ slices_ids = [slice.id for slice in slices]
+ # Refetch Slices
+ slices = db.session.query(Slice).filter(Slice.id.in_(slices_ids)).all()
+ for slice in slices:
+ self.assertIn(user_alpha1, slice.owners)
+ self.assertIn(user_alpha2, slice.owners)
+ self.assertIn(admin, slice.owners)
+ # Revert owners on slice
+ slice.owners = []
+ db.session.commit()
+
+ # Rollback changes
+ db.session.delete(dashboard)
+ db.session.delete(user_alpha1)
+ db.session.delete(user_alpha2)
+ db.session.commit()
+
def test_update_partial_dashboard(self):
"""
Dashboard API: Test update partial
