Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

✨ Handle member removal (#1867)

Luke Vellad70a7fdc802c
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.json
index de70f1dba..520444e2b 100644
--- a/apps/web/public/locales/en/app.json
+++ b/apps/web/public/locales/en/app.json
@@ -12,7 +12,6 @@
"comments": "Comments",
"continue": "Continue",
"copied": "Copied",
- "createAnAccount": "Create an account",
"createdBy": "by <b>{name}</b>",
"delete": "Delete",
"deleteDate": "Delete date",
@@ -116,16 +115,11 @@
"finishPoll": "Finalize",
"finalize": "Finalize",
"allDay": "All day",
- "permissionDenied": "Unauthorized",
- "permissionDeniedDescription": "If you are the poll creator, please login to access your poll",
- "loginDifferent": "Switch user",
"editDetailsDescription": "Change the details of your event.",
"finalizeDescription": "Select a final date for your event.",
"notificationsGuestTooltip": "Create an account or login to turn on notifications",
"dateAndTimeDescription": "Change your preferred date and time settings",
"createdTime": "Created {relativeTime}",
- "permissionDeniedParticipant": "If you are not the poll creator, you should go to the Invite Page.",
- "goToInvite": "Go to Invite Page",
"planFree": "Free",
"planPro": "Pro",
"Billing": "Billing",
@@ -424,5 +418,12 @@
"acceptInviteMetadataTitle": "Join {spaceName}",
"actionErrorPaymentRequired": "You need to upgrade to perform this action",
"loginWithAnotherAccount": "Login with another account",
- "adminRoleRequired": "You need to be an admin to perform this action"
+ "adminRoleRequired": "You need to be an admin to perform this action",
+ "removeMember": "Remove member",
+ "remove": "Remove Member",
+ "removeMemberConfirmation": "Are you sure you want to remove this member?",
+ "confirm": "Confirm",
+ "removeMemberLoading": "Removing member...",
+ "removeMemberSuccess": "Member removed successfully",
+ "removeMemberError": "Failed to remove member"
}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsx
new file mode 100644
index 000000000..0c15b9823
--- /dev/null
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsx
@@ -0,0 +1,109 @@
+"use client";
+
+import { subject } from "@casl/ability";
+import { Button } from "@rallly/ui/button";
+import {
+ Dialog,
+ DialogClose,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ useDialog,
+} from "@rallly/ui/dialog";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from "@rallly/ui/dropdown-menu";
+import { Icon } from "@rallly/ui/icon";
+import { toast } from "@rallly/ui/sonner";
+import { MoreHorizontalIcon, XIcon } from "lucide-react";
+import { Trans } from "@/components/trans";
+import { removeMemberAction } from "@/features/space/actions";
+import { useSpace } from "@/features/space/client";
+import type { MemberDTO } from "@/features/space/member/types";
+import { useTranslation } from "@/i18n/client";
+import { useSafeAction } from "@/lib/safe-action/client";
+
+export function MemberDropdownMenu({ member }: { member: MemberDTO }) {
+ const space = useSpace();
+ const removeMemberDialog = useDialog();
+ const removeMember = useSafeAction(removeMemberAction);
+ const { t } = useTranslation();
+ return (
+ <>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button variant="ghost" size="icon">
+ <Icon>
+ <MoreHorizontalIcon />
+ </Icon>
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem
+ onClick={() => {
+ removeMemberDialog.trigger();
+ }}
+ disabled={space
+ .getMemberAbility()
+ .cannot("delete", subject("SpaceMember", member))}
+ className="text-destructive"
+ >
+ <XIcon />
+ <Trans i18nKey="removeMember" defaults="Remove member" />
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ <Dialog {...removeMemberDialog.dialogProps}>
+ <DialogContent size="sm">
+ <DialogHeader>
+ <DialogTitle>
+ <Trans i18nKey="remove" defaults="Remove Member" />
+ </DialogTitle>
+ <DialogDescription>
+ <Trans
+ i18nKey="removeMemberConfirmation"
+ defaults="Are you sure you want to remove this member?"
+ />
+ </DialogDescription>
+ </DialogHeader>
+ <DialogFooter>
+ <Button
+ variant="destructive"
+ onClick={() => {
+ toast.promise(
+ removeMember.executeAsync({
+ memberId: member.id,
+ }),
+ {
+ loading: t("removeMemberLoading", {
+ defaultValue: "Removing member...",
+ }),
+ success: t("removeMemberSuccess", {
+ defaultValue: "Member removed successfully",
+ }),
+ error: t("removeMemberError", {
+ defaultValue: "Failed to remove member",
+ }),
+ },
+ );
+ removeMemberDialog.dismiss();
+ }}
+ >
+ <Trans i18nKey="confirm" defaults="Confirm" />
+ </Button>
+ <DialogClose asChild>
+ <Button>
+ <Trans i18nKey="cancel" defaults="Cancel" />
+ </Button>
+ </DialogClose>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+ </>
+ );
+}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx
index 5c04a706a..703905e6d 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx
@@ -2,6 +2,7 @@ import { Badge } from "@rallly/ui/badge";
import { UserSearchIcon } from "lucide-react";
import type { Metadata } from "next";
import { notFound } from "next/navigation";
+import { MemberDropdownMenu } from "@/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu";
import { PageContainer, PageContent } from "@/app/components/page-layout";
import {
EmptyState,
@@ -93,6 +94,7 @@ export default async function MembersPage({
<div className="text-sm">
<SpaceRole role={member.role} />
</div>
+ <MemberDropdownMenu member={member} />
</StackedListItem>
))}
</StackedList>
diff --git a/apps/web/src/features/billing/mutations.ts b/apps/web/src/features/billing/mutations.ts
index 97b056934..f1c5f3212 100644
--- a/apps/web/src/features/billing/mutations.ts
+++ b/apps/web/src/features/billing/mutations.ts
@@ -17,6 +17,7 @@ export async function updateSeatCount(spaceId: string, delta: number) {
try {
await stripe.subscriptionItems.update(subscription.subscriptionItemId, {
quantity: seatCount + delta,
+ proration_behavior: "create_prorations",
});
} catch (error) {
throw new AppError({
diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.ts
index dc7674bbd..ca8b87a40 100644
--- a/apps/web/src/features/space/actions.ts
+++ b/apps/web/src/features/space/actions.ts
@@ -6,6 +6,7 @@ import { prisma } from "@rallly/database";
import { absoluteUrl } from "@rallly/utils/absolute-url";
import { z } from "zod";
import { updateSeatCount } from "@/features/billing/mutations";
+import { getMember } from "@/features/space/data";
import { memberRoleSchema } from "@/features/space/schema";
import { toDBRole } from "@/features/space/utils";
import { setActiveSpace } from "@/features/user/mutations";
@@ -293,3 +294,43 @@ export const acceptInviteAction = authActionClient
console.warn("Failed to update user's active space");
}
});
+
+export const removeMemberAction = spaceActionClient
+ .metadata({
+ actionName: "space_remove_member",
+ })
+ .inputSchema(
+ z.object({
+ memberId: z.string(),
+ }),
+ )
+ .action(async ({ ctx, parsedInput }) => {
+ const member = await getMember(parsedInput.memberId);
+ if (!member) {
+ throw new AppError({
+ code: "NOT_FOUND",
+ message: "Member not found",
+ });
+ }
+
+ if (
+ ctx.getMemberAbility().cannot("delete", subject("SpaceMember", member))
+ ) {
+ throw new AppError({
+ code: "FORBIDDEN",
+ message: "You do not have permission to remove members from this space",
+ });
+ }
+
+ await prisma.$transaction(async (tx) => {
+ await tx.spaceMember.delete({
+ where: {
+ id: parsedInput.memberId,
+ },
+ });
+
+ if (isFeatureEnabled("billing")) {
+ await updateSeatCount(member.spaceId, -1);
+ }
+ });
+ });
diff --git a/apps/web/src/features/space/data.ts b/apps/web/src/features/space/data.ts
index 0071a05c7..c4e4a9437 100644
--- a/apps/web/src/features/space/data.ts
+++ b/apps/web/src/features/space/data.ts
@@ -13,6 +13,32 @@ import { fromDBRole, toDBRole } from "@/features/space/utils";
import { defineAbilityFor } from "@/features/user/ability";
import { isSelfHosted } from "@/utils/constants";
+function createMemberDTO(member: {
+ id: string;
+ userId: string;
+ spaceId: string;
+ role: DBSpaceMemberRole;
+ space: {
+ ownerId: string;
+ };
+ user: {
+ name: string;
+ email: string;
+ image?: string | null;
+ };
+}) {
+ return {
+ id: member.id,
+ name: member.user.name,
+ userId: member.userId,
+ spaceId: member.spaceId,
+ email: member.user.email,
+ image: member.user.image ?? undefined,
+ role: fromDBRole(member.role),
+ isOwner: member.userId === member.space.ownerId,
+ } satisfies MemberDTO;
+}
+
function getSpaceTier(space: {
subscription: {
active: boolean;
@@ -187,6 +213,7 @@ export const loadMembers = cache(
id: true,
userId: true,
role: true,
+ spaceId: true,
user: {
select: {
name: true,
@@ -205,18 +232,40 @@ export const loadMembers = cache(
return {
total: totalCount,
- data: members.map(
- (member) =>
- ({
- id: member.id,
- name: member.user.name,
- email: member.user.email,
- image: member.user.image ?? undefined,
- role: fromDBRole(member.role),
- isOwner: member.userId === space.ownerId,
- }) satisfies MemberDTO,
- ),
+ data: members.map((member) => createMemberDTO({ ...member, space })),
hasNextPage: page * pageSize < totalCount,
};
},
);
+
+export const getMember = async (id: string) => {
+ const member = await prisma.spaceMember.findUnique({
+ where: {
+ id,
+ },
+ select: {
+ id: true,
+ userId: true,
+ spaceId: true,
+ role: true,
+ space: {
+ select: {
+ ownerId: true,
+ },
+ },
+ user: {
+ select: {
+ name: true,
+ email: true,
+ image: true,
+ },
+ },
+ },
+ });
+
+ if (!member) {
+ return null;
+ }
+
+ return createMemberDTO(member);
+};
diff --git a/apps/web/src/features/space/member/ability.ts b/apps/web/src/features/space/member/ability.ts
index 58fedd067..ed2bd6009 100644
--- a/apps/web/src/features/space/member/ability.ts
+++ b/apps/web/src/features/space/member/ability.ts
@@ -2,11 +2,7 @@ import type { PureAbility } from "@casl/ability";
import { AbilityBuilder } from "@casl/ability";
import type { PrismaQuery, Subjects } from "@casl/prisma";
import { createPrismaAbility } from "@casl/prisma";
-import type {
- ScheduledEvent,
- SpaceMember,
- SpaceMemberInvite,
-} from "@rallly/database";
+import type { MemberDTO } from "@/features/space/member/types";
import type { MemberRole } from "@/features/space/schema";
export type MemberAbilityContext = {
@@ -16,9 +12,14 @@ export type MemberAbilityContext = {
type Action = "cancel" | "create" | "read" | "update" | "delete";
type Subject = Subjects<{
- ScheduledEvent: ScheduledEvent;
- SpaceMember: SpaceMember;
- SpaceMemberInvite: SpaceMemberInvite;
+ ScheduledEvent: {
+ spaceId: string;
+ userId: string;
+ };
+ SpaceMember: MemberDTO;
+ SpaceMemberInvite: {
+ spaceId: string;
+ };
Subscription: {
spaceId: string;
};
@@ -66,13 +67,12 @@ function defineSpaceAdminRules(
// Can do everything a member can do
defineSpaceMemberRules(builder, ctx);
- can("create", "SpaceMemberInvite", { spaceId: ctx.space.id });
- can(["delete"], "SpaceMember", { spaceId: ctx.space.id });
- cannot("update", "SpaceMember", ["role"], {
- spaceId: ctx.space.id,
- userId: ctx.user.id,
- });
can("read", "Subscription", {
spaceId: ctx.space.id,
});
+ can("create", "SpaceMemberInvite");
+ can("delete", "SpaceMember", { spaceId: ctx.space.id });
+ cannot(["delete", "update"], "SpaceMember", {
+ userId: ctx.user.id,
+ });
}
diff --git a/apps/web/src/features/space/member/types.ts b/apps/web/src/features/space/member/types.ts
index d6939c008..4122b56d0 100644
--- a/apps/web/src/features/space/member/types.ts
+++ b/apps/web/src/features/space/member/types.ts
@@ -4,6 +4,8 @@ export type MemberDTO = {
id: string;
name: string;
email: string;
+ userId: string;
+ spaceId: string;
image?: string;
role: MemberRole;
isOwner: boolean;