Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(web): label short analytics weeks with their real end date

Richie McIlroyb75f4fd93dfd
diff --git a/apps/web/app/(org)/dashboard/analytics/components/StatsChart.tsx b/apps/web/app/(org)/dashboard/analytics/components/StatsChart.tsx
index 141b0eee7..570ebe389 100644
--- a/apps/web/app/(org)/dashboard/analytics/components/StatsChart.tsx
+++ b/apps/web/app/(org)/dashboard/analytics/components/StatsChart.tsx
@@ -165,17 +165,26 @@ const rollUpLongRanges = (
for (let end = data.length; end > 0; end -= 7) {
const chunk = data.slice(Math.max(0, end - 7), end);
const first = chunk[0];
- if (!first) continue;
+ const last = chunk[chunk.length - 1];
+ if (!first || !last) continue;
weeks.unshift(
chunk.reduce(
(acc, point) => ({
bucket: acc.bucket,
+ bucketEnd: acc.bucketEnd,
views: acc.views + point.views,
comments: acc.comments + point.comments,
reactions: acc.reactions + point.reactions,
caps: acc.caps + point.caps,
}),
- { bucket: first.bucket, views: 0, comments: 0, reactions: 0, caps: 0 },
+ {
+ bucket: first.bucket,
+ bucketEnd: last.bucket,
+ views: 0,
+ comments: 0,
+ reactions: 0,
+ caps: 0,
+ },
),
);
}
diff --git a/apps/web/app/(org)/dashboard/analytics/components/TrafficChart.tsx b/apps/web/app/(org)/dashboard/analytics/components/TrafficChart.tsx
index a659ce45f..0e47a3296 100644
--- a/apps/web/app/(org)/dashboard/analytics/components/TrafficChart.tsx
+++ b/apps/web/app/(org)/dashboard/analytics/components/TrafficChart.tsx
@@ -23,6 +23,7 @@ export type Metric = "views" | "comments" | "reactions" | "caps";
export type ChartPoint = {
bucket: string;
+ bucketEnd?: string;
caps: number;
views: number;
comments: number;
@@ -334,7 +335,7 @@ export default function TrafficChart({
aria-valuenow={hoverIndex ?? Math.max(0, n - 1)}
aria-valuetext={
hovered
- ? `${formatBucketTitle(hovered.bucket, granularity)}: ${metrics
+ ? `${formatBucketTitle(hovered.bucket, granularity, hovered.bucketEnd)}: ${metrics
.map((m) => `${hovered[m]} ${METRIC_META[m].label.toLowerCase()}`)
.join(", ")}`
: "Use the left and right arrow keys to move between points"
@@ -605,7 +606,11 @@ export default function TrafficChart({
style={{ left: tooltipLeft, width: tooltipWidth }}
>
<p className="text-[13px] font-medium leading-tight">
- {formatBucketTitle(hovered.bucket, granularity)}
+ {formatBucketTitle(
+ hovered.bucket,
+ granularity,
+ hovered.bucketEnd,
+ )}
</p>
<div className="my-2.5 h-px bg-gray-1/15" />
<div className="space-y-1.5">
diff --git a/apps/web/app/(org)/dashboard/analytics/components/format.ts b/apps/web/app/(org)/dashboard/analytics/components/format.ts
index 28a5a384a..dc9193e56 100644
--- a/apps/web/app/(org)/dashboard/analytics/components/format.ts
+++ b/apps/web/app/(org)/dashboard/analytics/components/format.ts
@@ -38,7 +38,11 @@ export const formatBucketTick = (
});
};
-export const formatBucketTitle = (bucket: string, granularity: Granularity) => {
+export const formatBucketTitle = (
+ bucket: string,
+ granularity: Granularity,
+ bucketEnd?: string,
+) => {
const date = new Date(bucket);
if (Number.isNaN(date.getTime())) return bucket;
if (granularity === "hour") {
@@ -55,7 +59,9 @@ export const formatBucketTitle = (bucket: string, granularity: Granularity) => {
return `${day}, ${start} to ${end}`;
}
if (granularity === "week") {
- const end = new Date(date.getTime() + 6 * 24 * 60 * 60 * 1000);
+ const end = bucketEnd
+ ? new Date(bucketEnd)
+ : new Date(date.getTime() + 6 * 24 * 60 * 60 * 1000);
const short = (d: Date) =>
d.toLocaleDateString([], {
day: "numeric",