Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
Merge branch 'main' into cursor/PM-468-dataroom-upload-visibility-b14f
Marc Seitz11428afb6543
diff --cc app/(ee)/api/links/[id]/upload/route.tsindex fee7f055,78baabe6..e3146518--- a/app/(ee)/api/links/[id]/upload/route.ts+++ b/app/(ee)/api/links/[id]/upload/route.ts@@@ -139,7 -167,7 +167,7 @@@ export async function POSTviewId: viewId,linkId: linkId,originalFilename: document.name,-- fileSize: document.versions[0].fileSize,++ fileSize: documentData.fileSize ?? 0,numPages: document.numPages,mimeType: document.contentType,dataroomId: dataroomId,@@@ -148,19 -176,57 +176,69 @@@},});+ // 4. Send upload notification to team if enabled+ if (link.enableNotification) {+ try {+ // Cancel any existing pending notification runs for this viewer+dataroom+link+ // Note: runs.list tag filter uses OR logic, so we must post-filter+ // to ensure we only cancel runs matching ALL three tags+ const requiredTags = [+ `dataroom_${dataroomId}`,+ `link_${linkId}`,+ `viewer_${viewerId}`,+ ];+ const allRuns = await runs.list({+ taskIdentifier: ["send-dataroom-upload-notification"],+ tag: requiredTags,+ status: ["DELAYED", "QUEUED"],+ period: "10m",+ });++ const matchingRuns = allRuns.data.filter((run) =>+ requiredTags.every((tag) => run.tags?.includes(tag)),+ );++ await Promise.all(matchingRuns.map((run) => runs.cancel(run.id)));++ // Trigger a new notification with 5-minute delay to batch uploads+ waitUntil(+ sendDataroomUploadNotificationTask.trigger(+ {+ dataroomId,+ linkId,+ viewerId,+ teamId: link.teamId,+ },+ {+ idempotencyKey: `upload-notification-${link.teamId}-${dataroomId}-${linkId}-${viewerId}-${newDataroomDocument.id}`,+ tags: [+ `team_${link.teamId}`,+ `dataroom_${dataroomId}`,+ `link_${linkId}`,+ `viewer_${viewerId}`,+ ],+ delay: new Date(Date.now() + 5 * 60 * 1000), // 5 minute delay+ },+ ),+ );+ } catch (error) {+ console.error("Error triggering upload notification:", error);+ }+ }+- return NextResponse.json({ success: true });+ // Return document data for optimistic UI rendering+ return NextResponse.json({+ success: true,+ document: {+ id: document.id,+ name: document.name,+ dataroomDocumentId: newDataroomDocument.id,+ folderId: dataroomFolderId,+ fileType: document.type,- hasPages: document.versions[0]?.hasPages ?? false,++ hasPages: (document.numPages ?? 0) > 0,+ createdAt: document.createdAt,+ },+ });} catch (error) {console.error("Error uploading document:", error);return NextResponse.json(diff --cc components/view/dataroom/dataroom-view.tsxindex 7654effb,280222e3..f3b92cb1--- a/components/view/dataroom/dataroom-view.tsx+++ b/components/view/dataroom/dataroom-view.tsx@@@ -279,33 -285,34 +286,36 @@@ export default function DataroomView(if (submitted) {return (- <div- className="min-h-screen bg-white"- style={{ backgroundColor: dataroomViewBackgroundColor ?? undefined }}- >- <DataroomViewer- accessControls={link.accessControls || group?.accessControls || []}- brand={brand!}- viewId={viewData.viewId}- isPreview={viewData.isPreview}- linkId={link.id}- dataroom={dataroom}- allowDownload={link.allowDownload!}- enableIndexFile={link.enableIndexFile}- folderId={folderId}- setFolderId={setFolderId}- viewerId={viewData.viewerId}- viewData={viewData}- isEmbedded={isEmbedded}- dataroomIndexEnabled={dataroomIndexEnabled}- viewerEmail={- viewData.viewerEmail ??- data.email ??- verifiedEmail ??- userEmail ??- undefined- }- />- </div>+ <PendingUploadsProvider>- <div className="bg-gray-950">++ <div++ className="min-h-screen bg-white"++ style={{ backgroundColor: dataroomViewBackgroundColor ?? undefined }}++ >+ <DataroomViewer+ accessControls={link.accessControls || group?.accessControls || []}+ brand={brand!}+ viewId={viewData.viewId}+ isPreview={viewData.isPreview}+ linkId={link.id}+ dataroom={dataroom}+ allowDownload={link.allowDownload!}+ enableIndexFile={link.enableIndexFile}+ folderId={folderId}+ setFolderId={setFolderId}+ viewerId={viewData.viewerId}+ viewData={viewData}+ isEmbedded={isEmbedded}+ dataroomIndexEnabled={dataroomIndexEnabled}+ viewerEmail={+ viewData.viewerEmail ??+ data.email ??+ verifiedEmail ??+ userEmail ??+ undefined+ }+ />+ </div>+ </PendingUploadsProvider>);}diff --cc components/view/viewer/dataroom-viewer.tsxindex ae5a3156,3c2e8fad..7ce1cd20--- a/components/view/viewer/dataroom-viewer.tsx+++ b/components/view/viewer/dataroom-viewer.tsx@@@ -54,7 -53,10 +54,11 @@@ importIntroductionProvider,} from "../dataroom/introduction-modal";import DataroomNav from "../dataroom/nav-dataroom";+import PendingDocumentCard from "../dataroom/pending-document-card";+ import {+ ViewerSurfaceThemeProvider,+ createViewerSurfaceTheme,+ } from "./viewer-surface-theme";const ViewerBreadcrumbItem = ({folder,@@@ -551,17 -619,8 +625,17 @@@ export default function DataroomViewer()}<ul role="list" className="-mx-4 space-y-4 overflow-auto p-4">- {mixedItems.length === 0 ? (+ {/* Show pending uploads at the top */}+ {!searchQuery &&+ pendingUploadsForFolder.map((pendingUpload) => (+ <li key={pendingUpload.id}>+ <PendingDocumentCard pendingUpload={pendingUpload} />+ </li>+ ))}++ {mixedItems.length === 0 &&+ pendingUploadsForFolder.length === 0 ? (- <li className="py-6 text-center text-muted-foreground">+ <li className="py-6 text-center text-[var(--viewer-subtle-text)]">{searchQuery? "No documents match your search.": "No items available."}