Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
fix(versions): show correct visitor stats for version
Marc Seitzd621c0c4a2a9
diff --git a/components/visitors/visitors-table.tsx b/components/visitors/visitors-table.tsxindex e1a34e4c..e2a9489c 100644--- a/components/visitors/visitors-table.tsx+++ b/components/visitors/visitors-table.tsx@@ -202,10 +202,11 @@ export default function VisitorsTable({ numPages }: { numPages: number }) {{!isFreePlan ? (<VisitorUserAgent viewId={view.id} />) : null}+<VisitorChartdocumentId={view.documentId!}viewId={view.id}- totalPages={numPages}+ totalPages={view.versionNumPages}/></TableCell></TableRow>diff --git a/lib/swr/use-document.ts b/lib/swr/use-document.tsindex 593c36f4..f48e2c73 100644--- a/lib/swr/use-document.ts+++ b/lib/swr/use-document.ts@@ -87,6 +87,8 @@ interface ViewWithDuration extends View {name: string;};} | null;+ versionNumber: number;+ versionNumPages: number;}type TStatsData = {diff --git a/pages/api/teams/[teamId]/documents/[id]/views/index.ts b/pages/api/teams/[teamId]/documents/[id]/views/index.tsindex b24a913b..5c935a61 100644--- a/pages/api/teams/[teamId]/documents/[id]/views/index.ts+++ b/pages/api/teams/[teamId]/documents/[id]/views/index.ts@@ -57,10 +57,12 @@ export default async function handle(ownerId: true,numPages: true,versions: {- where: { isPrimary: true },orderBy: { createdAt: "desc" },- take: 1,- select: { numPages: true },+ select: {+ versionNumber: true,+ createdAt: true,+ numPages: true,+ },},_count: {select: {@@ -126,10 +128,6 @@ export default async function handle(},});- // get the numPages from document- const numPages =- document.versions?.[0]?.numPages || document.numPages || 0;-// filter the last 20 viewsconst limitedViews =team.plan === "free" && offset >= LIMITS.views ? [] : views;@@ -156,6 +154,15 @@ export default async function handle(// Construct the response combining views and their respective durationsconst viewsWithDuration = limitedViews?.map((view: any, index: number) => {+ // find the relevant document version for the view+ const relevantDocumentVersion = document.versions.find(+ (version) => version.createdAt <= view.viewedAt,+ );++ // get the number of pages for the document version or the document+ const numPages =+ relevantDocumentVersion?.numPages || document.numPages || 0;+// calculate the completion rateconst completionRate = numPages? (durations[index].data.length / numPages) * 100@@ -167,6 +174,8 @@ export default async function handle(duration: durations[index],totalDuration: summedDurations[index],completionRate: completionRate.toFixed(),+ versionNumber: relevantDocumentVersion?.versionNumber || 0,+ versionNumPages: numPages,};},);