Skip to content

feat: add groups column to members page in organizations #14620

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 4 commits into from
Sep 10, 2024
Merged

feat: add groups column to members page in organizations #14620

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01aabc5
feat: add groups column to members page in organizations
DanielleMaywood Sep 9, 2024
b695847
fix: run 'make fmt'
DanielleMaywood Sep 9, 2024
baa09c1
fix: stop displaying groups member is in for other organisations
DanielleMaywood Sep 10, 2024
fc987cb
fix: run 'make fmt'
DanielleMaywood Sep 10, 2024
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
Prev Previous commit
Next Next commit
fix: stop displaying groups member is in for other organisations
  • Loading branch information
@DanielleMaywood
DanielleMaywood committed Sep 10, 2024
commit baa09c177e28fe0158005041be80328db6ab96e4
7 changes: 7 additions & 0 deletions site/src/api/queries/groups.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ export function groupsByUserId() {
} satisfies UseQueryOptions<Group[], unknown, GroupsByUserId>;
}

export function groupsByUserIdInOrganization(organization: string) {
return {
...groupsByOrganization(organization),
select: selectGroupsByUserId,
} satisfies UseQueryOptions<Group[], unknown, GroupsByUserId>;
}

export function selectGroupsByUserId(groups: Group[]): GroupsByUserId {
// Sorting here means that nothing has to be sorted for the individual
// user arrays later
Expand Down
11 changes: 8 additions & 3 deletions site/src/pages/ManagementSettingsPage/OrganizationMembersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { groupsByUserId } from "api/queries/groups";
import { groupsByUserId, groupsByUserIdInOrganization } from "api/queries/groups";
import {
addOrganizationMember,
organizationMembers,
Expand All @@ -23,11 +23,16 @@ const OrganizationMembersPage: FC = () => {
};
const { user: me } = useAuthenticated();

const groupsByUserIdQuery = useQuery(groupsByUserId());
const groupsByUserIdQuery = useQuery(groupsByUserIdInOrganization(organizationName));

const membersQuery = useQuery(organizationMembers(organizationName));
const organizationRolesQuery = useQuery(organizationRoles(organizationName));

const members = membersQuery.data?.map((member) => {
const groups = groupsByUserIdQuery.data?.get(member.user_id) ?? [];
return {...member, groups};
})

const addMemberMutation = useMutation(
addOrganizationMember(queryClient, organizationName),
);
Expand Down Expand Up @@ -60,7 +65,7 @@ const OrganizationMembersPage: FC = () => {
isAddingMember={addMemberMutation.isLoading}
isUpdatingMemberRoles={updateMemberRolesMutation.isLoading}
me={me}
members={membersQuery.data}
members={members}
groupsByUserId={groupsByUserIdQuery.data}
addMember={async (user: User) => {
await addMemberMutation.mutateAsync(user.id);
Expand Down
5 changes: 4 additions & 1 deletion site/src/pages/ManagementSettingsPage/OrganizationMembersPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ const meta: Meta<typeof OrganizationMembersPageView> = {
isAddingMember: false,
isUpdatingMemberRoles: false,
me: MockUser,
members: [MockOrganizationMember, MockOrganizationMember2],
members: [
{...MockOrganizationMember, groups: []},
{...MockOrganizationMember2, groups: []},
],
addMember: () => Promise.resolve(),
removeMember: () => Promise.resolve(),
updateMemberRoles: () => Promise.resolve(),
Expand Down
11 changes: 7 additions & 4 deletions site/src/pages/ManagementSettingsPage/OrganizationMembersPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import TableRow from "@mui/material/TableRow";
import { getErrorMessage } from "api/errors";
import type { GroupsByUserId } from "api/queries/groups";
import type {
Group,
OrganizationMemberWithUserData,
SlimRole,
User,
Expand Down Expand Up @@ -40,7 +41,7 @@ interface OrganizationMembersPageViewProps {
isAddingMember: boolean;
isUpdatingMemberRoles: boolean;
me: User;
members: OrganizationMemberWithUserData[] | undefined;
members: Array<OrganizationMemberTableEntry> | undefined,
groupsByUserId: GroupsByUserId | undefined;
addMember: (user: User) => Promise<void>;
removeMember: (member: OrganizationMemberWithUserData) => Promise<void>;
Expand All @@ -50,6 +51,10 @@ interface OrganizationMembersPageViewProps {
) => Promise<void>;
}

interface OrganizationMemberTableEntry extends OrganizationMemberWithUserData {
groups: readonly Group[] | undefined,
};

export const OrganizationMembersPageView: FC<
OrganizationMembersPageViewProps
> = (props) => {
Expand Down Expand Up @@ -120,9 +125,7 @@ export const OrganizationMembersPageView: FC<
}
}}
/>
<UserGroupsCell
userGroups={props.groupsByUserId?.get(member.user_id)}
/>
<UserGroupsCell userGroups={member.groups} />
<TableCell>
{member.user_id !== props.me.id && props.canEditMembers && (
<MoreMenu>
Expand Down
Loading