chore: Remove unused sliceCanEdit logic (#24312)

apache · Jun 8, 2023 · 69c2cd5 · 69c2cd5
1 parent f5148ef
commit 69c2cd5
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 24 deletions.
diff --git a/superset-frontend/src/dashboard/actions/hydrate.js b/superset-frontend/src/dashboard/actions/hydrate.js
@@ -353,7 +353,6 @@ export const hydrateDashboard =
  roles,
  ),
  superset_can_csv: findPermission('can_csv', 'Superset', roles),
- slice_can_edit: findPermission('can_slice', 'Superset', roles),
  common: {
  // legacy, please use state.common instead
  flash_messages: common?.flash_messages,

diff --git a/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx b/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx
@@ -35,7 +35,6 @@ jest.mock('src/dashboard/components/SliceHeaderControls', () => ({
  data-updated-dttm={props.updatedDttm}
  data-superset-can-explore={props.supersetCanExplore}
  data-superset-can-csv={props.supersetCanCSV}
- data-slice-can-edit={props.sliceCanEdit}
  data-component-id={props.componentId}
  data-dashboard-id={props.dashboardId}
  data-is-full-size={props.isFullSize}
@@ -114,7 +113,6 @@ const createProps = (overrides: any = {}) => ({
  sliceName: 'Vaccine Candidates per Phase',
  supersetCanExplore: true,
  supersetCanCSV: true,
- sliceCanEdit: false,
  slice: {
  slice_id: 312,
  slice_url: '/explore/?form_data=%7B%22slice_id%22%3A%20312%7D',
@@ -205,8 +203,6 @@ test('Should render - default props', () => {
  delete props.supersetCanExplore;
  // @ts-ignore
  delete props.supersetCanCSV;
- // @ts-ignore
- delete props.sliceCanEdit;
 
  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
  expect(screen.getByTestId('slice-header')).toBeInTheDocument();
@@ -247,8 +243,6 @@ test('Should render default props and "call" actions', () => {
  delete props.supersetCanExplore;
  // @ts-ignore
  delete props.supersetCanCSV;
- // @ts-ignore
- delete props.sliceCanEdit;
 
  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
  userEvent.click(screen.getByTestId('toggleExpandSlice'));
@@ -424,10 +418,6 @@ test('Correct props to "SliceHeaderControls"', () => {
  'data-is-full-size',
  'false',
  );
- expect(screen.getByTestId('SliceHeaderControls')).toHaveAttribute(
- 'data-slice-can-edit',
- 'false',
- );
  expect(screen.getByTestId('SliceHeaderControls')).toHaveAttribute(
  'data-superset-can-csv',
  'true',

diff --git a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
@@ -147,7 +147,6 @@ const SliceHeader: FC<SliceHeaderProps> = ({
  supersetCanExplore = false,
  supersetCanShare = false,
  supersetCanCSV = false,
- sliceCanEdit = false,
  exportFullCSV,
  slice,
  componentId,
@@ -269,7 +268,6 @@ const SliceHeader: FC<SliceHeaderProps> = ({
  supersetCanExplore={supersetCanExplore}
  supersetCanShare={supersetCanShare}
  supersetCanCSV={supersetCanCSV}
- sliceCanEdit={sliceCanEdit}
  componentId={componentId}
  dashboardId={dashboardId}
  addSuccessToast={addSuccessToast}

diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx b/superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx
@@ -86,7 +86,6 @@ const createProps = (viz_type = 'sunburst') =>
  updatedDttm: 1617213803803,
  supersetCanExplore: true,
  supersetCanCSV: true,
- sliceCanEdit: false,
  componentId: 'CHART-fYo7IyvKZQ',
  dashboardId: 26,
  isFullSize: false,
@@ -136,8 +135,6 @@ test('Should render default props', () => {
  delete props.isCached;
  // @ts-ignore
  delete props.isExpanded;
- // @ts-ignore
- delete props.sliceCanEdit;
 
  renderWrapper(props);
  expect(

diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
@@ -154,7 +154,6 @@ export interface SliceHeaderControlsProps {
  supersetCanExplore?: boolean;
  supersetCanShare?: boolean;
  supersetCanCSV?: boolean;
- sliceCanEdit?: boolean;
 
  crossFiltersEnabled?: boolean;
 }

diff --git a/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx b/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx
@@ -78,7 +78,6 @@ const propTypes = {
  supersetCanExplore: PropTypes.bool.isRequired,
  supersetCanShare: PropTypes.bool.isRequired,
  supersetCanCSV: PropTypes.bool.isRequired,
- sliceCanEdit: PropTypes.bool.isRequired,
  addSuccessToast: PropTypes.func.isRequired,
  addDangerToast: PropTypes.func.isRequired,
  ownState: PropTypes.object,
@@ -391,7 +390,6 @@ class Chart extends React.Component {
  supersetCanExplore,
  supersetCanShare,
  supersetCanCSV,
- sliceCanEdit,
  addSuccessToast,
  addDangerToast,
  ownState,
@@ -458,7 +456,6 @@ class Chart extends React.Component {
  supersetCanExplore={supersetCanExplore}
  supersetCanShare={supersetCanShare}
  supersetCanCSV={supersetCanCSV}
- sliceCanEdit={sliceCanEdit}
  componentId={componentId}
  dashboardId={dashboardId}
  filters={filters}

diff --git a/superset-frontend/src/dashboard/components/gridComponents/Chart.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/Chart.test.jsx
@@ -69,7 +69,6 @@ describe('Chart', () => {
  isExpanded: false,
  supersetCanExplore: false,
  supersetCanCSV: false,
- sliceCanEdit: false,
  };
 
  function setup(overrideProps) {

diff --git a/superset-frontend/src/dashboard/containers/Chart.jsx b/superset-frontend/src/dashboard/containers/Chart.jsx
@@ -95,7 +95,6 @@ function mapStateToProps(
  supersetCanExplore: !!dashboardInfo.superset_can_explore,
  supersetCanShare: !!dashboardInfo.superset_can_share,
  supersetCanCSV: !!dashboardInfo.superset_can_csv,
- sliceCanEdit: !!dashboardInfo.slice_can_edit,
  ownState: dataMask[id]?.ownState,
  filterState: dataMask[id]?.filterState,
  maxRows: common.conf.SQL_MAX_ROW,

diff --git a/tests/integration_tests/security_tests.py b/tests/integration_tests/security_tests.py
@@ -1364,7 +1364,6 @@ def assert_can_gamma(self, perm_set):
  self.assertIn(("can_fave_dashboards", "Superset"), perm_set)
  self.assertIn(("can_fave_slices", "Superset"), perm_set)
  self.assertIn(("can_save_dash", "Superset"), perm_set)
- self.assertIn(("can_slice", "Superset"), perm_set)
  self.assertIn(("can_explore_json", "Superset"), perm_set)
  self.assertIn(("can_userinfo", "UserDBModelView"), perm_set)
  self.assert_can_menu("Databases", perm_set)
@@ -1574,7 +1573,6 @@ def test_gamma_permissions(self):
  self.assertIn(("can_fave_dashboards", "Superset"), gamma_perm_set)
  self.assertIn(("can_fave_slices", "Superset"), gamma_perm_set)
  self.assertIn(("can_save_dash", "Superset"), gamma_perm_set)
- self.assertIn(("can_slice", "Superset"), gamma_perm_set)
  self.assertIn(("can_userinfo", "UserDBModelView"), gamma_perm_set)
 
  def test_views_are_secured(self):