Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
fix: move folder
Marc Seitzbd547eac69ca
diff --git a/components/datarooms/folders/selection-tree.tsx b/components/datarooms/folders/selection-tree.tsxindex 6a9e6a08..12176bac 100644--- a/components/datarooms/folders/selection-tree.tsx+++ b/components/datarooms/folders/selection-tree.tsx@@ -16,13 +16,17 @@ const FolderComponentSelection = memo(selectedFolder,setSelectedFolder,disableId,+ ancestorDisabled,}: {folder: DataroomFolderWithDocuments;disableId?: string[];selectedFolder: TSelectedFolder;setSelectedFolder: React.Dispatch<React.SetStateAction<TSelectedFolder>>;+ ancestorDisabled?: boolean;}) => {- // Recursively render child folders if they exist+ const isSelfDisabled = disableId?.includes(folder.id) ?? false;+ const isDisabled = ancestorDisabled || isSelfDisabled;+const childFolders = useMemo(() =>folder.childFolders.map((childFolder) => (@@ -32,16 +36,22 @@ const FolderComponentSelection = memo(selectedFolder={selectedFolder}disableId={disableId}setSelectedFolder={setSelectedFolder}+ ancestorDisabled={isDisabled}/>)),- [folder.childFolders, selectedFolder, setSelectedFolder, disableId],+ [+ folder.childFolders,+ selectedFolder,+ setSelectedFolder,+ disableId,+ isDisabled,+ ],);const isActive = folder.id === selectedFolder?.id;const isChildActive = folder.childFolders.some((childFolder) => childFolder.id === selectedFolder?.id,);- const isDisabled = disableId?.includes(folder.id);return (<divdiff --git a/pages/api/teams/[teamId]/datarooms/[id]/folders/move.ts b/pages/api/teams/[teamId]/datarooms/[id]/folders/move.tsindex b4513c2a..c3159956 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/folders/move.ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/folders/move.ts@@ -60,10 +60,36 @@ export default async function handle(},});+ // Prevent moving a folder into itself or one of its descendants.+ // Single query to fetch the full parentId map, then walk in memory.+ if (selectedFolder) {+ const allFolders = await prisma.dataroomFolder.findMany({+ where: { dataroomId },+ select: { id: true, parentId: true },+ });+ const parentMap = new Map(+ allFolders.map((f) => [f.id, f.parentId]),+ );+ const folderIdSet = new Set(folderIds);+ const visited = new Set<string>();+ let currentId: string | null = selectedFolder;+ while (currentId) {+ if (folderIdSet.has(currentId)) {+ return res.status(400).json({+ message:+ "Cannot move a folder into itself or one of its subfolders",+ });+ }+ if (visited.has(currentId)) break;+ visited.add(currentId);+ currentId = parentMap.get(currentId) ?? null;+ }+ }+const existingFolders = await prisma.dataroomFolder.findMany({where: {dataroomId: dataroomId,- parentId: selectedFolder, // Check only inside the target folder can be null+ parentId: selectedFolder,},select: { name: true },});