Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
Merge branch 'main' into 251/bulk-upload-process
Marc Seitzc8dfacb91936
diff --cc components/datarooms/dataroom-items-list.tsxindex 2d6c80a0,9f2a8675..f90213ee--- a/components/datarooms/dataroom-items-list.tsx+++ b/components/datarooms/dataroom-items-list.tsx@@@ -45,12 -43,14 +46,14 @@@ import UploadZone,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";-import { Checkbox } from "../ui/checkbox";type FolderOrDocument =| (DataroomFolderWithCount & { itemType: "folder" })@@@ -71,10 -71,22 +74,19 @@@ export function DataroomItemsList(folderCount: number;documentCount: number;}) {+ const { viewerGroups } = useDataroomGroups();const { isMobile } = useMediaQuery();++ const [uploads, setUploads] = useState<UploadState[]>([]);+ const [rejectedFiles, setRejectedFiles] = useState<RejectedFile[]>([]);+ const [showGroupPermissions, setShowGroupPermissions] = useState(false);+ const [uploadedFiles, setUploadedFiles] = useState<+ {+ documentId: string;+ dataroomDocumentId: string;+ fileName: 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 [moveFolderOpen, setMoveFolderOpen] = useState<boolean>(false);@@@ -485,23 -543,15 +543,24 @@@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,+ );+ });}}+ onUploadSuccess={handleUploadSuccess}onUploadRejected={(rejected) => {- setRejectedFiles(rejected);+ setRejectedFiles((prevRejected) => [...prevRejected, ...rejected]);setShowDrawer(true);}}setUploads={setUploads}diff --cc components/documents/documents-list.tsxindex 793a924a,5288235a..82e1a5c7--- a/components/documents/documents-list.tsx+++ b/components/documents/documents-list.tsx@@@ -35,19 -37,9 +35,20 @@@ import { FolderWithCount } from "@/lib/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 { Checkbox } from "../ui/checkbox";import { Portal } from "../ui/portal";import { ButtonTooltip } from "../ui/tooltip";import { useDeleteDocumentsAndFoldersModal } from "./actions/delete-documents-modal";diff --cc components/upload-zone.tsxindex fcf4eab8,138de378..01e777b6--- a/components/upload-zone.tsx+++ b/components/upload-zone.tsx@@@ -72,42 -72,45 +72,50 @@@ interface FileWithPaths extends FilewhereToUploadPath?: string;}-export default function UploadZone({- children,- onUploadStart,- onUploadProgress,- onUploadRejected,- folderPathName,- setUploads,- setRejectedFiles,- dataroomId,- onUploadSuccess,-}: {+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;+ onUploadSuccess?: (+ files: {+ fileName: string;+ documentId: string;+ dataroomDocumentId: string;+ }[],+ ) => void;- 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 }[]>- >;+ setUploads: React.Dispatch<React.SetStateAction<UploadState[]>>;+ setRejectedFiles: React.Dispatch<React.SetStateAction<RejectedFile[]>>;folderPathName?: string;dataroomId?: string;-}) {+}++export default function UploadZone({+ children,+ onUploadStart,+ onUploadProgress,+ onUploadRejected,++ onUploadSuccess,+ folderPathName,+ setUploads,+ setRejectedFiles,+ dataroomId,+}: UploadZoneProps) {const analytics = useAnalytics();const { plan, isFree, isTrial } = usePlan();const router = useRouter();@@@ -376,13 -372,7 +384,13 @@@}// update progress to 100%- setUploads((prevUploads) =>- prevUploads.map((upload) =>- upload.uploadId === newUploads[index].uploadId- ? { ...upload, progress: 100, documentId: document.id }- : upload,- ),- 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,