Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
refactor(folder-tree): update move folder tree with new selection
Marc Seitz1a43815b9021
diff --git a/components/datarooms/folders/selection-tree.tsx b/components/datarooms/folders/selection-tree.tsxindex d3588bd9..1252d19b 100644--- a/components/datarooms/folders/selection-tree.tsx+++ b/components/datarooms/folders/selection-tree.tsx@@ -1,5 +1,6 @@import { memo, useMemo } from "react";+import { TSelectedFolder } from "@/components/documents/move-folder-modal";import { FileTree } from "@/components/ui/nextra-filetree";import {@@ -12,12 +13,12 @@ import { buildNestedFolderStructure } from "./utils";const FolderComponentSelection = memo(({folder,- selectedFolderId,- setFolderId,+ selectedFolder,+ setSelectedFolder,}: {folder: DataroomFolderWithDocuments;- selectedFolderId: string;- setFolderId: React.Dispatch<React.SetStateAction<string>>;+ selectedFolder: TSelectedFolder;+ setSelectedFolder: React.Dispatch<React.SetStateAction<TSelectedFolder>>;}) => {// Recursively render child folders if they existconst childFolders = useMemo(@@ -26,11 +27,16 @@ const FolderComponentSelection = memo(<FolderComponentSelectionkey={childFolder.id}folder={childFolder}- selectedFolderId={selectedFolderId}- setFolderId={setFolderId}+ selectedFolder={selectedFolder}+ setSelectedFolder={setSelectedFolder}/>)),- [folder.childFolders, selectedFolderId, setFolderId],+ [folder.childFolders, selectedFolder, setSelectedFolder],+ );++ const isActive = folder.id === selectedFolder?.id;+ const isChildActive = folder.childFolders.some(+ (childFolder) => childFolder.id === selectedFolder?.id,);return (@@ -38,13 +44,17 @@ const FolderComponentSelection = memo(onClick={(e) => {e.preventDefault();e.stopPropagation();- setFolderId(folder.id);+ setSelectedFolder({ id: folder.id, name: folder.name });}}><FileTree.Foldername={folder.name}key={folder.id}- active={folder.id === selectedFolderId}+ active={isActive}+ childActive={isChildActive}+ onToggle={() =>+ setSelectedFolder({ id: folder.id, name: folder.name })+ }>{childFolders}</FileTree.Folder>@@ -56,12 +66,12 @@ FolderComponentSelection.displayName = "FolderComponentSelection";const SidebarFoldersSelectipon = ({folders,- selectedFolderId,- setFolderId,+ selectedFolder,+ setSelectedFolder,}: {folders: DataroomFolderWithDocuments[];- selectedFolderId: string;- setFolderId: React.Dispatch<React.SetStateAction<string>>;+ selectedFolder: TSelectedFolder;+ setSelectedFolder: React.Dispatch<React.SetStateAction<TSelectedFolder>>;}) => {const nestedFolders = useMemo(() => {if (folders) {@@ -76,8 +86,8 @@ const SidebarFoldersSelectipon = ({<FolderComponentSelectionkey={folder.id}folder={folder}- selectedFolderId={selectedFolderId}- setFolderId={setFolderId}+ selectedFolder={selectedFolder}+ setSelectedFolder={setSelectedFolder}/>))}</FileTree>@@ -86,12 +96,12 @@ const SidebarFoldersSelectipon = ({export function SidebarFolderTreeSelection({dataroomId,- selectedFolderId,- setFolderId,+ selectedFolder,+ setSelectedFolder,}: {dataroomId: string;- selectedFolderId: string;- setFolderId: React.Dispatch<React.SetStateAction<string>>;+ selectedFolder: TSelectedFolder;+ setSelectedFolder: React.Dispatch<React.SetStateAction<TSelectedFolder>>;}) {const { folders, error } = useDataroomFoldersTree({ dataroomId });@@ -100,8 +110,8 @@ export function SidebarFolderTreeSelection({return (<SidebarFoldersSelectiponfolders={folders}- selectedFolderId={selectedFolderId}- setFolderId={setFolderId}+ selectedFolder={selectedFolder}+ setSelectedFolder={setSelectedFolder}/>);}diff --git a/components/datarooms/move-dataroom-folder-modal.tsx b/components/datarooms/move-dataroom-folder-modal.tsxindex c128b020..35fcda19 100644--- a/components/datarooms/move-dataroom-folder-modal.tsx+++ b/components/datarooms/move-dataroom-folder-modal.tsx@@ -5,6 +5,7 @@ import { useState } from "react";import { useTeam } from "@/context/team-context";import { toast } from "sonner";import { mutate } from "swr";+import { set } from "ts-pattern/dist/patterns";import { SidebarFolderTreeSelection } from "@/components/datarooms/folders";import { Button } from "@/components/ui/button";@@ -17,6 +18,8 @@ import {DialogTitle,} from "@/components/ui/dialog";+import { TSelectedFolder } from "../documents/move-folder-modal";+export function MoveToDataroomFolderModal({open,setOpen,@@ -31,10 +34,11 @@ export function MoveToDataroomFolderModal({documentName?: string;}) {const router = useRouter();- const [folderId, setFolderId] = useState<string>("");+ const [selectedFolder, setSelectedFolder] = useState<TSelectedFolder>(null);const [loading, setLoading] = useState<boolean>(false);const teamInfo = useTeam();+ const teamId = teamInfo?.currentTeam?.id;const currentPath = router.query.name? (router.query.name as string[]).join("/")@@ -44,19 +48,19 @@ export function MoveToDataroomFolderModal({event.preventDefault();event.stopPropagation();- if (folderId === "") return;+ if (!selectedFolder) return;setLoading(true);try {const response = await fetch(- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/documents/${documentId}`,+ `/api/teams/${teamId}/datarooms/${dataroomId}/documents/${documentId}`,{method: "PUT",headers: {"Content-Type": "application/json",},body: JSON.stringify({- folderId: folderId,+ folderId: selectedFolder.id,currentPathName: "/" + currentPath,}),},@@ -76,14 +80,10 @@ export function MoveToDataroomFolderModal({toast.success("Document moved successfully!");+ mutate(`/api/teams/${teamId}/datarooms/${dataroomId}/folders`);+ mutate(`/api/teams/${teamId}/datarooms/${dataroomId}/folders${oldPath}`);mutate(- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/folders`,- );- mutate(- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/folders${oldPath}`,- );- mutate(- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/folders${newPath}`,+ `/api/teams/${teamId}/datarooms/${dataroomId}/folders${newPath}`,).then(() => {router.push(`/datarooms/${dataroomId}/documents${newPath}`);});@@ -109,14 +109,26 @@ export function MoveToDataroomFolderModal({<div className="mb-2"><SidebarFolderTreeSelectiondataroomId={dataroomId}- selectedFolderId={folderId}- setFolderId={setFolderId}+ selectedFolder={selectedFolder}+ setSelectedFolder={setSelectedFolder}/></div><DialogFooter>- <Button onClick={handleSubmit} className="h-9 w-full">- Move to folder+ <Button+ onClick={handleSubmit}+ className="flex h-9 w-full gap-1"+ loading={loading}+ disabled={!selectedFolder}+ >+ {!selectedFolder ? (+ "Select a folder"+ ) : (+ <>+ Move to{" "}+ <span className="font-medium">{selectedFolder.name}</span>+ </>+ )}</Button></DialogFooter></form>diff --git a/components/documents/move-folder-modal.tsx b/components/documents/move-folder-modal.tsxindex 2a027af6..8d0aee83 100644--- a/components/documents/move-folder-modal.tsx+++ b/components/documents/move-folder-modal.tsx@@ -17,6 +17,8 @@ import {DialogTitle,} from "@/components/ui/dialog";+export type TSelectedFolder = { id: string; name: string } | null;+export function MoveToFolderModal({open,setOpen,@@ -29,10 +31,11 @@ export function MoveToFolderModal({documentName?: string;}) {const router = useRouter();- const [folderId, setFolderId] = useState<string>("");+ const [selectedFolder, setSelectedFolder] = useState<TSelectedFolder>(null);const [loading, setLoading] = useState<boolean>(false);const teamInfo = useTeam();+ const teamId = teamInfo?.currentTeam?.id;const currentPath = router.query.name? (router.query.name as string[]).join("/")@@ -42,19 +45,19 @@ export function MoveToFolderModal({event.preventDefault();event.stopPropagation();- if (folderId === "") return;+ if (!selectedFolder) return;setLoading(true);try {const response = await fetch(- `/api/teams/${teamInfo?.currentTeam?.id}/documents/${documentId}`,+ `/api/teams/${teamId}/documents/${documentId}`,{method: "PUT",headers: {"Content-Type": "application/json",},body: JSON.stringify({- folderId: folderId,+ folderId: selectedFolder.id,currentPathName: "/" + currentPath,}),},@@ -74,13 +77,11 @@ export function MoveToFolderModal({toast.success("Document moved successfully!");- mutate(`/api/teams/${teamInfo?.currentTeam?.id}/folders`);- mutate(`/api/teams/${teamInfo?.currentTeam?.id}/folders${oldPath}`);- mutate(`/api/teams/${teamInfo?.currentTeam?.id}/folders${newPath}`).then(- () => {- router.push(`/documents/tree${newPath}`);- },- );+ mutate(`/api/teams/${teamId}/folders`);+ mutate(`/api/teams/${teamId}/folders${oldPath}`);+ mutate(`/api/teams/${teamId}/folders${newPath}`).then(() => {+ router.push(`/documents/tree${newPath}`);+ });} catch (error) {console.error("Error moving document", error);toast.error("Failed to move document. Try again.");@@ -102,14 +103,26 @@ export function MoveToFolderModal({<form><div className="mb-2"><SidebarFolderTreeSelection- selectedFolderId={folderId}- setFolderId={setFolderId}+ selectedFolder={selectedFolder}+ setSelectedFolder={setSelectedFolder}/></div><DialogFooter>- <Button onClick={handleSubmit} className="h-9 w-full">- Move to folder+ <Button+ onClick={handleSubmit}+ className="flex h-9 w-full gap-1"+ loading={loading}+ disabled={!selectedFolder}+ >+ {!selectedFolder ? (+ "Select a folder"+ ) : (+ <>+ Move to{" "}+ <span className="font-medium">{selectedFolder.name}</span>+ </>+ )}</Button></DialogFooter></form>diff --git a/components/sidebar-folders.tsx b/components/sidebar-folders.tsxindex d52dea7c..8112680d 100644--- a/components/sidebar-folders.tsx+++ b/components/sidebar-folders.tsx@@ -6,6 +6,8 @@ import { FileTree } from "@/components/ui/nextra-filetree";import { FolderWithDocuments, useFolders } from "@/lib/swr/use-documents";+import { TSelectedFolder } from "./documents/move-folder-modal";+// Helper function to build nested folder structureconst buildNestedFolderStructure = (folders: FolderWithDocuments[]) => {const folderMap = new Map();@@ -89,12 +91,12 @@ FolderComponent.displayName = "FolderComponent";const FolderComponentSelection = memo(({folder,- selectedFolderId,- setFolderId,+ selectedFolder,+ setSelectedFolder,}: {folder: FolderWithDocuments;- selectedFolderId: string;- setFolderId: React.Dispatch<React.SetStateAction<string>>;+ selectedFolder: TSelectedFolder;+ setSelectedFolder: React.Dispatch<React.SetStateAction<TSelectedFolder>>;}) => {// Recursively render child folders if they existconst childFolders = useMemo(@@ -103,11 +105,16 @@ const FolderComponentSelection = memo(<FolderComponentSelectionkey={childFolder.id}folder={childFolder}- selectedFolderId={selectedFolderId}- setFolderId={setFolderId}+ selectedFolder={selectedFolder}+ setSelectedFolder={setSelectedFolder}/>)),- [folder.childFolders, selectedFolderId, setFolderId],+ [folder.childFolders, selectedFolder, setSelectedFolder],+ );++ const isActive = folder.id === selectedFolder?.id;+ const isChildActive = folder.childFolders.some(+ (childFolder) => childFolder.id === selectedFolder?.id,);return (@@ -115,13 +122,17 @@ const FolderComponentSelection = memo(onClick={(e) => {e.preventDefault();e.stopPropagation();- setFolderId(folder.id);+ setSelectedFolder({ id: folder.id, name: folder.name });}}><FileTree.Foldername={folder.name}key={folder.id}- active={folder.id === selectedFolderId}+ active={isActive}+ childActive={isChildActive}+ onToggle={() =>+ setSelectedFolder({ id: folder.id, name: folder.name })+ }>{childFolders}</FileTree.Folder>@@ -156,14 +167,14 @@ export default function SidebarFolderTree() {return <SidebarFolders folders={folders} />;}-const SidebarFoldersSelectipon = ({+const SidebarFoldersSelection = ({folders,- selectedFolderId,- setFolderId,+ selectedFolder,+ setSelectedFolder,}: {folders: FolderWithDocuments[];- selectedFolderId: string;- setFolderId: React.Dispatch<React.SetStateAction<string>>;+ selectedFolder: TSelectedFolder;+ setSelectedFolder: React.Dispatch<React.SetStateAction<TSelectedFolder>>;}) => {const nestedFolders = useMemo(() => {if (folders) {@@ -178,8 +189,8 @@ const SidebarFoldersSelectipon = ({<FolderComponentSelectionkey={folder.id}folder={folder}- selectedFolderId={selectedFolderId}- setFolderId={setFolderId}+ selectedFolder={selectedFolder}+ setSelectedFolder={setSelectedFolder}/>))}</FileTree>@@ -187,21 +198,21 @@ const SidebarFoldersSelectipon = ({};export function SidebarFolderTreeSelection({- selectedFolderId,- setFolderId,+ selectedFolder,+ setSelectedFolder,}: {- selectedFolderId: string;- setFolderId: React.Dispatch<React.SetStateAction<string>>;+ selectedFolder: TSelectedFolder;+ setSelectedFolder: React.Dispatch<React.SetStateAction<TSelectedFolder>>;}) {const { folders, error } = useFolders();if (!folders || error) return null;return (- <SidebarFoldersSelectipon+ <SidebarFoldersSelectionfolders={folders}- selectedFolderId={selectedFolderId}- setFolderId={setFolderId}+ selectedFolder={selectedFolder}+ setSelectedFolder={setSelectedFolder}/>);}