Merge pull request #3109 from Dokploy/3097-actions-section-not-working-on-users-page

refactor: enhance user management actions in dashboard
This commit is contained in:
Mauricio Siu
2025-11-26 02:23:35 -05:00
committed by GitHub
@@ -111,35 +111,75 @@ export const ShowUsers = () => {
</TableCell> </TableCell>
<TableCell className="text-right flex justify-end"> <TableCell className="text-right flex justify-end">
<DropdownMenu> {member.role !== "owner" && (
<DropdownMenuTrigger asChild> <DropdownMenu>
<Button <DropdownMenuTrigger asChild>
variant="ghost" <Button
className="h-8 w-8 p-0" variant="ghost"
> className="h-8 w-8 p-0"
<span className="sr-only">Open menu</span> >
<MoreHorizontal className="h-4 w-4" /> <span className="sr-only">
</Button> Open menu
</DropdownMenuTrigger> </span>
<DropdownMenuContent align="end"> <MoreHorizontal className="h-4 w-4" />
<DropdownMenuLabel> </Button>
Actions </DropdownMenuTrigger>
</DropdownMenuLabel> <DropdownMenuContent align="end">
<DropdownMenuLabel>
Actions
</DropdownMenuLabel>
{member.role !== "owner" && (
<AddUserPermissions <AddUserPermissions
userId={member.user.id} userId={member.user.id}
/> />
)}
{member.role !== "owner" && ( {!isCloud && (
<> <DialogAction
{!isCloud && ( title="Delete User"
<DialogAction description="Are you sure you want to delete this user?"
title="Delete User" type="destructive"
description="Are you sure you want to delete this user?" onClick={async () => {
type="destructive" await mutateAsync({
onClick={async () => { userId: member.user.id,
})
.then(() => {
toast.success(
"User deleted successfully",
);
refetch();
})
.catch(() => {
toast.error(
"Error deleting destination",
);
});
}}
>
<DropdownMenuItem
className="w-full cursor-pointer text-red-500 hover:!text-red-600"
onSelect={(e) => e.preventDefault()}
>
Delete User
</DropdownMenuItem>
</DialogAction>
)}
<DialogAction
title="Unlink User"
description="Are you sure you want to unlink this user?"
type="destructive"
onClick={async () => {
if (!isCloud) {
const orgCount =
await utils.user.checkUserOrganizations.fetch(
{
userId: member.user.id,
},
);
console.log(orgCount);
if (orgCount === 1) {
await mutateAsync({ await mutateAsync({
userId: member.user.id, userId: member.user.id,
}) })
@@ -151,86 +191,40 @@ export const ShowUsers = () => {
}) })
.catch(() => { .catch(() => {
toast.error( toast.error(
"Error deleting destination", "Error deleting user",
); );
}); });
}} return;
>
<DropdownMenuItem
className="w-full cursor-pointer text-red-500 hover:!text-red-600"
onSelect={(e) =>
e.preventDefault()
}
>
Delete User
</DropdownMenuItem>
</DialogAction>
)}
<DialogAction
title="Unlink User"
description="Are you sure you want to unlink this user?"
type="destructive"
onClick={async () => {
if (!isCloud) {
const orgCount =
await utils.user.checkUserOrganizations.fetch(
{
userId: member.user.id,
},
);
console.log(orgCount);
if (orgCount === 1) {
await mutateAsync({
userId: member.user.id,
})
.then(() => {
toast.success(
"User deleted successfully",
);
refetch();
})
.catch(() => {
toast.error(
"Error deleting user",
);
});
return;
}
} }
}
const { error } = const { error } =
await authClient.organization.removeMember( await authClient.organization.removeMember(
{ {
memberIdOrEmail: member.id, memberIdOrEmail: member.id,
}, },
); );
if (!error) { if (!error) {
toast.success( toast.success(
"User unlinked successfully", "User unlinked successfully",
); );
refetch(); refetch();
} else { } else {
toast.error( toast.error("Error unlinking user");
"Error unlinking user", }
); }}
} >
}} <DropdownMenuItem
className="w-full cursor-pointer text-red-500 hover:!text-red-600"
onSelect={(e) => e.preventDefault()}
> >
<DropdownMenuItem Unlink User
className="w-full cursor-pointer text-red-500 hover:!text-red-600" </DropdownMenuItem>
onSelect={(e) => e.preventDefault()} </DialogAction>
> </DropdownMenuContent>
Unlink User </DropdownMenu>
</DropdownMenuItem> )}
</DialogAction>
</>
)}
</DropdownMenuContent>
</DropdownMenu>
</TableCell> </TableCell>
</TableRow> </TableRow>
); );