Skip to content

Open-source status page, incident response and uptime monitoring

fix(dashboard): prevent self-deletion in workspace members table (#2777)

Sandip Godhanidd838b4f5b02
diff --git a/apps/dashboard/src/components/data-table/settings/members/data-table.tsx b/apps/dashboard/src/components/data-table/settings/members/data-table.tsx
index 058ec2a55..d494af4c0 100644
--- a/apps/dashboard/src/components/data-table/settings/members/data-table.tsx
+++ b/apps/dashboard/src/components/data-table/settings/members/data-table.tsx
@@ -1,3 +1,4 @@
+import { Badge } from "@openstatus/ui/components/ui/badge";
import {
Table,
TableBody,
@@ -15,6 +16,7 @@ import { useTRPC } from "@/lib/trpc/client";
export function DataTable() {
const trpc = useTRPC();
const { data: members, refetch } = useQuery(trpc.member.list.queryOptions());
+ const { data: user } = useQuery(trpc.user.get.queryOptions());
const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());
const deleteMemberMutation = useMutation(
trpc.member.delete.mutationOptions({
@@ -38,37 +40,49 @@ export function DataTable() {
</TableRow>
</TableHeader>
<TableBody>
- {members.map((item) => (
- <TableRow key={item.user.id}>
- <TableCell>
- {item.user.name ?? (
- <span className="text-muted-foreground">-</span>
- )}
- </TableCell>
- <TableCell>{item.user.email}</TableCell>
- <TableCell>{item.role}</TableCell>
- <TableCell>
- {formatDate(item.user.createdAt ?? item.createdAt)}
- </TableCell>
- <TableCell>
- <div className="flex justify-end">
- <QuickActions
- deleteAction={{
- confirmationValue: item.user.email ?? "user",
- description: workspace?.ssoEnabled
- ? "This workspace uses SSO. They can sign in again and rejoin automatically unless you also remove them from your identity provider."
- : undefined,
- // FIXME: when deleting myself, throws an error, should have been caught by the toast.error
- submitAction: async () =>
- await deleteMemberMutation.mutateAsync({
- id: item.user.id,
- }),
- }}
- />
- </div>
- </TableCell>
- </TableRow>
- ))}
+ {members.map((item) => {
+ const currentUserId = user?.id;
+ const isMe = Boolean(currentUserId && item.user.id === currentUserId);
+ const canDelete = Boolean(
+ currentUserId && item.user.id !== currentUserId,
+ );
+
+ return (
+ <TableRow key={item.user.id}>
+ <TableCell>
+ <div className="flex items-center gap-2">
+ {item.user.name ?? (
+ <span className="text-muted-foreground">-</span>
+ )}
+ {isMe ? <Badge variant="secondary">You</Badge> : null}
+ </div>
+ </TableCell>
+ <TableCell>{item.user.email}</TableCell>
+ <TableCell>{item.role}</TableCell>
+ <TableCell>
+ {formatDate(item.user.createdAt ?? item.createdAt)}
+ </TableCell>
+ <TableCell>
+ {canDelete ? (
+ <div className="flex justify-end">
+ <QuickActions
+ deleteAction={{
+ confirmationValue: item.user.email ?? "user",
+ description: workspace?.ssoEnabled
+ ? "This workspace uses SSO. They can sign in again and rejoin automatically unless you also remove them from your identity provider."
+ : undefined,
+ submitAction: async () =>
+ await deleteMemberMutation.mutateAsync({
+ id: item.user.id,
+ }),
+ }}
+ />
+ </div>
+ ) : null}
+ </TableCell>
+ </TableRow>
+ );
+ })}
</TableBody>
</Table>
);