🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor date formatting in Chart and PerformanceChart components
Bill Yangd146cf320427
diff --git a/client/src/app/[site]/main/components/MainSection/Chart.tsx b/client/src/app/[site]/main/components/MainSection/Chart.tsxindex 237f069a1..b5e960803 100644--- a/client/src/app/[site]/main/components/MainSection/Chart.tsx+++ b/client/src/app/[site]/main/components/MainSection/Chart.tsx@@ -17,7 +17,11 @@ import {formatSecondsAsMinutesAndSeconds,formatter,} from "../../../../../lib/utils";-import { userLocale, hour12 } from "../../../../../lib/dateTimeUtils";+import {+ userLocale,+ hour12,+ formatChartDateTime,+} from "../../../../../lib/dateTimeUtils";const getMax = (time: Time, bucket: TimeBucket) => {const now = DateTime.now();@@ -336,7 +340,6 @@ export function Chart({enablePoints={false}useMesh={true}animate={false}- // motionConfig="stiff"enableSlices={"x"}colors={["hsl(var(--dataviz))"]}enableArea={true}@@ -351,31 +354,30 @@ export function Chart({const previousTime = slice.points[0].data.previousTime as DateTime;const diff = currentY - previousY;- const diffPercentage = (diff / previousY) * 100;+ const diffPercentage = previousY ? (diff / previousY) * 100 : 9999;return (- <div className="text-sm bg-neutral-900 p-2 rounded-md">- {previousY ? (- <div- className="text-lg font-medium"- style={{- color:- diffPercentage > 0- ? "hsl(var(--green-400))"- : "hsl(var(--red-400))",- }}- >- {diffPercentage > 0 ? "+" : ""}- {diffPercentage.toFixed(2)}%- </div>- ) : null}- <div className="flex justify-between text-sm w-36">- <div>{formatDateTime(currentTime, bucket)}</div>+ <div className="text-sm bg-neutral-850 p-2 rounded-md border border-neutral-750">+ <div+ className="text-lg font-medium"+ style={{+ color:+ diffPercentage > 0+ ? "hsl(var(--green-400))"+ : "hsl(var(--red-400))",+ }}+ >+ {diffPercentage > 0 ? "+" : ""}+ {diffPercentage.toFixed(2)}%+ </div>++ <div className="flex justify-between text-sm w-40">+ <div>{formatChartDateTime(currentTime, bucket)}</div><div>{formatTooltipValue(currentY, selectedStat)}</div></div>{previousTime && (<div className="flex justify-between text-sm text-muted-foreground">- <div>{formatDateTime(previousTime, bucket)}</div>+ <div>{formatChartDateTime(previousTime, bucket)}</div><div>{formatTooltipValue(previousY, selectedStat)}</div></div>)}@@ -398,28 +400,3 @@ export function Chart({/>);}--const formatDateTime = (dt: DateTime, bucket: TimeBucket) => {- const showMinutes = [- "minute",- "five_minutes",- "ten_minutes",- "fifteen_minutes",- "hour",- ].includes(bucket);- const options: Intl.DateTimeFormatOptions = {- month: "short",- day: "numeric",- hour: "numeric",- hour12: hour12,- };- if (showMinutes && !hour12) {- options.minute = "numeric";- }- if (bucket === "day") {- options.minute = undefined;- options.hour = undefined;- options.month = "long";- }- return new Intl.DateTimeFormat(userLocale, options).format(dt.toJSDate());-};diff --git a/client/src/app/[site]/performance/components/PerformanceChart.tsx b/client/src/app/[site]/performance/components/PerformanceChart.tsxindex fcc18522c..e10043f08 100644--- a/client/src/app/[site]/performance/components/PerformanceChart.tsx+++ b/client/src/app/[site]/performance/components/PerformanceChart.tsx@@ -12,7 +12,11 @@ import { useState } from "react";import { useGetPerformanceTimeSeries } from "../../../../api/analytics/performance/useGetPerformanceTimeSeries";import { BucketSelection } from "../../../../components/BucketSelection";import { authClient } from "../../../../lib/auth";-import { hour12, userLocale } from "../../../../lib/dateTimeUtils";+import {+ formatChartDateTime,+ hour12,+ userLocale,+} from "../../../../lib/dateTimeUtils";import { useStore } from "../../../../lib/store";import { cn } from "../../../../lib/utils";import { usePerformanceStore } from "../performanceStore";@@ -405,32 +409,9 @@ export function PerformanceChart() {new Date(slice.points[0].data.x));- const formatDateTime = (dt: DateTime) => {- const options: Intl.DateTimeFormatOptions = {- month: "short",- day: "numeric",- hour: "numeric",- hour12: hour12,- };- if (- bucket === "hour" ||- bucket === "minute" ||- bucket === "five_minutes" ||- bucket === "ten_minutes" ||- bucket === "fifteen_minutes"- ) {- if (!hour12) {- options.minute = "numeric";- }- }- return new Intl.DateTimeFormat(userLocale, options).format(- dt.toJSDate()- );- };-return (- <div className="text-sm bg-neutral-900 p-3 rounded-md min-w-[150px] border border-neutral-750">- {formatDateTime(currentTime)}+ <div className="text-sm bg-neutral-850 p-3 rounded-md min-w-[150px] border border-neutral-750">+ {formatChartDateTime(currentTime, bucket)}<div className="space-y-2 mt-2">{slice.points.map((point: any) => {return (diff --git a/client/src/lib/dateTimeUtils.ts b/client/src/lib/dateTimeUtils.tsindex 485d5a821..68722ce47 100644--- a/client/src/lib/dateTimeUtils.ts+++ b/client/src/lib/dateTimeUtils.ts@@ -1,4 +1,5 @@-import { Duration, DurationLikeObject, Settings } from "luxon";+import { TimeBucket } from "@rybbit/shared";+import { DateTime, Duration, DurationLikeObject, Settings } from "luxon";// Detect user locale from the browser environment (fallback to 'en-US' on server)export const userLocale =@@ -174,3 +175,37 @@ export const hourMinuteLabels: string[] = getLocalizedTimeLabels(userLocale, {minute: "2-digit",hour12: hour12,});++export const formatChartDateTime = (dt: DateTime, bucket: TimeBucket) => {+ const showMinutes = [+ "minute",+ "five_minutes",+ "ten_minutes",+ "fifteen_minutes",+ "hour",+ ].includes(bucket);+ const options: Intl.DateTimeFormatOptions = {+ month: "short",+ day: "numeric",+ hour: "numeric",+ hour12: hour12,+ };+ if (showMinutes && !hour12) {+ options.minute = "numeric";+ }+ if (bucket === "day") {+ options.minute = undefined;+ options.hour = undefined;+ options.month = "long";+ }+ if (+ bucket === "fifteen_minutes" ||+ bucket === "ten_minutes" ||+ bucket === "five_minutes" ||+ bucket === "minute"+ ) {+ options.minute = "numeric";+ options.hour = "numeric";+ }+ return new Intl.DateTimeFormat(userLocale, options).format(dt.toJSDate());+};