Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add unified ask every time permissions modal
Marc Seitz1437d9c1e1be
diff --git a/components/datarooms/dataroom-document-card.tsx b/components/datarooms/dataroom-document-card.tsxindex f00a6034..844ca45c 100644--- a/components/datarooms/dataroom-document-card.tsx+++ b/components/datarooms/dataroom-document-card.tsx@@ -34,7 +34,7 @@ import {import { AddToDataroomModal } from "../documents/add-document-to-dataroom-modal";import FileProcessStatusBar from "../documents/file-process-status-bar";-import { SetGroupPermissionsModal } from "./groups/set-group-permissions-modal";+import { SetUnifiedPermissionsModal } from "./groups/set-unified-permissions-modal";import { MoveToDataroomFolderModal } from "./move-dataroom-folder-modal";type DocumentsCardProps = {@@ -342,7 +342,7 @@ export default function DataroomDocumentCard({/>) : null}{groupPermissionOpen ? (- <SetGroupPermissionsModal+ <SetUnifiedPermissionsModalopen={groupPermissionOpen}setOpen={setGroupPermissionOpen}dataroomId={dataroomId}diff --git a/components/datarooms/dataroom-items-list.tsx b/components/datarooms/dataroom-items-list.tsxindex 506c9e7e..fa4a1ed8 100644--- a/components/datarooms/dataroom-items-list.tsx+++ b/components/datarooms/dataroom-items-list.tsx@@ -40,6 +40,7 @@ import { useMediaQuery } from "@/lib/utils/use-media-query";import { useRemoveDataroomItemsModal } from "@/components/datarooms/actions/remove-document-modal";import DataroomDocumentCard from "@/components/datarooms/dataroom-document-card";+import { SetUnifiedPermissionsModal } from "@/components/datarooms/groups/set-unified-permissions-modal";import { useDeleteFolderModal } from "@/components/documents/actions/delete-folder-modal";import { DraggableItem } from "@/components/documents/drag-and-drop/draggable-item";import { DroppableFolder } from "@/components/documents/drag-and-drop/droppable-folder";@@ -56,7 +57,6 @@ import UploadZone, {} from "@/components/upload-zone";import { itemsMessage } from "./folders/utils";-import { SetGroupPermissionsModal } from "./groups/set-group-permissions-modal";import { MoveToDataroomFolderModal } from "./move-dataroom-folder-modal";type FolderOrDocument =@@ -733,7 +733,7 @@ export function DataroomItemsList({) : null}{showGroupPermissions && dataroomId && (- <SetGroupPermissionsModal+ <SetUnifiedPermissionsModalopen={showGroupPermissions}setOpen={setShowGroupPermissions}dataroomId={dataroomId}@@ -742,7 +742,6 @@ export function DataroomItemsList({setShowGroupPermissions(false);setUploadedFiles([]);}}- isAutoOpen/>)}<DeleteFolderModal />diff --git a/components/datarooms/groups/set-group-permissions-modal.tsx b/components/datarooms/groups/set-group-permissions-modal.tsxdeleted file mode 100644index 0ce2b03f..00000000--- a/components/datarooms/groups/set-group-permissions-modal.tsx+++ /dev/null@@ -1,452 +0,0 @@-import { useEffect, useMemo, useState } from "react";--import { useTeam } from "@/context/team-context";-import { ItemType } from "@prisma/client";-import {- ArrowDownToLineIcon,- ArrowLeftIcon,- EyeIcon,- EyeOffIcon,- FileTextIcon,- Loader2,-} from "lucide-react";-import { toast } from "sonner";-import { mutate } from "swr";--import useDataroomGroups from "@/lib/swr/use-dataroom-groups";-import { cn } from "@/lib/utils";--import CloudDownloadOff from "@/components/shared/icons/cloud-download-off";-import { Button } from "@/components/ui/button";-import {- Dialog,- DialogContent,- DialogDescription,- DialogFooter,- DialogHeader,- DialogTitle,-} from "@/components/ui/dialog";-import {- Table,- TableBody,- TableCell,- TableHead,- TableHeader,- TableRow,-} from "@/components/ui/table";-import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";--type GroupPermissions = Record<string, { view: boolean; download: boolean }>;--export function SetGroupPermissionsModal({- open,- setOpen,- dataroomId,- onComplete,- isAutoOpen,- uploadedFiles,-}: {- open: boolean;- setOpen: (open: boolean) => void;- dataroomId: string;- onComplete?: () => void;- isAutoOpen?: boolean;- uploadedFiles: {- documentId: string;- dataroomDocumentId: string;- fileName: string;- }[];-}) {- const teamInfo = useTeam();- const teamId = teamInfo?.currentTeam?.id;- const [selectedFile, setSelectedFile] = useState<{- documentId: string;- dataroomDocumentId: string;- fileName: string;- } | null>(null);- const [showFileList, setShowFileList] = useState<boolean>(- uploadedFiles.length > 1,- );-- const currentDocumentId = useMemo(() => {- return selectedFile?.documentId || uploadedFiles[0]?.documentId;- }, [selectedFile, uploadedFiles]);-- const currentDataroomDocumentId = useMemo(() => {- return (- selectedFile?.dataroomDocumentId || uploadedFiles[0]?.dataroomDocumentId- );- }, [selectedFile, uploadedFiles]);-- const {- viewerGroups,- loading: viewerGroupsLoading,- mutate: mutateGroups,- } = useDataroomGroups({- documentId: currentDataroomDocumentId,- });- const [loading, setLoading] = useState(false);- const [selectedGroups, setSelectedGroups] = useState<GroupPermissions>({});-- useEffect(() => {- if (uploadedFiles.length === 1) {- setSelectedFile(uploadedFiles[0]);- setShowFileList(false);- } else {- setShowFileList(true);- }- }, [uploadedFiles]);-- useEffect(() => {- if (selectedFile) {- mutateGroups();- }- }, [selectedFile, mutateGroups]);-- useEffect(() => {- if (viewerGroups) {- const initialGroups = viewerGroups.reduce<GroupPermissions>(- (acc, group) => ({- ...acc,- [group.id]: {- view: group.accessControls?.[0]?.canView ?? false,- download: group.accessControls?.[0]?.canDownload ?? false,- },- }),- {},- );- setSelectedGroups(initialGroups);- }- }, [viewerGroups]);-- const handleSubmit = async (event: React.FormEvent) => {- event.preventDefault();- setLoading(true);-- try {- await Promise.all(- Object.entries(selectedGroups).map(([groupId, permissions]) => {- return fetch(- `/api/teams/${teamId}/datarooms/${dataroomId}/groups/${groupId}/permissions`,- {- method: "POST",- headers: {- "Content-Type": "application/json",- },- body: JSON.stringify({- dataroomId,- groupId,- permissions: {- [currentDataroomDocumentId]: {- itemType: ItemType.DATAROOM_DOCUMENT,- view: permissions.view,- download: permissions.download,- },- },- }),- },- );- }),- );-- toast.success("Group permissions updated successfully!");-- await Promise.all([- mutateGroups(),- mutate(- `/api/teams/${teamId}/datarooms/${dataroomId}/groups?documentId=${currentDocumentId}`,- ),- ]);-- if (uploadedFiles.length > 1) {- setShowFileList(true);- } else {- onComplete?.();- setOpen(false);- }- } catch (error) {- console.error("Error updating group permissions:", error);- toast.error("Failed to update group permissions");- } finally {- setLoading(false);- }- };-- const handleBack = () => {- setShowFileList(true);- };-- const updatePermissions = (groupId: string, newPermissions: string[]) => {- const hasView = newPermissions.includes("view");- const hasDownload = newPermissions.includes("download");-- const prevPermissions = selectedGroups[groupId] || {- view: false,- download: false,- };-- if (- hasDownload &&- !hasView &&- !prevPermissions.view &&- !prevPermissions.download- ) {- newPermissions = ["view", "download"];- } else if (hasDownload && !hasView) {- newPermissions = [];- }-- setSelectedGroups((prev) => ({- ...prev,- [groupId]: {- view: newPermissions.includes("view"),- download: newPermissions.includes("download"),- },- }));- };-- const handleFileSelect = (file: (typeof uploadedFiles)[0]) => {- setSelectedFile(file);- setShowFileList(false);- mutateGroups();- };-- return (- <Dialog open={open} onOpenChange={setOpen}>- <DialogContent className="sm:max-w-[600px]">- <DialogHeader className="w-[90%]">- <div className="flex items-center gap-2">- {!showFileList && uploadedFiles.length > 1 && (- <Button- variant="ghost"- size="icon"- onClick={handleBack}- className="h-8 w-8"- >- <ArrowLeftIcon className="h-4 w-4" />- </Button>- )}- <div>- <DialogTitle>Set Group Permissions</DialogTitle>- <DialogDescription>- {showFileList- ? "Select a file to set permissions"- : "Update group permissions for the selected file"}- </DialogDescription>- </div>- </div>- </DialogHeader>-- {showFileList ? (- <div className="space-y-2">- {uploadedFiles.map((file) => (- <div- key={file.documentId}- className={cn(- "flex cursor-pointer items-center justify-between rounded-lg border p-3",- selectedFile?.documentId === file.documentId- ? "border-primary bg-primary/5"- : "hover:bg-muted/50",- )}- onClick={() => handleFileSelect(file)}- >- <div className="flex items-center space-x-3">- <FileTextIcon className="h-5 w-5" />- <span>{file.fileName}</span>- </div>- {selectedFile?.documentId === file.documentId && (- <div className="text-sm text-primary">Selected</div>- )}- </div>- ))}- </div>- ) : (- <>- <div>- <p className="text-sm font-medium">Selected File</p>- <div className="mt-1 flex items-center space-x-2 rounded-lg border p-3">- <FileTextIcon className="h-5 w-5" />- <span>- {selectedFile?.fileName || uploadedFiles[0]?.fileName}- </span>- </div>- </div>-- <form onSubmit={handleSubmit}>- <div className="rounded-md border">- <div className="max-h-[400px] overflow-y-auto">- <Table>- <TableHeader className="sticky top-0 z-10 bg-secondary">- <TableRow>- <TableHead className="w-[60%]">Group</TableHead>- <TableHead className="w-[20%] text-center">- View- </TableHead>- <TableHead className="w-[20%] text-center">- Download- </TableHead>- </TableRow>- </TableHeader>- <TableBody className="relative">- {viewerGroupsLoading ? (- <TableRow>- <TableCell colSpan={3} className="w-full text-center">- <Loader2 className="m-auto h-5 w-5 animate-spin" />- </TableCell>- </TableRow>- ) : viewerGroups && viewerGroups.length > 0 ? (- viewerGroups?.map((group) => (- <TableRow key={group.id}>- <TableCell>- <div>- <p className="font-medium">{group.name}</p>- <p className="text-sm text-muted-foreground">- {group._count.members} members- </p>- </div>- </TableCell>- <TableCell className="text-center">- <ToggleGroup- type="multiple"- value={Object.entries(- selectedGroups[group.id] || {},- )- .filter(- ([key, value]) => key === "view" && value,- )- .map(([key, _]) => key)}- onValueChange={(value) => {- const currentPermissions = Object.entries(- selectedGroups[group.id] || {},- )- .filter(([_, val]) => val)- .map(([key, _]) => key);-- if (- currentPermissions.includes("view") &&- !value.includes("view")- ) {- const newPerms = currentPermissions.filter(- (p) => p !== "view" && p !== "download",- );- updatePermissions(group.id, newPerms);- } else if (- !currentPermissions.includes("view") &&- value.includes("view")- ) {- const newPerms = [- ...currentPermissions,- "view",- ];- updatePermissions(group.id, newPerms);- }- }}- className="justify-center"- >- <ToggleGroupItem- value="view"- aria-label="Toggle view"- size="sm"- className={cn(- "px-3 py-1 text-muted-foreground hover:ring-1 hover:ring-gray-400 data-[state=on]:bg-foreground data-[state=on]:text-background",- selectedGroups[group.id]?.view- ? "data-[state=on]:bg-foreground data-[state=on]:text-background"- : "",- )}- >- {selectedGroups[group.id]?.view ? (- <EyeIcon className="h-5 w-5" />- ) : (- <EyeOffIcon className="h-5 w-5" />- )}- </ToggleGroupItem>- </ToggleGroup>- </TableCell>- <TableCell className="text-center">- <ToggleGroup- type="multiple"- value={Object.entries(- selectedGroups[group.id] || {},- )- .filter(- ([key, value]) =>- key === "download" && value,- )- .map(([key, _]) => key)}- onValueChange={(value) => {- const currentPermissions = Object.entries(- selectedGroups[group.id] || {},- )- .filter(([_, val]) => val)- .map(([key, _]) => key);-- if (- value.includes("download") &&- !currentPermissions.includes("view")- ) {- const newPerms = [- ...currentPermissions,- "view",- "download",- ];- updatePermissions(group.id, newPerms);- } else {- const newPerms = currentPermissions.filter(- (p) => p !== "download",- );- if (value.includes("download")) {- newPerms.push("download");- }- updatePermissions(group.id, newPerms);- }- }}- className="justify-center"- >- <ToggleGroupItem- value="download"- aria-label="Toggle download"- size="sm"- className={cn(- "px-3 py-1 text-muted-foreground hover:ring-1 hover:ring-gray-400 data-[state=on]:bg-foreground data-[state=on]:text-background",- selectedGroups[group.id]?.download- ? "data-[state=on]:bg-foreground data-[state=on]:text-background"- : "",- )}- >- {selectedGroups[group.id]?.download ? (- <ArrowDownToLineIcon className="h-5 w-5" />- ) : (- <CloudDownloadOff className="h-5 w-5" />- )}- </ToggleGroupItem>- </ToggleGroup>- </TableCell>- </TableRow>- ))- ) : !viewerGroupsLoading && viewerGroups?.length === 0 ? (- <TableRow>- <TableCell colSpan={3} className="w-full text-center">- No groups found- </TableCell>- </TableRow>- ) : null}- </TableBody>- </Table>- </div>- </div>- <DialogFooter className="mt-6">- <Button- type="submit"- loading={loading}- disabled={!viewerGroups || viewerGroups.length === 0}- >- Save permissions- </Button>- </DialogFooter>- </form>- </>- )}- </DialogContent>- </Dialog>- );-}diff --git a/components/datarooms/groups/set-unified-permissions-modal.tsx b/components/datarooms/groups/set-unified-permissions-modal.tsxnew file mode 100644index 00000000..ad47aac2--- /dev/null+++ b/components/datarooms/groups/set-unified-permissions-modal.tsx@@ -0,0 +1,1099 @@+import { useCallback, useEffect, useMemo, useState } from "react";++import { useTeam } from "@/context/team-context";+import { ItemType } from "@prisma/client";+import {+ ArrowDownToLineIcon,+ ArrowLeftIcon,+ EyeIcon,+ EyeOffIcon,+ FileTextIcon,+ LinkIcon,+ Loader2,+ Users,+} from "lucide-react";+import { toast } from "sonner";+import { mutate } from "swr";++import { useDataroomLinks } from "@/lib/swr/use-dataroom";+import useDataroomGroups from "@/lib/swr/use-dataroom-groups";+import useDataroomPermissionGroups from "@/lib/swr/use-dataroom-permission-groups";+import { cn } from "@/lib/utils";++import CloudDownloadOff from "@/components/shared/icons/cloud-download-off";+import { Button } from "@/components/ui/button";+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from "@/components/ui/dialog";+import {+ Table,+ TableBody,+ TableCell,+ TableHead,+ TableHeader,+ TableRow,+} from "@/components/ui/table";+import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";++type GroupPermissions = Record<string, { view: boolean; download: boolean }>;+type LinkPermissions = Record<string, { view: boolean; download: boolean }>;++export function SetUnifiedPermissionsModal({+ open,+ setOpen,+ dataroomId,+ onComplete,+ uploadedFiles,+}: {+ open: boolean;+ setOpen: (open: boolean) => void;+ dataroomId: string;+ onComplete?: () => void;+ uploadedFiles: {+ documentId: string;+ dataroomDocumentId: string;+ fileName: string;+ }[];+}) {+ const teamInfo = useTeam();+ const teamId = teamInfo?.currentTeam?.id;+ const [selectedFile, setSelectedFile] = useState<{+ documentId: string;+ dataroomDocumentId: string;+ fileName: string;+ } | null>(null);++ // Computed values instead of useEffect + useState+ const { showFileList, defaultSelectedFile } = useMemo(() => {+ const shouldShowFileList = uploadedFiles.length > 1;+ const defaultFile = uploadedFiles.length === 1 ? uploadedFiles[0] : null;+ return {+ showFileList: shouldShowFileList,+ defaultSelectedFile: defaultFile,+ };+ }, [uploadedFiles]);++ const [showFileListState, setShowFileListState] = useState(showFileList);++ // Initialize selectedFile on mount or when uploadedFiles changes+ useEffect(() => {+ if (defaultSelectedFile && !selectedFile) {+ setSelectedFile(defaultSelectedFile);+ setShowFileListState(false);+ } else if (!defaultSelectedFile) {+ setShowFileListState(true);+ }+ }, [defaultSelectedFile, selectedFile]);++ const currentDocumentId = useMemo(() => {+ return selectedFile?.documentId || uploadedFiles[0]?.documentId;+ }, [selectedFile, uploadedFiles]);++ const currentDataroomDocumentId = useMemo(() => {+ return (+ selectedFile?.dataroomDocumentId || uploadedFiles[0]?.dataroomDocumentId+ );+ }, [selectedFile, uploadedFiles]);++ // Fetch viewer groups+ const {+ viewerGroups,+ loading: viewerGroupsLoading,+ mutate: mutateViewerGroups,+ } = useDataroomGroups({+ documentId: currentDataroomDocumentId,+ });++ // Fetch links and permission groups+ const { links, loading: linksLoading } = useDataroomLinks();+ const { permissionGroups, loading: permissionGroupsLoading } =+ useDataroomPermissionGroups();++ const [loading, setLoading] = useState(false);+ // Track permissions per file using dataroomDocumentId as key+ const [filePermissions, setFilePermissions] = useState<+ Record<+ string,+ {+ groupPermissions: GroupPermissions;+ linkPermissions: LinkPermissions;+ }+ >+ >({});+ // Track which files have been saved+ const [savedFiles, setSavedFiles] = useState<Set<string>>(new Set());++ // Current file permissions (derived from filePermissions)+ const selectedGroupPermissions = useMemo(() => {+ return currentDataroomDocumentId+ ? filePermissions[currentDataroomDocumentId]?.groupPermissions || {}+ : {};+ }, [filePermissions, currentDataroomDocumentId]);++ const selectedLinkPermissions = useMemo(() => {+ return currentDataroomDocumentId+ ? filePermissions[currentDataroomDocumentId]?.linkPermissions || {}+ : {};+ }, [filePermissions, currentDataroomDocumentId]);++ // Memoize links with permission groups to avoid recalculation+ const linksWithPermissionGroups = useMemo(() => {+ if (!links || !permissionGroups) return [];++ return links+ .filter(+ (link) =>+ link.permissionGroupId &&+ permissionGroups.some((pg) => pg.id === link.permissionGroupId),+ )+ .map((link) => ({+ ...link,+ permissionGroup: permissionGroups.find(+ (pg) => pg.id === link.permissionGroupId,+ ),+ }));+ }, [links, permissionGroups]);++ // Refetch viewer groups when selectedFile changes+ useEffect(() => {+ if (selectedFile) {+ mutateViewerGroups();+ }+ }, [selectedFile, mutateViewerGroups]);++ // Memoize initial group permissions instead of useEffect+ const initialGroupPermissions = useMemo(() => {+ if (!viewerGroups) return {};++ return viewerGroups.reduce<GroupPermissions>(+ (acc, group) => ({+ ...acc,+ [group.id]: {+ view: group.accessControls?.[0]?.canView ?? false,+ download: group.accessControls?.[0]?.canDownload ?? false,+ },+ }),+ {},+ );+ }, [viewerGroups]);++ // Memoize initial link permissions instead of useEffect+ const initialLinkPermissions = useMemo(() => {+ if (!linksWithPermissionGroups || !currentDataroomDocumentId) return {};++ return linksWithPermissionGroups.reduce<LinkPermissions>((acc, link) => {+ const documentPermission = link.permissionGroup?.accessControls?.find(+ (ac) => ac.itemId === currentDataroomDocumentId,+ );+ return {+ ...acc,+ [link.id]: {+ view: documentPermission?.canView ?? false,+ download: documentPermission?.canDownload ?? false,+ },+ };+ }, {});+ }, [linksWithPermissionGroups, currentDataroomDocumentId]);++ // Update state when initial permissions change+ useEffect(() => {+ if (currentDataroomDocumentId) {+ setFilePermissions((prev) => ({+ ...prev,+ [currentDataroomDocumentId]: {+ groupPermissions: initialGroupPermissions,+ linkPermissions:+ prev[currentDataroomDocumentId]?.linkPermissions || {},+ },+ }));+ }+ }, [initialGroupPermissions, currentDataroomDocumentId]);++ useEffect(() => {+ if (currentDataroomDocumentId) {+ setFilePermissions((prev) => ({+ ...prev,+ [currentDataroomDocumentId]: {+ groupPermissions:+ prev[currentDataroomDocumentId]?.groupPermissions || {},+ linkPermissions: initialLinkPermissions,+ },+ }));+ }+ }, [initialLinkPermissions, currentDataroomDocumentId]);++ // Memoize permission update handlers to avoid recreation+ const updateGroupPermissions = useCallback(+ (groupId: string, newPermissions: string[]) => {+ if (!currentDataroomDocumentId) return;++ const hasView = newPermissions.includes("view");+ const hasDownload = newPermissions.includes("download");++ const prevPermissions = selectedGroupPermissions[groupId] || {+ view: false,+ download: false,+ };++ let finalPermissions = newPermissions;++ if (+ hasDownload &&+ !hasView &&+ !prevPermissions.view &&+ !prevPermissions.download+ ) {+ finalPermissions = ["view", "download"];+ } else if (hasDownload && !hasView) {+ finalPermissions = [];+ }++ setFilePermissions((prev) => ({+ ...prev,+ [currentDataroomDocumentId]: {+ groupPermissions: {+ ...prev[currentDataroomDocumentId]?.groupPermissions,+ [groupId]: {+ view: finalPermissions.includes("view"),+ download: finalPermissions.includes("download"),+ },+ },+ linkPermissions:+ prev[currentDataroomDocumentId]?.linkPermissions || {},+ },+ }));+ },+ [selectedGroupPermissions, currentDataroomDocumentId],+ );++ const updateLinkPermissions = useCallback(+ (linkId: string, newPermissions: string[]) => {+ if (!currentDataroomDocumentId) return;++ const hasView = newPermissions.includes("view");+ const hasDownload = newPermissions.includes("download");++ const prevPermissions = selectedLinkPermissions[linkId] || {+ view: false,+ download: false,+ };++ let finalPermissions = newPermissions;++ if (+ hasDownload &&+ !hasView &&+ !prevPermissions.view &&+ !prevPermissions.download+ ) {+ finalPermissions = ["view", "download"];+ } else if (hasDownload && !hasView) {+ finalPermissions = [];+ }++ setFilePermissions((prev) => ({+ ...prev,+ [currentDataroomDocumentId]: {+ groupPermissions:+ prev[currentDataroomDocumentId]?.groupPermissions || {},+ linkPermissions: {+ ...prev[currentDataroomDocumentId]?.linkPermissions,+ [linkId]: {+ view: finalPermissions.includes("view"),+ download: finalPermissions.includes("download"),+ },+ },+ },+ }));+ },+ [selectedLinkPermissions, currentDataroomDocumentId],+ );++ // Memoize bulk actions to avoid recreation+ const enableViewForAll = useCallback(() => {+ if (!currentDataroomDocumentId) return;++ // Enable view for all viewer groups+ const newGroupPermissions = { ...selectedGroupPermissions };+ viewerGroups?.forEach((group) => {+ newGroupPermissions[group.id] = {+ ...newGroupPermissions[group.id],+ view: true,+ };+ });++ // Enable view for all links+ const newLinkPermissions = { ...selectedLinkPermissions };+ linksWithPermissionGroups?.forEach((link) => {+ newLinkPermissions[link.id] = {+ ...newLinkPermissions[link.id],+ view: true,+ };+ });++ setFilePermissions((prev) => ({+ ...prev,+ [currentDataroomDocumentId]: {+ groupPermissions: newGroupPermissions,+ linkPermissions: newLinkPermissions,+ },+ }));+ }, [+ selectedGroupPermissions,+ selectedLinkPermissions,+ viewerGroups,+ linksWithPermissionGroups,+ currentDataroomDocumentId,+ ]);++ const enableDownloadForAll = useCallback(() => {+ if (!currentDataroomDocumentId) return;++ // Enable view + download for all viewer groups+ const newGroupPermissions = { ...selectedGroupPermissions };+ viewerGroups?.forEach((group) => {+ newGroupPermissions[group.id] = {+ view: true,+ download: true,+ };+ });++ // Enable view + download for all links+ const newLinkPermissions = { ...selectedLinkPermissions };+ linksWithPermissionGroups?.forEach((link) => {+ newLinkPermissions[link.id] = {+ view: true,+ download: true,+ };+ });++ setFilePermissions((prev) => ({+ ...prev,+ [currentDataroomDocumentId]: {+ groupPermissions: newGroupPermissions,+ linkPermissions: newLinkPermissions,+ },+ }));+ }, [+ selectedGroupPermissions,+ selectedLinkPermissions,+ viewerGroups,+ linksWithPermissionGroups,+ currentDataroomDocumentId,+ ]);++ const handleFileSelect = useCallback((file: (typeof uploadedFiles)[0]) => {+ setSelectedFile(file);+ setShowFileListState(false);+ }, []);++ const handleBack = useCallback(() => {+ setShowFileListState(true);+ }, []);++ const handleSubmit = useCallback(+ async (event: React.FormEvent) => {+ event.preventDefault();+ setLoading(true);++ try {+ // Save viewer group permissions (only if changed and at least one permission is true)+ const viewerGroupPromises = Object.entries(selectedGroupPermissions)+ .filter(([groupId, permissions]) => {+ // Only process groups that have actual permissions set OR have changed+ const initialPermissions = initialGroupPermissions[groupId];+ const hasChanged =+ !initialPermissions ||+ initialPermissions.view !== permissions.view ||+ initialPermissions.download !== permissions.download;++ return hasChanged && (permissions.view || permissions.download);+ })+ .map(([groupId, permissions]) => {+ return fetch(+ `/api/teams/${teamId}/datarooms/${dataroomId}/groups/${groupId}/permissions`,+ {+ method: "POST",+ headers: {+ "Content-Type": "application/json",+ },+ body: JSON.stringify({+ dataroomId,+ groupId,+ permissions: {+ [currentDataroomDocumentId]: {+ itemType: ItemType.DATAROOM_DOCUMENT,+ view: permissions.view,+ download: permissions.download,+ },+ },+ }),+ },+ );+ });++ // Filter out link permissions that haven't changed or are both false+ const linksNeedingUpdate = Object.entries(selectedLinkPermissions)+ .filter(([linkId, permissions]) => {+ // Only process links that have actual permissions set OR need to be removed+ const initialPermissions = initialLinkPermissions[linkId];+ const hasChanged =+ !initialPermissions ||+ initialPermissions.view !== permissions.view ||+ initialPermissions.download !== permissions.download;++ return hasChanged;+ })+ .map(([linkId, permissions]) => ({ linkId, permissions }));++ // Save link permissions (only fetch and update what's needed)+ const linkPromises = linksNeedingUpdate.map(+ async ({ linkId, permissions }) => {+ const link = linksWithPermissionGroups.find((l) => l.id === linkId);+ if (!link?.permissionGroupId) return Promise.resolve();++ // Fetch existing permissions for this permission group+ const existingPermissionsResponse = await fetch(+ `/api/teams/${teamId}/datarooms/${dataroomId}/permission-groups/${link.permissionGroupId}`,+ );++ if (!existingPermissionsResponse.ok) {+ throw new Error("Failed to fetch existing permissions");+ }++ const { permissionGroup } =+ await existingPermissionsResponse.json();++ // Build the complete permissions object by merging existing with new+ const allPermissions: Record<+ string,+ { view: boolean; download: boolean; itemType: ItemType }+ > = {};++ // Add all existing permissions+ permissionGroup.accessControls.forEach((control: any) => {+ allPermissions[control.itemId] = {+ view: control.canView,+ download: control.canDownload,+ itemType: control.itemType,+ };+ });++ // Only add/update the permission if at least one is true+ if (permissions.view || permissions.download) {+ allPermissions[currentDataroomDocumentId] = {+ itemType: ItemType.DATAROOM_DOCUMENT,+ view: permissions.view,+ download: permissions.download,+ };+ } else {+ // If both are false, remove the permission entirely+ delete allPermissions[currentDataroomDocumentId];+ }++ // Send the complete permissions set+ return fetch(+ `/api/teams/${teamId}/datarooms/${dataroomId}/permission-groups/${link.permissionGroupId}`,+ {+ method: "PUT",+ headers: {+ "Content-Type": "application/json",+ },+ body: JSON.stringify({+ permissions: allPermissions,+ linkId: linkId,+ }),+ },+ );+ },+ );++ await Promise.all([...viewerGroupPromises, ...linkPromises]);++ toast.success("Permissions updated successfully!");++ await Promise.all([+ mutateViewerGroups(),+ mutate(+ `/api/teams/${teamId}/datarooms/${dataroomId}/groups?documentId=${currentDocumentId}`,+ ),+ mutate(+ `/api/teams/${teamId}/datarooms/${dataroomId}/permission-groups`,+ ),+ mutate(`/api/teams/${teamId}/datarooms/${dataroomId}/links`),+ ]);++ // Mark current file as saved+ setSavedFiles((prev) => new Set([...prev, currentDataroomDocumentId]));++ if (uploadedFiles.length > 1) {+ // Find next unsaved file+ const nextUnsavedFile = uploadedFiles.find(+ (file) =>+ !savedFiles.has(file.dataroomDocumentId) &&+ file.dataroomDocumentId !== currentDataroomDocumentId,+ );++ if (nextUnsavedFile) {+ // Go to next unsaved file+ setSelectedFile(nextUnsavedFile);+ setShowFileListState(false);+ } else {+ // All files are saved, complete the flow+ onComplete?.();+ setOpen(false);+ }+ } else {+ onComplete?.();+ setOpen(false);+ }+ } catch (error) {+ console.error("Error updating permissions:", error);+ toast.error("Failed to update permissions");+ } finally {+ setLoading(false);+ }+ },+ [+ selectedGroupPermissions,+ selectedLinkPermissions,+ initialGroupPermissions,+ initialLinkPermissions,+ teamId,+ dataroomId,+ currentDataroomDocumentId,+ linksWithPermissionGroups,+ mutateViewerGroups,+ currentDocumentId,+ uploadedFiles,+ savedFiles,+ onComplete,+ setOpen,+ ],+ );++ // Memoize computed values for UI+ const isLoading = useMemo(+ () => viewerGroupsLoading || linksLoading || permissionGroupsLoading,+ [viewerGroupsLoading, linksLoading, permissionGroupsLoading],+ );++ const hasViewerGroups = useMemo(+ () => viewerGroups && viewerGroups.length > 0,+ [viewerGroups],+ );++ const hasLinks = useMemo(+ () => linksWithPermissionGroups && linksWithPermissionGroups.length > 0,+ [linksWithPermissionGroups],+ );++ const hasAnyPermissions = useMemo(+ () => hasViewerGroups || hasLinks,+ [hasViewerGroups, hasLinks],+ );++ return (+ <Dialog open={open} onOpenChange={setOpen}>+ <DialogContent className="sm:max-w-[600px]">+ <DialogHeader className="w-[90%]">+ <div className="flex items-center gap-2">+ {!showFileListState && uploadedFiles.length > 1 && (+ <Button+ variant="ghost"+ size="icon"+ onClick={handleBack}+ className="h-8 w-8"+ >+ <ArrowLeftIcon className="h-4 w-4" />+ </Button>+ )}+ <div>+ <DialogTitle>Set Permissions</DialogTitle>+ <DialogDescription>+ {showFileListState+ ? savedFiles.size === uploadedFiles.length+ ? "All files have been processed successfully!"+ : "Select a file to set permissions"+ : "Update permissions for the selected file"}+ {uploadedFiles.length > 1 && (+ <div className="mt-2 text-sm text-muted-foreground">+ Progress: {savedFiles.size} of {uploadedFiles.length} files+ completed+ </div>+ )}+ </DialogDescription>+ </div>+ </div>+ </DialogHeader>++ {showFileListState ? (+ <div className="space-y-2">+ {uploadedFiles.map((file) => {+ const isSaved = savedFiles.has(file.dataroomDocumentId);+ const isSelected = selectedFile?.documentId === file.documentId;++ return (+ <div+ key={file.documentId}+ className={cn(+ "flex cursor-pointer items-center justify-between rounded-lg border p-3",+ isSelected+ ? "border-primary bg-primary/5"+ : isSaved+ ? "border-green-200 bg-green-50"+ : "hover:bg-muted/50",+ )}+ onClick={() => handleFileSelect(file)}+ >+ <div className="flex items-center space-x-3">+ <FileTextIcon className="h-5 w-5" />+ <span>{file.fileName}</span>+ </div>+ <div className="flex items-center space-x-2">+ {isSaved && (+ <div className="text-sm text-green-600">✓ Saved</div>+ )}+ {isSelected && (+ <div className="text-sm text-primary">Selected</div>+ )}+ </div>+ </div>+ );+ })}+ </div>+ ) : (+ <>+ <div>+ <p className="text-sm font-medium">Selected File</p>+ <div className="mt-1 flex items-center space-x-2 rounded-lg border p-3">+ <FileTextIcon className="h-5 w-5" />+ <span>+ {selectedFile?.fileName || uploadedFiles[0]?.fileName}+ </span>+ </div>+ </div>++ {hasAnyPermissions && (+ <div className="flex gap-2">+ <Button+ type="button"+ variant="outline"+ size="sm"+ onClick={enableViewForAll}+ className="flex items-center gap-2"+ >+ <EyeIcon className="h-4 w-4" />+ Enable View for All+ </Button>+ <Button+ type="button"+ variant="outline"+ size="sm"+ onClick={enableDownloadForAll}+ className="flex items-center gap-2"+ >+ <ArrowDownToLineIcon className="h-4 w-4" />+ Enable Download for All+ </Button>+ </div>+ )}++ <form onSubmit={handleSubmit}>+ <div className="rounded-md border">+ <div className="max-h-[400px] overflow-y-auto">+ {isLoading ? (+ <div className="flex items-center justify-center py-8">+ <Loader2 className="h-8 w-8 animate-spin" />+ </div>+ ) : !hasAnyPermissions ? (+ <div className="py-8 text-center">+ <p className="text-muted-foreground">+ No groups or links found. Create groups or links to set+ permissions.+ </p>+ </div>+ ) : (+ <Table>+ <TableHeader className="sticky top-0 z-10 bg-secondary">+ <TableRow>+ <TableHead className="w-[60%]">Name</TableHead>+ <TableHead className="w-[20%] text-center">+ View+ </TableHead>+ <TableHead className="w-[20%] text-center">+ Download+ </TableHead>+ </TableRow>+ </TableHeader>+ <TableBody className="relative">+ {hasViewerGroups && (+ <>+ <TableRow>+ <TableCell+ colSpan={3}+ className="bg-muted/50 font-medium"+ >+ <div className="flex items-center gap-2">+ <Users className="h-4 w-4" />+ Viewer Groups+ </div>+ </TableCell>+ </TableRow>+ {viewerGroups?.map((group) => (+ <TableRow key={group.id}>+ <TableCell>+ <div>+ <p className="font-medium">{group.name}</p>+ <p className="text-sm text-muted-foreground">+ {group._count.members} members+ </p>+ </div>+ </TableCell>+ <TableCell className="text-center">+ <ToggleGroup+ type="multiple"+ value={Object.entries(+ selectedGroupPermissions[group.id] || {},+ )+ .filter(+ ([key, value]) =>+ key === "view" && value,+ )+ .map(([key, _]) => key)}+ onValueChange={(value) => {+ const currentPermissions = Object.entries(+ selectedGroupPermissions[group.id] ||+ {},+ )+ .filter(([_, val]) => val)+ .map(([key, _]) => key);++ if (+ currentPermissions.includes("view") &&+ !value.includes("view")+ ) {+ const newPerms =+ currentPermissions.filter(+ (p) =>+ p !== "view" && p !== "download",+ );+ updateGroupPermissions(+ group.id,+ newPerms,+ );+ } else if (+ !currentPermissions.includes("view") &&+ value.includes("view")+ ) {+ const newPerms = [+ ...currentPermissions,+ "view",+ ];+ updateGroupPermissions(+ group.id,+ newPerms,+ );+ }+ }}+ className="justify-center"+ >+ <ToggleGroupItem+ value="view"+ aria-label="Toggle view"+ size="sm"+ className={cn(+ "px-3 py-1 text-muted-foreground hover:ring-1 hover:ring-gray-400 data-[state=on]:bg-foreground data-[state=on]:text-background",+ selectedGroupPermissions[group.id]?.view+ ? "data-[state=on]:bg-foreground data-[state=on]:text-background"+ : "",+ )}+ >+ {selectedGroupPermissions[group.id]+ ?.view ? (+ <EyeIcon className="h-5 w-5" />+ ) : (+ <EyeOffIcon className="h-5 w-5" />+ )}+ </ToggleGroupItem>+ </ToggleGroup>+ </TableCell>+ <TableCell className="text-center">+ <ToggleGroup+ type="multiple"+ value={Object.entries(+ selectedGroupPermissions[group.id] || {},+ )+ .filter(+ ([key, value]) =>+ key === "download" && value,+ )+ .map(([key, _]) => key)}+ onValueChange={(value) => {+ const currentPermissions = Object.entries(+ selectedGroupPermissions[group.id] ||+ {},+ )+ .filter(([_, val]) => val)+ .map(([key, _]) => key);++ if (+ value.includes("download") &&+ !currentPermissions.includes("view")+ ) {+ const newPerms = [+ ...currentPermissions,+ "view",+ "download",+ ];+ updateGroupPermissions(+ group.id,+ newPerms,+ );+ } else {+ const newPerms =+ currentPermissions.filter(+ (p) => p !== "download",+ );+ if (value.includes("download")) {+ newPerms.push("download");+ }+ updateGroupPermissions(+ group.id,+ newPerms,+ );+ }+ }}+ className="justify-center"+ >+ <ToggleGroupItem+ value="download"+ aria-label="Toggle download"+ size="sm"+ className={cn(+ "px-3 py-1 text-muted-foreground hover:ring-1 hover:ring-gray-400 data-[state=on]:bg-foreground data-[state=on]:text-background",+ selectedGroupPermissions[group.id]+ ?.download+ ? "data-[state=on]:bg-foreground data-[state=on]:text-background"+ : "",+ )}+ >+ {selectedGroupPermissions[group.id]+ ?.download ? (+ <ArrowDownToLineIcon className="h-5 w-5" />+ ) : (+ <CloudDownloadOff className="h-5 w-5" />+ )}+ </ToggleGroupItem>+ </ToggleGroup>+ </TableCell>+ </TableRow>+ ))}+ </>+ )}++ {hasLinks && (+ <>+ <TableRow>+ <TableCell+ colSpan={3}+ className="bg-muted/50 font-medium"+ >+ <div className="flex items-center gap-2">+ <LinkIcon className="h-4 w-4" />+ Links+ </div>+ </TableCell>+ </TableRow>+ {linksWithPermissionGroups?.map((link) => (+ <TableRow key={link.id}>+ <TableCell>+ <div>+ <p className="font-medium">+ {link.name ||+ `Link #${link.id.slice(-5)}`}+ </p>+ <p className="max-w-[300px] truncate text-sm text-muted-foreground">+ {link.domainId && link.slug+ ? `${link.domainSlug}/${link.slug}`+ : `${process.env.NEXT_PUBLIC_MARKETING_URL}/view/${link.id}`}+ </p>+ </div>+ </TableCell>+ <TableCell className="text-center">+ <ToggleGroup+ type="multiple"+ value={Object.entries(+ selectedLinkPermissions[link.id] || {},+ )+ .filter(+ ([key, value]) =>+ key === "view" && value,+ )+ .map(([key, _]) => key)}+ onValueChange={(value) => {+ const currentPermissions = Object.entries(+ selectedLinkPermissions[link.id] || {},+ )+ .filter(([_, val]) => val)+ .map(([key, _]) => key);++ if (+ currentPermissions.includes("view") &&+ !value.includes("view")+ ) {+ const newPerms =+ currentPermissions.filter(+ (p) =>+ p !== "view" && p !== "download",+ );+ updateLinkPermissions(+ link.id,+ newPerms,+ );+ } else if (+ !currentPermissions.includes("view") &&+ value.includes("view")+ ) {+ const newPerms = [+ ...currentPermissions,+ "view",+ ];+ updateLinkPermissions(+ link.id,+ newPerms,+ );+ }+ }}+ className="justify-center"+ >+ <ToggleGroupItem+ value="view"+ aria-label="Toggle view"+ size="sm"+ className={cn(+ "px-3 py-1 text-muted-foreground hover:ring-1 hover:ring-gray-400 data-[state=on]:bg-foreground data-[state=on]:text-background",+ selectedLinkPermissions[link.id]?.view+ ? "data-[state=on]:bg-foreground data-[state=on]:text-background"+ : "",+ )}+ >+ {selectedLinkPermissions[link.id]+ ?.view ? (+ <EyeIcon className="h-5 w-5" />+ ) : (+ <EyeOffIcon className="h-5 w-5" />+ )}+ </ToggleGroupItem>+ </ToggleGroup>+ </TableCell>+ <TableCell className="text-center">+ <ToggleGroup+ type="multiple"+ value={Object.entries(+ selectedLinkPermissions[link.id] || {},+ )+ .filter(+ ([key, value]) =>+ key === "download" && value,+ )+ .map(([key, _]) => key)}+ onValueChange={(value) => {+ const currentPermissions = Object.entries(+ selectedLinkPermissions[link.id] || {},+ )+ .filter(([_, val]) => val)+ .map(([key, _]) => key);++ if (+ value.includes("download") &&+ !currentPermissions.includes("view")+ ) {+ const newPerms = [+ ...currentPermissions,+ "view",+ "download",+ ];+ updateLinkPermissions(+ link.id,+ newPerms,+ );+ } else {+ const newPerms =+ currentPermissions.filter(+ (p) => p !== "download",+ );+ if (value.includes("download")) {+ newPerms.push("download");+ }+ updateLinkPermissions(+ link.id,+ newPerms,+ );+ }+ }}+ className="justify-center"+ >+ <ToggleGroupItem+ value="download"+ aria-label="Toggle download"+ size="sm"+ className={cn(+ "px-3 py-1 text-muted-foreground hover:ring-1 hover:ring-gray-400 data-[state=on]:bg-foreground data-[state=on]:text-background",+ selectedLinkPermissions[link.id]+ ?.download+ ? "data-[state=on]:bg-foreground data-[state=on]:text-background"+ : "",+ )}+ >+ {selectedLinkPermissions[link.id]+ ?.download ? (+ <ArrowDownToLineIcon className="h-5 w-5" />+ ) : (+ <CloudDownloadOff className="h-5 w-5" />+ )}+ </ToggleGroupItem>+ </ToggleGroup>+ </TableCell>+ </TableRow>+ ))}+ </>+ )}+ </TableBody>+ </Table>+ )}+ </div>+ </div>+ <DialogFooter className="mt-6">+ <Button+ type="submit"+ loading={loading}+ disabled={!hasAnyPermissions}+ >+ {uploadedFiles.length > 1+ ? (() => {+ const remainingFiles = uploadedFiles.filter(+ (file) =>+ !savedFiles.has(file.dataroomDocumentId) &&+ file.dataroomDocumentId !==+ currentDataroomDocumentId,+ );+ return remainingFiles.length > 0+ ? "Save & Next"+ : "Save & Complete";+ })()+ : "Save permissions"}+ </Button>+ </DialogFooter>+ </form>+ </>+ )}+ </DialogContent>+ </Dialog>+ );+}diff --git a/components/documents/add-document-modal.tsx b/components/documents/add-document-modal.tsxindex 7ce8938a..87313881 100644--- a/components/documents/add-document-modal.tsx+++ b/components/documents/add-document-modal.tsx@@ -23,6 +23,7 @@ import { useDataroom } from "@/lib/swr/use-dataroom";import useLimits from "@/lib/swr/use-limits";import { getSupportedContentType } from "@/lib/utils/get-content-type";+import { SetUnifiedPermissionsModal } from "@/components/datarooms/groups/set-unified-permissions-modal";import DocumentUpload from "@/components/document-upload";import { Button } from "@/components/ui/button";import {@@ -43,7 +44,6 @@ import { Label } from "@/components/ui/label";import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";import { UpgradePlanModal } from "../billing/upgrade-plan-modal";-import { SetGroupPermissionsModal } from "../datarooms/groups/set-group-permissions-modal";interface DataroomDocument {id: string;@@ -684,7 +684,7 @@ export function AddDocumentModal({</Dialog>{showGroupPermissions && dataroomId && (- <SetGroupPermissionsModal+ <SetUnifiedPermissionsModalopen={showGroupPermissions}setOpen={setShowGroupPermissions}dataroomId={dataroomId}@@ -694,7 +694,6 @@ export function AddDocumentModal({setAddDocumentModalOpen?.(false);setUploadedFiles([]);}}- isAutoOpen/>)}</>diff --git a/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/folders/index.tsindex 8a739df7..b174a841 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts@@ -14,7 +14,7 @@ async function applyFolderPermissions(folderPath: string,): Promise<void> {try {- await applyDefaultFolderPermissions(dataroomId, folderId);+ await applyDefaultFolderPermissions(dataroomId, folderId, folderPath);} catch (error) {console.error("Error applying folder permissions:", error);throw error;@@ -24,6 +24,7 @@ async function applyFolderPermissions(async function applyDefaultFolderPermissions(dataroomId: string,folderId: string,+ folderPath?: string,) {const [dataroom, viewerGroups, permissionGroups] = await Promise.all([prisma.dataroom.findUnique({@@ -50,6 +51,17 @@ async function applyDefaultFolderPermissions(if (!dataroom) return;+ if (+ dataroom.defaultPermissionStrategy ===+ DefaultPermissionStrategy.INHERIT_FROM_PARENT &&+ folderPath+ ) {+ // If we have a folder path, inherit from parent folder+ await inheritFolderPermissionsFromParent(dataroomId, folderId, folderPath);+ return;+ }++ // Fallback to default behavior (for root folders or non-inherit strategies)const allPermissionGroupData: {groupId: string;itemId: string;@@ -69,7 +81,7 @@ async function applyDefaultFolderPermissions(groupId: group.id,itemId: folderId,itemType: ItemType.DATAROOM_FOLDER,- canView: true,+ canView: true, // Root folders get view permissions by defaultcanDownload: false,canDownloadOriginal: false,});@@ -104,6 +116,100 @@ async function applyDefaultFolderPermissions(]);}+async function inheritFolderPermissionsFromParent(+ dataroomId: string,+ folderId: string,+ folderPath: string,+) {+ // Get parent folder path+ const pathSegments = folderPath.split("/").filter(Boolean);+ const parentPath = "/" + pathSegments.slice(0, -1).join("/");++ // If this is a root folder, apply default permissions+ if (parentPath === "/") {+ await applyDefaultFolderPermissions(dataroomId, folderId);+ return;+ }++ const parentFolder = await prisma.dataroomFolder.findUnique({+ where: {+ dataroomId_path: { dataroomId, path: parentPath },+ },+ select: { id: true },+ });++ if (!parentFolder) {+ // If no parent folder found, apply default permissions+ await applyDefaultFolderPermissions(dataroomId, folderId);+ return;+ }++ // Get existing permissions for the parent folder+ const [parentViewerPermissions, parentPermissionGroupPermissions] =+ await Promise.all([+ prisma.viewerGroupAccessControls.findMany({+ where: {+ itemId: parentFolder.id,+ itemType: ItemType.DATAROOM_FOLDER,+ },+ select: { groupId: true, canView: true, canDownload: true },+ }),+ prisma.permissionGroupAccessControls.findMany({+ where: {+ itemId: parentFolder.id,+ itemType: ItemType.DATAROOM_FOLDER,+ },+ select: {+ groupId: true,+ canView: true,+ canDownload: true,+ canDownloadOriginal: true,+ },+ }),+ ]);++ // Apply parent permissions to the new folder+ await prisma.$transaction(async (tx) => {+ const viewerGroupPermissionsToCreate: any[] = [];+ const permissionGroupPermissionsToCreate: any[] = [];++ parentViewerPermissions.forEach((parentPerm) => {+ viewerGroupPermissionsToCreate.push({+ groupId: parentPerm.groupId,+ itemId: folderId,+ itemType: ItemType.DATAROOM_FOLDER,+ canView: parentPerm.canView,+ canDownload: parentPerm.canDownload,+ });+ });++ parentPermissionGroupPermissions.forEach((parentPerm) => {+ permissionGroupPermissionsToCreate.push({+ groupId: parentPerm.groupId,+ itemId: folderId,+ itemType: ItemType.DATAROOM_FOLDER,+ canView: parentPerm.canView,+ canDownload: parentPerm.canDownload,+ canDownloadOriginal: parentPerm.canDownloadOriginal,+ });+ });++ if (viewerGroupPermissionsToCreate.length > 0) {+ await tx.viewerGroupAccessControls.createMany({+ data: viewerGroupPermissionsToCreate,+ skipDuplicates: true,+ });+ }++ if (permissionGroupPermissionsToCreate.length > 0) {+ await tx.permissionGroupAccessControls.createMany({+ data: permissionGroupPermissionsToCreate,+ skipDuplicates: true,+ });+ }+ });+}+export default async function handle(req: NextApiRequest,res: NextApiResponse,diff --git a/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/permissions.ts b/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/permissions.tsindex b272532e..46c0d2df 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/permissions.ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/permissions.ts@@ -7,6 +7,120 @@ import { getServerSession } from "next-auth/next";import prisma from "@/lib/prisma";import { CustomUser } from "@/lib/types";+// Helper function to get parent folder IDs for a given document in a dataroom+async function getParentFolderIds(+ dataroomId: string,+ documentId: string,+): Promise<string[]> {+ // Get the dataroom document to find which folder it's in+ const dataroomDocument = await prisma.dataroomDocument.findUnique({+ where: { id: documentId },+ select: { folderId: true },+ });++ if (!dataroomDocument?.folderId) {+ return []; // Document is at root level+ }++ // Get the folder and walk up the hierarchy+ const parentFolders: string[] = [];+ let currentFolderId: string | null = dataroomDocument.folderId;++ while (currentFolderId) {+ parentFolders.push(currentFolderId);++ const folder: { parentId: string | null } | null =+ await prisma.dataroomFolder.findUnique({+ where: { id: currentFolderId },+ select: { parentId: true },+ });++ currentFolderId = folder?.parentId || null;+ }++ return parentFolders;+}++// Helper function to ensure parent folders are visible when child documents are made visible+async function ensureParentFoldersVisible(+ dataroomId: string,+ groupId: string,+ permissions: Record<+ string,+ { itemType: ItemType; view: boolean; download: boolean }+ >,+): Promise<void> {+ const foldersToMakeVisible = new Set<string>();++ // Find all documents that are being made visible+ const visibleDocuments = Object.entries(permissions)+ .filter(+ ([_, perm]) => perm.itemType === ItemType.DATAROOM_DOCUMENT && perm.view,+ )+ .map(([itemId, _]) => itemId);++ // Get parent folder IDs for all visible documents+ for (const documentId of visibleDocuments) {+ const parentFolders = await getParentFolderIds(dataroomId, documentId);+ parentFolders.forEach((folderId) => foldersToMakeVisible.add(folderId));+ }++ // Also handle folders that are being made visible - ensure their parent folders are visible too+ const visibleFolders = Object.entries(permissions)+ .filter(+ ([_, perm]) => perm.itemType === ItemType.DATAROOM_FOLDER && perm.view,+ )+ .map(([itemId, _]) => itemId);++ for (const folderId of visibleFolders) {+ let currentFolderId: string | null = folderId;++ while (currentFolderId) {+ const folder: { parentId: string | null } | null =+ await prisma.dataroomFolder.findUnique({+ where: { id: currentFolderId },+ select: { parentId: true },+ });++ if (folder?.parentId) {+ foldersToMakeVisible.add(folder.parentId);+ currentFolderId = folder.parentId;+ } else {+ break;+ }+ }+ }++ // Update or create permissions for parent folders to make them visible+ if (foldersToMakeVisible.size > 0) {+ const foldersToUpdate = Array.from(foldersToMakeVisible);++ await prisma.$transaction(async (tx) => {+ for (const folderId of foldersToUpdate) {+ await tx.viewerGroupAccessControls.upsert({+ where: {+ groupId_itemId: {+ groupId: groupId,+ itemId: folderId,+ },+ },+ create: {+ groupId: groupId,+ itemId: folderId,+ itemType: ItemType.DATAROOM_FOLDER,+ canView: true,+ canDownload: false,+ },+ update: {+ canView: true, // Always ensure parent folders are visible+ // Don't change canDownload - preserve existing setting+ },+ });+ }+ });+ }+}+export default async function handler(req: NextApiRequest,res: NextApiResponse,@@ -23,12 +137,18 @@ export default async function handler(}const userId = (session.user as CustomUser).id;- const { teamId } = req.query as { teamId: string };+ const {+ teamId,+ id: dataroomId,+ groupId,+ } = req.query as {+ teamId: string;+ id: string;+ groupId: string;+ };try {- const { dataroomId, groupId, permissions } = req.body as {- dataroomId: string;- groupId: string;+ const { permissions } = req.body as {permissions: Record<string,{ itemType: ItemType; view: boolean; download: boolean }@@ -36,7 +156,7 @@ export default async function handler(};// Validate input- if (!dataroomId || !groupId || !permissions) {+ if (!permissions) {return res.status(400).json({ message: "Missing required fields" });}@@ -133,6 +253,9 @@ export default async function handler(}});+ // After saving permissions, ensure parent folders are visible for any items that were made visible+ await ensureParentFoldersVisible(dataroomId, groupId, permissions);+res.status(200).json({ message: "Permissions updated successfully" });} catch (error) {console.error("Error updating permissions:", error);diff --git a/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/[permissionGroupId].ts b/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/[permissionGroupId].tsindex 7de961b1..82aad896 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/[permissionGroupId].ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/[permissionGroupId].ts@@ -23,6 +23,121 @@ const patchPermissionGroupSchema = z.object({description: z.string().optional(),});+// Helper function to get parent folder IDs for a given document in a dataroom+async function getParentFolderIds(+ dataroomId: string,+ documentId: string,+): Promise<string[]> {+ // Get the dataroom document to find which folder it's in+ const dataroomDocument = await prisma.dataroomDocument.findUnique({+ where: { id: documentId },+ select: { folderId: true },+ });++ if (!dataroomDocument?.folderId) {+ return []; // Document is at root level+ }++ // Get the folder and walk up the hierarchy+ const parentFolders: string[] = [];+ let currentFolderId: string | null = dataroomDocument.folderId;++ while (currentFolderId) {+ parentFolders.push(currentFolderId);++ const folder: { parentId: string | null } | null =+ await prisma.dataroomFolder.findUnique({+ where: { id: currentFolderId },+ select: { parentId: true },+ });++ currentFolderId = folder?.parentId || null;+ }++ return parentFolders;+}++// Helper function to ensure parent folders are visible when child documents are made visible+async function ensureParentFoldersVisible(+ dataroomId: string,+ groupId: string,+ permissions: Record<+ string,+ { itemType: ItemType; view: boolean; download: boolean }+ >,+): Promise<void> {+ const foldersToMakeVisible = new Set<string>();++ // Find all documents that are being made visible+ const visibleDocuments = Object.entries(permissions)+ .filter(+ ([_, perm]) => perm.itemType === ItemType.DATAROOM_DOCUMENT && perm.view,+ )+ .map(([itemId, _]) => itemId);++ // Get parent folder IDs for all visible documents+ for (const documentId of visibleDocuments) {+ const parentFolders = await getParentFolderIds(dataroomId, documentId);+ parentFolders.forEach((folderId) => foldersToMakeVisible.add(folderId));+ }++ // Also handle folders that are being made visible - ensure their parent folders are visible too+ const visibleFolders = Object.entries(permissions)+ .filter(+ ([_, perm]) => perm.itemType === ItemType.DATAROOM_FOLDER && perm.view,+ )+ .map(([itemId, _]) => itemId);++ for (const folderId of visibleFolders) {+ let currentFolderId: string | null = folderId;++ while (currentFolderId) {+ const folder: { parentId: string | null } | null =+ await prisma.dataroomFolder.findUnique({+ where: { id: currentFolderId },+ select: { parentId: true },+ });++ if (folder?.parentId) {+ foldersToMakeVisible.add(folder.parentId);+ currentFolderId = folder.parentId;+ } else {+ break;+ }+ }+ }++ // Update or create permissions for parent folders to make them visible+ if (foldersToMakeVisible.size > 0) {+ const foldersToUpdate = Array.from(foldersToMakeVisible);++ await prisma.$transaction(async (tx) => {+ for (const folderId of foldersToUpdate) {+ await tx.permissionGroupAccessControls.upsert({+ where: {+ groupId_itemId: {+ groupId: groupId,+ itemId: folderId,+ },+ },+ create: {+ groupId: groupId,+ itemId: folderId,+ itemType: ItemType.DATAROOM_FOLDER,+ canView: true,+ canDownload: false,+ canDownloadOriginal: false,+ },+ update: {+ canView: true, // Always ensure parent folders are visible+ // Don't change canDownload - preserve existing setting+ },+ });+ }+ });+ }+}+export default async function handle(req: NextApiRequest,res: NextApiResponse,@@ -61,7 +176,19 @@ export default async function handle(return res.status(401).end("Unauthorized");}- // Fetch permission group with access controls+ // Verify dataroom exists and belongs to team+ const dataroom = await prisma.dataroom.findUnique({+ where: {+ id: dataroomId,+ teamId: teamId,+ },+ });++ if (!dataroom) {+ return res.status(404).json({ error: "Dataroom not found" });+ }++ // Fetch permission group and its access controlsconst permissionGroup = await prisma.permissionGroup.findUnique({where: {id: permissionGroupId,@@ -69,16 +196,7 @@ export default async function handle(teamId: teamId,},include: {- accessControls: {- select: {- id: true,- itemId: true,- itemType: true,- canView: true,- canDownload: true,- canDownloadOriginal: true,- },- },+ accessControls: true,},});@@ -88,7 +206,91 @@ export default async function handle(return res.status(200).json({ permissionGroup });} catch (error) {- errorhandler(error, res);+ return errorhandler(error, res);+ }+ } else if (req.method === "PATCH") {+ // PATCH /api/teams/:teamId/datarooms/:id/permission-groups/:permissionGroupId+ const session = await getServerSession(req, res, authOptions);+ if (!session) {+ return res.status(401).end("Unauthorized");+ }++ const {+ teamId,+ id: dataroomId,+ permissionGroupId,+ } = req.query as {+ teamId: string;+ id: string;+ permissionGroupId: string;+ };++ const userId = (session.user as CustomUser).id;++ try {+ // Verify team membership+ const team = await prisma.team.findUnique({+ where: {+ id: teamId,+ users: {+ some: { userId },+ },+ },+ });++ if (!team) {+ return res.status(401).end("Unauthorized");+ }++ // Verify dataroom exists and belongs to team+ const dataroom = await prisma.dataroom.findUnique({+ where: {+ id: dataroomId,+ teamId: teamId,+ },+ });++ if (!dataroom) {+ return res.status(404).json({ error: "Dataroom not found" });+ }++ // Verify permission group exists and belongs to dataroom+ const permissionGroup = await prisma.permissionGroup.findUnique({+ where: {+ id: permissionGroupId,+ dataroomId: dataroomId,+ teamId: teamId,+ },+ });++ if (!permissionGroup) {+ return res.status(404).json({ error: "Permission group not found" });+ }++ // Validate and update permission group+ const validationResult = patchPermissionGroupSchema.safeParse(req.body);+ if (!validationResult.success) {+ return res.status(400).json({+ error: "Invalid request body",+ details: validationResult.error.issues,+ });+ }++ const { name, description } = validationResult.data;++ const updatedPermissionGroup = await prisma.permissionGroup.update({+ where: {+ id: permissionGroupId,+ },+ data: {+ ...(name && { name }),+ ...(description !== undefined && { description }),+ },+ });++ return res.status(200).json({ permissionGroup: updatedPermissionGroup });+ } catch (error) {+ return errorhandler(error, res);}} else if (req.method === "PUT") {// PUT /api/teams/:teamId/datarooms/:id/permission-groups/:permissionGroupId@@ -167,33 +369,24 @@ export default async function handle(const validatedPermissions = validationResult.data;- // Update permission group access controls using a transactionconst updatedPermissionGroup = await prisma.$transaction(async (tx) => {- // Get existing access controls to determine what needs to be updated vs created- const existingControls =+ // Get existing permissions for comparison+ const existingPermissions =await tx.permissionGroupAccessControls.findMany({where: {groupId: permissionGroupId,},- select: {- itemId: true,- itemType: true,- canView: true,- canDownload: true,- canDownloadOriginal: true,- },});+ // Create maps for efficient lookupconst existingMap = new Map(- existingControls.map((control) => [- `${control.itemId}-${control.itemType}`,- control,- ]),+ existingPermissions.map((p) => [`${p.itemId}-${p.itemType}`, p]),);+ // Categorize permissions into updates vs createsconst toUpdate: Array<{itemId: string;- itemType: any;+ itemType: ItemType;canView: boolean;canDownload: boolean;canDownloadOriginal: boolean;@@ -202,7 +395,7 @@ export default async function handle(const toCreate: Array<{groupId: string;itemId: string;- itemType: any;+ itemType: ItemType;canView: boolean;canDownload: boolean;canDownloadOriginal: boolean;@@ -271,49 +464,36 @@ export default async function handle(),);- const toDelete = existingControls.filter(- (control) =>- !newItemKeys.has(`${control.itemId}-${control.itemType}`),+ const toDelete = existingPermissions.filter(+ (p) => !newItemKeys.has(`${p.itemId}-${p.itemType}`),);if (toDelete.length > 0) {- await Promise.all(- toDelete.map((item) =>- tx.permissionGroupAccessControls.deleteMany({- where: {- groupId: permissionGroupId,- itemId: item.itemId,- itemType: item.itemType,- },- }),- ),- );- }-- // Return the updated permission group with access controls- return await tx.permissionGroup.findUnique({- where: { id: permissionGroupId },- include: {- accessControls: {- select: {- id: true,- itemId: true,- itemType: true,- canView: true,- canDownload: true,- canDownloadOriginal: true,+ await tx.permissionGroupAccessControls.deleteMany({+ where: {+ id: {+ in: toDelete.map((p) => p.id),},},- },- });+ });+ }++ return permissionGroup;});+ // After saving permissions, ensure parent folders are visible for any items that were made visible+ await ensureParentFoldersVisible(+ dataroomId,+ permissionGroupId,+ validatedPermissions,+ );+return res.status(200).json({ permissionGroup: updatedPermissionGroup });} catch (error) {- errorhandler(error, res);+ return errorhandler(error, res);}- } else if (req.method === "PATCH") {- // PATCH /api/teams/:teamId/datarooms/:id/permission-groups/:permissionGroupId+ } else if (req.method === "DELETE") {+ // DELETE /api/teams/:teamId/datarooms/:id/permission-groups/:permissionGroupIdconst session = await getServerSession(req, res, authOptions);if (!session) {return res.status(401).end("Unauthorized");@@ -332,6 +512,7 @@ export default async function handle(const userId = (session.user as CustomUser).id;try {+ // Verify team membershipconst team = await prisma.team.findUnique({where: {id: teamId,@@ -345,6 +526,7 @@ export default async function handle(return res.status(401).end("Unauthorized");}+ // Verify dataroom exists and belongs to teamconst dataroom = await prisma.dataroom.findUnique({where: {id: dataroomId,@@ -356,6 +538,7 @@ export default async function handle(return res.status(404).json({ error: "Dataroom not found" });}+ // Verify permission group exists and belongs to dataroomconst permissionGroup = await prisma.permissionGroup.findUnique({where: {id: permissionGroupId,@@ -368,35 +551,20 @@ export default async function handle(return res.status(404).json({ error: "Permission group not found" });}- const validationResult = patchPermissionGroupSchema.safeParse(req.body);-- if (!validationResult.success) {- return res.status(400).json({- error: "Invalid request body",- details: validationResult.error.issues,- });- }-- const dataToUpdate = validationResult.data;-- if (Object.keys(dataToUpdate).length === 0) {- return res.status(400).json({ error: "No fields to update" });- }-- const updatedPermissionGroup = await prisma.permissionGroup.update({+ // Delete the permission group (this will cascade delete access controls)+ await prisma.permissionGroup.delete({where: {id: permissionGroupId,},- data: dataToUpdate,});- return res.status(200).json({ permissionGroup: updatedPermissionGroup });+ return res.status(200).json({ message: "Permission group deleted" });} catch (error) {- errorhandler(error, res);+ return errorhandler(error, res);}}- // We only allow GET requests- res.setHeader("Allow", ["GET", "PUT", "PATCH"]);+ // We only allow GET, PATCH, PUT, and DELETE requests+ res.setHeader("Allow", ["GET", "PATCH", "PUT", "DELETE"]);return res.status(405).end(`Method ${req.method} Not Allowed`);}diff --git a/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/index.tsindex 7cacb06d..4ddee1d6 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/index.ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/index.ts@@ -61,6 +61,7 @@ export default async function handle(createdAt: "desc",},include: {+ accessControls: true,links: {select: {id: true,