Skip to content

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

feat: add sort index to dataroom subfolder

Marc Seitzf87b5c76faa5
diff --git a/components/documents/dataroom-items-list.tsx b/components/datarooms/dataroom-items-list.tsx
similarity index 86%
rename from components/documents/dataroom-items-list.tsx
rename to components/datarooms/dataroom-items-list.tsx
index 19e756c5..23d8cad2 100644
--- a/components/documents/dataroom-items-list.tsx
+++ b/components/datarooms/dataroom-items-list.tsx
@@ -1,8 +1,9 @@
import { useState } from "react";
-import React from "react";
import { TeamContextType } from "@/context/team-context";
+import { EmptyDocuments } from "@/components/documents/empty-document";
+import FolderCard from "@/components/documents/folder-card";
import { UploadNotificationDrawer } from "@/components/upload-notification";
import UploadZone from "@/components/upload-zone";
@@ -11,17 +12,12 @@ import {
DataroomFolderWithCount,
} from "@/lib/swr/use-dataroom";
-import DataroomDocumentCard from "../datarooms/dataroom-document-card";
-import { EmptyDocuments } from "./empty-document";
-import FolderCard from "./folder-card";
+import DataroomDocumentCard from "./dataroom-document-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,
@@ -94,8 +90,8 @@ export function DataroomItemsList({
{mixedItems.map(renderItem)}
</ul>
- {!mixedItems.length && (
- <div className="flex items-center justify-center">
+ {mixedItems.length === 0 && (
+ <div className="flex h-full justify-center">
<EmptyDocuments />
</div>
)}
diff --git a/components/datarooms/sortable/sortable-list.tsx b/components/datarooms/sortable/sortable-list.tsx
index a46de121..7226a1fd 100644
--- a/components/datarooms/sortable/sortable-list.tsx
+++ b/components/datarooms/sortable/sortable-list.tsx
@@ -1,5 +1,4 @@
import { useState } from "react";
-import React from "react";
import { TeamContextType } from "@/context/team-context";
import {
@@ -26,7 +25,6 @@ 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 {
DataroomFolderDocument,
@@ -43,11 +41,13 @@ export function DataroomSortableList({
mixedItems,
teamInfo,
dataroomId,
+ folderPathName,
setIsReordering,
}: {
mixedItems: FolderOrDocument[] | undefined;
teamInfo: TeamContextType | null;
dataroomId: string;
+ folderPathName?: string[];
setIsReordering: (isReordering: boolean) => void;
}) {
const [activeId, setActiveId] = useState<string | null>(null);
@@ -124,10 +124,10 @@ export function DataroomSortableList({
// Update local data using SWR's mutate
mutate(
- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/folders?root=true`,
+ `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/folders${folderPathName ? `/${folderPathName.join(" / ")}` : "?root=true"}`,
);
mutate(
- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}/documents`,
+ `/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroomId}${folderPathName ? `/folders/documents/${folderPathName.join("/")}` : "/documents"}`,
);
setIsReordering(false);
toast.success("Index saved successfully");
@@ -219,96 +219,7 @@ export function DataroomSortableList({
</div>
) : null}
</DragOverlay>
- {/* <DragOverlay>
- {activeId && activeId.startsWith("document-") && (
- <div className="opacity-50">
- {renderItem(
- items.find(
- (item) =>
- !isFolder(item) && `document-${item.id}` === activeId,
- )!,
- )}
- </div>
- )}
- </DragOverlay> */}
</DndContext>
- {/* <div className="space-y-4"> */}
- {/* Folders list */}
- {/* <ul role="list" className="space-y-4">
- {folders
- ? folders.map((folder) => {
- return (
- <FolderCard
- key={folder.id}
- folder={folder}
- teamInfo={teamInfo}
- isDataroom={!!dataroomId}
- dataroomId={dataroomId}
- />
- );
- })
- : Array.from({ length: 3 }).map((_, i) => (
- <li
- key={i}
- className="relative flex w-full items-center space-x-3 rounded-lg border px-4 py-5 sm:px-6 lg:px-6"
- >
- <Skeleton key={i} className="h-9 w-9" />
- <div>
- <Skeleton key={i} className="h-4 w-32" />
- <Skeleton key={i + 1} className="mt-2 h-3 w-12" />
- </div>
- <Skeleton
- key={i + 1}
- className="absolute right-5 top-[50%] h-5 w-20 -translate-y-[50%] transform"
- />
- </li>
- ))}
- </ul> */}
-
- {/* Documents list */}
- {/* <ul role="list" className="space-y-4">
- {documents
- ? documents.map((document) => {
- if (dataroomId) {
- return (
- <DataroomDocumentCard
- key={document.id}
- document={document as DataroomFolderDocument}
- teamInfo={teamInfo}
- dataroomId={dataroomId}
- />
- );
- } else {
- return (
- <DocumentCard
- key={document.id}
- document={
- document as DocumentWithLinksAndLinkCountAndViewCount
- }
- teamInfo={teamInfo}
- />
- );
- }
- })
- : Array.from({ length: 3 }).map((_, i) => (
- <li
- key={i}
- className="relative flex w-full items-center space-x-3 rounded-lg border px-4 py-5 sm:px-6 lg:px-6"
- >
- <Skeleton key={i} className="h-9 w-9" />
- <div>
- <Skeleton key={i} className="h-4 w-32" />
- <Skeleton key={i + 1} className="mt-2 h-3 w-12" />
- </div>
- <Skeleton
- key={i + 1}
- className="absolute right-5 top-[50%] h-5 w-20 -translate-y-[50%] transform"
- />
- </li>
- ))}
- </ul> */}
-
- {/* </div> */}
</div>
);
}
diff --git a/components/documents/loading-document.tsx b/components/documents/loading-document.tsx
new file mode 100644
index 00000000..abe56f79
--- /dev/null
+++ b/components/documents/loading-document.tsx
@@ -0,0 +1,24 @@
+import { Skeleton } from "../ui/skeleton";
+
+export function LoadingDocuments({ count }: { count: number }) {
+ return (
+ <ul role="list" className="space-y-4">
+ {Array.from({ length: count }).map((_, i) => (
+ <li
+ key={i}
+ className="relative flex w-full items-center space-x-3 rounded-lg border px-4 py-5 sm:px-6 lg:px-6"
+ >
+ <Skeleton key={i} className="h-9 w-9" />
+ <div>
+ <Skeleton key={i} className="h-4 w-32" />
+ <Skeleton key={i + 1} className="mt-2 h-3 w-12" />
+ </div>
+ <Skeleton
+ key={i + 1}
+ className="absolute right-5 top-[50%] h-5 w-20 -translate-y-[50%] transform"
+ />
+ </li>
+ ))}
+ </ul>
+ );
+}
diff --git a/lib/swr/use-dataroom.ts b/lib/swr/use-dataroom.ts
index 8fdc0685..6f9b6cb0 100644
--- a/lib/swr/use-dataroom.ts
+++ b/lib/swr/use-dataroom.ts
@@ -76,24 +76,32 @@ export function useDataroomItems({
const teamInfo = useTeam();
const teamId = teamInfo?.currentTeam?.id;
- console.log("useDataroomItems", teamId, id);
-
const { data: folderData, error: folderError } = useSWR<
DataroomFolderWithCount[]
>(
- teamId && id && `/api/teams/${teamId}/datarooms/${id}/folders?root=true`,
+ teamId &&
+ id &&
+ `/api/teams/${teamId}/datarooms/${id}/folders${root ? "?root=true" : name ? `/${name.join("/")}` : ""}`,
fetcher,
{
revalidateOnFocus: false,
dedupingInterval: 30000,
},
);
+
const { data: documentData, error: documentError } = useSWR<
DataroomFolderDocument[]
- >(teamId && id && `/api/teams/${teamId}/datarooms/${id}/documents`, fetcher, {
- revalidateOnFocus: false,
- dedupingInterval: 30000,
- });
+ >(
+ teamId &&
+ id &&
+ `/api/teams/${teamId}/datarooms/${id}${name ? `/folders/documents/${name.join("/")}` : "/documents"}`,
+
+ fetcher,
+ {
+ revalidateOnFocus: false,
+ dedupingInterval: 30000,
+ },
+ );
const isLoading =
!folderData && !documentData && !folderError && !documentError;
@@ -114,7 +122,10 @@ export function useDataroomItems({
}, [folderData, documentData]);
return {
- items: combinedItems,
+ items: combinedItems as (
+ | (DataroomFolderWithCount & { itemType: "folder" })
+ | (DataroomFolderDocument & { itemType: "document" })
+ )[],
folderCount: folderData?.length || 0,
documentCount: documentData?.length || 0,
isLoading,
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/folders/documents/[...name].ts b/pages/api/teams/[teamId]/datarooms/[id]/folders/documents/[...name].ts
index 5831bf5a..64f84010 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/folders/documents/[...name].ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/folders/documents/[...name].ts
@@ -65,17 +65,21 @@ export default async function handle(
dataroomId: dataroomId,
folderId: folder.id,
},
- orderBy: {
- document: {
- name: "asc",
+ orderBy: [
+ { orderIndex: "asc" },
+ {
+ document: {
+ name: "asc",
+ },
},
- },
+ ],
select: {
id: true,
dataroomId: true,
folderId: true,
createdAt: true,
updatedAt: true,
+ orderIndex: true,
document: {
select: {
id: true,
diff --git a/pages/datarooms/[id]/documents/[...name].tsx b/pages/datarooms/[id]/documents/[...name].tsx
index 6d68d2f3..f6a11107 100644
--- a/pages/datarooms/[id]/documents/[...name].tsx
+++ b/pages/datarooms/[id]/documents/[...name].tsx
@@ -5,7 +5,6 @@ import { useState } from "react";
import { useTeam } from "@/context/team-context";
import {
ArrowUpDownIcon,
- CheckIcon,
FileIcon,
FolderIcon,
FolderPlusIcon,
@@ -14,32 +13,31 @@ import {
import { BreadcrumbComponent } from "@/components/datarooms/dataroom-breadcrumb";
import { DataroomHeader } from "@/components/datarooms/dataroom-header";
+import { DataroomItemsList } from "@/components/datarooms/dataroom-items-list";
import { SidebarFolderTree } from "@/components/datarooms/folders";
+import { DataroomSortableList } from "@/components/datarooms/sortable/sortable-list";
import { AddDocumentModal } from "@/components/documents/add-document-modal";
-import { DocumentsList } from "@/components/documents/documents-list";
+import { LoadingDocuments } from "@/components/documents/loading-document";
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 {
- useDataroom,
- useDataroomFolderDocuments,
- useDataroomFolders,
-} from "@/lib/swr/use-dataroom";
+import { useDataroom, useDataroomItems } from "@/lib/swr/use-dataroom";
export default function Documents() {
const router = useRouter();
const { name } = router.query as { name: string[] };
const { dataroom } = useDataroom();
- const { folders } = useDataroomFolders({ name });
- const { documents } = useDataroomFolderDocuments({ name });
+ const { items, folderCount, documentCount, isLoading } = useDataroomItems({
+ name,
+ });
const teamInfo = useTeam();
- const [reorderItems, setReorderItems] = useState<boolean>(false);
+ const [isReordering, setIsReordering] = useState<boolean>(false);
return (
<AppLayout>
@@ -124,51 +122,51 @@ 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" />
- ) : (
+ {items.length > 0 && !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 ? (
+ {isLoading ? <LoadingDocuments count={3} /> : null}
+
+ {isReordering ? (
<DataroomSortableList
- documents={documents}
- folders={folders}
+ mixedItems={items}
+ folderPathName={name}
teamInfo={teamInfo}
dataroomId={dataroom?.id!}
+ setIsReordering={setIsReordering}
/>
) : (
- <DocumentsList
- documents={documents}
- folders={folders}
+ <DataroomItemsList
+ mixedItems={items}
teamInfo={teamInfo}
+ dataroomId={dataroom?.id!}
folderPathName={name}
- dataroomId={dataroom?.id}
/>
)}
</div>
diff --git a/pages/datarooms/[id]/documents/index.tsx b/pages/datarooms/[id]/documents/index.tsx
index 71fe66fe..439b2cd2 100644
--- a/pages/datarooms/[id]/documents/index.tsx
+++ b/pages/datarooms/[id]/documents/index.tsx
@@ -1,35 +1,33 @@
-import { useCallback, useState } from "react";
+import { useState } from "react";
import { useTeam } from "@/context/team-context";
+import { mix } from "framer-motion";
import {
ArrowUpDownIcon,
- CheckIcon,
FileIcon,
FolderIcon,
FolderPlusIcon,
PlusIcon,
} from "lucide-react";
-import { mutate } from "swr";
import { BreadcrumbComponent } from "@/components/datarooms/dataroom-breadcrumb";
import { DataroomHeader } from "@/components/datarooms/dataroom-header";
+import { DataroomItemsList } from "@/components/datarooms/dataroom-items-list";
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 { LoadingDocuments } from "@/components/documents/loading-document";
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, useDataroomItems } from "@/lib/swr/use-dataroom";
export default function Documents() {
const { dataroom } = useDataroom();
- const { items, folderCount, documentCount } = useDataroomItems({
+ const { items, folderCount, documentCount, isLoading } = useDataroomItems({
root: true,
});
const teamInfo = useTeam();
@@ -148,7 +146,8 @@ export default function Documents() {
</div>
</div>
- {}
+ {isLoading ? <LoadingDocuments count={3} /> : null}
+
{isReordering ? (
<DataroomSortableList
mixedItems={items}