Skip to content

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

fix: only show pages with type

Marc Seitz088bbb09e4c8
diff --git a/components/view/dataroom/dataroom-view.tsx b/components/view/dataroom/dataroom-view.tsx
index 6bb287f6..8815ed69 100644
--- a/components/view/dataroom/dataroom-view.tsx
+++ b/components/view/dataroom/dataroom-view.tsx
@@ -54,6 +54,7 @@ export type DEFAULT_DOCUMENT_VIEW_TYPE = {
| null;
sheetData?: SheetData[] | null;
notionData?: { recordMap: ExtendedRecordMap | null };
+ fileType?: string;
};
export default function DataroomView({
@@ -139,7 +140,7 @@ export default function DataroomView({
setVerificationRequested(true);
setIsLoading(false);
} else {
- const { viewId, file, pages, notionData, sheetData } =
+ const { viewId, file, pages, notionData, sheetData, fileType } =
fetchData as DEFAULT_DOCUMENT_VIEW_TYPE;
plausible("dataroomViewed"); // track the event
analytics.identify(
@@ -161,6 +162,7 @@ export default function DataroomView({
pages,
notionData,
sheetData,
+ fileType,
}));
setSubmitted(true);
setVerificationRequested(false);
@@ -276,7 +278,7 @@ export default function DataroomView({
setDocumentData={setDocumentData}
/>
</div>
- ) : viewData.sheetData ? (
+ ) : viewData.fileType === "sheet" && viewData.sheetData ? (
<div className="bg-gray-950">
<ExcelViewer
linkId={link.id}
@@ -290,7 +292,7 @@ export default function DataroomView({
setDocumentData={setDocumentData}
/>
</div>
- ) : useAdvancedExcelViewer ? (
+ ) : viewData.fileType === "sheet" && useAdvancedExcelViewer ? (
<div className="bg-gray-950">
<AdvancedExcelViewer
linkId={link.id}
diff --git a/components/view/document-view.tsx b/components/view/document-view.tsx
index 5eb1785c..e59c702a 100644
--- a/components/view/document-view.tsx
+++ b/components/view/document-view.tsx
@@ -33,6 +33,7 @@ export type DEFAULT_DOCUMENT_VIEW_TYPE = {
| { file: string; pageNumber: string; embeddedLinks: string[] }[]
| null;
sheetData?: SheetData[] | null;
+ fileType?: string;
};
export default function DocumentView({
@@ -116,7 +117,7 @@ export default function DocumentView({
setVerificationRequested(true);
setIsLoading(false);
} else {
- const { viewId, file, pages, sheetData } =
+ const { viewId, file, pages, sheetData, fileType } =
fetchData as DEFAULT_DOCUMENT_VIEW_TYPE;
plausible("documentViewed"); // track the event
analytics.identify(
@@ -129,7 +130,7 @@ export default function DocumentView({
viewerId: viewId,
viewerEmail: data.email ?? verifiedEmail ?? userEmail,
});
- setViewData({ viewId, file, pages, sheetData });
+ setViewData({ viewId, file, pages, sheetData, fileType });
setSubmitted(true);
setVerificationRequested(false);
setIsLoading(false);
diff --git a/components/view/view-data.tsx b/components/view/view-data.tsx
index 8fefafae..c88c9000 100644
--- a/components/view/view-data.tsx
+++ b/components/view/view-data.tsx
@@ -51,7 +51,7 @@ export default function ViewData({
versionNumber={document.versions[0].versionNumber}
brand={brand}
/>
- ) : viewData.sheetData ? (
+ ) : viewData.fileType === "sheet" && viewData.sheetData ? (
<ExcelViewer
linkId={link.id}
viewId={viewData.viewId}
@@ -61,7 +61,7 @@ export default function ViewData({
sheetData={viewData.sheetData}
brand={brand}
/>
- ) : useAdvancedExcelViewer ? (
+ ) : viewData.fileType === "sheet" && useAdvancedExcelViewer ? (
<AdvancedExcelViewer
linkId={link.id}
viewId={viewData.viewId}
diff --git a/pages/api/views-dataroom.ts b/pages/api/views-dataroom.ts
index 70ea38ea..dee4487b 100644
--- a/pages/api/views-dataroom.ts
+++ b/pages/api/views-dataroom.ts
@@ -2,6 +2,7 @@ import { NextApiRequest, NextApiResponse } from "next";
import { waitUntil } from "@vercel/functions";
import { parsePageId } from "notion-utils";
+import { record } from "zod";
import sendNotification from "@/lib/api/notification-helper";
import { sendVerificationEmail } from "@/lib/emails/send-email-verification";
@@ -451,6 +452,13 @@ export default async function handle(
!useAdvancedExcelViewer
? sheetData
: undefined,
+ fileType: documentVersion
+ ? documentVersion.type
+ : documentPages
+ ? "pdf"
+ : recordMap
+ ? "notion"
+ : undefined,
};
return res.status(200).json(returnObject);
diff --git a/pages/api/views.ts b/pages/api/views.ts
index b47f5b7c..27ece11d 100644
--- a/pages/api/views.ts
+++ b/pages/api/views.ts
@@ -338,6 +338,11 @@ export default async function handle(
!useAdvancedExcelViewer
? sheetData
: undefined,
+ fileType: documentVersion
+ ? documentVersion.type
+ : documentPages
+ ? "pdf"
+ : undefined,
};
return res.status(200).json(returnObject);