Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
✨ Allow role change (#1873)
Luke Vella575acb8718c1
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.jsonindex dedda08a4..ee6996b94 100644--- a/apps/web/public/locales/en/app.json+++ b/apps/web/public/locales/en/app.json@@ -431,5 +431,10 @@"rolePlaceholder": "Select role...","invalidEmailAddress": "Please enter a valid email address","billingAcknowledgmentRequired": "You must acknowledge the billing impact",- "billingAcknowledgment": "I understand that adding members will affect my subscription price"+ "billingAcknowledgment": "I understand that adding members will affect my subscription price",+ "makeAdmin": "Make admin",+ "makeMember": "Make member",+ "changingRole": "Changing role...",+ "roleChangedSuccess": "Role changed successfully",+ "roleChangedError": "Failed to change role"}diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsxindex cb280c5fa..2a4108b82 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsx@@ -225,8 +225,8 @@ export function InviteMemberForm({ onSuccess }: { onSuccess?: () => void }) {control={form.control}name="billingAcknowledgment"render={({ field }) => (- <FormItem className="rounded-lg border p-3">- <div className="flex flex-row items-start gap-3">+ <FormItem>+ <div className="flex flex-row items-start gap-3 rounded-lg border p-3"><FormControl><Checkboxchecked={field.value}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.tsxindex d65d73089..be1ce616a 100644--- 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@@ -16,15 +16,20 @@ import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,+ DropdownMenuSeparator,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 { MoreHorizontalIcon, ShieldIcon, UserIcon, XIcon } from "lucide-react";import { Trans } from "@/components/trans";-import { removeMemberAction } from "@/features/space/actions";+import {+ changeMemberRoleAction,+ removeMemberAction,+} from "@/features/space/actions";import { useSpace } from "@/features/space/client";import type { MemberDTO } from "@/features/space/member/types";+import type { MemberRole } from "@/features/space/schema";import { useTranslation } from "@/i18n/client";import { useSafeAction } from "@/lib/safe-action/client";@@ -32,7 +37,37 @@ export function MemberDropdownMenu({ member }: { member: MemberDTO }) {const space = useSpace();const removeMemberDialog = useDialog();const removeMember = useSafeAction(removeMemberAction);+ const changeMemberRole = useSafeAction(changeMemberRoleAction);const { t } = useTranslation();++ const canUpdateMember = space+ .getMemberAbility()+ .can("update", subject("SpaceMember", member));++ const canDeleteMember = space+ .getMemberAbility()+ .can("delete", subject("SpaceMember", member));++ const handleRoleChange = (newRole: MemberRole) => {+ toast.promise(+ changeMemberRole.executeAsync({+ memberId: member.id,+ role: newRole,+ }),+ {+ loading: t("changingRole", {+ defaultValue: "Changing role...",+ }),+ success: t("roleChangedSuccess", {+ defaultValue: "Role changed successfully",+ }),+ error: t("roleChangedError", {+ defaultValue: "Failed to change role",+ }),+ },+ );+ };+return (<><DropdownMenu>@@ -44,13 +79,33 @@ export function MemberDropdownMenu({ member }: { member: MemberDTO }) {</Button></DropdownMenuTrigger><DropdownMenuContent align="end">+ {member.role === "member" ? (+ <DropdownMenuItem+ onClick={() => handleRoleChange("admin")}+ disabled={!canUpdateMember}+ >+ <Icon>+ <ShieldIcon className="size-4" />+ </Icon>+ <Trans i18nKey="makeAdmin" defaults="Make admin" />+ </DropdownMenuItem>+ ) : (+ <DropdownMenuItem+ onClick={() => handleRoleChange("member")}+ disabled={!canUpdateMember}+ >+ <Icon>+ <UserIcon />+ </Icon>+ <Trans i18nKey="makeMember" defaults="Make member" />+ </DropdownMenuItem>+ )}+ <DropdownMenuSeparator /><DropdownMenuItemonClick={() => {removeMemberDialog.trigger();}}- disabled={space- .getMemberAbility()- .cannot("delete", subject("SpaceMember", member))}+ disabled={!canDeleteMember}className="text-destructive"><XIcon className="size-4" />diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.tsindex ca8b87a40..39c0ca388 100644--- a/apps/web/src/features/space/actions.ts+++ b/apps/web/src/features/space/actions.ts@@ -334,3 +334,42 @@ export const removeMemberAction = spaceActionClient}});});++export const changeMemberRoleAction = spaceActionClient+ .metadata({+ actionName: "space_change_member_role",+ })+ .inputSchema(+ z.object({+ memberId: z.string(),+ role: memberRoleSchema,+ }),+ )+ .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("update", subject("SpaceMember", member))+ ) {+ throw new AppError({+ code: "FORBIDDEN",+ message:+ "You do not have permission to change member roles in this space",+ });+ }++ await prisma.spaceMember.update({+ where: {+ id: parsedInput.memberId,+ },+ data: {+ role: toDBRole(parsedInput.role),+ },+ });+ });diff --git a/apps/web/src/features/space/member/ability.ts b/apps/web/src/features/space/member/ability.tsindex ed2bd6009..cd001d586 100644--- a/apps/web/src/features/space/member/ability.ts+++ b/apps/web/src/features/space/member/ability.ts@@ -71,8 +71,8 @@ function defineSpaceAdminRules(spaceId: ctx.space.id,});can("create", "SpaceMemberInvite");- can("delete", "SpaceMember", { spaceId: ctx.space.id });- cannot(["delete", "update"], "SpaceMember", {+ can(["update", "delete"], "SpaceMember", { spaceId: ctx.space.id });+ cannot(["update", "delete"], "SpaceMember", {userId: ctx.user.id,});}