Skip to content

Commit bd5761a

Browse files
committed
chore: update groups page table to shadcn
1 parent 21f7715 commit bd5761a

File tree

1 file changed

+51
-52
lines changed

1 file changed

+51
-52
lines changed

site/src/pages/GroupsPage/GroupPage.tsx

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ import PersonAdd from "@mui/icons-material/PersonAdd";
44
import SettingsOutlined from "@mui/icons-material/SettingsOutlined";
55
import LoadingButton from "@mui/lab/LoadingButton";
66
import Button from "@mui/material/Button";
7-
import Table from "@mui/material/Table";
8-
import TableBody from "@mui/material/TableBody";
9-
import TableCell from "@mui/material/TableCell";
10-
import TableContainer from "@mui/material/TableContainer";
11-
import TableHead from "@mui/material/TableHead";
12-
import TableRow from "@mui/material/TableRow";
137
import { getErrorMessage } from "api/errors";
148
import {
159
addMember,
@@ -40,6 +34,14 @@ import {
4034
} from "components/MoreMenu/MoreMenu";
4135
import { SettingsHeader } from "components/SettingsHeader/SettingsHeader";
4236
import { Stack } from "components/Stack/Stack";
37+
import {
38+
Table,
39+
TableBody,
40+
TableCell,
41+
TableHead,
42+
TableHeader,
43+
TableRow,
44+
} from "components/Table/Table";
4345
import {
4446
PaginationStatus,
4547
TableToolbar,
@@ -111,7 +113,6 @@ export const GroupPage: FC = () => {
111113
{canUpdateGroup && (
112114
<Stack direction="row" spacing={2}>
113115
<Button
114-
role="button"
115116
component={RouterLink}
116117
startIcon={<SettingsOutlined />}
117118
to="settings"
@@ -160,53 +161,51 @@ export const GroupPage: FC = () => {
160161
/>
161162
</TableToolbar>
162163

163-
<TableContainer>
164-
<Table>
165-
<TableHead>
166-
<TableRow>
167-
<TableCell width="59%">User</TableCell>
168-
<TableCell width="40">Status</TableCell>
169-
<TableCell width="1%" />
170-
</TableRow>
171-
</TableHead>
164+
<Table>
165+
<TableHeader>
166+
<TableRow>
167+
<TableHead className="w-2/5">User</TableHead>
168+
<TableHead className="w-3/5">Status</TableHead>
169+
<TableHead className="w-auto" />
170+
</TableRow>
171+
</TableHeader>
172172

173-
<TableBody>
174-
{groupData?.members.length === 0 ? (
175-
<TableRow>
176-
<TableCell colSpan={999}>
177-
<EmptyState
178-
message="No members yet"
179-
description="Add a member using the controls above"
180-
/>
181-
</TableCell>
182-
</TableRow>
183-
) : (
184-
groupData?.members.map((member) => (
185-
<GroupMemberRow
186-
member={member}
187-
group={groupData}
188-
key={member.id}
189-
canUpdate={canUpdateGroup}
190-
onRemove={async () => {
191-
try {
192-
await removeMemberMutation.mutateAsync({
193-
groupId: groupData.id,
194-
userId: member.id,
195-
});
196-
await groupQuery.refetch();
197-
displaySuccess("Member removed successfully.");
198-
} catch (error) {
199-
displayError(
200-
getErrorMessage(error, "Failed to remove member."),
201-
);
202-
}
203-
}}
173+
<TableBody>
174+
{groupData?.members.length === 0 ? (
175+
<TableRow>
176+
<TableCell colSpan={999}>
177+
<EmptyState
178+
message="No members yet"
179+
description="Add a member using the controls above"
204180
/>
205-
))
206-
)}
207-
</TableBody>
208-
</Table>
209-
</TableContainer>
181+
</TableCell>
182+
</TableRow>
183+
) : (
184+
groupData?.members.map((member) => (
185+
<GroupMemberRow
186+
member={member}
187+
group={groupData}
188+
key={member.id}
189+
canUpdate={canUpdateGroup}
190+
onRemove={async () => {
191+
try {
192+
await removeMemberMutation.mutateAsync({
193+
groupId: groupData.id,
194+
userId: member.id,
195+
});
196+
await groupQuery.refetch();
197+
displaySuccess("Member removed successfully.");
198+
} catch (error) {
199+
displayError(
200+
getErrorMessage(error, "Failed to remove member."),
201+
);
202+
}
203+
}}
204+
/>
205+
))
206+
)}
207+
</TableBody>
208+
</Table>
210209
</Stack>
211210

212211
{groupQuery.data && (

0 commit comments

Comments
 (0)