Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
✨ Show invited members (#1874)
Luke Vella6fd87d4dd973
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.jsonindex ee6996b94..bab9c49ff 100644--- a/apps/web/public/locales/en/app.json+++ b/apps/web/public/locales/en/app.json@@ -394,9 +394,6 @@"createSpaceSuccess": "Space created successfully","createSpaceError": "Failed to create space","members": "Members",- "noMembers": "No members found",- "noMembersDescription": "Try adjusting your search",- "searchMembers": "Search members","actionErrorTooManyRequests": "You are making too many requests","owner": "Owner","member": "Member",@@ -436,5 +433,12 @@"makeMember": "Make member","changingRole": "Changing role...","roleChangedSuccess": "Role changed successfully",- "roleChangedError": "Failed to change role"+ "roleChangedError": "Failed to change role",+ "cancelInvite": "Cancel invite",+ "cancelInviteConfirmation": "Are you sure you want to cancel the invite for {email}?",+ "cancelingInvite": "Canceling invite...",+ "inviteCanceledSuccess": "Invite canceled successfully",+ "inviteCanceledError": "Failed to cancel invite",+ "pendingInvites": "Pending Invites",+ "memberInvitedBy": "Invited by {inviterName}"}diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/header.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/header.tsxindex 46ea8c740..4cefc5a10 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/header.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/header.tsx@@ -10,7 +10,6 @@ import {PageHeaderActions,PageTitle,} from "@/app/components/page-layout";-import { SearchInput } from "@/app/components/search-input";import { PayWallDialog } from "@/components/pay-wall-dialog";import { Trans } from "@/components/trans";import { useSpace } from "@/features/space/client";@@ -29,9 +28,6 @@ export function MembersHeader() {<Trans i18nKey="members" defaults="Members" /></PageTitle><PageHeaderActions>- <SearchInput- placeholder={t("searchMembers", { defaultValue: "Search members" })}- /><Buttonvariant="primary"onClick={() => {diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-dropdown-menu.tsxnew file mode 100644index 000000000..0c8491092--- /dev/null+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-dropdown-menu.tsx@@ -0,0 +1,118 @@+"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 { cancelInviteAction } from "@/features/space/actions";+import { useSpace } from "@/features/space/client";+import { useTranslation } from "@/i18n/client";+import { useSafeAction } from "@/lib/safe-action/client";++type SpaceMemberInvite = {+ id: string;+ email: string;+ spaceId: string;+};++export function InviteDropdownMenu({ invite }: { invite: SpaceMemberInvite }) {+ const space = useSpace();+ const cancelInviteDialog = useDialog();+ const cancelInvite = useSafeAction(cancelInviteAction);+ const { t } = useTranslation();++ const canCancelInvite = space+ .getMemberAbility()+ .can("delete", subject("SpaceMemberInvite", invite));++ return (+ <>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button variant="ghost" size="icon">+ <Icon>+ <MoreHorizontalIcon />+ </Icon>+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuItem+ onClick={() => {+ cancelInviteDialog.trigger();+ }}+ disabled={!canCancelInvite}+ className="text-destructive"+ >+ <XIcon className="size-4" />+ <Trans i18nKey="cancelInvite" defaults="Cancel invite" />+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ <Dialog {...cancelInviteDialog.dialogProps}>+ <DialogContent size="sm">+ <DialogHeader>+ <DialogTitle>+ <Trans i18nKey="cancelInvite" defaults="Cancel Invite" />+ </DialogTitle>+ <DialogDescription>+ <Trans+ i18nKey="cancelInviteConfirmation"+ defaults="Are you sure you want to cancel the invite for {email}?"+ values={{ email: invite.email }}+ />+ </DialogDescription>+ </DialogHeader>+ <DialogFooter>+ <Button+ variant="destructive"+ onClick={() => {+ toast.promise(+ cancelInvite.executeAsync({+ inviteId: invite.id,+ }),+ {+ loading: t("cancelingInvite", {+ defaultValue: "Canceling invite...",+ }),+ success: t("inviteCanceledSuccess", {+ defaultValue: "Invite canceled successfully",+ }),+ error: t("inviteCanceledError", {+ defaultValue: "Failed to cancel invite",+ }),+ },+ );+ cancelInviteDialog.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.tsxindex 703905e6d..bc5582039 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx@@ -1,115 +1,100 @@import { Badge } from "@rallly/ui/badge";-import { UserSearchIcon } from "lucide-react";import type { Metadata } from "next";import { notFound } from "next/navigation";+import { InviteDropdownMenu } from "@/app/[locale]/(space)/(dashboard)/members/components/invite-dropdown-menu";import { MemberDropdownMenu } from "@/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu";import { PageContainer, PageContent } from "@/app/components/page-layout";-import {- EmptyState,- EmptyStateDescription,- EmptyStateIcon,- EmptyStateTitle,-} from "@/components/empty-state";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";-import { Pagination } from "@/components/pagination";import { StackedList, StackedListItem } from "@/components/stacked-list";import { Trans } from "@/components/trans";import { SpaceRole } from "@/features/space/components/space-role";import { isSpacesEnabled } from "@/features/space/constants";-import { loadMembers } from "@/features/space/data";+import { loadInvites, loadMembers } from "@/features/space/data";import { getTranslation } from "@/i18n/server";import { MembersHeader } from "./components/header";-import { MembersTabs } from "./components/tabs";-import { searchParamsSchema } from "./schema";-export default async function MembersPage({- searchParams,-}: {- searchParams: Promise<{ [key: string]: string | string[] | undefined }>;-}) {+export default async function MembersPage() {if (!isSpacesEnabled) {return notFound();}- const { page, pageSize, q, role } = searchParamsSchema.parse(- await searchParams,- );-- const members = await loadMembers({- page,- pageSize,- q,- role,- });+ const [members, invites] = await Promise.all([loadMembers(), loadInvites()]);return (<PageContainer><MembersHeader />- <PageContent className="space-y-4">- <MembersTabs value={role}>- {members.data.length === 0 ? (- <EmptyState>- <EmptyStateIcon>- <UserSearchIcon />- </EmptyStateIcon>- <EmptyStateTitle>- <Trans i18nKey="noMembers" defaults="No members found" />- </EmptyStateTitle>- <EmptyStateDescription>- <Trans- i18nKey="noMembersDescription"- defaults="Try adjusting your search"- />- </EmptyStateDescription>- </EmptyState>- ) : (- <>- <StackedList>- {members.data.map((member) => (- <StackedListItem key={member.id}>- <div className="flex flex-1 items-center gap-4">- <OptimizedAvatarImage- src={member.image ?? undefined}- name={member.name}- size="md"- />+ <PageContent className="space-y-6">+ <section className="flex flex-col gap-4">+ <h2 className="font-medium">+ <Trans i18nKey="members" />+ </h2>+ <StackedList>+ {members.data.map((member) => (+ <StackedListItem key={member.id}>+ <div className="flex flex-1 items-center gap-4">+ <OptimizedAvatarImage+ src={member.image ?? undefined}+ name={member.name}+ size="md"+ />+ <div>+ <div className="flex items-center gap-x-2">+ <div className="font-semibold text-sm">{member.name}</div><div>- <div className="flex items-center gap-x-2">- <div className="font-semibold text-sm">- {member.name}- </div>- <div>- {member.isOwner ? (- <Badge>- <Trans i18nKey="owner" defaults="Owner" />- </Badge>- ) : null}- </div>- </div>- <div className="text-muted-foreground text-sm">- {member.email}- </div>+ {member.isOwner ? (+ <Badge>+ <Trans i18nKey="owner" defaults="Owner" />+ </Badge>+ ) : null}</div></div>- <div className="text-sm">- <SpaceRole role={member.role} />+ <div className="text-muted-foreground text-sm">+ {member.email}</div>- <MemberDropdownMenu member={member} />- </StackedListItem>- ))}- </StackedList>- <div>- {members.total > pageSize ? (- <Pagination- currentPage={page}- totalItems={members.total}- pageSize={pageSize}- />- ) : null}- </div>- </>- )}- </MembersTabs>+ </div>+ </div>+ <div className="text-sm">+ <SpaceRole role={member.role} />+ </div>+ <MemberDropdownMenu member={member} />+ </StackedListItem>+ ))}+ </StackedList>+ </section>+ {invites.length > 0 && (+ <section className="flex flex-col gap-4">+ <h2 className="font-medium">+ <Trans i18nKey="pendingInvites" defaults="Pending Invites" />+ </h2>+ <StackedList>+ {invites.map((invite) => (+ <StackedListItem key={invite.id}>+ <div className="flex flex-1 items-center gap-4">+ <OptimizedAvatarImage name={invite.email} size="md" />+ <div>+ <div className="flex items-center gap-x-2">+ <div className="font-semibold text-sm">+ {invite.email}+ </div>+ </div>+ <div className="text-muted-foreground text-sm">+ <Trans+ i18nKey="memberInvitedBy"+ defaults="Invited by {inviterName}"+ values={{ inviterName: invite.invitedBy.name }}+ />+ </div>+ </div>+ </div>+ <div className="text-sm">+ <SpaceRole role={invite.role} />+ </div>+ <InviteDropdownMenu invite={invite} />+ </StackedListItem>+ ))}+ </StackedList>+ </section>+ )}</PageContent></PageContainer>);diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.tsindex 39c0ca388..205bc0b69 100644--- a/apps/web/src/features/space/actions.ts+++ b/apps/web/src/features/space/actions.ts@@ -373,3 +373,43 @@ export const changeMemberRoleAction = spaceActionClient},});});++export const cancelInviteAction = spaceActionClient+ .metadata({+ actionName: "space_cancel_invite",+ })+ .inputSchema(+ z.object({+ inviteId: z.string(),+ }),+ )+ .action(async ({ ctx, parsedInput }) => {+ const invite = await prisma.spaceMemberInvite.findUnique({+ where: { id: parsedInput.inviteId },+ });++ if (!invite) {+ throw new AppError({+ code: "NOT_FOUND",+ message: "Invite not found",+ });+ }++ if (invite.spaceId !== ctx.space.id) {+ throw new AppError({+ code: "FORBIDDEN",+ message: "You do not have access to this invite",+ });+ }++ if (ctx.getMemberAbility().cannot("delete", "SpaceMemberInvite")) {+ throw new AppError({+ code: "FORBIDDEN",+ message: "You do not have permission to cancel invites",+ });+ }++ await prisma.spaceMemberInvite.delete({+ where: { id: parsedInput.inviteId },+ });+ });diff --git a/apps/web/src/features/space/data.ts b/apps/web/src/features/space/data.tsindex c4e4a9437..438834529 100644--- a/apps/web/src/features/space/data.ts+++ b/apps/web/src/features/space/data.ts@@ -1,15 +1,11 @@import { accessibleBy } from "@casl/prisma";-import type {- SpaceMemberRole as DBSpaceMemberRole,- Prisma,-} from "@rallly/database";+import type { SpaceMemberRole as DBSpaceMemberRole } from "@rallly/database";import { prisma } from "@rallly/database";import { cache } from "react";import { requireSpace, requireUser } from "@/auth/data";import type { MemberDTO } from "@/features/space/member/types";-import type { MemberRole } from "@/features/space/schema";import type { SpaceDTO } from "@/features/space/types";-import { fromDBRole, toDBRole } from "@/features/space/utils";+import { fromDBRole } from "@/features/space/utils";import { defineAbilityFor } from "@/features/user/ability";import { isSelfHosted } from "@/utils/constants";@@ -163,80 +159,40 @@ export const loadPaymentMethods = cache(async () => {return paymentMethods;});-export const loadMembers = cache(- async ({- page = 1,- pageSize = 10,- q,- role,- }: {- page?: number;- pageSize?: number;- q?: string;- role?: "all" | MemberRole;- }) => {- const space = await requireSpace();-- const whereClause: Prisma.SpaceMemberWhereInput = {- spaceId: space.id,- ...(q- ? {- user: {- OR: [- {- name: {- contains: q,- mode: "insensitive",- },- },- {- email: {- contains: q,- mode: "insensitive",- },- },- ],- },- }- : {}),- ...(role && role !== "all"- ? {- role: toDBRole(role),- }- : {}),- };+export const loadMembers = cache(async () => {+ const space = await requireSpace();- const [members, totalCount] = await Promise.all([- prisma.spaceMember.findMany({- where: whereClause,- select: {- id: true,- userId: true,- role: true,- spaceId: true,- user: {- select: {- name: true,- email: true,- image: true,- },+ const [members, totalCount] = await Promise.all([+ prisma.spaceMember.findMany({+ where: {+ spaceId: space.id,+ },+ select: {+ id: true,+ userId: true,+ role: true,+ spaceId: true,+ user: {+ select: {+ name: true,+ email: true,+ image: true,},},- skip: (page - 1) * pageSize,- take: pageSize,- }),- prisma.spaceMember.count({- where: whereClause,- }),- ]);+ },+ }),+ prisma.spaceMember.count({+ where: {+ spaceId: space.id,+ },+ }),+ ]);- return {- total: totalCount,- data: members.map((member) => createMemberDTO({ ...member, space })),- hasNextPage: page * pageSize < totalCount,- };- },-);+ return {+ total: totalCount,+ data: members.map((member) => createMemberDTO({ ...member, space })),+ };+});export const getMember = async (id: string) => {const member = await prisma.spaceMember.findUnique({@@ -269,3 +225,30 @@ export const getMember = async (id: string) => {return createMemberDTO(member);};++export const loadInvites = cache(async () => {+ const space = await requireSpace();++ const invites = await prisma.spaceMemberInvite.findMany({+ where: {+ spaceId: space.id,+ },+ include: {+ invitedBy: {+ select: {+ id: true,+ name: true,+ email: true,+ },+ },+ },+ orderBy: {+ createdAt: "desc",+ },+ });++ return invites.map((invite) => ({+ ...invite,+ role: fromDBRole(invite.role),+ }));+});diff --git a/apps/web/src/features/space/member/ability.ts b/apps/web/src/features/space/member/ability.tsindex cd001d586..040a84d41 100644--- a/apps/web/src/features/space/member/ability.ts+++ b/apps/web/src/features/space/member/ability.ts@@ -70,9 +70,9 @@ function defineSpaceAdminRules(can("read", "Subscription", {spaceId: ctx.space.id,});- can("create", "SpaceMemberInvite");+ can(["create", "delete"], "SpaceMemberInvite");can(["update", "delete"], "SpaceMember", { spaceId: ctx.space.id });- cannot(["update", "delete"], "SpaceMember", {+ cannot(["delete", "update"], "SpaceMember", {userId: ctx.user.id,});}