Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
fix: resolve conflict when uploading documents sequentially
Ashish Viradiyaaaa198ecb50d
diff --git a/components/datarooms/dataroom-items-list.tsx b/components/datarooms/dataroom-items-list.tsxindex c52b3e11..2d6c80a0 100644--- a/components/datarooms/dataroom-items-list.tsx+++ b/components/datarooms/dataroom-items-list.tsx@@ -25,11 +25,6 @@ import {import { motion } from "motion/react";import { toast } from "sonner";-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";-import { moveDataroomDocumentToFolder } from "@/lib/documents/move-dataroom-documents";import { moveDataroomFolderToFolder } from "@/lib/documents/move-dataroom-folders";import {@@ -39,6 +34,14 @@ import {import { FolderWithCount } from "@/lib/swr/use-documents";import { useMediaQuery } from "@/lib/utils/use-media-query";+import { EmptyDocuments } from "@/components/documents/empty-document";+import FolderCard from "@/components/documents/folder-card";+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";@@ -70,12 +73,8 @@ export function DataroomItemsList({}) {const { isMobile } = useMediaQuery();- const [uploads, setUploads] = useState<- { fileName: string; progress: number; documentId?: string }[]- >([]);- const [rejectedFiles, setRejectedFiles] = useState<- { fileName: string; message: string }[]- >([]);+ const [uploads, setUploads] = useState<UploadState[]>([]);+ const [rejectedFiles, setRejectedFiles] = useState<RejectedFile[]>([]);const [showDrawer, setShowDrawer] = useState(false);const [moveFolderOpen, setMoveFolderOpen] = useState<boolean>(false);@@ -482,18 +481,27 @@ export function DataroomItemsList({<UploadZonefolderPathName={folderPathName?.join("/")}onUploadStart={(newUploads) => {- setUploads(newUploads);+ setUploads((prevUploads) => [...prevUploads, ...newUploads]);setShowDrawer(true);}}onUploadProgress={(index, progress, documentId) => {- setUploads((prevUploads) =>- prevUploads.map((upload, i) =>- i === index ? { ...upload, progress, documentId } : upload,- ),- );+ setUploads((prevUploads) => {+ const recentBatchStartIndex = prevUploads.length - index - 1;+ if (+ recentBatchStartIndex < 0 ||+ recentBatchStartIndex >= prevUploads.length+ ) {+ return prevUploads;+ }+ return prevUploads.map((upload, i) =>+ i === recentBatchStartIndex+ ? { ...upload, progress, documentId }+ : upload,+ );+ });}}onUploadRejected={(rejected) => {- setRejectedFiles(rejected);+ setRejectedFiles((prevRejected) => [...prevRejected, ...rejected]);setShowDrawer(true);}}setUploads={setUploads}diff --git a/components/documents/documents-list.tsx b/components/documents/documents-list.tsxindex 55d54793..793a924a 100644--- a/components/documents/documents-list.tsx+++ b/components/documents/documents-list.tsx@@ -26,9 +26,7 @@ import {import { motion } from "motion/react";import { toast } from "sonner";-import { Skeleton } from "@/components/ui/skeleton";-import { UploadNotificationDrawer } from "@/components/upload-notification";-import UploadZone from "@/components/upload-zone";+import { moveDocumentToFolder } from "@/lib/documents/move-documents";import { moveFolderToFolder } from "@/lib/documents/move-folder";@@ -37,6 +35,17 @@ 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, {+ RejectedFile,+ UploadState,+} from "@/components/upload-zone";+++import { itemsMessage } from "../datarooms/folders/utils";import { Button } from "../ui/button";import { Portal } from "../ui/portal";@@ -66,12 +75,8 @@ export function DocumentsList({}) {const { isMobile } = useMediaQuery();- const [uploads, setUploads] = useState<- { fileName: string; progress: number; documentId?: string }[]- >([]);- const [rejectedFiles, setRejectedFiles] = useState<- { fileName: string; message: string }[]- >([]);+ const [uploads, setUploads] = useState<UploadState[]>([]);+ const [rejectedFiles, setRejectedFiles] = useState<RejectedFile[]>([]);const [showDrawer, setShowDrawer] = useState<boolean>(false);const [moveFolderOpen, setMoveFolderOpen] = useState<boolean>(false);@@ -401,18 +406,27 @@ export function DocumentsList({<UploadZonefolderPathName={folderPathName?.join("/")}onUploadStart={(newUploads) => {- setUploads(newUploads);+ setUploads((prevUploads) => [...prevUploads, ...newUploads]);setShowDrawer(true);}}onUploadProgress={(index, progress, documentId) => {- setUploads((prevUploads) =>- prevUploads.map((upload, i) =>- i === index ? { ...upload, progress, documentId } : upload,- ),- );+ setUploads((prevUploads) => {+ const recentBatchStartIndex = prevUploads.length - index - 1;+ if (+ recentBatchStartIndex < 0 ||+ recentBatchStartIndex >= prevUploads.length+ ) {+ return prevUploads;+ }+ return prevUploads.map((upload, i) =>+ i === recentBatchStartIndex+ ? { ...upload, progress, documentId }+ : upload,+ );+ });}}onUploadRejected={(rejected) => {- setRejectedFiles(rejected);+ setRejectedFiles((prevRejected) => [...prevRejected, ...rejected]);setShowDrawer(true);}}setUploads={setUploads}diff --git a/components/upload-notification.tsx b/components/upload-notification.tsxindex f79e51e0..73ce12d6 100644--- a/components/upload-notification.tsx+++ b/components/upload-notification.tsx@@ -9,6 +9,17 @@ import {} from "@/components/ui/drawer";import { Gauge } from "./ui/gauge";+import { RejectedFile, UploadState } from "./upload-zone";++interface UploadNotificationDrawerProps {+ open: boolean;+ onOpenChange: (open: boolean) => void;+ uploads: UploadState[];+ setUploads: (uploads: UploadState[]) => void;+ rejectedFiles: RejectedFile[];+ setRejectedFiles: (rejected: RejectedFile[]) => void;+ handleCloseDrawer: () => void;+}export function UploadNotificationDrawer({open,@@ -18,17 +29,7 @@ export function UploadNotificationDrawer({rejectedFiles,setRejectedFiles,handleCloseDrawer,-}: {- open: boolean;- onOpenChange: (open: boolean) => void;- uploads: { fileName: string; progress: number; documentId?: string }[];- setUploads: (- uploads: { fileName: string; progress: number; documentId?: string }[],- ) => void;- rejectedFiles: { fileName: string; message: string }[];- setRejectedFiles: (rejected: { fileName: string; message: string }[]) => void;- handleCloseDrawer: () => void;-}) {+}: UploadNotificationDrawerProps) {const uploadCount = uploads.length;const failedCount = rejectedFiles.length;@@ -107,4 +108,4 @@ export function UploadNotificationDrawer({</Drawer></div>);-}+};diff --git a/components/upload-zone.tsx b/components/upload-zone.tsxindex 85d50557..fcf4eab8 100644--- a/components/upload-zone.tsx+++ b/components/upload-zone.tsx@@ -72,6 +72,32 @@ interface FileWithPaths extends File {whereToUploadPath?: string;}+export interface UploadState {+ fileName: string;+ progress: number;+ documentId?: string;+ uploadId: string;+}++export interface RejectedFile {+ fileName: string;+ message: string;+}++interface UploadZoneProps extends React.PropsWithChildren {+ onUploadStart: (uploads: UploadState[]) => void;+ onUploadProgress: (+ index: number,+ progress: number,+ documentId?: string,+ ) => void;+ onUploadRejected: (rejected: RejectedFile[]) => void;+ setUploads: React.Dispatch<React.SetStateAction<UploadState[]>>;+ setRejectedFiles: React.Dispatch<React.SetStateAction<RejectedFile[]>>;+ folderPathName?: string;+ dataroomId?: string;+}+export default function UploadZone({children,onUploadStart,@@ -81,28 +107,7 @@ export default function UploadZone({setUploads,setRejectedFiles,dataroomId,-}: {- children: React.ReactNode;- onUploadStart: (- uploads: { fileName: string; progress: number; documentId?: string }[],- ) => void;- onUploadProgress: (- index: number,- progress: number,- documentId?: string,- ) => void;- onUploadRejected: (rejected: { fileName: string; message: string }[]) => void;- setUploads: React.Dispatch<- React.SetStateAction<- { fileName: string; progress: number; documentId?: string }[]- >- >;- setRejectedFiles: React.Dispatch<- React.SetStateAction<{ fileName: string; message: string }[]>- >;- folderPathName?: string;- dataroomId?: string;-}) {+}: UploadZoneProps) {const analytics = useAnalytics();const { plan, isFree, isTrial } = usePlan();const router = useRouter();@@ -207,6 +212,7 @@ export default function UploadZone({const newUploads = validatedFiles.valid.map((file) => ({fileName: file.name,progress: 0,+ uploadId: crypto.randomUUID(),}));onUploadStart(newUploads);@@ -240,22 +246,28 @@ export default function UploadZone({const { complete } = await resumableUpload({file, // FileonProgress: (bytesUploaded, bytesTotal) => {- uploadProgress.current[index] = (bytesUploaded / bytesTotal) * 100;- onUploadProgress(- index,- Math.min(Math.round(uploadProgress.current[index]), 99),+ const progress = Math.min(+ Math.round((bytesUploaded / bytesTotal) * 100),+ 99,+ );+ setUploads((prevUploads) =>+ prevUploads.map((upload) =>+ upload.uploadId === newUploads[index].uploadId+ ? { ...upload, progress }+ : upload,+ ),);const _progress = uploadProgress.current.reduce((acc, progress) => acc + progress,0,);-- setProgress(Math.round(_progress / acceptedFiles.length));},onError: (error) => {setUploads((prev) =>- prev.filter((upload) => upload.fileName !== file.name),+ prev.filter(+ (upload) => upload.uploadId !== newUploads[index].uploadId,+ ),);setRejectedFiles((prev) => [@@ -364,7 +376,13 @@ export default function UploadZone({}// update progress to 100%- onUploadProgress(index, 100, document.id);+ setUploads((prevUploads) =>+ prevUploads.map((upload) =>+ upload.uploadId === newUploads[index].uploadId+ ? { ...upload, progress: 100, documentId: document.id }+ : upload,+ ),+ );analytics.capture("Document Added", {documentId: document.id,