Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add group member actions (add, remove)
Marc Seitzb62c1f48067c
diff --git a/components/datarooms/groups/add-member-modal.tsx b/components/datarooms/groups/add-member-modal.tsxindex 7c2a7b7c..0e8ef2fa 100644--- a/components/datarooms/groups/add-member-modal.tsx+++ b/components/datarooms/groups/add-member-modal.tsx@@ -34,6 +34,7 @@ export function AddGroupMemberModal({const [inputValue, setInputValue] = useState<string>("");const [loading, setLoading] = useState<boolean>(false);const teamInfo = useTeam();+ const teamId = teamInfo?.currentTeam?.id;const analytics = useAnalytics();// Email validation regex pattern@@ -71,7 +72,7 @@ export function AddGroupMemberModal({// POST request with multiple emailsconst response = await fetch(- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/groups/${groupId}/members`,+ `/api/teams/${teamId}/datarooms/${dataroomId}/groups/${groupId}/members`,{method: "POST",headers: {@@ -87,22 +88,22 @@ export function AddGroupMemberModal({const error = await response.json();setLoading(false);setOpen(false);- toast.error(error.message || "Failed to send invitations.");+ toast.error(error.message || "Failed to add group members.");return;}- analytics.capture("Dataroom View Invitation Sent", {+ analytics.capture("Dataroom Group Member Added", {inviteeCount: emails.length,- teamId: teamInfo?.currentTeam?.id,+ teamId: teamId,dataroomId: dataroomId,+ groupId: groupId,});- mutate(- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/groups/${groupId}`,- );+ mutate(`/api/teams/${teamId}/datarooms/${dataroomId}/groups/${groupId}`);- toast.success("Invitation emails have been sent!");+ toast.success("Group members added successfully!");setOpen(false);+ setInputValue("");setLoading(false);};diff --git a/components/datarooms/groups/group-member-table.tsx b/components/datarooms/groups/group-member-table.tsxindex 963c4ef9..f3df78d6 100644--- a/components/datarooms/groups/group-member-table.tsx+++ b/components/datarooms/groups/group-member-table.tsx@@ -1,18 +1,10 @@import { useState } from "react";import { useTeam } from "@/context/team-context";-import {- BadgeCheckIcon,- MoreHorizontalIcon,- PlusCircleIcon,- SendIcon,- UserXIcon,- XIcon,-} from "lucide-react";+import { MoreHorizontalIcon, PlusCircleIcon, UserXIcon } from "lucide-react";import { toast } from "sonner";import { mutate } from "swr";-import { AddTeamMembers } from "@/components/teams/add-team-member-modal";import { Button } from "@/components/ui/button";import {DropdownMenu,@@ -31,13 +23,10 @@ import {TableHeader,TableRow,} from "@/components/ui/table";-import { BadgeTooltip } from "@/components/ui/tooltip";import { VisitorAvatar } from "@/components/visitors/visitor-avatar";import { useDataroomGroup } from "@/lib/swr/use-dataroom-groups";-import { timeAgo } from "@/lib/utils";-import { AddViewerModal } from "../add-viewer-modal";import { AddGroupMemberModal } from "./add-member-modal";export default function GroupMemberTable({@@ -48,19 +37,22 @@ export default function GroupMemberTable({groupId: string;}) {const teamInfo = useTeam();+ const teamId = teamInfo?.currentTeam?.id;const { viewerGroupMembers } = useDataroomGroup();const [addMembersOpen, setAddMembersOpen] = useState<boolean>(false);const handleRemoveMember = async (id: string) => {// mutate the data optimistically+ const key = `/api/teams/${teamId}/datarooms/${dataroomId}/groups/${groupId}`;mutate(- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/groups/${groupId}/members`,- (currentData: { viewerGroupMembers: any[] } | undefined) => {+ key,+ (currentData: { members: any[] } | undefined) => {if (!currentData) return currentData;+ console.log(currentData);return {...currentData,- viewerGroupMembers: currentData.viewerGroupMembers.filter(+ viewerGroupMembers: currentData.members.filter((member) => member.id !== id,),};@@ -69,19 +61,23 @@ export default function GroupMemberTable({);const response = await fetch(- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/groups/${groupId}/members/${id}`,- { method: "DELETE" },+ `/api/teams/${teamId}/datarooms/${dataroomId}/groups/${groupId}/members/${id}`,+ {+ method: "DELETE",+ },);if (!response.ok) {+ mutate(key);toast.error("Failed to remove member");return;}+ mutate(key);toast.success("Member removed successfully");};return (- <div className="w-full">+ <div className="l"><div className="mb-2 flex items-center justify-between md:mb-4"><h2>All members</h2><Button@@ -107,7 +103,7 @@ export default function GroupMemberTable({<TableHead>Name</TableHead>{/* <TableHead>Visit Duration</TableHead> */}{/* <TableHead>Last Viewed Document</TableHead> */}- <TableHead>Last Viewed</TableHead>+ {/* <TableHead>Last Viewed</TableHead> */}<TableHead className="text-center"></TableHead></TableRow></TableHeader>@@ -140,24 +136,8 @@ export default function GroupMemberTable({</div></div></TableCell>- {/* Duration */}- {/* <TableCell className="">- <div className="text-sm text-muted-foreground">- {durationFormat(view.totalDuration)}- </div>- </TableCell> */}- {/* Completion */}- {/* <TableCell className="flex justify-start">- <div className="text-sm text-muted-foreground">- <Gauge- value={view.completionRate}- size={"small"}- showValue={true}- />- </div>- </TableCell> */}{/* Last Viewed */}- <TableCell className="text-sm text-muted-foreground">+ {/* <TableCell className="text-sm text-muted-foreground"><timedateTime={new Date(viewer.viewer.updatedAt).toISOString()}>@@ -165,7 +145,7 @@ export default function GroupMemberTable({? timeAgo(viewer.viewer.updatedAt): "-"}</time>- </TableCell>+ </TableCell> */}{/* Actions */}<TableCell className="p-0 text-center"><DropdownMenu>@@ -198,12 +178,6 @@ export default function GroupMemberTable({<TableCell className="min-w-[100px]"><Skeleton className="h-6 w-full" /></TableCell>- <TableCell className="min-w-[450px]">- <Skeleton className="h-6 w-full" />- </TableCell>- <TableCell>- <Skeleton className="h-6 w-24" />- </TableCell><TableCell><Skeleton className="h-6 w-24" /></TableCell>diff --git a/components/datarooms/groups/group-navigation.tsx b/components/datarooms/groups/group-navigation.tsxnew file mode 100644index 00000000..11fad8e8--- /dev/null+++ b/components/datarooms/groups/group-navigation.tsx@@ -0,0 +1,59 @@+import Link from "next/link";+import { useRouter } from "next/router";++import { CogIcon, FileSlidersIcon, UsersIcon } from "lucide-react";++import { cn } from "@/lib/utils";++export const GroupNavigation = ({+ dataroomId,+ viewerGroupId,+}: {+ dataroomId: string;+ viewerGroupId: string;+}) => {+ const router = useRouter();+ console.log(router.pathname);++ return (+ <nav className="grid space-y-1 text-sm">+ <Link+ href={`/datarooms/${dataroomId}/groups/${viewerGroupId}`}+ className={cn(+ "flex items-center gap-x-2 rounded-md p-2 text-primary hover:bg-muted",+ {+ "bg-muted font-medium":+ router.pathname === `/datarooms/[id]/groups/[groupId]`,+ },+ )}+ >+ <CogIcon className="h-4 w-4" />+ General+ </Link>+ <Link+ href={`/datarooms/${dataroomId}/groups/${viewerGroupId}/members`}+ className={cn(+ "flex items-center gap-x-2 rounded-md p-2 text-primary hover:bg-muted",+ {+ "bg-muted font-medium": router.pathname.includes("members"),+ },+ )}+ >+ <UsersIcon className="h-4 w-4" />+ Members+ </Link>+ <Link+ href={`/datarooms/${dataroomId}/groups/${viewerGroupId}/permissions`}+ className={cn(+ "flex items-center gap-x-2 rounded-md p-2 text-primary hover:bg-muted",+ {+ "bg-muted font-medium": router.pathname.includes("permissions"),+ },+ )}+ >+ <FileSlidersIcon className="h-4 w-4" />+ Permissions+ </Link>+ </nav>+ );+};diff --git a/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/members/[memberId].ts b/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/members/[memberId].tsnew file mode 100644index 00000000..9c20a9ef--- /dev/null+++ b/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/members/[memberId].ts@@ -0,0 +1,61 @@+import { NextApiRequest, NextApiResponse } from "next";++import { authOptions } from "@/pages/api/auth/[...nextauth]";+import { getServerSession } from "next-auth";++import { errorhandler } from "@/lib/errorHandler";+import prisma from "@/lib/prisma";+import { CustomUser } from "@/lib/types";++export default async function handle(+ req: NextApiRequest,+ res: NextApiResponse,+) {+ if (req.method === "DELETE") {+ // DELETE /api/teams/:teamId/datarooms/:id/groups/:groupId/members/:memberId+ const session = await getServerSession(req, res, authOptions);+ if (!session) {+ return res.status(401).end("Unauthorized");+ }++ const {+ teamId,+ id: dataroomId,+ groupId,+ memberId,+ } = req.query as {+ teamId: string;+ id: string;+ groupId: string;+ memberId: string;+ };+ const userId = (session.user as CustomUser).id;++ try {+ const team = await prisma.team.findUnique({+ where: {+ id: teamId,+ users: {+ some: {+ userId,+ },+ },+ },+ });++ if (!team) {+ return res.status(401).json("Unauthorized");+ }++ await prisma.viewerGroupMembership.delete({+ where: { id: memberId },+ });+ return res.status(204).end();+ } catch (error) {+ errorhandler(error, res);+ }+ } else {+ res.setHeader("Allow", ["DELETE"]);+ return res.status(405).end(`Method ${req.method} Not Allowed`);+ }+}diff --git a/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/members.ts b/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/members/index.tssimilarity index 93%rename from pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/members.tsrename to pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/members/index.tsindex ce9fd506..3f42e03e 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/members.ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/members/index.ts@@ -3,10 +3,8 @@ import { NextApiRequest, NextApiResponse } from "next";import { authOptions } from "@/pages/api/auth/[...nextauth]";import { getServerSession } from "next-auth/next";-import { errorhandler } from "@/lib/errorHandler";import prisma from "@/lib/prisma";import { CustomUser } from "@/lib/types";-import { log } from "@/lib/utils";export default async function handle(req: NextApiRequest,@@ -95,8 +93,8 @@ export default async function handle(res.status(500).json({ error: "Error creating folder" });}} else {- // We only allow GET, POST requests- res.setHeader("Allow", ["GET", "POST"]);+ // We only allow POST requests+ res.setHeader("Allow", ["POST"]);return res.status(405).end(`Method ${req.method} Not Allowed`);}}diff --git a/pages/datarooms/[id]/groups/[groupId]/members.tsx b/pages/datarooms/[id]/groups/[groupId]/members.tsxindex e9ff2e99..6f56b3ae 100644--- a/pages/datarooms/[id]/groups/[groupId]/members.tsx+++ b/pages/datarooms/[id]/groups/[groupId]/members.tsx@@ -1,48 +1,18 @@-import Link from "next/link";--import { useState } from "react";--import { ViewerGroup } from "@prisma/client";-import {- ChevronRight,- ChevronRightIcon,- CogIcon,- FileSlidersIcon,- UsersIcon,-} from "lucide-react";--import { AddViewerModal } from "@/components/datarooms/add-viewer-modal";import { DataroomHeader } from "@/components/datarooms/dataroom-header";import { DataroomNavigation } from "@/components/datarooms/dataroom-navigation";-import { AddGroupModal } from "@/components/datarooms/groups/add-group-modal";-import GroupCard from "@/components/datarooms/groups/group-card";+import { GroupHeader } from "@/components/datarooms/groups/group-header";import GroupMemberTable from "@/components/datarooms/groups/group-member-table";+import { GroupNavigation } from "@/components/datarooms/groups/group-navigation";import AppLayout from "@/components/layouts/app";-import { BreadcrumbSeparator } from "@/components/ui/breadcrumb";-import { Button } from "@/components/ui/button";-import {- Select,- SelectContent,- SelectItem,- SelectTrigger,- SelectValue,-} from "@/components/ui/select";-import DataroomViewersTable from "@/components/visitors/dataroom-viewers";import { useDataroom } from "@/lib/swr/use-dataroom";import { useDataroomGroup } from "@/lib/swr/use-dataroom-groups";-export default function DataroomGroupPage({- groups,-}: {- groups: ViewerGroup[];-}) {+export default function DataroomGroupPage() {const { dataroom } = useDataroom();const { viewerGroup } = useDataroomGroup();- const [modalOpen, setModalOpen] = useState<boolean>(false);-- if (!dataroom) {+ if (!dataroom || !viewerGroup) {return <div>Loading...</div>;}@@ -59,43 +29,16 @@ export default function DataroomGroupPage({<DataroomNavigation dataroomId={dataroom.id} /></header>- <div className="mx-auto flex w-full items-center gap-2">- <Link href={`/datarooms/${dataroom.id}/groups`}>- <h2 className="text-lg">All Groups</h2>- </Link>- <ChevronRightIcon className="h-4 w-4" />- <h2 className="text-lg font-semibold text-primary">- {viewerGroup?.name ?? "Management Team"}- </h2>- </div>- <div className="mx-auto grid w-full items-start gap-4 md:grid-cols-[180px_1fr] lg:grid-cols-[250px_1fr]">- <nav className="grid text-sm text-muted-foreground">- <Link- href={`/datarooms/${dataroom.id}/groups/${viewerGroup?.id}`}- className="flex items-center gap-x-2 rounded-md p-2 text-primary hover:bg-muted"- >- <CogIcon className="h-4 w-4" />- General- </Link>- <Link- href={`/datarooms/${dataroom.id}/groups/${viewerGroup?.id}/members`}- className="flex items-center gap-x-2 rounded-md bg-muted p-2 font-medium text-primary"- >- <UsersIcon className="h-4 w-4" />- Members- </Link>- <Link- href={`/datarooms/${dataroom.id}/groups/${viewerGroup?.id}/permissions`}- className="flex items-center gap-x-2 p-2 text-primary hover:bg-muted"- >- <FileSlidersIcon className="h-4 w-4" />- Permissions- </Link>- </nav>+ <GroupHeader dataroomId={dataroom.id} groupName={viewerGroup.name} />+ <div className="mx-auto grid w-full items-start gap-6 md:grid-cols-[180px_1fr] lg:grid-cols-[250px_1fr]">+ <GroupNavigation+ dataroomId={dataroom.id}+ viewerGroupId={viewerGroup.id}+ /><div className="grid gap-6"><GroupMemberTabledataroomId={dataroom.id}- groupId={viewerGroup?.id!}+ groupId={viewerGroup.id}/></div></div>