Skip to content

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

Refactor date formatting and tooltip handling in UsersTable and SessionCard components

Bill Yang1230ab89d60e
diff --git a/client/src/app/[site]/users/components/UsersTable.tsx b/client/src/app/[site]/users/components/UsersTable.tsx
index 139d171e3..5261970ed 100644
--- a/client/src/app/[site]/users/components/UsersTable.tsx
+++ b/client/src/app/[site]/users/components/UsersTable.tsx
@@ -258,19 +258,13 @@ export function UsersTable() {
const date = DateTime.fromSQL(info.getValue(), {
zone: "utc",
}).setZone(getTimezone());
- const formattedDate = formatDateTime(date, { year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "2-digit" });
+ const formattedDate = formatDateTime(date, { month: "short", day: "numeric", hour: "numeric", minute: "2-digit" });
const relativeTime = formatRelativeTime(info.getValue());
return (
<div className="whitespace-nowrap">
- <Tooltip>
- <TooltipTrigger asChild>
- <span>{relativeTime}</span>
- </TooltipTrigger>
- <TooltipContent>
- <p>{formattedDate}</p>
- </TooltipContent>
- </Tooltip>
+ <span className="group-hover:hidden">{relativeTime}</span>
+ <span className="hidden group-hover:inline">{formattedDate}</span>
</div>
);
},
@@ -281,19 +275,13 @@ export function UsersTable() {
const date = DateTime.fromSQL(info.getValue(), {
zone: "utc",
}).setZone(getTimezone());
- const formattedDate = formatDateTime(date, { year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "2-digit" });
+ const formattedDate = formatDateTime(date, { month: "short", day: "numeric", hour: "numeric", minute: "2-digit" });
const relativeTime = formatRelativeTime(info.getValue());
return (
<div className="whitespace-nowrap">
- <Tooltip>
- <TooltipTrigger asChild>
- <span>{relativeTime}</span>
- </TooltipTrigger>
- <TooltipContent>
- <p>{formattedDate}</p>
- </TooltipContent>
- </Tooltip>
+ <span className="group-hover:hidden">{relativeTime}</span>
+ <span className="hidden group-hover:inline">{formattedDate}</span>
</div>
);
},
@@ -419,7 +407,7 @@ export function UsersTable() {
const href = `/${site}/user/${encodeURIComponent(linkId)}`;
return (
- <tr key={row.id} className="border-b border-neutral-100 dark:border-neutral-800 group">
+ <tr key={row.id} className="border-b border-neutral-100 dark:border-neutral-800 group hover:bg-neutral-50 dark:hover:bg-neutral-850">
{row.getVisibleCells().map(cell => (
<td key={cell.id} className="px-3 py-3 relative">
{/* <Link
diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsx
index 8d6ebd1f4..ccb7853c5 100644
--- a/client/src/components/Sessions/SessionCard.tsx
+++ b/client/src/components/Sessions/SessionCard.tsx
@@ -45,6 +45,9 @@ export function SessionCard({ session, onClick, userId, expandedByDefault, highl
const end = DateTime.fromSQL(session.session_end);
const totalSeconds = Math.floor(end.diff(start).milliseconds / 1000);
const duration = formatShortDuration(totalSeconds);
+ const relativeTime = DateTime.fromSQL(session.session_start, { zone: "utc" })
+ .setZone(getTimezone())
+ .toRelative();
const isIdentified = !!session.identified_user_id;
const handleCardClick = () => {
@@ -69,7 +72,7 @@ export function SessionCard({ session, onClick, userId, expandedByDefault, highl
);
return (
- <div className="rounded-lg bg-white dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-850 overflow-hidden">
+ <div className="rounded-lg bg-white dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-850 overflow-hidden group/card">
<div className="p-3 cursor-pointer" onClick={handleCardClick}>
{/* Mobile layout - two rows */}
<div className="flex flex-col gap-2 md:hidden">
@@ -86,15 +89,18 @@ export function SessionCard({ session, onClick, userId, expandedByDefault, highl
</span>
{!!session.identified_user_id && <IdentifiedBadge traits={session.traits} />}
</div>
- <span className="text-xs text-neutral-500 dark:text-neutral-400">
- {formatDateTime(DateTime.fromSQL(session.session_start, { zone: "utc" }), {
- month: "short",
- day: "numeric",
- hour: "numeric",
- minute: "2-digit",
- hour12,
- timeZone: getTimezone(),
- })}
+ <span className="text-xs text-neutral-500 dark:text-neutral-400 ">
+ <span className="group-hover/card:hidden">
+ {formatDateTime(DateTime.fromSQL(session.session_start, { zone: "utc" }), {
+ month: "short",
+ day: "numeric",
+ hour: "numeric",
+ minute: "2-digit",
+ hour12,
+ timeZone: getTimezone(),
+ })}
+ </span>
+ <span className="hidden group-hover/card:inline">{relativeTime}</span>
</span>
</div>
@@ -290,15 +296,18 @@ export function SessionCard({ session, onClick, userId, expandedByDefault, highl
{/* Time information */}
<div className="flex items-center gap-1.5 text-xs text-neutral-600 dark:text-neutral-300">
- <span className="text-neutral-500 dark:text-neutral-400">
- {formatDateTime(DateTime.fromSQL(session.session_start, { zone: "utc" }), {
- month: "short",
- day: "numeric",
- hour: "numeric",
- minute: "2-digit",
- hour12,
- timeZone: getTimezone(),
- })}
+ <span className="text-neutral-500 dark:text-neutral-400 ">
+ <span className="group-hover/card:hidden">
+ {formatDateTime(DateTime.fromSQL(session.session_start, { zone: "utc" }), {
+ month: "short",
+ day: "numeric",
+ hour: "numeric",
+ minute: "2-digit",
+ hour12,
+ timeZone: getTimezone(),
+ })}
+ </span>
+ <span className="hidden group-hover/card:inline">{relativeTime}</span>
</span>
<span className="text-neutral-500 dark:text-neutral-400">•</span>
<span>{duration}</span>