Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add dataroom document / folder index sorting
Marc Seitz1be8f84e998c
diff --git a/components/datarooms/dataroom-document-card.tsx b/components/datarooms/dataroom-document-card.tsxindex 02d13633..091c6296 100644--- a/components/datarooms/dataroom-document-card.tsx+++ b/components/datarooms/dataroom-document-card.tsx@@ -223,7 +223,12 @@ export default function DataroomDocumentCard({</DropdownMenuTrigger><DropdownMenuContent align="end" ref={dropdownRef}><DropdownMenuLabel>Actions</DropdownMenuLabel>- <DropdownMenuItem onClick={() => setMoveFolderOpen(true)}>+ <DropdownMenuItem+ onClick={(e) => {+ e.stopPropagation();+ setMoveFolderOpen(true);+ }}+ ><FolderInputIcon className="mr-2 h-4 w-4" />Move to folder</DropdownMenuItem>diff --git a/components/datarooms/sortable/sortable-list.tsx b/components/datarooms/sortable/sortable-list.tsxindex f0b68bbb..a46de121 100644--- a/components/datarooms/sortable/sortable-list.tsx+++ b/components/datarooms/sortable/sortable-list.tsx@@ -1,4 +1,4 @@-import { useEffect, useState } from "react";+import { useState } from "react";import React from "react";import { TeamContextType } from "@/context/team-context";@@ -19,9 +19,13 @@ import {sortableKeyboardCoordinates,verticalListSortingStrategy,} from "@dnd-kit/sortable";+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 { Skeleton } from "@/components/ui/skeleton";import {@@ -29,35 +33,25 @@ import {DataroomFolderWithCount,} from "@/lib/swr/use-dataroom";-import { ItemCategory, SortableItem } from "./sortable-item";+import { SortableItem } from "./sortable-item";-type FolderOrDocument = DataroomFolderWithCount | DataroomFolderDocument;--const isFolder = (item: FolderOrDocument): item is DataroomFolderWithCount =>- "_count" in item && "childFolders" in item._count;+type FolderOrDocument =+ | (DataroomFolderWithCount & { itemType: "folder" })+ | (DataroomFolderDocument & { itemType: "document" });export function DataroomSortableList({- folders,- documents,+ mixedItems,teamInfo,dataroomId,- onReorder,+ setIsReordering,}: {- folders: DataroomFolderWithCount[] | undefined;- documents: DataroomFolderDocument[] | undefined;+ mixedItems: FolderOrDocument[] | undefined;teamInfo: TeamContextType | null;dataroomId: string;- onReorder: (newOrder: { category: ItemCategory; id: string }[]) => void;+ setIsReordering: (isReordering: boolean) => void;}) {const [activeId, setActiveId] = useState<string | null>(null);- const [items, setItems] = useState<FolderOrDocument[]>([- ...(folders || []),- ...(documents || []),- ]);-- useEffect(() => {- setItems([...(folders || []), ...(documents || [])]);- }, [folders, documents]);+ const [items, setItems] = useState<FolderOrDocument[]>(mixedItems ?? []);const sensors = useSensors(useSensor(PointerSensor),@@ -86,40 +80,72 @@ export function DataroomSortableList({if (activeId !== overId) {setItems((prevItems) => {const oldIndex = prevItems.findIndex(- (item) =>- `${isFolder(item) ? "folder" : "document"}-${item.id}` === activeId,+ (item) => `${item.itemType}-${item.id}` === activeId,);const newIndex = prevItems.findIndex(- (item) =>- `${isFolder(item) ? "folder" : "document"}-${item.id}` === overId,+ (item) => `${item.itemType}-${item.id}` === overId,);-- const newItems = arrayMove(prevItems, oldIndex, newIndex);- // onReorder(- // newItems.map((item) => ({- // category: isFolder(item) ? "folder" : "document",- // id: item.id,- // })),- // );- console.log("reorder", newItems);-- return newItems;+ const newOrder = arrayMove(prevItems, oldIndex, newIndex);+ return newOrder;});}setActiveId(null);};+ const handleSave = async () => {+ // if nothing changed just return+ if (items.every((item, index) => item.id === mixedItems?.[index].id)) {+ setIsReordering(false);+ return;+ }++ const newOrder = items.map((item, index) => ({+ category: item.itemType,+ id: item.id,+ orderIndex: index,+ }));++ try {+ // Make API call to save the new order+ console.log("Saving new order:", newOrder);+ const response = await fetch(+ `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/reorder`,+ {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify(newOrder),+ },+ );++ if (!response.ok) {+ throw new Error("Failed to save new order");+ }++ // Update local data using SWR's mutate+ mutate(+ `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/folders?root=true`,+ );+ mutate(+ `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/documents`,+ );+ setIsReordering(false);+ toast.success("Index saved successfully");+ } catch (error) {+ console.error("Failed to save new order:", error);+ toast.error("Failed to save index");+ // Optionally, show an error message to the user+ } finally {+ setIsReordering(false);+ }+ };+const renderItem = (item: FolderOrDocument) => {- const itemId = `${isFolder(item) ? "folder" : "document"}-${item.id}`;+ const itemId = `${item.itemType}-${item.id}`;return (- <SortableItem- key={itemId}- id={itemId}- category={isFolder(item) ? "folder" : "document"}- >- {isFolder(item) ? (+ <SortableItem key={itemId} id={itemId} category={item.itemType}>+ {item.itemType === "folder" ? (<FolderCardfolder={item}teamInfo={teamInfo}@@ -138,14 +164,20 @@ export function DataroomSortableList({};const activeItem = activeId- ? items.find(- (item) =>- `${isFolder(item) ? "folder" : "document"}-${item.id}` === activeId,- )+ ? items.find((item) => `${item.itemType}-${item.id}` === activeId): null;return (- <div className="rounded-lg border-2 border-dashed border-gray-400 p-2">+ <div className="relative rounded-lg border-2 border-dashed border-gray-400 p-2">+ <Button+ onClick={handleSave}+ variant={"outline"}+ size="sm"+ className="absolute right-[-2px] top-[-66px] gap-x-1"+ >+ <CheckIcon className="size-4" />+ Save index+ </Button><DndContextsensors={sensors}collisionDetection={closestCenter}@@ -153,9 +185,7 @@ export function DataroomSortableList({onDragStart={handleDragStart}><SortableContext- items={items.map(- (item) => `${isFolder(item) ? "folder" : "document"}-${item.id}`,- )}+ items={items.map((item) => `${item.itemType}-${item.id}`)}strategy={verticalListSortingStrategy}><ul role="list" className="relative space-y-4">@@ -172,7 +202,7 @@ export function DataroomSortableList({boxShadow: "0 0 10px rgba(0, 0, 0, 0.2)",}}>- {isFolder(activeItem) ? (+ {activeItem.itemType === "folder" ? (<FolderCardfolder={activeItem}teamInfo={teamInfo}diff --git a/components/documents/dataroom-items-list.tsx b/components/documents/dataroom-items-list.tsxnew file mode 100644index 00000000..19e756c5--- /dev/null+++ b/components/documents/dataroom-items-list.tsx@@ -0,0 +1,115 @@+import { useState } from "react";+import React from "react";++import { TeamContextType } from "@/context/team-context";++import { UploadNotificationDrawer } from "@/components/upload-notification";+import UploadZone from "@/components/upload-zone";++import {+ DataroomFolderDocument,+ DataroomFolderWithCount,+} from "@/lib/swr/use-dataroom";++import DataroomDocumentCard from "../datarooms/dataroom-document-card";+import { EmptyDocuments } from "./empty-document";+import FolderCard from "./folder-card";++type FolderOrDocument =+ | (DataroomFolderWithCount & { itemType: "folder" })+ | (DataroomFolderDocument & { itemType: "document" });++// const isFolder = (item: FolderOrDocument): item is DataroomFolderWithCount =>+// "_count" in item && "childFolders" in item._count;++export function DataroomItemsList({+ mixedItems,+ teamInfo,+ folderPathName,+ dataroomId,+}: {+ mixedItems: FolderOrDocument[] | [];+ teamInfo: TeamContextType | null;+ folderPathName?: string[];+ dataroomId: string;+}) {+ const [uploads, setUploads] = useState<+ { fileName: string; progress: number; documentId?: string }[]+ >([]);+ const [rejectedFiles, setRejectedFiles] = useState<+ { fileName: string; message: string }[]+ >([]);++ const [showDrawer, setShowDrawer] = useState(false);++ const renderItem = (item: FolderOrDocument) => {+ const itemId = `${item.itemType}-${item.id}`;++ return (+ <>+ {item.itemType === "folder" ? (+ <FolderCard+ key={itemId}+ folder={item}+ teamInfo={teamInfo}+ isDataroom={!!dataroomId}+ dataroomId={dataroomId}+ />+ ) : (+ <DataroomDocumentCard+ key={itemId}+ document={item as DataroomFolderDocument}+ teamInfo={teamInfo}+ dataroomId={dataroomId}+ />+ )}+ </>+ );+ };++ return (+ <>+ <UploadZone+ folderPathName={folderPathName?.join("/")}+ onUploadStart={(newUploads) => {+ setUploads(newUploads);+ setShowDrawer(true);+ }}+ onUploadProgress={(index, progress, documentId) => {+ setUploads((prevUploads) =>+ prevUploads.map((upload, i) =>+ i === index ? { ...upload, progress, documentId } : upload,+ ),+ );+ }}+ onUploadRejected={(rejected) => {+ setRejectedFiles(rejected);+ setShowDrawer(true);+ }}+ setUploads={setUploads}+ setRejectedFiles={setRejectedFiles}+ dataroomId={dataroomId}+ >+ <ul role="list" className="space-y-4">+ {mixedItems.map(renderItem)}+ </ul>++ {!mixedItems.length && (+ <div className="flex items-center justify-center">+ <EmptyDocuments />+ </div>+ )}+ </UploadZone>+ {showDrawer ? (+ <UploadNotificationDrawer+ open={showDrawer}+ onOpenChange={setShowDrawer}+ uploads={uploads}+ setUploads={setUploads}+ rejectedFiles={rejectedFiles}+ setRejectedFiles={setRejectedFiles}+ />+ ) : null}+ </>+ );+}diff --git a/components/documents/folder-card.tsx b/components/documents/folder-card.tsxindex b180fdf1..a984ae1c 100644--- a/components/documents/folder-card.tsx+++ b/components/documents/folder-card.tsx@@ -178,7 +178,9 @@ export default function FolderCard({return (<>- <li className="group/row relative flex items-center justify-between rounded-lg border-0 p-3 ring-1 ring-gray-400 transition-all hover:bg-secondary hover:ring-gray-500 dark:bg-secondary dark:ring-gray-500 hover:dark:ring-gray-400 sm:p-4">+ <div+ className="group/row relative flex items-center justify-between rounded-lg border-0 bg-white p-3 ring-1 ring-gray-400 transition-all hover:bg-secondary hover:ring-gray-500 dark:bg-secondary dark:ring-gray-500 hover:dark:ring-gray-400 sm:p-4"+ ><div className="flex min-w-0 shrink items-center space-x-2 sm:space-x-4"><div className="mx-0.5 flex w-8 items-center justify-center text-center sm:mx-1"><FolderIcon className="h-8 w-8" strokeWidth={1} />@@ -271,7 +273,7 @@ export default function FolderCard({</DropdownMenuContent></DropdownMenu></div>- </li>+ </div>{openFolder ? (<EditFolderModalopen={openFolder}diff --git a/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/documents/index.tsindex d7b03f8b..420adf35 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts@@ -1,13 +1,9 @@import { NextApiRequest, NextApiResponse } from "next";import { authOptions } from "@/pages/api/auth/[...nextauth]";-import { client } from "@/trigger";-import { DataroomDocument, Document } from "@prisma/client";-import slugify from "@sindresorhus/slugify";import { getServerSession } from "next-auth/next";import { errorhandler } from "@/lib/errorHandler";-import { newId } from "@/lib/id-helper";import prisma from "@/lib/prisma";import { CustomUser } from "@/lib/types";import { log } from "@/lib/utils";@@ -51,11 +47,14 @@ export default async function handle(dataroomId: dataroomId,folderId: null,},- orderBy: {- document: {- name: "asc",+ orderBy: [+ { orderIndex: "asc" },+ {+ document: {+ name: "asc",+ },},- },+ ],include: {document: {select: {@@ -78,23 +77,23 @@ export default async function handle(document: { ...document.document },}));- // Sort documents by name considering the numerical part- documentsWithCount.sort((a, b) => {- const getNumber = (str: string): number => {- const match = str.match(/^\d+/);- return match ? parseInt(match[0], 10) : 0;- };+ // // Sort documents by name considering the numerical part+ // documentsWithCount.sort((a, b) => {+ // const getNumber = (str: string): number => {+ // const match = str.match(/^\d+/);+ // return match ? parseInt(match[0], 10) : 0;+ // };- const numA = getNumber(a.document.name);- const numB = getNumber(b.document.name);+ // const numA = getNumber(a.document.name);+ // const numB = getNumber(b.document.name);- if (numA !== numB) {- return numA - numB;- }+ // if (numA !== numB) {+ // return numA - numB;+ // }- // If numerical parts are the same, fall back to lexicographical order- return a.document.name.localeCompare(b.document.name);- });+ // // If numerical parts are the same, fall back to lexicographical order+ // return a.document.name.localeCompare(b.document.name);+ // });return res.status(200).json(documentsWithCount);} catch (error) {diff --git a/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/folders/index.tsindex 9d1aa61d..b1e83b60 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts@@ -49,9 +49,12 @@ export default async function handle(dataroomId,parentId: null,},- orderBy: {- name: "asc",- },+ orderBy: [+ { orderIndex: "asc" },+ {+ name: "asc",+ },+ ],include: {_count: {select: { documents: true, childFolders: true },@@ -66,9 +69,12 @@ export default async function handle(where: {dataroomId,},- orderBy: {- name: "asc",- },+ orderBy: [+ { orderIndex: "asc" },+ {+ name: "asc",+ },+ ],include: {documents: {select: {@@ -82,11 +88,14 @@ export default async function handle(},},},- orderBy: {- document: {- name: "asc",+ orderBy: [+ { orderIndex: "asc" },+ {+ document: {+ name: "asc",+ },},- },+ ],},childFolders: {include: {@@ -102,11 +111,14 @@ export default async function handle(},},},- orderBy: {- document: {- name: "asc",+ orderBy: [+ { orderIndex: "asc" },+ {+ document: {+ name: "asc",+ },},- },+ ],},},},diff --git a/pages/api/teams/[teamId]/datarooms/[id]/reorder.ts b/pages/api/teams/[teamId]/datarooms/[id]/reorder.tsnew file mode 100644index 00000000..f73aca34--- /dev/null+++ b/pages/api/teams/[teamId]/datarooms/[id]/reorder.ts@@ -0,0 +1,60 @@+import type { NextApiRequest, NextApiResponse } from "next";++import { authOptions } from "@/pages/api/auth/[...nextauth]";+import { getServerSession } from "next-auth/next";++import prisma from "@/lib/prisma";++type OrderItem = {+ id: string;+ category: "folder" | "document";+ orderIndex: number;+};++export default async function handler(+ req: NextApiRequest,+ res: NextApiResponse,+) {+ if (req.method !== "POST") {+ return res.status(405).json({ message: "Method not allowed" });+ }++ const session = await getServerSession(req, res, authOptions);+ if (!session) {+ return res.status(401).end("Unauthorized");+ }++ const { id: dataroomId } = req.query as { teamId: string; id: string };+ const newOrder: OrderItem[] = req.body;++ if (+ !Array.isArray(newOrder) ||+ !dataroomId ||+ typeof dataroomId !== "string"+ ) {+ return res.status(400).json({ message: "Invalid input" });+ }++ try {+ await prisma.$transaction(async (prisma) => {+ for (const item of newOrder) {+ if (item.category === "folder") {+ await prisma.dataroomFolder.update({+ where: { id: item.id },+ data: { orderIndex: item.orderIndex },+ });+ } else {+ await prisma.dataroomDocument.update({+ where: { id: item.id },+ data: { orderIndex: item.orderIndex },+ });+ }+ }+ });++ res.status(200).json({ message: "Order updated successfully" });+ } catch (error) {+ console.error("Error updating order:", error);+ res.status(500).json({ message: "Error updating order" });+ }+}diff --git a/pages/datarooms/[id]/documents/index.tsx b/pages/datarooms/[id]/documents/index.tsxindex 991f7623..71fe66fe 100644--- a/pages/datarooms/[id]/documents/index.tsx+++ b/pages/datarooms/[id]/documents/index.tsx@@ -1,4 +1,4 @@-import { useState } from "react";+import { useCallback, useState } from "react";import { useTeam } from "@/context/team-context";import {@@ -9,32 +9,32 @@ import {FolderPlusIcon,PlusIcon,} from "lucide-react";+import { mutate } from "swr";import { BreadcrumbComponent } from "@/components/datarooms/dataroom-breadcrumb";import { DataroomHeader } from "@/components/datarooms/dataroom-header";import { SidebarFolderTree } from "@/components/datarooms/folders";import { DataroomSortableList } from "@/components/datarooms/sortable/sortable-list";import { AddDocumentModal } from "@/components/documents/add-document-modal";+import { DataroomItemsList } from "@/components/documents/dataroom-items-list";import { DocumentsList } from "@/components/documents/documents-list";import { AddFolderModal } from "@/components/folders/add-folder-modal";import AppLayout from "@/components/layouts/app";import { NavMenu } from "@/components/navigation-menu";import { Button } from "@/components/ui/button";import { ScrollArea, ScrollBar } from "@/components/ui/scroll-area";+import { Skeleton } from "@/components/ui/skeleton";-import {- useDataroom,- useDataroomDocuments,- useDataroomFolders,-} from "@/lib/swr/use-dataroom";+import { useDataroom, useDataroomItems } from "@/lib/swr/use-dataroom";export default function Documents() {const { dataroom } = useDataroom();- const { documents } = useDataroomDocuments();- const { folders } = useDataroomFolders({ root: true });+ const { items, folderCount, documentCount } = useDataroomItems({+ root: true,+ });const teamInfo = useTeam();- const [reorderItems, setReorderItems] = useState<boolean>(false);+ const [isReordering, setIsReordering] = useState<boolean>(false);return (<AppLayout>@@ -119,50 +119,48 @@ export default function Documents() {<div className="space-y-2"><BreadcrumbComponent /><section className="mb-2 flex items-center gap-x-2">- {folders && folders.length > 0 ? (+ {folderCount > 0 ? (<p className="flex items-center gap-x-1 text-sm text-gray-400"><FolderIcon className="h-4 w-4" />- <span>{folders.length} folders</span>+ <span>{folderCount} folders</span></p>) : null}- {documents && documents.length > 0 ? (+ {documentCount > 0 ? (<p className="flex items-center gap-x-1 text-sm text-gray-400"><FileIcon className="h-4 w-4" />- <span>{documents.length} documents</span>+ <span>{documentCount} documents</span></p>) : null}</section></div><div>- <Button- size="sm"- variant="outline"- className="gap-x-1"- onClick={() => setReorderItems(!reorderItems)}- >- {reorderItems ? (- <CheckIcon className="size-4" />- ) : (+ {!isReordering ? (+ <Button+ size="sm"+ variant="outline"+ className="gap-x-1"+ onClick={() => setIsReordering(!isReordering)}+ ><ArrowUpDownIcon className="h-4 w-4" />- )}- {reorderItems ? "Save index" : "Edit index"}- </Button>+ Edit index+ </Button>+ ) : null}</div></div>- {reorderItems ? (+ {}+ {isReordering ? (<DataroomSortableList- documents={documents}- folders={folders}+ mixedItems={items}teamInfo={teamInfo}dataroomId={dataroom?.id!}+ setIsReordering={setIsReordering}/>) : (- <DocumentsList- documents={documents}- folders={folders}+ <DataroomItemsList+ mixedItems={items}teamInfo={teamInfo}- dataroomId={dataroom?.id}+ dataroomId={dataroom?.id!}/>)}</div>