You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by el...@apache.org on 2023/12/02 01:20:56 UTC
(superset) 01/08: fix: remove `update_charts_owners` (#25843)
This is an automated email from the ASF dual-hosted git repository.
elizabeth pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/superset.git
commit cb6de0a9c9f505ee3f26e79ca9bfa5f3901528a0
Author: Beto Dealmeida <ro...@dealmeida.net>
AuthorDate: Fri Nov 3 13:06:31 2023 -0400
fix: remove `update_charts_owners` (#25843)
---
superset/dashboards/commands/create.py | 3 +-
superset/dashboards/commands/update.py | 1 -
superset/dashboards/dao.py | 9 -----
tests/integration_tests/dashboards/api_tests.py | 49 -------------------------
4 files changed, 1 insertion(+), 61 deletions(-)
diff --git a/superset/dashboards/commands/create.py b/superset/dashboards/commands/create.py
index 811508c2e7..68fd2567eb 100644
--- a/superset/dashboards/commands/create.py
+++ b/superset/dashboards/commands/create.py
@@ -40,8 +40,7 @@ class CreateDashboardCommand(CreateMixin, BaseCommand):
def run(self) -> Model:
self.validate()
try:
- dashboard = DashboardDAO.create(self._properties, commit=False)
- dashboard = DashboardDAO.update_charts_owners(dashboard, commit=True)
+ dashboard = DashboardDAO.create(self._properties, commit=True)
except DAOCreateFailedError as ex:
logger.exception(ex.exception)
raise DashboardCreateFailedError() from ex
diff --git a/superset/dashboards/commands/update.py b/superset/dashboards/commands/update.py
index 12ac241dcc..f10f12564f 100644
--- a/superset/dashboards/commands/update.py
+++ b/superset/dashboards/commands/update.py
@@ -56,7 +56,6 @@ class UpdateDashboardCommand(UpdateMixin, BaseCommand):
data=json.loads(self._properties.get("json_metadata", "{}")),
commit=False,
)
- dashboard = DashboardDAO.update_charts_owners(dashboard, commit=False)
db.session.commit()
except DAOUpdateFailedError as ex:
logger.exception(ex.exception)
diff --git a/superset/dashboards/dao.py b/superset/dashboards/dao.py
index 3f0666266f..68e2678247 100644
--- a/superset/dashboards/dao.py
+++ b/superset/dashboards/dao.py
@@ -154,15 +154,6 @@ class DashboardDAO(BaseDAO):
return not db.session.query(dashboard_query.exists()).scalar()
return True
- @staticmethod
- def update_charts_owners(model: Dashboard, commit: bool = True) -> Dashboard:
- owners = list(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 []
diff --git a/tests/integration_tests/dashboards/api_tests.py b/tests/integration_tests/dashboards/api_tests.py
index c9d25b679c..7630d5aad1 100644
--- a/tests/integration_tests/dashboards/api_tests.py
+++ b/tests/integration_tests/dashboards/api_tests.py
@@ -1400,55 +1400,6 @@ class TestDashboardApi(SupersetTestCase, ApiOwnersTestCaseMixin, InsertChartMixi
db.session.delete(model)
db.session.commit()
- @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
- def test_update_dashboard_chart_owners(self):
- """
- Dashboard API: Test update chart owners
- """
- user_alpha1 = self.create_user(
- "alpha1", "password", "Alpha", email="alpha1@superset.org"
- )
- user_alpha2 = self.create_user(
- "alpha2", "password", "Alpha", email="alpha2@superset.org"
- )
- 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.assertNotIn(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()
-
@pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
def test_update_dashboard_chart_owners_propagation(self):
"""