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

disable user list api call if not authorised

fix/EE-4602/switch-color-fix-rel-new
Prabhat Khera 2023-09-26 11:24:50 +13:00
parent fa087f0bb9
commit ad95bac5cc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,7 @@ export function AccessControlPanel({
<AccessControlPanelDetails <AccessControlPanelDetails
resourceType={resourceType} resourceType={resourceType}
resourceControl={resourceControl} resourceControl={resourceControl}
isAuthorisedToFetchUsers={isAdmin || isLeaderOfAnyRestrictedTeams}
/> />
{!isEditDisabled && !isEditMode && ( {!isEditDisabled && !isEditMode && (

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

@ -24,11 +24,13 @@ import { ResourceControlViewModel } from '../models/ResourceControlViewModel';
interface Props { interface Props {
resourceControl?: ResourceControlViewModel; resourceControl?: ResourceControlViewModel;
resourceType: ResourceControlType; resourceType: ResourceControlType;
isAuthorisedToFetchUsers?: boolean;
} }
export function AccessControlPanelDetails({ export function AccessControlPanelDetails({
resourceControl, resourceControl,
resourceType, resourceType,
isAuthorisedToFetchUsers = false,
}: Props) { }: Props) {
const inheritanceMessage = getInheritanceMessage( const inheritanceMessage = getInheritanceMessage(
resourceType, resourceType,
@ -41,7 +43,10 @@ export function AccessControlPanelDetails({
TeamAccesses: restrictedToTeams = [], TeamAccesses: restrictedToTeams = [],
} = resourceControl || {}; } = resourceControl || {};
const users = useAuthorizedUsers(restrictedToUsers.map((ra) => ra.UserId)); const users = useAuthorizedUsers(
restrictedToUsers.map((ra) => ra.UserId),
isAuthorisedToFetchUsers
);
const teams = useAuthorizedTeams(restrictedToTeams.map((ra) => ra.TeamId)); const teams = useAuthorizedTeams(restrictedToTeams.map((ra) => ra.TeamId));
const teamsLength = teams.data ? teams.data.length : 0; const teamsLength = teams.data ? teams.data.length : 0;