Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

refactor(duration): make output more human-friendly and locale-aware

Andrii Andrushchyshynd1279c84fe43
diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsx
index 63483a75d..b8b737469 100644
--- a/client/src/components/Sessions/SessionCard.tsx
+++ b/client/src/components/Sessions/SessionCard.tsx
@@ -19,7 +19,7 @@ import { GetSessionsResponse } from "../../api/analytics/userSessions";
import { Browser } from "../../app/[site]/components/shared/icons/Browser";
import { CountryFlag } from "../../app/[site]/components/shared/icons/CountryFlag";
import { OperatingSystem } from "../../app/[site]/components/shared/icons/OperatingSystem";
-import { cn, formatter, getCountryName } from "../../lib/utils";
+import { cn, formatter, getCountryName, formatDurationHuman } from "../../lib/utils";
import { Badge } from "../ui/badge";
import { SessionDetails } from "./SessionDetails";
@@ -56,9 +56,7 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {
const start = DateTime.fromSQL(session.session_start);
const end = DateTime.fromSQL(session.session_end);
const duration = end.diff(start, ["minutes", "seconds"]);
- const durationFormatted = `${Math.floor(duration.minutes)}m ${Math.floor(
- duration.seconds
- )}s`;
+ const durationFormatted = formatDurationHuman(duration.minutes, duration.seconds);
// Truncate user ID to first 8 characters
const truncatedUserId = session.user_id.substring(0, 8);
diff --git a/client/src/components/Sessions/SessionDetails.tsx b/client/src/components/Sessions/SessionDetails.tsx
index b8538361e..190d9696b 100644
--- a/client/src/components/Sessions/SessionDetails.tsx
+++ b/client/src/components/Sessions/SessionDetails.tsx
@@ -26,7 +26,7 @@ import {
import { Browser } from "../../app/[site]/components/shared/icons/Browser";
import { CountryFlag } from "../../app/[site]/components/shared/icons/CountryFlag";
import { OperatingSystem } from "../../app/[site]/components/shared/icons/OperatingSystem";
-import { cn, getCountryName, getLanguageName } from "../../lib/utils";
+import { cn, getCountryName, getLanguageName, formatDurationHuman } from "../../lib/utils";
import { Button } from "../ui/button";
// Component to display a single pageview or event
@@ -56,7 +56,7 @@ function PageviewItem({
const seconds = Math.floor(diff.seconds);
if (minutes > 0 || seconds > 0) {
- duration = `${minutes > 0 ? `${minutes}m ` : ""}${seconds}s`;
+ duration = formatDurationHuman(minutes, seconds);
}
}
diff --git a/client/src/lib/utils.ts b/client/src/lib/utils.ts
index a00dea859..17ef3091e 100644
--- a/client/src/lib/utils.ts
+++ b/client/src/lib/utils.ts
@@ -47,6 +47,25 @@ export function formatDuration(seconds: number): string {
}
}
+export function formatDurationHuman(minutes: number, seconds: number) {
+ const units: Record<string, number> = {};
+ if (minutes > 0) {
+ units.minutes = minutes;
+ }
+ if (seconds > 0 || minutes === 0) {
+ units.seconds = seconds;
+ }
+
+ const duration = Duration.fromObject(units)
+ .shiftTo('minutes', 'seconds')
+ .normalize();
+
+ return duration.toHuman({
+ listStyle: 'narrow',
+ unitDisplay: 'short'
+ });
+}
+
export function truncateString(str: string, n = 50) {
return str.length > n ? str.substring(0, n) + "..." : str;
}