Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add dataroom viewer history for uploaded documents
Marc Seitz55ddb27d7d02
diff --git a/components/visitors/dataroom-visitors-history.tsx b/components/visitors/dataroom-visitors-history.tsxindex d67040ea..7424551f 100644--- a/components/visitors/dataroom-visitors-history.tsx+++ b/components/visitors/dataroom-visitors-history.tsx@@ -1,14 +1,18 @@import Link from "next/link";-import { DownloadCloudIcon, FileCheckIcon } from "lucide-react";+import {+ DownloadCloudIcon,+ FileCheckIcon,+ UploadCloudIcon,+} from "lucide-react";++import { useDataroomVisitHistory } from "@/lib/swr/use-dataroom";+import { timeAgo } from "@/lib/utils";import { Button } from "@/components/ui/button";import { Skeleton } from "@/components/ui/skeleton";import { TableCell, TableRow } from "@/components/ui/table";-import { useDataroomVisitHistory } from "@/lib/swr/use-dataroom";-import { timeAgo } from "@/lib/utils";-export default function DataroomVisitHistory({viewId,dataroomId,@@ -16,10 +20,46 @@ export default function DataroomVisitHistory({viewId: string;dataroomId: string;}) {- const { documentViews } = useDataroomVisitHistory({ viewId, dataroomId });+ const { documentViews, uploadedDocumentViews } = useDataroomVisitHistory({+ viewId,+ dataroomId,+ });return (<>+ {uploadedDocumentViews &&+ uploadedDocumentViews.length > 0 &&+ uploadedDocumentViews.map((upload) => (+ <TableRow key={`${upload.documentId}-upload`}>+ <TableCell>+ <div className="flex items-center gap-x-4 overflow-visible">+ <UploadCloudIcon className="h-5 w-5 text-[#fb7a00]" />+ Uploaded {upload.originalFilename}+ </div>+ </TableCell>++ <TableCell>+ <div>+ <time+ className="truncate text-sm text-muted-foreground"+ dateTime={new Date(upload.uploadedAt).toISOString()}+ title={new Date(upload.uploadedAt).toLocaleString()}+ >+ {timeAgo(new Date(upload.uploadedAt))}+ </time>+ </div>+ </TableCell>+ <TableCell className="table-cell">+ <div className="flex items-center justify-end space-x-4">+ <Button size={"sm"} variant={"link"} className="">+ <Link href={`/documents/${upload.documentId}`}>+ See document+ </Link>+ </Button>+ </div>+ </TableCell>+ </TableRow>+ ))}{documentViews ? (documentViews.map((view) => (<>diff --git a/lib/swr/use-dataroom.ts b/lib/swr/use-dataroom.tsindex 27ff95ac..6c52d988 100644--- a/lib/swr/use-dataroom.ts+++ b/lib/swr/use-dataroom.ts@@ -267,6 +267,7 @@ export type DataroomFolderDocument = DataroomDocument & {name: string;type: string;versions?: { id: string; hasPages: boolean }[];+ isExternalUpload?: boolean;_count: {views: number;versions: number;@@ -361,6 +362,12 @@ type DataroomDocumentViewHistory = {};};+type DataroomDocumentUploadViewHistory = {+ uploadedAt: string;+ documentId: string;+ originalFilename: string;+};+export function useDataroomVisitHistory({viewId,dataroomId,@@ -371,7 +378,10 @@ export function useDataroomVisitHistory({const teamInfo = useTeam();const teamId = teamInfo?.currentTeam?.id;- const { data: documentViews, error } = useSWR<DataroomDocumentViewHistory[]>(+ const { data, error } = useSWR<{+ documentViews: DataroomDocumentViewHistory[];+ uploadedDocumentViews: DataroomDocumentUploadViewHistory[];+ }>(teamId &&dataroomId &&`/api/teams/${teamId}/datarooms/${dataroomId}/views/${viewId}/history`,@@ -382,8 +392,9 @@ export function useDataroomVisitHistory({);return {- documentViews,- loading: !error && !documentViews,+ documentViews: data?.documentViews,+ uploadedDocumentViews: data?.uploadedDocumentViews,+ loading: !error && !data,error,};}diff --git a/pages/api/teams/[teamId]/datarooms/[id]/views/[viewId]/history.ts b/pages/api/teams/[teamId]/datarooms/[id]/views/[viewId]/history.tsindex 1b2d32a5..f471e6b0 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/views/[viewId]/history.ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/views/[viewId]/history.ts@@ -49,29 +49,41 @@ export default async function handle(return res.status(403).end("Unauthorized to access this team");}- const documentViews = await prisma.view.findMany({- where: {- dataroomViewId: viewId,- dataroomId: dataroomId,- viewType: "DOCUMENT_VIEW",- },- orderBy: {- viewedAt: "asc",- },- select: {- id: true,- viewedAt: true,- downloadedAt: true,- document: {- select: {- id: true,- name: true,+ const [documentViews, uploadedDocumentViews] = await Promise.all([+ prisma.view.findMany({+ where: {+ dataroomViewId: viewId,+ dataroomId: dataroomId,+ viewType: "DOCUMENT_VIEW",+ },+ orderBy: {+ viewedAt: "asc",+ },+ select: {+ id: true,+ viewedAt: true,+ downloadedAt: true,+ document: {+ select: {+ id: true,+ name: true,+ },},},- },- });+ }),+ prisma.documentUpload.findMany({+ where: {+ viewId: viewId,+ },+ select: {+ uploadedAt: true,+ documentId: true,+ originalFilename: true,+ },+ }),+ ]);- return res.status(200).json(documentViews);+ return res.status(200).json({ documentViews, uploadedDocumentViews });} catch (error) {errorhandler(error, res);}