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

Fix issue:- #5617 Only owner and admin should allow to make changes in entity and service (#5625)

Browse Source
This commit is contained in:
Shailesh Parmar 2022-06-24 23:14:07 +05:30 committed by GitHub
parent ace12501b4
commit b29911a373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openmetadata-ui/src/main/resources/ui/src/components/MyAssetStats/MyAssetStats.component.tsx
View File

@ -116,7 +116,6 @@ const MyAssetStats: FunctionComponent<Props> = ({
count: countTeams, count: countTeams,
link: getTeamAndUserDetailsPath(), link: getTeamAndUserDetailsPath(),
dataTestId: 'terms', dataTestId: 'terms',
adminOnly: true,
}, },
}; };
}; };

3
openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
View File

@ -435,9 +435,8 @@ export const navLinkSettings = [
name: 'Teams & Users', name: 'Teams & Users',
to: ROUTES.TEAMS_AND_USERS, to: ROUTES.TEAMS_AND_USERS,
disabled: false, disabled: false,
isAdminOnly: true,
}, },
{ name: 'Webhooks', to: '/webhooks', disabled: false }, { name: 'Webhooks', to: '/webhooks', disabled: false, isAdminOnly: true },
]; ];
export const TITLE_FOR_NON_OWNER_ACTION = export const TITLE_FOR_NON_OWNER_ACTION =

2
openmetadata-ui/src/main/resources/ui/src/constants/ingestion.constant.ts
View File

@ -20,7 +20,7 @@ export const STEPS_FOR_ADD_INGESTION: Array<StepperStepType> = [
{ name: 'Schedule Interval', step: 3 }, { name: 'Schedule Interval', step: 3 },
]; ];
export const INGESTION_SCHEDULER_INITIAL_VALUE = '5 * * * *'; export const INGESTION_SCHEDULER_INITIAL_VALUE = '0 * * * *';
export const INITIAL_FILTER_PATTERN: FilterPattern = { export const INITIAL_FILTER_PATTERN: FilterPattern = {
includes: [], includes: [],

5
openmetadata-ui/src/main/resources/ui/src/pages/TeamsAndUsersPage/TeamsAndUsersPage.component.tsx
View File

@ -684,7 +684,10 @@ const TeamsAndUsersPage = () => {
useEffect(() => { useEffect(() => {
if (!isDataLoading) { if (!isDataLoading) {
if (teamAndUser) { if (teamAndUser) {
if (Object.values(UserType).includes(teamAndUser as UserType)) { if (
Object.values(UserType).includes(teamAndUser as UserType) &&
(isAdminUser || isAuthDisabled)
) {
setIsTeamVisible(false); setIsTeamVisible(false);
setactiveUserTab(teamAndUser as UserType); setactiveUserTab(teamAndUser as UserType);
setCurrentTeam({} as Team); setCurrentTeam({} as Team);

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

@ -156,12 +156,12 @@ const AuthenticatedAppRouter: FunctionComponent = () => {
<Route exact component={ExplorePage} path={ROUTES.EXPLORE} /> <Route exact component={ExplorePage} path={ROUTES.EXPLORE} />
<Route component={ExplorePage} path={ROUTES.EXPLORE_WITH_SEARCH} /> <Route component={ExplorePage} path={ROUTES.EXPLORE_WITH_SEARCH} />
<Route component={ExplorePage} path={ROUTES.EXPLORE_WITH_TAB} /> <Route component={ExplorePage} path={ROUTES.EXPLORE_WITH_TAB} />
<AdminProtectedRoute <Route
exact exact
component={TeamsAndUsersPage} component={TeamsAndUsersPage}
path={ROUTES.TEAMS_AND_USERS} path={ROUTES.TEAMS_AND_USERS}
/> />
<AdminProtectedRoute <Route
exact exact
component={TeamsAndUsersPage} component={TeamsAndUsersPage}
path={ROUTES.TEAMS_AND_USERS_DETAILS} path={ROUTES.TEAMS_AND_USERS_DETAILS}

1
openmetadata-ui/src/main/resources/ui/src/utils/APIUtils.js
View File

@ -65,6 +65,7 @@ export const formatUsersResponse = (hits) => {
email: d._source.email, email: d._source.email,
type: d._source.entity_type, type: d._source.entity_type,
id: d._source.user_id, id: d._source.user_id,
teams: d._source.teams,
}; };
}); });
}; };