Skip to content

Open-source status page, incident response and uptime monitoring

chore: status page v2 improvements (#1361)

Maximilian Kaske814971e1e718
diff --git a/apps/status-page/src/app/(public)/layout.tsx b/apps/status-page/src/app/(public)/layout.tsx
new file mode 100644
index 000000000..52c9afe1c
--- /dev/null
+++ b/apps/status-page/src/app/(public)/layout.tsx
@@ -0,0 +1,20 @@
+import { ThemeProvider } from "@/components/theme-provider";
+import { Toaster } from "@/components/ui/sonner";
+
+export default async function Layout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ return (
+ <ThemeProvider
+ attribute="class"
+ defaultTheme="system"
+ enableSystem
+ disableTransitionOnChange
+ >
+ {children}
+ <Toaster richColors expand />
+ </ThemeProvider>
+ );
+}
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(private)/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/(private)/layout.tsx
index 40f3219c8..2b919159f 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(private)/layout.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(private)/layout.tsx
@@ -1,42 +1,12 @@
import { Footer } from "@/components/nav/footer";
-import {
- FloatingButton,
- StatusPageProvider,
-} from "@/components/status-page/floating-button";
-import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
-export default function Layout({
- children,
- params,
-}: {
- children: React.ReactNode;
- params: Promise<{ domain: string }>;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
return (
- <Hydrate params={params}>
- <StatusPageProvider>
- <div className="flex min-h-screen flex-col gap-4">
- <main className="mx-auto flex w-full max-w-2xl flex-1 flex-col px-3 py-2">
- {children}
- </main>
- <Footer className="w-full border-t" />
- </div>
- <FloatingButton />
- </StatusPageProvider>
- </Hydrate>
+ <div className="flex min-h-screen flex-col gap-4">
+ <main className="mx-auto flex w-full max-w-2xl flex-1 flex-col px-3 py-2">
+ {children}
+ </main>
+ <Footer className="w-full border-t" />
+ </div>
);
}
-
-async function Hydrate({
- children,
- params,
-}: {
- children: React.ReactNode;
- params: Promise<{ domain: string }>;
-}) {
- const queryClient = getQueryClient();
- await queryClient.prefetchQuery(
- trpc.statusPage.get.queryOptions({ slug: (await params).domain }),
- );
- return <HydrateClient>{children}</HydrateClient>;
-}
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/layout.tsx
index cee0c82ae..0c5c7f7f5 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/layout.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/layout.tsx
@@ -1,6 +1,5 @@
"use client";
-import { useStatusPage } from "@/components/status-page/floating-button";
import {
Status,
StatusContent,
@@ -17,7 +16,6 @@ export default function EventLayout({
}: {
children: React.ReactNode;
}) {
- const { variant } = useStatusPage();
const { domain } = useParams<{ domain: string }>();
const trpc = useTRPC();
const { data: page } = useQuery(
@@ -27,7 +25,7 @@ export default function EventLayout({
if (!page) return null;
return (
- <Status variant={variant}>
+ <Status>
<StatusHeader>
<StatusTitle>{page.title}</StatusTitle>
<StatusDescription>{page.description}</StatusDescription>
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/layout.tsx
index d32af5263..b2f16ca1b 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/layout.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/layout.tsx
@@ -1,49 +1,20 @@
import { defaultMetadata, ogMetadata, twitterMetadata } from "@/app/metadata";
import { Footer } from "@/components/nav/footer";
import { Header } from "@/components/nav/header";
-import {
- FloatingButton,
- StatusPageProvider,
-} from "@/components/status-page/floating-button";
-import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
+import { getQueryClient, trpc } from "@/lib/trpc/server";
import type { Metadata } from "next";
import { notFound } from "next/navigation";
-export default function Layout({
- children,
- params,
-}: {
- children: React.ReactNode;
- params: Promise<{ domain: string }>;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
return (
- <Hydrate params={params}>
- <StatusPageProvider>
- <div className="flex min-h-screen flex-col gap-4">
- <Header className="w-full border-b" />
- <main className="mx-auto flex w-full max-w-2xl flex-1 flex-col px-3 py-2">
- {children}
- </main>
- <Footer className="w-full border-t" />
- </div>
- <FloatingButton />
- </StatusPageProvider>
- </Hydrate>
- );
-}
-
-async function Hydrate({
- children,
- params,
-}: {
- children: React.ReactNode;
- params: Promise<{ domain: string }>;
-}) {
- const queryClient = getQueryClient();
- await queryClient.prefetchQuery(
- trpc.statusPage.get.queryOptions({ slug: (await params).domain }),
+ <div className="flex min-h-screen flex-col gap-4">
+ <Header className="w-full border-b" />
+ <main className="mx-auto flex w-full max-w-2xl flex-1 flex-col px-3 py-2">
+ {children}
+ </main>
+ <Footer className="w-full border-t" />
+ </div>
);
- return <HydrateClient>{children}</HydrateClient>;
}
export async function generateMetadata({
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/page.tsx
index d7147c44c..0b392214e 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/page.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/page.tsx
@@ -4,16 +4,13 @@ import {
ChartAreaPercentiles,
ChartAreaPercentilesSkeleton,
} from "@/components/chart/chart-area-percentiles";
-import {
- EmptyStateContainer,
- EmptyStateDescription,
- EmptyStateTitle,
-} from "@/components/content/empty-state";
-import { useStatusPage } from "@/components/status-page/floating-button";
import {
Status,
StatusContent,
StatusDescription,
+ StatusEmptyState,
+ StatusEmptyStateDescription,
+ StatusEmptyStateTitle,
StatusHeader,
StatusTitle,
} from "@/components/status-page/status";
@@ -25,7 +22,6 @@ import Link from "next/link";
import { useParams } from "next/navigation";
export default function Page() {
- const { variant } = useStatusPage();
const { domain } = useParams<{ domain: string }>();
const trpc = useTRPC();
const { data: page } = useQuery(
@@ -37,69 +33,69 @@ export default function Page() {
if (!page) return null;
+ const publicMonitors = page.monitors.filter((monitor) => monitor.public);
+
return (
- <Status variant={variant}>
+ <Status>
<StatusHeader>
<StatusTitle>{page.title}</StatusTitle>
<StatusDescription>{page.description}</StatusDescription>
</StatusHeader>
<StatusContent className="flex flex-col gap-6">
- {page.monitors.length > 0 ? (
- page.monitors
- .filter((monitor) => monitor.public)
- .map((monitor) => {
- const data =
- monitors
- ?.find((item) => item.id === monitor.id)
- ?.data?.map((item) => ({
- ...item,
- // TODO: create formatter
- timestamp: new Date(item.timestamp).toLocaleString(
- "default",
- {
- day: "numeric",
- month: "short",
- hour: "numeric",
- minute: "numeric",
- timeZoneName: "short",
- },
- ),
- })) ?? [];
+ {publicMonitors.length > 0 ? (
+ publicMonitors.map((monitor) => {
+ const data =
+ monitors
+ ?.find((item) => item.id === monitor.id)
+ ?.data?.map((item) => ({
+ ...item,
+ // TODO: create formatter
+ timestamp: new Date(item.timestamp).toLocaleString(
+ "default",
+ {
+ day: "numeric",
+ month: "short",
+ hour: "numeric",
+ minute: "numeric",
+ timeZoneName: "short",
+ },
+ ),
+ })) ?? [];
- return (
- <Link
- key={monitor.id}
- href={`./monitors/${monitor.id}`}
- className="rounded-lg"
- >
- <div className="group -mx-3 -my-2 flex flex-col gap-2 rounded-lg border border-transparent px-3 py-2 hover:border-border/50 hover:bg-muted/50">
- <div className="flex flex-row items-center gap-2">
- <StatusMonitorTitle>{monitor.name}</StatusMonitorTitle>
- <StatusMonitorDescription>
- {monitor.description}
- </StatusMonitorDescription>
- </div>
- {isLoading ? (
- <ChartAreaPercentilesSkeleton className="h-[80px]" />
- ) : (
- <ChartAreaPercentiles
- className="h-[80px]"
- legendClassName="pb-1"
- data={data}
- singleSeries
- />
- )}
+ return (
+ <Link
+ key={monitor.id}
+ href={`./monitors/${monitor.id}`}
+ className="rounded-lg"
+ >
+ <div className="group -mx-3 -my-2 flex flex-col gap-2 rounded-lg border border-transparent px-3 py-2 hover:border-border/50 hover:bg-muted/50">
+ <div className="flex flex-row items-center gap-2">
+ <StatusMonitorTitle>{monitor.name}</StatusMonitorTitle>
+ <StatusMonitorDescription>
+ {monitor.description}
+ </StatusMonitorDescription>
</div>
- </Link>
- );
- })
+ {isLoading ? (
+ <ChartAreaPercentilesSkeleton className="h-[80px]" />
+ ) : (
+ <ChartAreaPercentiles
+ className="h-[80px]"
+ legendClassName="pb-1"
+ data={data}
+ singleSeries
+ />
+ )}
+ </div>
+ </Link>
+ );
+ })
) : (
- <EmptyStateContainer>
- <EmptyStateTitle>No public monitors</EmptyStateTitle>
- <EmptyStateDescription>
+ <StatusEmptyState>
+ <StatusEmptyStateTitle>No public monitors</StatusEmptyStateTitle>
+ <StatusEmptyStateDescription>
No public monitors have been added to this page.
- </EmptyStateDescription>
- </EmptyStateContainer>
+ </StatusEmptyStateDescription>
+ </StatusEmptyState>
)}
</StatusContent>
</Status>
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx
index 005be0e55..1ad5e51db 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx
@@ -37,7 +37,7 @@ export default function Page() {
trpc.statusPage.getUptime.queryOptions({
slug: domain,
monitorIds: page?.monitors?.map((monitor) => monitor.id.toString()) || [],
- // NOTE: this will be moved to db config
+ // NOTE: we could move that to the server as we query the page entry anyways
cardType,
barType,
}),
diff --git a/apps/status-page/src/app/(status-page)/[domain]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
new file mode 100644
index 000000000..b7bf4cdab
--- /dev/null
+++ b/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
@@ -0,0 +1,57 @@
+import {
+ FloatingButton,
+ StatusPageProvider,
+} from "@/components/status-page/floating-button";
+import { ThemeProvider } from "@/components/theme-provider";
+import { Toaster } from "@/components/ui/sonner";
+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
+import { z } from "zod";
+
+export const schema = z.object({
+ card: z.enum(["duration", "requests", "manual"]).default("duration"),
+ bar: z.enum(["absolute", "manual"]).default("absolute"),
+ uptime: z.boolean().default(true),
+ theme: z.enum(["default"]).default("default"),
+});
+
+const DISPLAY_FLOATING_BUTTON =
+ process.env.NODE_ENV === "development" ||
+ process.env.ENABLE_FLOATING_BUTTON === "true";
+
+export default async function Layout({
+ children,
+ params,
+}: {
+ children: React.ReactNode;
+ params: Promise<{ domain: string }>;
+}) {
+ const queryClient = getQueryClient();
+ const { domain } = await params;
+ const page = await queryClient.fetchQuery(
+ trpc.statusPage.get.queryOptions({ slug: domain }),
+ );
+
+ const validation = schema.safeParse(page?.configuration);
+
+ return (
+ <HydrateClient>
+ <ThemeProvider
+ attribute="class"
+ defaultTheme={page?.forceTheme ?? "system"}
+ enableSystem
+ disableTransitionOnChange
+ >
+ <StatusPageProvider
+ defaultBarType={validation.data?.bar}
+ defaultCardType={validation.data?.card}
+ defaultShowUptime={validation.data?.uptime}
+ defaultCommunityTheme={validation.data?.theme}
+ >
+ {children}
+ {DISPLAY_FLOATING_BUTTON ? <FloatingButton /> : null}
+ <Toaster richColors expand />
+ </StatusPageProvider>
+ </ThemeProvider>
+ </HydrateClient>
+ );
+}
diff --git a/apps/status-page/src/app/layout.tsx b/apps/status-page/src/app/layout.tsx
index 61af0e969..beb3bc68f 100644
--- a/apps/status-page/src/app/layout.tsx
+++ b/apps/status-page/src/app/layout.tsx
@@ -2,8 +2,6 @@ import type { Metadata } from "next";
import { Geist, Geist_Mono } from "next/font/google";
import "./globals.css";
import { TailwindIndicator } from "@/components/tailwind-indicator";
-import { ThemeProvider } from "@/components/theme-provider";
-import { Toaster } from "@/components/ui/sonner";
import { TRPCReactProvider } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
import LocalFont from "next/font/local";
@@ -54,18 +52,10 @@ export default function RootLayout({
)}
>
<NuqsAdapter>
- <ThemeProvider
- attribute="class"
- defaultTheme="system"
- enableSystem
- disableTransitionOnChange
- >
- <TRPCReactProvider>
- {children}
- <TailwindIndicator />
- <Toaster richColors expand />
- </TRPCReactProvider>
- </ThemeProvider>
+ <TRPCReactProvider>
+ {children}
+ <TailwindIndicator />
+ </TRPCReactProvider>
</NuqsAdapter>
</body>
</html>
diff --git a/apps/status-page/src/components/content/timestamp-hover-card.tsx b/apps/status-page/src/components/content/timestamp-hover-card.tsx
new file mode 100644
index 000000000..f68b2720d
--- /dev/null
+++ b/apps/status-page/src/components/content/timestamp-hover-card.tsx
@@ -0,0 +1,97 @@
+import {
+ HoverCard,
+ HoverCardContent,
+ HoverCardTrigger,
+} from "@/components/ui/hover-card";
+import { useCopyToClipboard } from "@/hooks/use-copy-to-clipboard";
+import { UTCDate } from "@date-fns/utc";
+import {
+ type HoverCardContentProps,
+ HoverCardPortal,
+} from "@radix-ui/react-hover-card";
+import { format } from "date-fns";
+import { formatDistanceToNowStrict } from "date-fns";
+import { Check, Copy } from "lucide-react";
+import { useEffect, useState } from "react";
+
+export function TimestampHoverCard({
+ date,
+ side = "right",
+ align = "start",
+ alignOffset = -4,
+ sideOffset,
+ children,
+ ...props
+}: React.ComponentProps<typeof HoverCardTrigger> & {
+ date: Date;
+ side?: HoverCardContentProps["side"];
+ align?: HoverCardContentProps["align"];
+ alignOffset?: HoverCardContentProps["alignOffset"];
+ sideOffset?: HoverCardContentProps["sideOffset"];
+}) {
+ const [open, setOpen] = useState(false);
+ const [_, setRerender] = useState(0);
+
+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+ const relative = formatDistanceToNowStrict(date, { addSuffix: true });
+ const formatted = format(date, "LLL dd, y HH:mm:ss");
+ const utc = format(new UTCDate(date), "LLL dd, y HH:mm:ss");
+
+ useEffect(() => {
+ // only setInterval if open
+ if (!open) return;
+
+ const interval = setInterval(() => {
+ setRerender((prev) => prev + 1);
+ }, 1000);
+
+ return () => clearInterval(interval);
+ }, [open]);
+
+ return (
+ <HoverCard openDelay={0} closeDelay={0} open={open} onOpenChange={setOpen}>
+ {/* NOTE: the trigger is an `a` tag per default */}
+ <HoverCardTrigger {...props}>{children}</HoverCardTrigger>
+ <HoverCardPortal>
+ <HoverCardContent
+ className="z-10 w-auto p-2"
+ {...{ side, align, alignOffset, sideOffset }}
+ >
+ <dl className="flex flex-col gap-1">
+ <Row value={formatted} label={timezone} />
+ <Row value={utc} label="UTC" />
+ {/* <Row value={date.toISOString()} label="ISO" /> */}
+ {/* <Row value={String(date.getTime())} label="Timestamp" /> */}
+ <Row value={relative} label="Relative" />
+ </dl>
+ </HoverCardContent>
+ </HoverCardPortal>
+ </HoverCard>
+ );
+}
+
+function Row({ value, label }: { value: string; label: string }) {
+ const { copy, isCopied } = useCopyToClipboard();
+
+ return (
+ <div
+ className="group flex items-center justify-between gap-4 text-sm"
+ onClick={(e) => {
+ e.stopPropagation();
+ copy(value, {});
+ }}
+ >
+ <dt className="text-muted-foreground">{label}</dt>
+ <dd className="flex items-center gap-1 truncate font-mono">
+ <span className="invisible group-hover:visible">
+ {!isCopied ? (
+ <Copy className="h-3 w-3" />
+ ) : (
+ <Check className="h-3 w-3" />
+ )}
+ </span>
+ {value}
+ </dd>
+ </div>
+ );
+}
diff --git a/apps/status-page/src/components/nav/footer.tsx b/apps/status-page/src/components/nav/footer.tsx
index e23af9542..4563fa1d3 100644
--- a/apps/status-page/src/components/nav/footer.tsx
+++ b/apps/status-page/src/components/nav/footer.tsx
@@ -1,15 +1,18 @@
"use client";
import { Link } from "@/components/common/link";
+import { TimestampHoverCard } from "@/components/content/timestamp-hover-card";
import { ThemeToggle } from "@/components/theme-toggle";
import { useTRPC } from "@/lib/trpc/client";
+import { cn } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
+import { format } from "date-fns";
import { useParams } from "next/navigation";
export function Footer(props: React.ComponentProps<"footer">) {
const { domain } = useParams<{ domain: string }>();
const trpc = useTRPC();
- const { data: page } = useQuery(
+ const { data: page, dataUpdatedAt } = useQuery(
trpc.statusPage.get.queryOptions({ slug: domain }),
);
@@ -17,12 +20,22 @@ export function Footer(props: React.ComponentProps<"footer">) {
return (
<footer {...props}>
- <div className="mx-auto flex max-w-2xl items-center justify-between px-3 py-2">
- {page.workspacePlan === "team" ? null : (
- <p className="text-muted-foreground">
+ <div className="mx-auto flex gap-4 max-w-2xl items-center justify-between px-3 py-2">
+ <div className="leading-[0.9]">
+ <p
+ className={cn(
+ "text-muted-foreground text-sm",
+ page.workspacePlan === "team" && "sr-only",
+ )}
+ >
Powered by <Link href="#">OpenStatus</Link>
</p>
- )}
+ <TimestampHoverCard date={new Date(dataUpdatedAt)} side="top">
+ <span className="text-muted-foreground/70 text-xs">
+ {format(new Date(dataUpdatedAt), "LLL dd, y HH:mm:ss")}
+ </span>
+ </TimestampHoverCard>
+ </div>
<ThemeToggle className="w-[140px]" />
</div>
</footer>
diff --git a/apps/status-page/src/components/status-page/floating-button.tsx b/apps/status-page/src/components/status-page/floating-button.tsx
index 7399f0261..80f5d17a0 100644
--- a/apps/status-page/src/components/status-page/floating-button.tsx
+++ b/apps/status-page/src/components/status-page/floating-button.tsx
@@ -39,7 +39,6 @@ export type BarType = (typeof BAR_TYPE)[number];
export const COMMUNITY_THEME = ["default", "github", "supabase"] as const;
export type CommunityTheme = (typeof COMMUNITY_THEME)[number];
-
interface StatusPageContextType {
variant: VariantType;
setVariant: (variant: VariantType) => void;
@@ -149,7 +148,7 @@ export function FloatingButton({ className }: { className?: string }) {
} = useStatusPage();
return (
- <div className={cn("fixed right-4 bottom-4 z-50 bg-background", className)}>
+ <div className={cn("fixed right-4 bottom-4 z-50", className)}>
<Popover>
<PopoverTrigger asChild>
<Button
diff --git a/apps/status-page/src/components/status-page/status-events.tsx b/apps/status-page/src/components/status-page/status-events.tsx
index 1d6414eab..c5d0f0ad1 100644
--- a/apps/status-page/src/components/status-page/status-events.tsx
+++ b/apps/status-page/src/components/status-page/status-events.tsx
@@ -1,20 +1,9 @@
+import { ProcessMessage } from "@/components/content/process-message";
+import { TimestampHoverCard } from "@/components/content/timestamp-hover-card";
import { Separator } from "@/components/ui/separator";
-import { useCopyToClipboard } from "@/hooks/use-copy-to-clipboard";
import { formatDateRange, formatDateTime } from "@/lib/formatter";
import { cn } from "@/lib/utils";
-import { UTCDate } from "@date-fns/utc";
-import { HoverCardPortal } from "@radix-ui/react-hover-card";
-import {
- format,
- formatDistanceStrict,
- formatDistanceToNowStrict,
-} from "date-fns";
-import { Check, Copy } from "lucide-react";
-import {
- HoverCard,
- HoverCardContent,
- HoverCardTrigger,
-} from "../ui/hover-card";
+import { formatDistanceStrict } from "date-fns";
import { status } from "./messages";
// TODO: rename file to status-event and move the `StatusEvents` component to the page level.
@@ -169,9 +158,9 @@ function StatusEventTimelineReportUpdate({
<span>{status[report.status]}</span>{" "}
{/* underline decoration-dashed underline-offset-2 decoration-muted-foreground/30 */}
<span className="font-mono text-muted-foreground/70 text-xs">
- <StatusEventDateHoverCard date={new Date(report.date)}>
- {formatDateTime(report.date)}
- </StatusEventDateHoverCard>
+ <TimestampHoverCard date={new Date(report.date)} asChild>
+ <span>{formatDateTime(report.date)}</span>
+ </TimestampHoverCard>
</span>{" "}
{duration ? (
<span className="font-mono text-muted-foreground/70 text-xs">
@@ -180,7 +169,7 @@ function StatusEventTimelineReportUpdate({
) : null}
</StatusEventTimelineTitle>
<StatusEventTimelineMessage>
- {report.message}
+ <ProcessMessage value={report.message} />
</StatusEventTimelineMessage>
</div>
</div>
@@ -220,13 +209,13 @@ export function StatusEventTimelineMaintenance({
<StatusEventTimelineTitle>
<span>Maintenance</span>{" "}
<span className="font-mono text-muted-foreground/70 text-xs">
- <StatusEventDateHoverCard date={maintenance.from}>
- {from}
- </StatusEventDateHoverCard>
+ <TimestampHoverCard date={maintenance.from} asChild>
+ <span>{from}</span>
+ </TimestampHoverCard>
{" - "}
- <StatusEventDateHoverCard date={maintenance.to}>
- {to}
- </StatusEventDateHoverCard>
+ <TimestampHoverCard date={maintenance.to} asChild>
+ <span>{to}</span>
+ </TimestampHoverCard>
</span>{" "}
{duration ? (
<span className="font-mono text-muted-foreground/70 text-xs">
@@ -235,7 +224,7 @@ export function StatusEventTimelineMaintenance({
) : null}
</StatusEventTimelineTitle>
<StatusEventTimelineMessage>
- {maintenance.message}
+ <ProcessMessage value={maintenance.message} />
</StatusEventTimelineMessage>
</div>
</div>
@@ -312,68 +301,3 @@ export function StatusEventTimelineSeparator({
/>
);
}
-
-export function StatusEventDateHoverCard({
- date,
- side = "right",
- align = "start",
- alignOffset = -4,
- sideOffset,
- children,
-}: React.ComponentProps<typeof HoverCardContent> & { date: Date }) {
- const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
- return (
- <HoverCard openDelay={0} closeDelay={0}>
- {/* NOTE: the trigger is an `a` tag per default */}
- <HoverCardTrigger asChild>
- <span>{children}</span>
- </HoverCardTrigger>
- <HoverCardPortal>
- <HoverCardContent
- className="z-10 w-auto p-2"
- {...{ side, align, alignOffset, sideOffset }}
- >
- <dl className="flex flex-col gap-1">
- <Row value={format(date, "LLL dd, y HH:mm:ss")} label={timezone} />
- <Row
- value={format(new UTCDate(date), "LLL dd, y HH:mm:ss")}
- label="UTC"
- />
- {/* <Row value={date.toISOString()} label="ISO" /> */}
- {/* <Row value={String(date.getTime())} label="Timestamp" /> */}
- <Row
- value={formatDistanceToNowStrict(date, { addSuffix: true })}
- label="Relative"
- />
- </dl>
- </HoverCardContent>
- </HoverCardPortal>
- </HoverCard>
- );
-}
-
-function Row({ value, label }: { value: string; label: string }) {
- const { copy, isCopied } = useCopyToClipboard();
-
- return (
- <div
- className="group flex items-center justify-between gap-4 text-sm"
- onClick={(e) => {
- e.stopPropagation();
- copy(value, {});
- }}
- >
- <dt className="text-muted-foreground">{label}</dt>
- <dd className="flex items-center gap-1 truncate font-mono">
- <span className="invisible group-hover:visible">
- {!isCopied ? (
- <Copy className="h-3 w-3" />
- ) : (
- <Check className="h-3 w-3" />
- )}
- </span>
- {value}
- </dd>
- </div>
- );
-}
diff --git a/packages/api/src/router/statusPage.utils.ts b/packages/api/src/router/statusPage.utils.ts
index 2452e01b7..1757758d2 100644
--- a/packages/api/src/router/statusPage.utils.ts
+++ b/packages/api/src/router/statusPage.utils.ts
@@ -401,7 +401,7 @@ export function setDataByType({
switch (cardType) {
case "requests":
if (total === 0) {
- cardData = [{ status: eventStatus ?? "empty", value: "1 day" }];
+ cardData = [{ status: eventStatus ?? "empty", value: "" }];
} else {
const entries = [
{ status: "success" as const, count: dayData.ok },
@@ -421,7 +421,7 @@ export function setDataByType({
case "duration":
if (total === 0) {
- cardData = [{ status: eventStatus ?? "empty", value: "1 day" }];
+ cardData = [{ status: eventStatus ?? "empty", value: "" }];
} else {
const entries = [
{ status: "error" as const, count: dayData.error },
@@ -477,8 +477,22 @@ export function setDataByType({
let total = 0;
// biome-ignore lint/suspicious/noAssignInExpressions: <explanation>
map.forEach((d) => (total += d));
- const day = 24 * 60;
- const minutes = Math.max(day - total, 0);
+
+ const now = new Date();
+ const startOfDay = new Date(date);
+ startOfDay.setUTCHours(0, 0, 0, 0);
+
+ let totalMinutesInDay: number;
+ if (isToday(date)) {
+ const minutesElapsed = Math.floor(
+ (now.getTime() - startOfDay.getTime()) / (1000 * 60),
+ );
+ totalMinutesInDay = minutesElapsed;
+ } else {
+ totalMinutesInDay = 24 * 60;
+ }
+
+ const minutes = Math.max(totalMinutesInDay - total, 0);
if (minutes === 0) return null;
return {
status: entry.status,
@@ -515,7 +529,7 @@ export function setDataByType({
default:
// Default to requests behavior
if (total === 0) {
- cardData = [{ status: eventStatus ?? "empty", value: "1 day" }];
+ cardData = [{ status: eventStatus ?? "empty", value: "" }];
} else {
const entries = [
{ status: "error" as const, count: dayData.error },