Fix issue #5355 Selecting Users or Admins renders first team's details (#5368)

Co-authored-by: Vivek Ratnavel Subramanian <vivekratnavel90@gmail.com>
This commit is contained in:
Shailesh Parmar 2022-06-09 23:37:29 +05:30 committed by GitHub
parent 7c387d6d54
commit eeab12b0fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions

View File

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

View File

@ -420,7 +420,12 @@ export const navLinkSettings = [
{ name: 'Roles', to: '/roles', disabled: false, isAdminOnly: true }, { name: 'Roles', to: '/roles', disabled: false, isAdminOnly: true },
{ name: 'Services', to: '/services', disabled: false }, { name: 'Services', to: '/services', disabled: false },
{ name: 'Tags', to: '/tags', disabled: false }, { name: 'Tags', to: '/tags', disabled: false },
{ name: 'Teams & Users', to: ROUTES.TEAMS_AND_USERS, disabled: false }, {
name: 'Teams & Users',
to: ROUTES.TEAMS_AND_USERS,
disabled: false,
isAdminOnly: true,
},
{ name: 'Webhooks', to: '/webhooks', disabled: false }, { name: 'Webhooks', to: '/webhooks', disabled: false },
]; ];

View File

@ -150,7 +150,7 @@ 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} />
<Route <AdminProtectedRoute
exact exact
component={TeamsAndUsersPage} component={TeamsAndUsersPage}
path={ROUTES.TEAMS_AND_USERS} path={ROUTES.TEAMS_AND_USERS}