Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: remove folders and contents from dataroom
Marc Seitz70ef8cd2000b
diff --git a/components/documents/folder-card.tsx b/components/documents/folder-card.tsxindex 2cb28565..3bdf39ad 100644--- a/components/documents/folder-card.tsx+++ b/components/documents/folder-card.tsx@@ -103,7 +103,7 @@ export default function FolderCard({},),{- loading: "Deleting folder...",+ loading: isDataroom ? "Removing folder..." : "Deleting folder...",success: () => {mutate(`/api/teams/${teamInfo?.currentTeam?.id}/${endpointTargetType}?root=true`,@@ -114,9 +114,13 @@ export default function FolderCard({mutate(`/api/teams/${teamInfo?.currentTeam?.id}/${endpointTargetType}${parentFolderPath}`,);- return "Folder deleted successfully.";+ return isDataroom+ ? "Folder removed successfully."+ : "Folder deleted successfully.";},- error: "Failed to delete folder. Move documents first.",+ error: isDataroom+ ? "Failed to remove folder."+ : "Failed to delete folder. Move documents first.",},);};@@ -242,10 +246,11 @@ export default function FolderCard({className="text-destructive duration-200 focus:bg-destructive focus:text-destructive-foreground">{isFirstClick ? (- "Really delete?"+ `Really ${isDataroom ? "remove" : "delete"}?`) : (<>- <TrashIcon className="mr-2 h-4 w-4" /> Delete Folder+ <TrashIcon className="mr-2 h-4 w-4" />{" "}+ {isDataroom ? "Remove Folder" : "Delete Folder"}</>)}</DropdownMenuItem>diff --git a/pages/api/teams/[teamId]/datarooms/[id]/folders/manage/[folderId]/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/folders/manage/[folderId]/index.tsindex d254a177..886f5970 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/folders/manage/[folderId]/index.ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/folders/manage/[folderId]/index.ts@@ -64,28 +64,16 @@ export default async function handle(id: folderId,dataroomId: dataroomId,},- select: {- _count: {- select: {- documents: true,- childFolders: true,- },- },- },});- if (folder?._count.documents! > 0 || folder?._count.childFolders! > 0) {- return res.status(401).json({- message: "Folder contains documents or folders. Move them first",+ if (!folder) {+ return res.status(404).json({+ message: "Folder not found",});}- await prisma.dataroomFolder.delete({- where: {- id: folderId,- dataroomId: dataroomId,- },- });+ // Delete the folder and its contents recursively+ await deleteFolderAndContents(folderId);return res.status(204).end(); // 204 No Content response for successful deletes} catch (error) {@@ -97,3 +85,29 @@ export default async function handle(return res.status(405).end(`Method ${req.method} Not Allowed`);}}++async function deleteFolderAndContents(folderId: string) {+ const childFoldersToDelete = await prisma.dataroomFolder.findMany({+ where: {+ parentId: folderId,+ },+ });++ console.log("Deleting folder and contents", childFoldersToDelete);++ for (const folder of childFoldersToDelete) {+ await deleteFolderAndContents(folder.id);+ }++ await prisma.dataroomDocument.deleteMany({+ where: {+ folderId: folderId,+ },+ });++ await prisma.dataroomFolder.delete({+ where: {+ id: folderId,+ },+ });+}