Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 111 additions & 40 deletions src/ui/Age/Age.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import clsx from "clsx";
import dayjs from "dayjs";
import LocalizedFormat from "dayjs/plugin/localizedFormat";
import TimezonePlugin from "dayjs/plugin/timezone";
import { Tooltip } from "react-tooltip";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger
} from "@flanksource-ui/components/ui/tooltip";
import { isEmpty } from "../../utils/date";
import {
datetimePreferenceAtom,
Expand Down Expand Up @@ -48,22 +53,22 @@ export default function Age({
datetimePreference,
suffix
);
return (
<>
<span
data-tooltip-id={`age-tooltip-${_from.local().fromNow(!suffix)}`}
className={className}
>
{formattedDate}
</span>

{datetimePreference !== "timestamp" && (
<Tooltip
id={`age-tooltip-${_from.local().fromNow(!suffix)}`}
content={formatDateForTooltip(_from, displayTimezonePreference)}
/>
)}
</>
if (datetimePreference === "timestamp") {
return <span className={className}>{formattedDate}</span>;
}

return (
<TooltipProvider delayDuration={0}>
<Tooltip>
<TooltipTrigger asChild>
<span className={className}>{formattedDate}</span>
</TooltipTrigger>
<TooltipContent side="top" className="max-w-none p-0">
<FullTimestampTooltip datetime={_from} />
</TooltipContent>
</Tooltip>
</TooltipProvider>
);
}

Expand All @@ -73,34 +78,45 @@ export default function Age({

if (duration.asMilliseconds() < 1000) {
return (
<>
<span
data-tooltip-id={`age-tooltip-${duration.asMilliseconds()}`}
className={className}
>
{duration.asMilliseconds()}ms
</span>
<Tooltip
id={`age-tooltip-${duration.asMilliseconds()}`}
content={`${formatDateForTooltip(_from, displayTimezonePreference)}`}
/>
</>
<TooltipProvider delayDuration={0}>
<Tooltip>
<TooltipTrigger asChild>
<span className={className}>{duration.asMilliseconds()}ms</span>
</TooltipTrigger>
<TooltipContent side="top" className="max-w-none p-0">
<FullTimestampTooltip datetime={_from} />
</TooltipContent>
</Tooltip>
</TooltipProvider>
);
}

return (
<>
<span
data-tooltip-id={`age-tooltip-${_from.local().to(_to)}`}
className={clsx(className, "whitespace-nowrap")}
>
{_from.local().to(_to, !suffix)}
</span>
<Tooltip
id={`age-tooltip-${_from.local().to(_to)}`}
content={`${formatDateForTooltip(_from, displayTimezonePreference)} - ${formatDateForTooltip(_to, displayTimezonePreference)}`}
/>
</>
<TooltipProvider delayDuration={0}>
<Tooltip>
<TooltipTrigger asChild>
<span className={clsx(className, "whitespace-nowrap")}>
{_from.local().to(_to, !suffix)}
</span>
</TooltipTrigger>
<TooltipContent side="top" className="max-w-none p-0">
<div className="w-[248px] space-y-1.5 rounded-md border border-white/20 bg-[#2b2b2b] p-2 text-white">
<div>
<div className="mb-1 text-[10px] uppercase tracking-wide text-zinc-400">
From
</div>
<FullTimestampRows datetime={_from} />
</div>
<div className="border-t border-white/15 pt-1.5">
<div className="mb-1 text-[10px] uppercase tracking-wide text-zinc-400">
To
</div>
<FullTimestampRows datetime={_to} />
</div>
</div>
</TooltipContent>
</Tooltip>
</TooltipProvider>
);
}

Expand All @@ -111,6 +127,61 @@ export function formatDateForTooltip(
return formatDayjs(datetime, displayTimezone, "timestamp", false);
}

function FullTimestampTooltip({ datetime }: { datetime: dayjs.Dayjs }) {
return (
<div className="w-[248px] rounded-md border border-white/20 bg-[#2b2b2b] p-2 text-white">
<FullTimestampRows datetime={datetime} />
</div>
);
}

function FullTimestampRows({ datetime }: { datetime: dayjs.Dayjs }) {
const browserTimezoneOffset = datetime.local().format("Z");
const browserTimestamp = datetime.local().format("YYYY-MM-DD HH:mm:ss");
const utcTimestamp = datetime.tz("UTC").format("YYYY-MM-DD HH:mm:ss");

return (
<div className="space-y-1 text-xs">
<div className="pb-1 text-zinc-100">{formatRelativeLong(datetime)}</div>
<div className="flex items-center gap-1.5 font-mono">
<span className="w-12 shrink-0 text-zinc-300">
{browserTimezoneOffset}
</span>
<span>{browserTimestamp}</span>
</div>
<div className="flex items-center gap-1.5 font-mono">
<span className="w-12 shrink-0 text-zinc-300">UTC</span>
<span>{utcTimestamp}</span>
</div>
</div>
);
}

function formatRelativeLong(datetime: dayjs.Dayjs) {
const now = dayjs();
const diffSeconds = datetime.diff(now, "second");
const absSeconds = Math.abs(diffSeconds);

const units: Array<{ unit: Intl.RelativeTimeFormatUnit; seconds: number }> = [
{ unit: "year", seconds: 365 * 24 * 60 * 60 },
{ unit: "month", seconds: 30 * 24 * 60 * 60 },
{ unit: "day", seconds: 24 * 60 * 60 },
{ unit: "hour", seconds: 60 * 60 },
{ unit: "minute", seconds: 60 },
{ unit: "second", seconds: 1 }
];

const selected =
units.find(({ seconds }) => absSeconds >= seconds) ??
units[units.length - 1];
const value = Math.round(diffSeconds / selected.seconds);

return new Intl.RelativeTimeFormat("en", {
numeric: "always",
style: "long"
}).format(value, selected.unit);
}

export function formatDayjs(
datetime: dayjs.Dayjs,
displayTimezone: string,
Expand Down
Loading