Skip to content

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

feat: add correct document version thumbnail and version num

Marc Seitz943ec02dd89a
diff --git a/components/charts/bar-chart-tooltip.tsx b/components/charts/bar-chart-tooltip.tsx
index 25ba1026..258e536e 100644
--- a/components/charts/bar-chart-tooltip.tsx
+++ b/components/charts/bar-chart-tooltip.tsx
@@ -17,7 +17,17 @@ const CustomTooltip = ({
// Default pageNumber to 0 or a sensible default if payload is not available
const pageNumber =
payload && payload.length > 0 ? parseInt(payload[0].payload.pageNumber) : 0;
- const { data, error } = useDocumentThumbnail(pageNumber, documentId);
+
+ // Default versionNumber to 0 or a sensible default if payload is not available
+ const versionNumber =
+ payload && payload.length > 0
+ ? parseInt(payload[0].payload.versionNumber)
+ : 1;
+ const { data, error } = useDocumentThumbnail(
+ pageNumber,
+ documentId,
+ versionNumber,
+ );
const imageUrl = data && !error ? data.imageUrl : null; // Always called, regardless of `active` or `payload`
diff --git a/components/charts/bar-chart.tsx b/components/charts/bar-chart.tsx
index aa3648ae..109c0de5 100644
--- a/components/charts/bar-chart.tsx
+++ b/components/charts/bar-chart.tsx
@@ -24,12 +24,13 @@ const renameDummyDurationKey = (data: Data[]): TransformedData[] => {
}, [] as TransformedData[]);
};
-const renameSumDurationKey = (data: SumData[]) => {
+const renameSumDurationKey = (data: SumData[], versionNumber?: number) => {
return data.map((item) => {
return {
...item,
"Time spent per page": item.sum_duration,
sum_duration: undefined,
+ versionNumber: versionNumber,
};
});
};
@@ -62,15 +63,17 @@ export default function BarChartComponent({
data,
isSum = false,
isDummy = false,
+ versionNumber,
}: {
data: any;
isSum?: boolean;
isDummy?: boolean;
+ versionNumber?: number;
}) {
const [, setValue] = useState<any>(null);
if (isSum) {
- const renamedData = renameSumDurationKey(data);
+ const renamedData = renameSumDurationKey(data, versionNumber);
return (
<BarChart
diff --git a/components/visitors/visitor-chart.tsx b/components/visitors/visitor-chart.tsx
index d8bf676c..4aaaca59 100644
--- a/components/visitors/visitor-chart.tsx
+++ b/components/visitors/visitor-chart.tsx
@@ -10,10 +10,12 @@ export default function VisitorChart({
documentId,
viewId,
totalPages = 0,
+ versionNumber,
}: {
documentId: string;
viewId: string;
totalPages?: number;
+ versionNumber?: number;
}) {
const { stats, error } = useVisitorStats(viewId);
@@ -41,7 +43,11 @@ export default function VisitorChart({
return (
<div className="rounded-bl-lg border-b border-l pb-0.5 pl-0.5 md:pb-1 md:pl-1">
- <BarChartComponent data={durationData} isSum={true} />
+ <BarChartComponent
+ data={durationData}
+ isSum={true}
+ versionNumber={versionNumber}
+ />
</div>
);
}
diff --git a/components/visitors/visitors-table.tsx b/components/visitors/visitors-table.tsx
index e2a9489c..062a9c53 100644
--- a/components/visitors/visitors-table.tsx
+++ b/components/visitors/visitors-table.tsx
@@ -6,6 +6,7 @@ import {
BadgeInfoIcon,
DownloadCloudIcon,
FileBadgeIcon,
+ FileDigitIcon,
ServerIcon,
ThumbsDownIcon,
ThumbsUpIcon,
@@ -202,11 +203,17 @@ export default function VisitorsTable({ numPages }: { numPages: number }) {
{!isFreePlan ? (
<VisitorUserAgent viewId={view.id} />
) : null}
-
+ <div className="pb-0.5 pl-0.5 md:pb-1 md:pl-1">
+ <div className="flex items-center gap-x-1 px-1">
+ <FileDigitIcon className="size-4" /> Document
+ Version {view.versionNumber}
+ </div>
+ </div>
<VisitorChart
documentId={view.documentId!}
viewId={view.id}
totalPages={view.versionNumPages}
+ versionNumber={view.versionNumber}
/>
</TableCell>
</TableRow>
diff --git a/lib/documents/get-file-helper.ts b/lib/documents/get-file-helper.ts
index c6a54355..fb6f0fc8 100644
--- a/lib/documents/get-file-helper.ts
+++ b/lib/documents/get-file-helper.ts
@@ -4,11 +4,14 @@ import prisma from "@/lib/prisma";
export const getFileForDocumentPage = async (
pageNumber: number,
documentId: string,
+ versionNumber?: number,
): Promise<string> => {
const documentVersions = await prisma.documentVersion.findMany({
where: {
documentId: documentId,
- isPrimary: true,
+ ...(versionNumber
+ ? { versionNumber: versionNumber }
+ : { isPrimary: true }),
},
select: {
id: true,
diff --git a/lib/swr/use-document.ts b/lib/swr/use-document.ts
index f48e2c73..49ff7b4f 100644
--- a/lib/swr/use-document.ts
+++ b/lib/swr/use-document.ts
@@ -2,6 +2,7 @@ import { useRouter } from "next/router";
import { useTeam } from "@/context/team-context";
import { View } from "@prisma/client";
+import { version } from "os";
import useSWR from "swr";
import useSWRImmutable from "swr/immutable";
@@ -149,11 +150,15 @@ export function useDocumentProcessingStatus(documentVersionId: string) {
};
}
-export function useDocumentThumbnail(pageNumber: number, documentId: string) {
+export function useDocumentThumbnail(
+ pageNumber: number,
+ documentId: string,
+ versionNumber?: number,
+) {
const { data, error } = useSWR<{ imageUrl: string }>(
pageNumber === 0
? null
- : `/api/jobs/get-thumbnail?documentId=${documentId}&pageNumber=${pageNumber}`,
+ : `/api/jobs/get-thumbnail?documentId=${documentId}&pageNumber=${pageNumber}&versionNumber=${versionNumber}`,
fetcher,
{
dedupingInterval: 1200000,
diff --git a/pages/api/jobs/get-thumbnail.ts b/pages/api/jobs/get-thumbnail.ts
index 17cf6888..6e7c1a97 100644
--- a/pages/api/jobs/get-thumbnail.ts
+++ b/pages/api/jobs/get-thumbnail.ts
@@ -21,15 +21,17 @@ export default async function handle(
return res.status(401).end("Unauthorized");
}
- const { documentId, pageNumber } = req.query as {
+ const { documentId, pageNumber, versionNumber } = req.query as {
documentId: string;
pageNumber: string;
+ versionNumber: string;
};
try {
const imageUrl = await getFileForDocumentPage(
Number(pageNumber),
documentId,
+ versionNumber === "undefined" ? undefined : Number(versionNumber),
);
return res.status(200).json({ imageUrl });