yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-31 04:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #7646 UI: Non-admin user should not be allowed to add a bot (#7681)

Browse Source 
* Fix #7646 UI: Non-admin user should not be allowed to add a bot

* Add tests
This commit is contained in:
Sachin Chaurasiya 2022-09-23 16:50:18 +05:30 committed by GitHub
parent d54279bc16
commit 8869da7a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 85 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx
View File

@ -59,10 +59,15 @@ const BotListV1 = ({
const [handleErrorPlaceholder, setHandleErrorPlaceholder] = useState(false);
const [searchedData, setSearchedData] = useState<Bot[]>([]);
const createPermission = checkPermission(
Operation.Create,
ResourceEntity.BOT,
permissions
/**
* Bot creation is two step process so here we should check for
* Create User and Create Bot both permissions
*/
const createPermission = useMemo(
() =>
checkPermission(Operation.Create, ResourceEntity.BOT, permissions) &&
checkPermission(Operation.Create, ResourceEntity.USER, permissions),
[permissions]
);
const deletePermission = useMemo(

26
openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx
View File

@ -105,6 +105,32 @@ const mockUserData = {
],
};
const mockUserRole = {
data: [
{
id: '3ed7b995-ce8b-4720-9beb-6f4a9c626920',
name: 'DataConsumer',
fullyQualifiedName: 'DataConsumer',
displayName: 'Data Consumer',
description:
'Users with Data Consumer role use different data assets for their day to day work.',
version: 0.1,
updatedAt: 1663825430544,
updatedBy: 'admin',
href: 'http://localhost:8585/api/v1/roles/3ed7b995-ce8b-4720-9beb-6f4a9c626920',
allowDelete: false,
deleted: false,
},
],
paging: {
total: 1,
},
};
jest.mock('../../axiosAPIs/rolesAPIV1.ts', () => ({
getRoles: jest.fn().mockImplementation(() => Promise.resolve(mockUserRole)),
}));
jest.mock('../common/ProfilePicture/ProfilePicture', () => {
return jest.fn().mockReturnValue(<p>ProfilePicture</p>);
});

1
openmetadata-ui/src/main/resources/ui/src/jsons/en.ts
View File

@ -25,6 +25,7 @@ const jsonData = {
'check-status-airflow': 'Error while connecting to Airflow instance!',
'create-user-error': 'Error while creating user!',
'create-bot-error': 'Error while creating bot!',
'create-conversation-error': 'Error while creating conversation!',
'create-message-error': 'Error while creating message!',
'create-role-error': 'Error While creating role!',

23
openmetadata-ui/src/main/resources/ui/src/pages/CreateUserPage/CreateUserPage.component.tsx
View File

@ -87,15 +87,22 @@ const CreateUserPage = () => {
name: res.name,
displayName: res.displayName,
description: res.description,
} as Bot).then((res) => {
setStatus('success');
res && showSuccessToast(`Bot created successfully`);
setTimeout(() => {
setStatus('initial');
} as Bot)
.then((res) => {
setStatus('success');
res && showSuccessToast(`Bot created successfully`);
setTimeout(() => {
setStatus('initial');
goToUserListPage();
}, 500);
});
goToUserListPage();
}, 500);
})
.catch((err: AxiosError) => {
handleSaveFailure(
err,
jsonData['api-error-messages']['create-bot-error']
);
});
} else {
setStatus('success');
setTimeout(() => {

27
openmetadata-ui/src/main/resources/ui/src/pages/CreateUserPage/CreateUserPage.test.tsx
View File

@ -23,6 +23,32 @@ import { MemoryRouter } from 'react-router-dom';
import { createUser } from '../../axiosAPIs/userAPI';
import AddUserPageComponent from './CreateUserPage.component';
const mockUserRole = {
data: [
{
id: '3ed7b995-ce8b-4720-9beb-6f4a9c626920',
name: 'DataConsumer',
fullyQualifiedName: 'DataConsumer',
displayName: 'Data Consumer',
description:
'Users with Data Consumer role use different data assets for their day to day work.',
version: 0.1,
updatedAt: 1663825430544,
updatedBy: 'admin',
href: 'http://localhost:8585/api/v1/roles/3ed7b995-ce8b-4720-9beb-6f4a9c626920',
allowDelete: false,
deleted: false,
},
],
paging: {
total: 1,
},
};
jest.mock('../../axiosAPIs/rolesAPIV1', () => ({
getRoles: jest.fn().mockImplementation(() => Promise.resolve(mockUserRole)),
}));
jest.mock('../../components/containers/PageContainerV1', () => {
return jest
.fn()
@ -53,7 +79,6 @@ jest.mock('../../axiosAPIs/userAPI', () => ({
jest.mock('../../AppState', () =>
jest.fn().mockReturnValue({
userRoles: [],
userTeams: [],
})
);

13
openmetadata-ui/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx
View File

@ -238,6 +238,13 @@ const AuthenticatedAppRouter: FunctionComponent = () => {
[permissions]
);
const createBotPermission = useMemo(
() =>
checkPermission(Operation.Create, ResourceEntity.USER, permissions) &&
checkPermission(Operation.Create, ResourceEntity.BOT, permissions),
[permissions]
);
return (
<Switch>
<Route exact component={MyDataPage} path={ROUTES.MY_DATA} />
@ -412,11 +419,7 @@ const AuthenticatedAppRouter: FunctionComponent = () => {
<AdminProtectedRoute
exact
component={CreateUserPage}
hasPermission={checkPermission(
Operation.Create,
ResourceEntity.BOT,
permissions
)}
hasPermission={createBotPermission}
path={ROUTES.CREATE_USER_WITH_BOT}
/>
<Route exact component={BotDetailsPage} path={ROUTES.BOTS_PROFILE} />