Skip to content

chore: warn user without permissions to view org members (cherry-pick #16721) #16788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2025
Merged

chore: warn user without permissions to view org members (cherry-pick #16721) #16788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions site/src/pages/OrganizationSettingsPage/OrganizationMembersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ const OrganizationMembersPage: FC = () => {
<OrganizationMembersPageView
allAvailableRoles={organizationRolesQuery.data}
canEditMembers={organizationPermissions.editMembers}
canViewMembers={organizationPermissions.viewMembers}
error={
membersQuery.error ??
organizationRolesQuery.error ??
Expand Down
16 changes: 14 additions & 2 deletions site/src/pages/OrganizationSettingsPage/OrganizationMembersPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
TableRow,
} from "components/Table/Table";
import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete";
import { TriangleAlert } from "lucide-react";
import { UserGroupsCell } from "pages/UsersPage/UsersTable/UserGroupsCell";
import { type FC, useState } from "react";
import { TableColumnHelpTooltip } from "./UserTable/TableColumnHelpTooltip";
Expand All @@ -36,6 +37,7 @@ import { UserRoleCell } from "./UserTable/UserRoleCell";
interface OrganizationMembersPageViewProps {
allAvailableRoles: readonly SlimRole[] | undefined;
canEditMembers: boolean;
canViewMembers: boolean;
error: unknown;
isAddingMember: boolean;
isUpdatingMemberRoles: boolean;
Expand All @@ -58,6 +60,7 @@ export const OrganizationMembersPageView: FC<
> = ({
allAvailableRoles,
canEditMembers,
canViewMembers,
error,
isAddingMember,
isUpdatingMemberRoles,
Expand All @@ -70,7 +73,7 @@ export const OrganizationMembersPageView: FC<
return (
<div>
<SettingsHeader title="Members" />
<Stack>
<div className="flex flex-col gap-4">
{Boolean(error) && <ErrorAlert error={error} />}

{canEditMembers && (
Expand All @@ -80,6 +83,15 @@ export const OrganizationMembersPageView: FC<
/>
)}

{!canViewMembers && (
<div className="flex flex-row text-content-warning gap-2 items-center text-sm font-medium">
<TriangleAlert className="size-icon-sm" />
<p>
You do not have permission to view members other than yourself.
</p>
</div>
)}

<Table>
<TableHeader>
<TableRow>
Expand Down Expand Up @@ -154,7 +166,7 @@ export const OrganizationMembersPageView: FC<
))}
</TableBody>
</Table>
</Stack>
</div>
</div>
);
};
Expand Down
Loading