Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

Fix(Dataroom): Modal Text Drag Triggers Background Item Drag

Ashish Viradiya4714a4edd212
diff --git a/components/datarooms/dataroom-items-list.tsx b/components/datarooms/dataroom-items-list.tsx
index f90213ee..6e65374b 100644
--- a/components/datarooms/dataroom-items-list.tsx
+++ b/components/datarooms/dataroom-items-list.tsx
@@ -32,25 +32,25 @@ import {
DataroomFolderWithCount,
} from "@/lib/swr/use-dataroom";
import useDataroomGroups from "@/lib/swr/use-dataroom-groups";
-import { FolderWithCount } from "@/lib/swr/use-documents";
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 { 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";
import { EmptyDocuments } from "@/components/documents/empty-document";
import FolderCard from "@/components/documents/folder-card";
+import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Portal } from "@/components/ui/portal";
+import { ButtonTooltip } from "@/components/ui/tooltip";
import { UploadNotificationDrawer } from "@/components/upload-notification";
import UploadZone, {
RejectedFile,
UploadState,
} from "@/components/upload-zone";
-import { DraggableItem } from "../documents/drag-and-drop/draggable-item";
-import { DroppableFolder } from "../documents/drag-and-drop/droppable-folder";
-import { Button } from "../ui/button";
-import { Checkbox } from "../ui/checkbox";
-import { Portal } from "../ui/portal";
-import { ButtonTooltip } from "../ui/tooltip";
-import { useRemoveDataroomItemsModal } from "./actions/remove-document-modal";
-import DataroomDocumentCard from "./dataroom-document-card";
import { itemsMessage } from "./folders/utils";
import { SetGroupPermissionsModal } from "./groups/set-group-permissions-modal";
import { MoveToDataroomFolderModal } from "./move-dataroom-folder-modal";
@@ -106,6 +106,24 @@ export function DataroomItemsList({
const [isOverFolder, setIsOverFolder] = useState<boolean>(false);
const [isDragging, setIsDragging] = useState<boolean>(false);
+ const { setDeleteModalOpen, setFolderToDelete, DeleteFolderModal } =
+ useDeleteFolderModal(teamInfo, true, dataroomId);
+
+ const handleDeleteFolder = useCallback(
+ (folderId: string) => {
+ const folderToDelete = mixedItems.find(
+ (f) => f.id === folderId && f.itemType === "folder",
+ );
+ if (folderToDelete && folderToDelete.itemType === "folder") {
+ const { itemType, ...folder } = folderToDelete;
+ setFolderToDelete(folder);
+ setDeleteModalOpen(true);
+ setSelectedFolders((prev) => prev.filter((id) => id !== folderId));
+ }
+ },
+ [mixedItems, setFolderToDelete, setDeleteModalOpen, setSelectedFolders],
+ );
+
const handleCloseDrawer = () => {
setShowDrawer(false);
};
@@ -346,6 +364,7 @@ export function DataroomItemsList({
teamInfo={teamInfo}
isDataroom={!!dataroomId}
dataroomId={dataroomId}
+ onDelete={handleDeleteFolder}
/>
) : (
<DataroomDocumentCard
@@ -385,6 +404,7 @@ export function DataroomItemsList({
dataroomId={dataroomId}
isSelected={selectedFolders.includes(item.id)}
isDragging={isDragging && selectedFolders.includes(item.id)}
+ onDelete={handleDeleteFolder}
/>
</DraggableItem>
</DroppableFolder>
@@ -622,6 +642,7 @@ export function DataroomItemsList({
teamInfo={teamInfo}
isDataroom={!!dataroomId}
dataroomId={dataroomId}
+ onDelete={handleDeleteFolder}
/>
) : null}
{selectedDocumentsLength + selectedFoldersLength > 1 ? (
@@ -686,6 +707,7 @@ export function DataroomItemsList({
isAutoOpen
/>
)}
+ <DeleteFolderModal />
</>
);
}
diff --git a/components/datarooms/sortable/sortable-list.tsx b/components/datarooms/sortable/sortable-list.tsx
index da6aeb53..9ace38a7 100644
--- a/components/datarooms/sortable/sortable-list.tsx
+++ b/components/datarooms/sortable/sortable-list.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useCallback, useState } from "react";
import { TeamContextType } from "@/context/team-context";
import {
@@ -22,16 +22,17 @@ import { CheckIcon } from "lucide-react";
import { toast } from "sonner";
import { mutate } from "swr";
-import DataroomDocumentCard from "@/components/datarooms/dataroom-document-card";
-import FolderCard from "@/components/documents/folder-card";
-import { Button } from "@/components/ui/button";
-import { Portal } from "@/components/ui/portal";
-
import {
DataroomFolderDocument,
DataroomFolderWithCount,
} from "@/lib/swr/use-dataroom";
+import DataroomDocumentCard from "@/components/datarooms/dataroom-document-card";
+import { useDeleteFolderModal } from "@/components/documents/actions/delete-folder-modal";
+import FolderCard from "@/components/documents/folder-card";
+import { Button } from "@/components/ui/button";
+import { Portal } from "@/components/ui/portal";
+
import { SortableItem } from "./sortable-item";
type FolderOrDocument =
@@ -54,6 +55,27 @@ export function DataroomSortableList({
const [activeId, setActiveId] = useState<string | null>(null);
const [items, setItems] = useState<FolderOrDocument[]>(mixedItems ?? []);
+ const { setDeleteModalOpen, setFolderToDelete, DeleteFolderModal } =
+ useDeleteFolderModal(teamInfo, true, dataroomId);
+
+ const handleDeleteFolder = useCallback(
+ (folderId: string) => {
+ const folderToDelete = items.find(
+ (f) => f.id === folderId && f.itemType === "folder",
+ );
+ if (folderToDelete && folderToDelete.itemType === "folder") {
+ const { itemType, ...folder } = folderToDelete;
+ setFolderToDelete(folder);
+ setDeleteModalOpen(true);
+ setItems((prevItems) =>
+ prevItems.filter((item) => item.id !== folderId),
+ );
+ }
+ setItems((prevItems) => prevItems.filter((item) => item.id !== folderId));
+ },
+ [items, setFolderToDelete, setDeleteModalOpen, setItems],
+ );
+
const sensors = useSensors(
useSensor(PointerSensor),
useSensor(KeyboardSensor, {
@@ -149,8 +171,9 @@ export function DataroomSortableList({
<FolderCard
folder={item}
teamInfo={teamInfo}
- isDataroom={!!dataroomId}
+ isDataroom
dataroomId={dataroomId}
+ onDelete={handleDeleteFolder}
/>
) : (
<DataroomDocumentCard
@@ -197,8 +220,9 @@ export function DataroomSortableList({
<FolderCard
folder={activeItem}
teamInfo={teamInfo}
- isDataroom={!!dataroomId}
+ isDataroom
dataroomId={dataroomId}
+ onDelete={handleDeleteFolder}
/>
) : (
<DataroomDocumentCard
@@ -223,6 +247,7 @@ export function DataroomSortableList({
Save index
</Button>
</Portal>
+ <DeleteFolderModal />
</div>
);
}
diff --git a/components/documents/actions/delete-documents-modal.tsx b/components/documents/actions/delete-documents-modal.tsx
index b75fa73e..12875f91 100644
--- a/components/documents/actions/delete-documents-modal.tsx
+++ b/components/documents/actions/delete-documents-modal.tsx
@@ -237,7 +237,12 @@ function DeleteItemsModal({
</div>
</div>
- <Button variant="destructive" loading={deleting} disabled={!isValid}>
+ <Button
+ variant="destructive"
+ type="submit"
+ loading={deleting}
+ disabled={!isValid}
+ >
Confirm delete
{documentIds.length > 0 &&
` ${documentIds.length} document${documentIds.length > 1 ? "s" : ""}`}
diff --git a/components/documents/actions/delete-folder-modal.tsx b/components/documents/actions/delete-folder-modal.tsx
new file mode 100644
index 00000000..30a561a8
--- /dev/null
+++ b/components/documents/actions/delete-folder-modal.tsx
@@ -0,0 +1,98 @@
+import { useCallback, useMemo, useState } from "react";
+
+import { toast } from "sonner";
+import { mutate } from "swr";
+
+import { DataroomFolderWithCount } from "@/lib/swr/use-dataroom";
+import { FolderWithCount } from "@/lib/swr/use-documents";
+
+import { DeleteFolderModal } from "../delete-folder-modal";
+
+export function useDeleteFolderModal(
+ teamInfo: any,
+ isDataroom?: boolean,
+ dataroomId?: string,
+) {
+ const [deleteModalOpen, setDeleteModalOpen] = useState<boolean>(false);
+ const [folderToDelete, setFolderToDelete] = useState<
+ FolderWithCount | DataroomFolderWithCount | null
+ >(null);
+ const parentFolderPath = folderToDelete?.path.substring(
+ 0,
+ folderToDelete?.path.lastIndexOf("/"),
+ );
+
+ const DeleteFolderModalCallback = useCallback(() => {
+ if (!deleteModalOpen || !folderToDelete) return null;
+
+ const handleDeleteFolder = async (folderId: string) => {
+ const endpointTargetType =
+ isDataroom && dataroomId
+ ? `datarooms/${dataroomId}/folders`
+ : "folders";
+
+ toast.promise(
+ fetch(
+ `/api/teams/${teamInfo?.currentTeam?.id}/${endpointTargetType}/manage/${folderId}`,
+ {
+ method: "DELETE",
+ },
+ ),
+ {
+ loading: isDataroom ? "Removing folder..." : "Deleting folder...",
+ success: () => {
+ mutate(
+ `/api/teams/${teamInfo?.currentTeam?.id}/${endpointTargetType}?root=true`,
+ );
+ mutate(
+ `/api/teams/${teamInfo?.currentTeam?.id}/${endpointTargetType}`,
+ );
+ mutate(
+ `/api/teams/${teamInfo?.currentTeam?.id}/${endpointTargetType}${parentFolderPath}`,
+ );
+ return isDataroom
+ ? "Folder removed successfully."
+ : `Folder deleted successfully with ${folderToDelete?._count.documents} documents and ${folderToDelete?._count.childFolders} folders`;
+ },
+ error: isDataroom
+ ? "Failed to remove folder."
+ : "Failed to delete folder. Move documents first.",
+ },
+ );
+ };
+
+ return (
+ <DeleteFolderModal
+ folderId={folderToDelete.id}
+ open={deleteModalOpen}
+ setOpen={setDeleteModalOpen}
+ folderName={folderToDelete.name}
+ documents={folderToDelete._count.documents}
+ childFolders={folderToDelete._count.childFolders}
+ isDataroom={false}
+ handleButtonClick={(event, folderId) => {
+ event.stopPropagation();
+ event.preventDefault();
+ setDeleteModalOpen(false);
+ handleDeleteFolder(folderId);
+ }}
+ />
+ );
+ }, [
+ deleteModalOpen,
+ folderToDelete,
+ teamInfo,
+ isDataroom,
+ dataroomId,
+ parentFolderPath,
+ ]);
+
+ return useMemo(
+ () => ({
+ setDeleteModalOpen,
+ setFolderToDelete,
+ DeleteFolderModal: DeleteFolderModalCallback,
+ }),
+ [DeleteFolderModalCallback],
+ );
+}
diff --git a/components/documents/delete-folder-modal.tsx b/components/documents/delete-folder-modal.tsx
index e8d4a50c..1004bc77 100644
--- a/components/documents/delete-folder-modal.tsx
+++ b/components/documents/delete-folder-modal.tsx
@@ -1,12 +1,12 @@
-import { FileIcon, Files, Folder } from "lucide-react";
+import { useState } from "react";
-import { Button } from "@/components/ui/button";
+import { FileIcon, Folder } from "lucide-react";
-import { useMediaQuery } from "@/lib/utils/use-media-query";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Modal } from "@/components/ui/modal";
+import { DialogDescription, DialogTitle } from "@/components/ui/dialog";
-import { CardDescription, CardTitle } from "../ui/card";
-import { Input } from "../ui/input";
-import { Modal } from "../ui/modal";
export type TSelectedDataroom = { id: string; name: string } | null;
@@ -29,11 +29,20 @@ export function DeleteFolderModal({
handleButtonClick?: (e: React.FormEvent, folderId: string) => void;
setOpen: React.Dispatch<React.SetStateAction<boolean>>;
}) {
+ const [inputValue, setInputValue] = useState("");
+ const requiredText = `confirm ${isDataroom ? "remove" : "delete"} folder`;
+ const isInputValid = inputValue === requiredText;
+
return (
- <Modal showModal={open} setShowModal={setOpen}>
- <div className="flex flex-col items-center justify-center space-y-3 border-b border-border bg-white px-4 py-4 pt-8 dark:border-gray-900 dark:bg-gray-900 sm:px-8">
- <CardTitle>{isDataroom ? "Remove Folder" : "Delete Folder"}</CardTitle>
- <CardDescription>
+ <Modal showModal={open} setShowModal={setOpen} noBackdropBlur>
+ <div
+ className="flex flex-col items-center justify-center space-y-3 border-b border-border bg-white px-4 py-4 pt-8 dark:border-gray-900 dark:bg-gray-900 sm:px-8"
+ onDragStart={(e) => e.preventDefault()}
+ >
+ <DialogTitle>
+ {isDataroom ? "Remove Folder" : "Delete Folder"}
+ </DialogTitle>
+ <DialogDescription>
{isDataroom
? "This will remove the folder and its contents from this dataroom. The original documents will remain in your workspace."
: "This will permanently delete the folder and all its contents, including subfolders, documents, dataroom references, and any visitor analytics."}
@@ -50,7 +59,7 @@ export function DeleteFolderModal({
{childFolders > 1 ? "folders" : "folder"}
</span>
</div>
- </CardDescription>
+ </DialogDescription>
</div>
<form
@@ -67,7 +76,7 @@ export function DeleteFolderModal({
>
To verify, type{" "}
<span className="font-semibold text-foreground">
- confirm {isDataroom ? "remove" : "delete"} folder
+ {requiredText}
</span>{" "}
below
</label>
@@ -76,14 +85,16 @@ export function DeleteFolderModal({
type="text"
name="verification"
id="verification"
- pattern={`confirm ${isDataroom ? "remove" : "delete"} folder`}
+ value={inputValue}
+ onChange={(e) => setInputValue(e.target.value)}
+ pattern={requiredText}
required
autoComplete="off"
className="bg-white dark:border-gray-500 dark:bg-gray-800 focus:dark:bg-transparent"
/>
</div>
</div>
- <Button variant="destructive">
+ <Button variant="destructive" type="submit" disabled={!isInputValid}>
Confirm {isDataroom ? "remove" : "delete"} folder
</Button>
</form>
diff --git a/components/documents/documents-list.tsx b/components/documents/documents-list.tsx
index 82e1a5c7..e87b637c 100644
--- a/components/documents/documents-list.tsx
+++ b/components/documents/documents-list.tsx
@@ -26,8 +26,6 @@ import {
import { motion } from "motion/react";
import { toast } from "sonner";
-
-
import { moveDocumentToFolder } from "@/lib/documents/move-documents";
import { moveFolderToFolder } from "@/lib/documents/move-folder";
import { DataroomFolderWithCount } from "@/lib/swr/use-dataroom";
@@ -35,8 +33,6 @@ import { FolderWithCount } from "@/lib/swr/use-documents";
import { DocumentWithLinksAndLinkCountAndViewCount } from "@/lib/types";
import { useMediaQuery } from "@/lib/utils/use-media-query";
-
-
import { Skeleton } from "@/components/ui/skeleton";
import { UploadNotificationDrawer } from "@/components/upload-notification";
import UploadZone, {
@@ -44,14 +40,13 @@ import UploadZone, {
UploadState,
} from "@/components/upload-zone";
-
-
import { itemsMessage } from "../datarooms/folders/utils";
import { Button } from "../ui/button";
import { Checkbox } from "../ui/checkbox";
import { Portal } from "../ui/portal";
import { ButtonTooltip } from "../ui/tooltip";
import { useDeleteDocumentsAndFoldersModal } from "./actions/delete-documents-modal";
+import { useDeleteFolderModal } from "./actions/delete-folder-modal";
import DocumentCard from "./document-card";
import { DraggableItem } from "./drag-and-drop/draggable-item";
import { DroppableFolder } from "./drag-and-drop/droppable-folder";
@@ -59,6 +54,17 @@ import { EmptyDocuments } from "./empty-document";
import FolderCard from "./folder-card";
import { MoveToFolderModal, TSelectedFolder } from "./move-folder-modal";
+export type Upload = {
+ fileName: string;
+ progress: number;
+ documentId?: string;
+};
+
+export type File = {
+ fileName: string;
+ message: string;
+};
+
export function DocumentsList({
folders,
documents,
@@ -78,16 +84,11 @@ export function DocumentsList({
const [uploads, setUploads] = useState<UploadState[]>([]);
const [rejectedFiles, setRejectedFiles] = useState<RejectedFile[]>([]);
+ const [selectedDocuments, setSelectedDocuments] = useState<string[]>([]);
+ const [selectedFolders, setSelectedFolders] = useState<string[]>([]);
const [showDrawer, setShowDrawer] = useState<boolean>(false);
- const [moveFolderOpen, setMoveFolderOpen] = useState<boolean>(false);
-
const [dragOffset, setDragOffset] = useState({ x: 0, y: 0 });
- const [selectedDocuments, setSelectedDocuments] = useState<string[]>([]);
- //forFolder
- const [selectedFolder, setSelectedFolder] = useState<string[]>([]);
- const [parentFolderId, setParentFolderId] = useState<string>("");
-
const [draggedDocument, setDraggedDocument] =
useState<DocumentWithLinksAndLinkCountAndViewCount | null>(null);
@@ -95,19 +96,36 @@ export function DocumentsList({
const [draggedFolder, setDraggedFolder] = useState<
FolderWithCount | DataroomFolderWithCount | null
>(null);
-
- const [isOverFolder, setIsOverFolder] = useState<boolean>(false);
const [isDragging, setIsDragging] = useState<boolean>(false);
+ const [isOverFolder, setIsOverFolder] = useState<boolean>(false);
+ const [parentFolderId, setParentFolderId] = useState<string>("");
+ const [moveFolderOpen, setMoveFolderOpen] = useState<boolean>(false);
+
+ const { setDeleteModalOpen, setFolderToDelete, DeleteFolderModal } =
+ useDeleteFolderModal(teamInfo);
+
+ const handleDeleteFolder = useCallback(
+ (folderId: string) => {
+ const folderToDelete = folders?.find((f) => f.id === folderId);
+ if (folderToDelete) {
+ setFolderToDelete(folderToDelete);
+ setDeleteModalOpen(true);
+ setSelectedFolders((prev) => prev.filter((id) => id !== folderId));
+ }
+ },
+ [folders, setFolderToDelete, setDeleteModalOpen, setSelectedFolders],
+ );
- const totalSelectedItem = [...selectedDocuments, ...selectedFolder].length;
const { setShowDeleteItemsModal, DeleteItemsModal } =
useDeleteDocumentsAndFoldersModal({
documentIds: selectedDocuments,
- setSelectedDocuments: setSelectedDocuments,
- folderIds: selectedFolder,
- setSelectedFolder,
+ setSelectedDocuments,
+ folderIds: selectedFolders,
+ setSelectedFolder: setSelectedFolders,
});
+ const totalSelectedItem = [...selectedDocuments, ...selectedFolders].length;
+
const sensors = useSensors(
useSensor(MouseSensor),
useSensor(TouchSensor),
@@ -124,14 +142,14 @@ export function DocumentsList({
);
const selectedFoldersLength = useMemo(
- () => selectedFolder && selectedFolder.length,
- [selectedFolder],
+ () => selectedFolders && selectedFolders.length,
+ [selectedFolders],
);
const handleSelect = useCallback(
(id: string, type: "document" | "folder") => {
if (type === "folder") {
- setSelectedFolder((prev) =>
+ setSelectedFolders((prev) =>
prev.includes(id)
? prev.filter((docId) => docId !== id)
: [...prev, id],
@@ -203,12 +221,12 @@ export function DocumentsList({
itemId,
folders,
setDraggedFolder,
- selectedFolder,
- setSelectedFolder,
+ selectedFolders,
+ setSelectedFolders,
);
}
},
- [handleDragForType, documents, folders, selectedDocuments, selectedFolder],
+ [handleDragForType, documents, folders, selectedDocuments, selectedFolders],
);
const handleDragOver = (event: DragOverEvent) => {
@@ -280,7 +298,7 @@ export function DocumentsList({
if (!over) return;
const activeId = active.id;
const overId = over.id;
- if (selectedFolder.includes(overId.toString())) {
+ if (selectedFolders.includes(overId.toString())) {
return toast.error(
"Can not move folder and documents into selected folders",
);
@@ -296,7 +314,7 @@ export function DocumentsList({
const documentsToMove =
selectedDocumentsLength > 0 ? selectedDocuments : [];
// Move the folder(s) to the new folder
- const foldersToMove = selectedFoldersLength > 0 ? selectedFolder : [];
+ const foldersToMove = selectedFoldersLength > 0 ? selectedFolders : [];
toast.promise(
moveDocumentsAndFolders({
@@ -316,7 +334,7 @@ export function DocumentsList({
);
setSelectedDocuments([]);
- setSelectedFolder([]);
+ setSelectedFolders([]);
setIsOverFolder(false);
};
@@ -326,7 +344,7 @@ export function DocumentsList({
const resetSelection = () => {
setSelectedDocuments([]);
- setSelectedFolder([]);
+ setSelectedFolders([]);
};
const HeaderContent = memo(() => {
@@ -337,12 +355,12 @@ export function DocumentsList({
const handleSelectAll = () => {
if (isAllSelected) {
setSelectedDocuments([]);
- setSelectedFolder([]);
+ setSelectedFolders([]);
} else {
const allDocumentIds = documents?.map((doc) => doc.id) || [];
const allFolderIds = folders?.map((folder) => folder.id) || [];
setSelectedDocuments(allDocumentIds);
- setSelectedFolder(allFolderIds);
+ setSelectedFolders(allFolderIds);
}
};
@@ -472,6 +490,11 @@ export function DocumentsList({
key={folder.id}
folder={folder}
teamInfo={teamInfo}
+ isSelected={selectedFolders.includes(folder.id)}
+ isDragging={
+ isDragging && selectedFolders.includes(folder.id)
+ }
+ onDelete={handleDeleteFolder}
/>
);
})
@@ -559,13 +582,13 @@ export function DocumentsList({
<DroppableFolder
key={folder.id}
id={folder.id}
- disabledFolder={selectedFolder}
+ disabledFolder={selectedFolders}
path={folder.path}
>
<DraggableItem
key={folder.id}
id={folder.id}
- isSelected={selectedFolder.includes(folder.id)}
+ isSelected={selectedFolders.includes(folder.id)}
onSelect={(id, type) => {
handleSelect(id, type);
}}
@@ -576,11 +599,12 @@ export function DocumentsList({
key={folder.id}
folder={folder}
teamInfo={teamInfo}
- isSelected={selectedFolder.includes(folder.id)}
+ isSelected={selectedFolders.includes(folder.id)}
isDragging={
isDragging &&
- selectedFolder.includes(folder.id)
+ selectedFolders.includes(folder.id)
}
+ onDelete={handleDeleteFolder}
/>
</DraggableItem>
</DroppableFolder>
@@ -669,6 +693,7 @@ export function DocumentsList({
<FolderCard
folder={draggedFolder}
teamInfo={teamInfo}
+ onDelete={handleDeleteFolder}
/>
) : null}
{totalSelectedItem > 1 ? (
@@ -699,12 +724,11 @@ export function DocumentsList({
setOpen={setMoveFolderOpen}
setSelectedDocuments={setSelectedDocuments}
documentIds={selectedDocuments}
- folderIds={selectedFolder}
+ folderIds={selectedFolders}
folderParentId={parentFolderId}
- setSelectedFoldersId={setSelectedFolder}
+ setSelectedFoldersId={setSelectedFolders}
/>
) : null}
- <DeleteItemsModal />
</>
)}
</UploadZone>
@@ -719,6 +743,8 @@ export function DocumentsList({
setRejectedFiles={setRejectedFiles}
/>
) : null}
+ <DeleteFolderModal />
+ <DeleteItemsModal />
</>
);
-};
+}
diff --git a/components/documents/folder-card.tsx b/components/documents/folder-card.tsx
index 5488ecb2..a000db4e 100644
--- a/components/documents/folder-card.tsx
+++ b/components/documents/folder-card.tsx
@@ -34,7 +34,6 @@ import {
import { MoveToDataroomFolderModal } from "../datarooms/move-dataroom-folder-modal";
import { EditFolderModal } from "../folders/edit-folder-modal";
import { AddFolderToDataroomModal } from "./add-folder-to-dataroom-modal";
-import { DeleteFolderModal } from "./delete-folder-modal";
import { MoveToFolderModal } from "./move-folder-modal";
type FolderCardProps = {
@@ -46,7 +45,9 @@ type FolderCardProps = {
isOver?: boolean;
isHovered?: boolean;
isSelected?: boolean;
+ onDelete?: (folderId: string) => void;
};
+
export default function FolderCard({
folder,
teamInfo,
@@ -56,13 +57,13 @@ export default function FolderCard({
isOver,
isSelected,
isHovered,
+ onDelete,
}: FolderCardProps) {
const router = useRouter();
const [moveFolderOpen, setMoveFolderOpen] = useState<boolean>(false);
const [openFolder, setOpenFolder] = useState<boolean>(false);
const [menuOpen, setMenuOpen] = useState<boolean>(false);
const [addDataroomOpen, setAddDataroomOpen] = useState<boolean>(false);
- const [deleteModalOpen, setDeleteModalOpen] = useState<boolean>(false);
const dropdownRef = useRef<HTMLDivElement | null>(null);
const folderPath =
@@ -76,55 +77,14 @@ export default function FolderCard({
// https://github.com/radix-ui/primitives/issues/1241#issuecomment-1888232392
useEffect(() => {
- if (!openFolder || !addDataroomOpen || !deleteModalOpen) {
+ if (!openFolder || !addDataroomOpen) {
setTimeout(() => {
document.body.style.pointerEvents = "";
});
}
- }, [openFolder, addDataroomOpen, deleteModalOpen]);
-
- const handleButtonClick = (event: any, FolderId: string) => {
- event.stopPropagation();
- event.preventDefault();
+ }, [openFolder, addDataroomOpen]);
- setDeleteModalOpen(false);
- handleDeleteFolder(FolderId);
- setMenuOpen(false);
- };
- const handleDeleteFolder = async (folderId: string) => {
- const endpointTargetType =
- isDataroom && dataroomId ? `datarooms/${dataroomId}/folders` : "folders";
-
- toast.promise(
- fetch(
- `/api/teams/${teamInfo?.currentTeam?.id}/${endpointTargetType}/manage/${folderId}`,
- {
- method: "DELETE",
- },
- ),
- {
- loading: isDataroom ? "Removing folder..." : "Deleting folder...",
- success: () => {
- mutate(
- `/api/teams/${teamInfo?.currentTeam?.id}/${endpointTargetType}?root=true`,
- );
- mutate(
- `/api/teams/${teamInfo?.currentTeam?.id}/${endpointTargetType}`,
- );
- mutate(
- `/api/teams/${teamInfo?.currentTeam?.id}/${endpointTargetType}${parentFolderPath}`,
- );
- return isDataroom
- ? "Folder removed successfully."
- : `Folder deleted successfully with ${folder._count.documents} documents and ${folder._count.childFolders} folders`;
- },
- error: isDataroom
- ? "Failed to remove folder."
- : "Failed to delete folder. Move documents first.",
- },
- );
- };
const handleCreateDataroom = (e: any, folderId: string) => {
e.stopPropagation();
@@ -311,7 +271,8 @@ export default function FolderCard({
onClick={(event) => {
event.preventDefault();
event.stopPropagation();
- setDeleteModalOpen(true);
+ onDelete?.(folder.id);
+ setMenuOpen(false);
}}
className="text-destructive duration-200 focus:bg-destructive focus:text-destructive-foreground"
>
@@ -350,18 +311,6 @@ export default function FolderCard({
dataroomId={dataroomId}
/>
) : null}
- {deleteModalOpen ? (
- <DeleteFolderModal
- folderId={folder.id}
- open={deleteModalOpen}
- setOpen={setDeleteModalOpen}
- folderName={folder.name}
- documents={folder._count.documents}
- childFolders={folder._count.childFolders}
- isDataroom={isDataroom}
- handleButtonClick={handleButtonClick}
- />
- ) : null}
{moveFolderOpen && !isDataroom ? (
<MoveToFolderModal
open={moveFolderOpen}