Skip to content

Open-source status page, incident response and uptime monitoring

fix: utc time status page (#904)

Maximilian Kasked592d22f4a2e
diff --git a/apps/web/src/components/status-page/datetime-tooltip.tsx b/apps/web/src/components/status-page/datetime-tooltip.tsx
new file mode 100644
index 000000000..b633b7fa4
--- /dev/null
+++ b/apps/web/src/components/status-page/datetime-tooltip.tsx
@@ -0,0 +1,43 @@
+"use client";
+
+import { cn } from "@/lib/utils";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@openstatus/ui";
+import { format } from "date-fns";
+import { formatInTimeZone } from "date-fns-tz";
+import { useState } from "react";
+
+export function DateTimeTooltip({
+ date = new Date(),
+ className,
+}: {
+ date?: Date;
+ className?: string;
+}) {
+ const [open, setOpen] = useState(false);
+ return (
+ <TooltipProvider>
+ <Tooltip open={open} onOpenChange={setOpen}>
+ <TooltipTrigger
+ onClick={() => setOpen(false)}
+ className={cn(
+ "text-muted-foreground underline decoration-muted-foreground/30 decoration-dashed underline-offset-4",
+ className
+ )}
+ asChild
+ >
+ <span>{formatInTimeZone(date, "UTC", "LLL dd, y HH:mm (z)")}</span>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p className="text-muted-foreground text-xs">
+ {format(date, "LLL dd, y HH:mm (z)")}
+ </p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ );
+}
diff --git a/apps/web/src/components/status-page/status-check.tsx b/apps/web/src/components/status-page/status-check.tsx
index 4a1ef7f78..1dfff6cb3 100644
--- a/apps/web/src/components/status-page/status-check.tsx
+++ b/apps/web/src/components/status-page/status-check.tsx
@@ -6,9 +6,9 @@ import type {
import type { StatusVariant } from "@openstatus/tracker";
import { Tracker } from "@openstatus/tracker";
-import { getServerTimezoneFormat } from "@/lib/timezone";
import { cn } from "@/lib/utils";
import { Icons } from "../icons";
+import { DateTimeTooltip } from "./datetime-tooltip";
export async function StatusCheck({
statusReports,
@@ -23,8 +23,6 @@ export async function StatusCheck({
const className = tracker.currentClassName;
const details = tracker.currentDetails;
- const formattedServerDate = getServerTimezoneFormat();
-
return (
<div className="flex flex-col items-center gap-3">
<div className="flex items-center gap-3">
@@ -33,10 +31,13 @@ export async function StatusCheck({
<StatusIcon variant={details.variant} />
</span>
</div>
- <p className="text-muted-foreground text-xs">
- Status Check <span className="text-muted-foreground/50 text-xs">•</span>{" "}
- {formattedServerDate}
- </p>
+ <div className="flex flex-wrap gap-2">
+ <p className="text-muted-foreground text-xs">Status Check</p>
+ <span className="text-muted-foreground/50 text-xs">•</span>{" "}
+ <p className="text-xs">
+ <DateTimeTooltip date={new Date()} />
+ </p>
+ </div>
</div>
);
}
diff --git a/apps/web/src/components/status-page/status-report.tsx b/apps/web/src/components/status-page/status-report.tsx
index d44831bf9..416ff235f 100644
--- a/apps/web/src/components/status-page/status-report.tsx
+++ b/apps/web/src/components/status-page/status-report.tsx
@@ -1,6 +1,5 @@
"use client";
-import { format } from "date-fns";
import { ChevronRight } from "lucide-react";
import Link from "next/link";
import { useParams } from "next/navigation";
@@ -16,6 +15,9 @@ import { setPrefixUrl } from "@/app/status-page/[domain]/utils";
import { cn } from "@/lib/utils";
import { StatusBadge } from "../status-update/status-badge";
import { ProcessMessage } from "./process-message";
+import { DateTimeTooltip } from "./datetime-tooltip";
+import { format } from "date-fns";
+import { formatInTimeZone } from "date-fns-tz";
function StatusReport({
report,
@@ -65,10 +67,11 @@ function StatusReportDescription({
}) {
const firstReport =
report.statusReportUpdates[report.statusReportUpdates.length - 1];
+
return (
<div className={cn("flex flex-wrap items-center gap-2", className)}>
- <p className="text-muted-foreground">
- {format(firstReport.date || new Date(), "LLL dd, y HH:mm")}
+ <p className="text-muted-foreground text-sm">
+ Started at <DateTimeTooltip date={firstReport.date} />
</p>
<span className="text-muted-foreground/50 text-xs">•</span>
<StatusBadge status={report.status} />
@@ -89,17 +92,17 @@ function StatusReportDescription({
// reports are already `orderBy: desc(report.date)` within the query itself
function StatusReportUpdates({ report }: { report: StatusReportWithUpdates }) {
return (
- <div className="grid gap-4 md:grid-cols-4">
+ <div className="grid gap-2 md:grid-cols-10 md:gap-4">
{report.statusReportUpdates.map((update) => {
return (
<Fragment key={update.id}>
- <div className="flex items-center gap-2 md:col-span-1 md:flex-col md:items-start md:gap-1">
+ <div className="flex items-center gap-2 md:col-span-3 md:flex-col md:items-start md:gap-1">
<p className="font-medium capitalize">{update.status}</p>
<p className="font-mono text-muted-foreground text-sm md:text-xs">
- {format(update.date, "LLL dd, y HH:mm")}
+ <DateTimeTooltip date={update.date} />
</p>
</div>
- <div className="prose dark:prose-invert md:col-span-3">
+ <div className="prose dark:prose-invert md:col-span-7">
<ProcessMessage value={update.message} />
</div>
</Fragment>
diff --git a/apps/web/src/components/tracker/tracker.tsx b/apps/web/src/components/tracker/tracker.tsx
index 151743116..229e62ca4 100644
--- a/apps/web/src/components/tracker/tracker.tsx
+++ b/apps/web/src/components/tracker/tracker.tsx
@@ -1,7 +1,7 @@
"use client";
import { cva } from "class-variance-authority";
-import { endOfDay, format, formatDuration, startOfDay } from "date-fns";
+import { format, formatDuration } from "date-fns";
import { ChevronRight, Info } from "lucide-react";
import Link from "next/link";
import * as React from "react";
@@ -13,7 +13,12 @@ import type {
StatusReportUpdate,
} from "@openstatus/db/src/schema";
import type { Monitor } from "@openstatus/tinybird";
-import { Tracker as OSTracker, classNames } from "@openstatus/tracker";
+import {
+ Tracker as OSTracker,
+ classNames,
+ endOfDay,
+ startOfDay,
+} from "@openstatus/tracker";
import {
HoverCard,
HoverCardContent,
@@ -150,7 +155,7 @@ export const Bar = ({
<div
className={cn(
rootClassName,
- "h-auto w-1 flex-none rounded-full",
+ "h-auto w-1 flex-none rounded-full"
)}
/>
<div className="grid flex-1 gap-1">
@@ -245,7 +250,7 @@ export function DowntimeText({
Down for{" "}
{formatDuration(
{ minutes, hours, days },
- { format: ["days", "hours", "minutes", "seconds"], zero: false },
+ { format: ["days", "hours", "minutes", "seconds"], zero: false }
)}
</p>
);
diff --git a/apps/web/src/lib/timezone.ts b/apps/web/src/lib/timezone.ts
index fa50750d1..b0b29c3f0 100644
--- a/apps/web/src/lib/timezone.ts
+++ b/apps/web/src/lib/timezone.ts
@@ -34,8 +34,15 @@ export function convertTimezoneToGMT(defaultTimezone?: string) {
return `Etc/GMT${offset}` as const;
}
+export function getServerTimezoneUTCFormat() {
+ const now = new Date();
+ const now_utc = new Date(now.toUTCString().slice(0, -4)); // remove the GMT end
+
+ return format(now_utc, "LLL dd, y HH:mm:ss (z)", { timeZone: "UTC" });
+}
+
export function getServerTimezoneFormat() {
- return format(new Date(), "LLL dd, y HH:mm:ss zzz", { timeZone: "UTC" });
+ return format(new Date(), "LLL dd, y HH:mm:ss (z)");
}
export function formatDate(date: Date) {
diff --git a/packages/tracker/src/index.ts b/packages/tracker/src/index.ts
index 57a6ca030..ec332caca 100644
--- a/packages/tracker/src/index.ts
+++ b/packages/tracker/src/index.ts
@@ -1,3 +1,4 @@
export * from "./tracker";
export * from "./types";
export * from "./config";
+export * from "./utils";
diff --git a/packages/tracker/src/utils.ts b/packages/tracker/src/utils.ts
index c6e5c4a91..abbf81fde 100644
--- a/packages/tracker/src/utils.ts
+++ b/packages/tracker/src/utils.ts
@@ -1,32 +1,32 @@
export function endOfDay(date: Date): Date {
// Create a new Date object to avoid mutating the original date
- const newDate = new Date(date);
+ // const newDate = new Date(date);
+ const newDate = new Date(
+ Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()),
+ );
// Set hours, minutes, seconds, and milliseconds to end of day
- newDate.setHours(23, 59, 59, 999);
+ newDate.setUTCHours(23, 59, 59, 999);
return newDate;
}
export function startOfDay(date: Date): Date {
// Create a new Date object to avoid mutating the original date
- const newDate = new Date(date);
+ // const newDate = new Date(date);
+ const newDate = new Date(
+ Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()),
+ );
// Set hours, minutes, seconds, and milliseconds to start of day
- newDate.setHours(0, 0, 0, 0);
+ newDate.setUTCHours(0, 0, 0, 0);
return newDate;
}
export function isSameDay(date1: Date, date2: Date) {
- const newDate1 = new Date(date1);
- const newDate2 = new Date(date2);
-
- newDate1.setDate(newDate1.getDate());
- newDate1.setHours(0, 0, 0, 0);
-
- newDate2.setDate(newDate2.getDate());
- newDate2.setHours(0, 0, 0, 0);
+ const newDate1 = startOfDay(date1);
+ const newDate2 = startOfDay(date2);
return newDate1.toUTCString() === newDate2.toUTCString();
}