github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix team lead access to view user names (#10388)

pull/10401/head
Prabhat Khera 2023-09-28 12:40:54 +13:00 committed by GitHub
parent 95ca1d396b
commit 99625cd35f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/react/portainer/access-control/AccessControlPanel/AccessControlPanel.tsx
View File

@ -4,7 +4,7 @@ import { Edit, Eye } from 'lucide-react';
import { useUser } from '@/react/hooks/useUser'; import { useUser } from '@/react/hooks/useUser';
import { Icon } from '@/react/components/Icon'; import { Icon } from '@/react/components/Icon';
import { TeamMembership, TeamRole } from '@/react/portainer/users/teams/types'; import { TeamMembership, TeamRole } from '@/react/portainer/users/teams/types';
import { useUserMembership } from '@/portainer/users/queries'; import { useIsTeamLeader, useUserMembership } from '@/portainer/users/queries';
import { EnvironmentId } from '@/react/portainer/environments/types'; import { EnvironmentId } from '@/react/portainer/environments/types';
import { TableContainer, TableTitle } from '@@/datatables'; import { TableContainer, TableTitle } from '@@/datatables';
@ -34,7 +34,7 @@ export function AccessControlPanel({
onUpdateSuccess, onUpdateSuccess,
}: Props) { }: Props) {
const [isEditMode, toggleEditMode] = useReducer((state) => !state, false); const [isEditMode, toggleEditMode] = useReducer((state) => !state, false);
const { isAdmin } = useUser(); const { user, isAdmin } = useUser();
const isInherited = checkIfInherited(); const isInherited = checkIfInherited();
@ -46,13 +46,15 @@ export function AccessControlPanel({
isInherited || isInherited ||
(!isAdmin && !isPartOfRestrictedUsers && !isLeaderOfAnyRestrictedTeams); (!isAdmin && !isPartOfRestrictedUsers && !isLeaderOfAnyRestrictedTeams);
const isTeamLeader = useIsTeamLeader(user) as boolean;
return ( return (
<TableContainer> <TableContainer>
<TableTitle label="Access control" icon={Eye} /> <TableTitle label="Access control" icon={Eye} />
<AccessControlPanelDetails <AccessControlPanelDetails
resourceType={resourceType} resourceType={resourceType}
resourceControl={resourceControl} resourceControl={resourceControl}
isAuthorisedToFetchUsers={isAdmin || isLeaderOfAnyRestrictedTeams} isAuthorisedToFetchUsers={isAdmin || isTeamLeader}
/> />
{!isEditDisabled && !isEditMode && ( {!isEditDisabled && !isEditMode && (