Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
✨ Show role permissions in the invite member dialog (#3116)
Luke Vellaada0b31b34b4
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.jsonindex a978cf369..47b08a1be 100644--- a/apps/web/public/locales/en/app.json+++ b/apps/web/public/locales/en/app.json@@ -38,7 +38,6 @@"adminAccessRequired": "Administrator access required","adminAccessRequiredDescription": "You need administrator access to view this page.","adminAccessRequiredSelfHostedHint": "If you are the owner of this instance, check that INITIAL_ADMIN_EMAIL is set to the email address of the administrator account.",- "adminRoleDescription": "Full member access plus space management and member permissions","adminRoleRequired": "You need to be an admin to perform this action","adminSetup": "Admin setup","adminSetupCta": "Make me an admin",@@ -403,6 +402,11 @@"inviteLink": "Invite link","inviteMember": "Invite member","inviteMemberDescription": "Invite a new member to your space",+ "inviteMemberDialogPermissionAllowed": "Allowed:",+ "inviteMemberDialogPermissionMembers": "Invite and remove members",+ "inviteMemberDialogPermissionNotAllowed": "Not allowed:",+ "inviteMemberDialogPermissionPollsEvents": "Create and manage polls and events",+ "inviteMemberDialogPermissionSettings": "Manage space settings","inviteMemberFormSubmit": "Send invite","inviteMembersUpsellDescription": "Invite members to manage polls and events together in this space.","inviteNotEnoughSeats": "There are not enough seats available to send this invite",@@ -494,7 +498,6 @@"memberCount": "{count, plural, =0 {No members} one {1 member} other {# members}}","memberInactive": "Inactive","memberInvitedBy": "Invited by {inviterName}",- "memberRoleDescription": "Can create and manage all scheduling tools in this space","members": "Members","membersInactiveAlertDescription": "These members lost access when this space's Pro subscription ended. Their seats are kept and access is restored when the space is upgraded again.","membersInactiveAlertTitle": "Members are inactive",@@ -703,7 +706,6 @@"richTextNumberedList": "Numbered list","role": "Role","roleChangedSuccess": "Role changed successfully",- "rolePlaceholder": "Select role...","rsvpCardDescription": "To join this event, please register below.","rsvpCardTitle": "Registration","rsvpNoticeCanceled": "Event canceled",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 512c434ff..d88aea29a 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@@ -27,13 +27,13 @@ import {SelectValue,} from "@rallly/ui/select";import { toast } from "@rallly/ui/sonner";-import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";-import { InfoIcon } from "lucide-react";-import { useMemo } from "react";+import { CheckIcon, XIcon } from "lucide-react";+import React from "react";import { useForm } from "react-hook-form";import * as z from "zod";import { SpaceRole } from "@/features/space/components/space-role";import { inviteMemberAction } from "@/features/space/member/actions";+import type { MemberRole } from "@/features/space/schema";import { memberRoleSchema } from "@/features/space/schema";import { Trans, useTranslation } from "@/i18n/client";import { useSafeAction } from "@/lib/safe-action/client";@@ -41,7 +41,7 @@ import { useSafeAction } from "@/lib/safe-action/client";function useInviteMemberFormSchema() {const { t } = useTranslation();- return useMemo(() => {+ return React.useMemo(() => {return z.object({email: z.email({message: t("invalidEmailAddress", {@@ -53,9 +53,75 @@ function useInviteMemberFormSchema() {}, [t]);}+function RolePermission({+ allowed,+ children,+}: {+ allowed: boolean;+ children: React.ReactNode;+}) {+ return (+ <li className="flex items-center gap-2">+ {allowed ? (+ <CheckIcon className="size-4 shrink-0 text-green-600" />+ ) : (+ <XIcon className="size-4 shrink-0 text-muted-foreground" />+ )}+ <span className="sr-only">+ {allowed ? (+ <Trans+ i18nKey="inviteMemberDialogPermissionAllowed"+ defaults="Allowed:"+ />+ ) : (+ <Trans+ i18nKey="inviteMemberDialogPermissionNotAllowed"+ defaults="Not allowed:"+ />+ )}+ </span>+ <span className={allowed ? undefined : "text-muted-foreground"}>+ {children}+ </span>+ </li>+ );+}++function RolePermissions({ role, id }: { role: MemberRole; id?: string }) {+ const isAdmin = role === "admin";+ return (+ <ul+ id={id}+ aria-live="polite"+ aria-atomic="true"+ className="mt-2 grid gap-2 rounded-lg border border-card-border bg-card p-3 text-sm"+ >+ <RolePermission allowed={true}>+ <Trans+ i18nKey="inviteMemberDialogPermissionPollsEvents"+ defaults="Create and manage polls and events"+ />+ </RolePermission>+ <RolePermission allowed={isAdmin}>+ <Trans+ i18nKey="inviteMemberDialogPermissionMembers"+ defaults="Invite and remove members"+ />+ </RolePermission>+ <RolePermission allowed={isAdmin}>+ <Trans+ i18nKey="inviteMemberDialogPermissionSettings"+ defaults="Manage space settings"+ />+ </RolePermission>+ </ul>+ );+}+export function InviteMemberForm({ onSuccess }: { onSuccess?: () => void }) {const { t } = useTranslation();const formSchema = useInviteMemberFormSchema();+ const rolePermissionsId = React.useId();const form = useForm({defaultValues: {@@ -159,42 +225,9 @@ export function InviteMemberForm({ onSuccess }: { onSuccess?: () => void }) {name="role"render={({ field }) => (<FormItem>- <div className="flex items-center gap-x-1">- <FormLabel>- <Trans i18nKey="role" defaults="Role" />- </FormLabel>- <Tooltip>- <TooltipTrigger type="button">- <InfoIcon className="size-4 shrink-0 text-muted-foreground" />- </TooltipTrigger>- <TooltipContent align="start" side="right">- <div className="w-60 space-y-3">- <div>- <h4 className="font-medium text-sm">- <Trans i18nKey="member" defaults="Member" />- </h4>- <p className="mt-1 opacity-75">- <Trans- i18nKey="memberRoleDescription"- defaults="Can create and manage all scheduling tools in this space"- />- </p>- </div>- <div>- <h4 className="font-medium text-sm">- <Trans i18nKey="admin" defaults="Admin" />- </h4>- <p className="mt-1 opacity-75">- <Trans- i18nKey="adminRoleDescription"- defaults="Full member access plus space management and member permissions"- />- </p>- </div>- </div>- </TooltipContent>- </Tooltip>- </div>+ <FormLabel>+ <Trans i18nKey="role" defaults="Role" />+ </FormLabel><FormControl><Selectitems={Object.values(memberRoleSchema.enum).map((role) => ({@@ -208,12 +241,11 @@ export function InviteMemberForm({ onSuccess }: { onSuccess?: () => void }) {}}value={field.value}>- <SelectTrigger className="w-full">- <SelectValue- placeholder={t("rolePlaceholder", {- defaultValue: "Select role...",- })}- />+ <SelectTrigger+ className="w-full"+ aria-describedby={rolePermissionsId}+ >+ <SelectValue /></SelectTrigger><SelectContent>{Object.values(memberRoleSchema.enum).map((role) => (@@ -224,6 +256,7 @@ export function InviteMemberForm({ onSuccess }: { onSuccess?: () => void }) {</SelectContent></Select></FormControl>+ <RolePermissions role={field.value} id={rolePermissionsId} /></FormItem>)}/>diff --git a/packages/tailwind-config/shared-styles.css b/packages/tailwind-config/shared-styles.cssindex 98b608961..59748c5e9 100644--- a/packages/tailwind-config/shared-styles.css+++ b/packages/tailwind-config/shared-styles.css@@ -107,6 +107,21 @@--card-accent: oklch(0.26 0.006 286.033);}+/*+ * Surface-relative card: inside an elevated surface (dialog, popover) a card+ * steps once more away from that surface — darker in light mode, lighter in+ * dark mode — so it never blends into the surface it sits on. Works because+ * the card utilities resolve var(--card) at the element (@theme inline), so+ * the nearest surface's override wins through normal CSS inheritance.+ */+:where([data-slot="dialog-content"], [data-slot="popover-content"]) {+ --card: var(--color-gray-50);+}++.dark :where([data-slot="dialog-content"], [data-slot="popover-content"]) {+ --card: oklch(0.31 0.006 286.033);+}+@theme inline {--color-primary: var(--primary);--color-primary-foreground: var(--primary-foreground);