iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: enable admin to edit dataset in explore (#20613) 

* add conditional

* add test

* fix lint
This commit is contained in:
Phillip Kelley-Dotson 2022-07-08 11:22:45 -07:00 committed by GitHub
parent 0ce0c6e1eb
commit e1a918f141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
superset-frontend/src/explore/components/controls/DatasourceControl/DatasourceControl.test.tsx
View File

@ -139,6 +139,27 @@ test('Click on Edit dataset', async () => {
).toBeInTheDocument();
});
test('Edit dataset should be disabled when user is not admin', async () => {
const props = createProps();
// @ts-expect-error
props.user.roles = {};
props.datasource.owners = [];
SupersetClientGet.mockImplementation(
async () => ({ json: { result: [] } } as any),
);
render(<DatasourceControl {...props} />, {
useRedux: true,
});
userEvent.click(screen.getByTestId('datasource-menu-trigger'));
expect(screen.getByTestId('edit-dataset')).toHaveAttribute(
'aria-disabled',
'true',
);
});
test('Click on View in SQL Lab', async () => {
const props = createProps();
const postFormSpy = jest.spyOn(SupersetClient, 'postForm');

7
superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
View File

@ -236,10 +236,9 @@ class DatasourceControl extends React.PureComponent {
const isSqlSupported = datasource.type === 'table';
const { user } = this.props;
const allowEdit = datasource.owners
?.map(o => o.id || o.value)
.includes(user.userId);
isUserAdmin(user);
const allowEdit =
datasource.owners?.map(o => o.id || o.value).includes(user.userId) ||
isUserAdmin(user);
const editText = t('Edit dataset');