Skip to content

chore: update table component and styles #16541

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
Feb 12, 2025
Merged

chore: update table component and styles #16541

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
176 changes: 79 additions & 97 deletions site/src/pages/OrganizationSettingsPage/OrganizationMembersPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
import type { Interpolation, Theme } from "@emotion/react";
import PersonAdd from "@mui/icons-material/PersonAdd";
import LoadingButton from "@mui/lab/LoadingButton";
import Table from "@mui/material/Table";
import TableBody from "@mui/material/TableBody";
import TableCell from "@mui/material/TableCell";
import TableContainer from "@mui/material/TableContainer";
import TableHead from "@mui/material/TableHead";
import TableRow from "@mui/material/TableRow";
import { getErrorMessage } from "api/errors";
import type { GroupsByUserId } from "api/queries/groups";
import type {
Group,
OrganizationMemberWithUserData,
Expand All @@ -28,6 +20,13 @@ import {
} from "components/MoreMenu/MoreMenu";
import { SettingsHeader } from "components/SettingsHeader/SettingsHeader";
import { Stack } from "components/Stack/Stack";
import {
Table,
TableBody,
TableCell,
TableHeader,
TableRow,
} from "components/Table/Table";
import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete";
import { UserGroupsCell } from "pages/UsersPage/UsersTable/UserGroupsCell";
import { type FC, useState } from "react";
Expand Down Expand Up @@ -80,83 +79,80 @@ export const OrganizationMembersPageView: FC<
onSubmit={addMember}
/>
)}

<TableContainer>
<Table>
<TableHead>
<TableRow>
<TableCell width="33%">User</TableCell>
<TableCell width="33%">
<Stack direction="row" spacing={1} alignItems="center">
<span>Roles</span>
<TableColumnHelpTooltip variant="roles" />
</Stack>
<Table>
<TableHeader>
<TableRow>
<TableCell width="33%">User</TableCell>
<TableCell width="33%">
<Stack direction="row" spacing={1} alignItems="center">
<span>Roles</span>
<TableColumnHelpTooltip variant="roles" />
</Stack>
</TableCell>
<TableCell width="33%">
<Stack direction="row" spacing={1} alignItems="center">
<span>Groups</span>
<TableColumnHelpTooltip variant="groups" />
</Stack>
</TableCell>
<TableCell width="1%" />
</TableRow>
</TableHeader>
<TableBody>
{members?.map((member) => (
<TableRow key={member.user_id} className="align-baseline">
<TableCell>
<AvatarData
avatar={
<Avatar
fallback={member.username}
src={member.avatar_url}
/>
}
title={member.name || member.username}
subtitle={member.email}
/>
</TableCell>
<TableCell width="33%">
<Stack direction="row" spacing={1} alignItems="center">
<span>Groups</span>
<TableColumnHelpTooltip variant="groups" />
</Stack>
<UserRoleCell
inheritedRoles={member.global_roles}
roles={member.roles}
allAvailableRoles={allAvailableRoles}
oidcRoleSyncEnabled={false}
isLoading={isUpdatingMemberRoles}
canEditUsers={canEditMembers}
onEditRoles={async (roles) => {
try {
await updateMemberRoles(member, roles);
displaySuccess("Roles updated successfully.");
} catch (error) {
displayError(
getErrorMessage(error, "Failed to update roles."),
);
}
}}
/>
<UserGroupsCell userGroups={member.groups} />
<TableCell>
{member.user_id !== me.id && canEditMembers && (
<MoreMenu>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I personally try to avoid conditional rendering with && and instead will use a ternary. The reason being that I've been burned one too many times by the issue described in the Pitfall note in the React docs.

But I see && used a lot within the code base, and this case doesn't fall into the issue so just wanted to bring it up just in case!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya you will notice this this pattern everywhere the component is used. I think right now ternaries only get used if there is something to return in both the true and false case.

<MoreMenuTrigger>
<ThreeDotsButton />
</MoreMenuTrigger>
<MoreMenuContent>
<MoreMenuItem
danger
onClick={() => removeMember(member)}
>
Remove
</MoreMenuItem>
</MoreMenuContent>
</MoreMenu>
)}
</TableCell>
<TableCell width="1%" />
</TableRow>
</TableHead>
<TableBody>
{members?.map((member) => (
<TableRow key={member.user_id}>
<TableCell>
<AvatarData
avatar={
<Avatar
fallback={member.username}
src={member.avatar_url}
/>
}
title={member.name || member.username}
subtitle={member.email}
/>
</TableCell>
<UserRoleCell
inheritedRoles={member.global_roles}
roles={member.roles}
allAvailableRoles={allAvailableRoles}
oidcRoleSyncEnabled={false}
isLoading={isUpdatingMemberRoles}
canEditUsers={canEditMembers}
onEditRoles={async (roles) => {
try {
await updateMemberRoles(member, roles);
displaySuccess("Roles updated successfully.");
} catch (error) {
displayError(
getErrorMessage(error, "Failed to update roles."),
);
}
}}
/>
<UserGroupsCell userGroups={member.groups} />
<TableCell>
{member.user_id !== me.id && canEditMembers && (
<MoreMenu>
<MoreMenuTrigger>
<ThreeDotsButton />
</MoreMenuTrigger>
<MoreMenuContent>
<MoreMenuItem
danger
onClick={() => removeMember(member)}
>
Remove
</MoreMenuItem>
</MoreMenuContent>
</MoreMenu>
)}
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</TableContainer>
))}
</TableBody>
</Table>
</Stack>
</div>
);
Expand Down Expand Up @@ -190,7 +186,7 @@ const AddOrganizationMember: FC<AddOrganizationMemberProps> = ({
>
<Stack direction="row" alignItems="center" spacing={1}>
<UserAutocomplete
css={styles.autoComplete}
className="w-[300px]"
value={selectedUser}
onChange={(newValue) => {
setSelectedUser(newValue);
Expand All @@ -210,17 +206,3 @@ const AddOrganizationMember: FC<AddOrganizationMemberProps> = ({
</form>
);
};

const styles = {
role: (theme) => ({
backgroundColor: theme.roles.notice.background,
borderColor: theme.roles.notice.outline,
}),
globalRole: (theme) => ({
backgroundColor: theme.roles.inactive.background,
borderColor: theme.roles.inactive.outline,
}),
autoComplete: {
width: 300,
},
} satisfies Record<string, Interpolation<Theme>>;
7 changes: 3 additions & 4 deletions site/src/pages/OrganizationSettingsPage/UserTable/UserRoleCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
* users like that, though, know that it will be painful
*/
import { type Interpolation, type Theme, useTheme } from "@emotion/react";
import Stack from "@mui/material/Stack";
import TableCell from "@mui/material/TableCell";
import Tooltip from "@mui/material/Tooltip";
import type { LoginType, SlimRole } from "api/typesGenerated";
import { Pill } from "components/Pill/Pill";
import { TableCell } from "components/Table/Table";
import {
Popover,
PopoverContent,
Expand Down Expand Up @@ -59,7 +58,7 @@ export const UserRoleCell: FC<UserRoleCellProps> = ({

return (
<TableCell>
<Stack direction="row" spacing={1}>
<div className="flex flex-row gap-1 items-center">
{canEditUsers && (
<EditRolesButton
roles={sortRolesByAccessLevel(allAvailableRoles ?? [])}
Expand Down Expand Up @@ -97,7 +96,7 @@ export const UserRoleCell: FC<UserRoleCellProps> = ({
</Pill>

{extraRoles.length > 0 && <OverflowRolePill roles={extraRoles} />}
</Stack>
</div>
</TableCell>
);
};
Expand Down
12 changes: 4 additions & 8 deletions site/src/pages/UsersPage/UsersTable/UserGroupsCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ import { useTheme } from "@emotion/react";
import GroupIcon from "@mui/icons-material/Group";
import List from "@mui/material/List";
import ListItem from "@mui/material/ListItem";
import TableCell from "@mui/material/TableCell";
import type { Group } from "api/typesGenerated";
import { Avatar } from "components/Avatar/Avatar";
import { OverflowY } from "components/OverflowY/OverflowY";
import { Stack } from "components/Stack/Stack";
import { TableCell } from "components/Table/Table";
import {
Popover,
PopoverContent,
Expand Down Expand Up @@ -40,12 +39,9 @@ export const UserGroupsCell: FC<GroupsCellProps> = ({ userGroups }) => {
color: "inherit",
lineHeight: "1",
}}
type="button"
>
<Stack
spacing={0}
direction="row"
css={{ columnGap: 8, alignItems: "center" }}
>
<div className="flex flex-row gap-2 items-center">
<GroupIcon
css={{
width: "1rem",
Expand All @@ -57,7 +53,7 @@ export const UserGroupsCell: FC<GroupsCellProps> = ({ userGroups }) => {
<span>
{userGroups.length} Group{userGroups.length !== 1 && "s"}
</span>
</Stack>
</div>
</button>
</PopoverTrigger>

Expand Down
Loading