Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: update barchart with multiple versions
Marc Seitz8eee3d92a3fa
diff --git a/components/charts/bar-chart.tsx b/components/charts/bar-chart.tsxindex 9da27bca..2a784a14 100644--- a/components/charts/bar-chart.tsx+++ b/components/charts/bar-chart.tsx@@ -1,4 +1,40 @@import { BarChart } from "@tremor/react";+import { useState } from "react";++type Data = {+ versionNumber: number;+ pageNumber: string;+ avg_duration: number;+};++type TransformedData = {+ pageNumber: string;+ [key: string]: number | string; // Adjusted type to accommodate version keys+};++type Color =+ | "neutral"+ | "emerald"+ | "gray"+ | "slate"+ | "zinc"+ | "stone"+ | "red"+ | "orange"+ | "amber"+ | "yellow"+ | "lime"+ | "green"+ | "teal"+ | "cyan"+ | "sky"+ | "blue"+ | "indigo"+ | "violet"+ | "purple"+ | "fuchsia"+ | "pink"+ | "rose";const timeFormatter = (number: number) => {const totalSeconds = Math.floor(number / 1000);@@ -11,15 +47,15 @@ const timeFormatter = (number: number) => {return `${minutes}:${secondsFormatted}`;};-const renameAvgDurationKey = (data: any[]) => {- return data.map((item) => {- return {- ...item,- "Time spent per page": item.avg_duration,- avg_duration: undefined,- };- });-};+// const renameAvgDurationKey = (data: any[]) => {+// return data.map((item) => {+// return {+// ...item,+// "Time spent per page": item.avg_duration,+// avg_duration: undefined,+// };+// });+// };const renameSumDurationKey = (data: any[]) => {return data.map((item) => {@@ -31,19 +67,87 @@ const renameSumDurationKey = (data: any[]) => {});};++// Transform data+const transformData = (data: Data[]): TransformedData[] => {+ return data.reduce((acc, { versionNumber, pageNumber, avg_duration }) => {+ const index = acc.findIndex((item) => item.pageNumber === pageNumber);+ if (index === -1) {+ acc.push({+ pageNumber,+ [`Version ${versionNumber}`]: avg_duration,+ });+ } else {+ acc[index][`Version ${versionNumber}`] = avg_duration;+ }+ return acc;+ }, [] as TransformedData[]);+};++const getVersionNumbers = (data: TransformedData[]) => {+ return [+ ...new Set(+ data.flatMap((item) =>+ Object.keys(item).filter((key) => key !== "pageNumber")+ )+ ),+ ];+};+++const getColors = (versionNumbers: string[]): Color[] => {+ const colorArray = [+ "emerald",+ "teal",+ "gray",+ "zinc",+ "neutral",+ "stone",+ "red",+ "orange",+ "amber",+ "yellow",+ "lime",+ "green",+ "cyan",+ "sky",+ "blue",+ "indigo",+ "violet",+ "purple",+ "fuchsia",+ "pink",+ "rose",+ ];+ return versionNumbers.map((versionNumber: string) => {+ const versionIndex = parseInt(versionNumber.split(" ")[1]) - 1;+ return colorArray[versionIndex % colorArray.length] as Color;+ });+};+export default function BarChartComponent({data, isSum = false}: {data: any, isSum?: boolean}) {- const renamedData = isSum ? renameSumDurationKey(data) : renameAvgDurationKey(data);+ const [, setValue] = useState<any>(null);++ const renamedData = isSum ? renameSumDurationKey(data) : transformData(data);+ // const transformedData = transformData(data);+ const versionNumbers = getVersionNumbers(renamedData);+ const colors = getColors(versionNumbers);++ console.log("renamedData", renamedData);+ console.log("versionNumbers", versionNumbers);+ console.log("colors", colors);return (<BarChartclassName="mt-6 rounded-tremor-small"data={renamedData}index="pageNumber"- categories={["Time spent per page"]}- colors={["emerald"]}+ categories={versionNumbers}+ colors={colors}valueFormatter={timeFormatter}yAxisWidth={50}showGridLines={false}+ onValueChange={(v) => setValue(v)}/>);}diff --git a/components/documents/stats-chart.tsx b/components/documents/stats-chart.tsxindex ff40fc2b..53efa153 100644--- a/components/documents/stats-chart.tsx+++ b/components/documents/stats-chart.tsx@@ -5,10 +5,10 @@ import BarChartComponent from "../charts/bar-chart";export default function StatsChart({documentId,- totalPages = 0,+ totalPagesMax = 0,}: {documentId: string;- totalPages?: number;+ totalPagesMax?: number;}) {const { stats, error } = useStats();@@ -21,7 +21,7 @@ export default function StatsChart({}let durationData = {- data: Array.from({ length: totalPages }, (_, i) => ({+ data: Array.from({ length: totalPagesMax }, (_, i) => ({pageNumber: (i + 1).toString(),avg_duration: 0,})),@@ -29,13 +29,25 @@ export default function StatsChart({const swrData = stats?.duration;- durationData.data = durationData.data.map((item) => {- const swrItem = swrData.data.find(- (data) => data.pageNumber === item.pageNumber- );- return swrItem ? swrItem : item;+ durationData.data = durationData.data.flatMap((item) => {+ return swrData.data+ .filter((data) => data.pageNumber === item.pageNumber)+ .map((data) => ({+ versionNumber: data.versionNumber,+ pageNumber: item.pageNumber,+ avg_duration: data.avg_duration,+ }));});+ console.log("durationData.data", durationData.data);++ // durationData.data = durationData.data.map((item) => {+ // const swrItem = swrData.data.find(+ // (data) => data.pageNumber === item.pageNumber+ // );+ // return swrItem ? swrItem : item;+ // });+return (<div className="p-5"><BarChartComponent data={durationData.data} />diff --git a/lib/swr/use-stats.ts b/lib/swr/use-stats.tsindex 6a404ecb..2dce8eac 100644--- a/lib/swr/use-stats.ts+++ b/lib/swr/use-stats.ts@@ -12,7 +12,7 @@ interface StatsData {views: View[];groupedViews: GroupedView[];duration: {- data: { pageNumber: string; avg_duration: number }[];+ data: { versionNumber: number, pageNumber: string; avg_duration: number }[];};total_duration: number;}diff --git a/pages/documents/[id].tsx b/pages/documents/[id].tsxindex 6a27dc95..ec30582d 100644--- a/pages/documents/[id].tsx+++ b/pages/documents/[id].tsx@@ -61,7 +61,7 @@ export default function DocumentPage() {{document.numPages !== null && (<StatsChartdocumentId={document.id}- totalPages={primaryVersion.numPages!}+ totalPagesMax={primaryVersion.numPages!}/>)}<StatsCard />diff --git a/tsconfig.json b/tsconfig.jsonindex 279f94bf..2b1f8659 100644--- a/tsconfig.json+++ b/tsconfig.json@@ -16,6 +16,7 @@"moduleResolution": "node","resolveJsonModule": true,"isolatedModules": true,+ "downlevelIteration": true,"jsx": "preserve","incremental": true,"paths": {