Skip to content

Open-source status page, incident response and uptime monitoring

feat: status-banner last update display (#1779)

Maximilian Kaske47b9f368871c
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 b617d2e88..a8d600711 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
@@ -18,8 +18,10 @@ import {
StatusBannerTabsTrigger,
} from "@/components/status-page/status-banner";
import {
+ StatusEventAffected,
+ StatusEventAffectedBadge,
StatusEventTimelineMaintenance,
- StatusEventTimelineReport,
+ StatusEventTimelineReportUpdate,
} from "@/components/status-page/status-events";
import { StatusFeed } from "@/components/status-page/status-feed";
import { StatusMonitor } from "@/components/status-page/status-monitor";
@@ -28,6 +30,7 @@ import { Separator } from "@/components/ui/separator";
import { useTRPC } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
+import Link from "next/link";
import { notFound, useParams } from "next/navigation";
import { useMemo } from "react";
@@ -136,21 +139,43 @@ export default function Page() {
(report) => report.id === e.id,
);
if (!report) return null;
+ const lastUpdate = report.statusReportUpdates.sort(
+ (a, b) => b.date.getTime() - a.date.getTime(),
+ )[0];
+ if (!lastUpdate) return null;
return (
<StatusBannerTabsContent
value={`${e.type}-${e.id}`}
key={`${e.type}-${e.id}`}
>
- <StatusBannerContainer status={e.status}>
- <StatusBannerContent>
- <StatusEventTimelineReport
- reportId={report.id}
- updates={report.statusReportUpdates}
- withDot={false}
- maxUpdates={3}
- />
- </StatusBannerContent>
- </StatusBannerContainer>
+ <Link
+ href={`./events/report/${report.id}`}
+ className="rounded-lg"
+ >
+ <StatusBannerContainer status={e.status}>
+ <StatusBannerContent>
+ <StatusEventTimelineReportUpdate
+ report={lastUpdate}
+ withDot={false}
+ isLast={true}
+ withSeparator={false}
+ />
+ {report.monitorsToStatusReports.length > 0 ? (
+ <StatusEventAffected>
+ {report.monitorsToStatusReports.map(
+ (affected) => (
+ <StatusEventAffectedBadge
+ key={affected.monitor.id}
+ >
+ {affected.monitor.name}
+ </StatusEventAffectedBadge>
+ ),
+ )}
+ </StatusEventAffected>
+ ) : null}
+ </StatusBannerContent>
+ </StatusBannerContainer>
+ </Link>
</StatusBannerTabsContent>
);
}
@@ -164,14 +189,32 @@ export default function Page() {
value={`${e.type}-${e.id}`}
key={e.id}
>
- <StatusBannerContainer status={e.status}>
- <StatusBannerContent>
- <StatusEventTimelineMaintenance
- maintenance={maintenance}
- withDot={false}
- />
- </StatusBannerContent>
- </StatusBannerContainer>
+ <Link
+ href={`./events/maintenance/${maintenance.id}`}
+ className="rounded-lg"
+ >
+ <StatusBannerContainer status={e.status}>
+ <StatusBannerContent>
+ <StatusEventTimelineMaintenance
+ maintenance={maintenance}
+ withDot={false}
+ />
+ {maintenance.maintenancesToMonitors.length > 0 ? (
+ <StatusEventAffected>
+ {maintenance.maintenancesToMonitors.map(
+ (affected) => (
+ <StatusEventAffectedBadge
+ key={affected.monitor.id}
+ >
+ {affected.monitor.name}
+ </StatusEventAffectedBadge>
+ ),
+ )}
+ </StatusEventAffected>
+ ) : null}
+ </StatusBannerContent>
+ </StatusBannerContainer>
+ </Link>
</StatusBannerTabsContent>
);
}
diff --git a/apps/status-page/src/components/status-page/status-banner.tsx b/apps/status-page/src/components/status-page/status-banner.tsx
index 2d9772cfd..4a6a00831 100644
--- a/apps/status-page/src/components/status-page/status-banner.tsx
+++ b/apps/status-page/src/components/status-page/status-banner.tsx
@@ -111,7 +111,10 @@ export function StatusBannerContent({
...props
}: React.ComponentProps<"div">) {
return (
- <div className={cn("px-3 py-2 sm:px-4 sm:py-3", className)} {...props}>
+ <div
+ className={cn("flex flex-col gap-2 px-3 py-2 sm:px-4 sm:py-3", className)}
+ {...props}
+ >
{children}
</div>
);
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 03cd2f8a2..8ba7b8505 100644
--- a/apps/status-page/src/components/status-page/status-events.tsx
+++ b/apps/status-page/src/components/status-page/status-events.tsx
@@ -106,7 +106,7 @@ export function StatusEventAffected({
...props
}: React.ComponentProps<"div">) {
return (
- <div className={cn("flex flex-wrap gap-px", className)} {...props}>
+ <div className={cn("flex flex-wrap gap-1", className)} {...props}>
{children}
</div>
);
@@ -187,11 +187,11 @@ export function StatusEventTimelineReport({
withDot?: boolean;
maxUpdates?: number;
}) {
- const prefix = usePathnamePrefix();
+ const _prefix = usePathnamePrefix();
const sortedUpdates = [...updates].sort(
(a, b) => b.date.getTime() - a.date.getTime(),
);
- const hasMoreUpdates = maxUpdates && sortedUpdates.length > maxUpdates;
+ const _hasMoreUpdates = maxUpdates && sortedUpdates.length > maxUpdates;
const displayedUpdates = maxUpdates
? sortedUpdates.slice(0, maxUpdates)
: sortedUpdates;
@@ -223,25 +223,17 @@ export function StatusEventTimelineReport({
key={index}
report={update}
duration={durationText}
- withSeparator={
- index !== displayedUpdates.length - 1 && !hasMoreUpdates
- }
+ withSeparator={index !== displayedUpdates.length - 1}
withDot={withDot}
- isLast={index === displayedUpdates.length - 1 && !hasMoreUpdates}
+ isLast={index === displayedUpdates.length - 1}
/>
);
})}
- {hasMoreUpdates && (
- <StatusEventTimelineReadMore
- href={`${prefix ? `/${prefix}` : ""}/events/report/${reportId}`}
- withDot={withDot}
- />
- )}
</div>
);
}
-function StatusEventTimelineReportUpdate({
+export function StatusEventTimelineReportUpdate({
report,
duration,
withSeparator = true,
@@ -273,6 +265,7 @@ function StatusEventTimelineReportUpdate({
<div className={cn(isLast ? "mb-0" : "mb-2")}>
<StatusEventTimelineTitle>
<span>{status[report.status]}</span>{" "}
+ <span className="text-muted-foreground/70">·</span>{" "}
<span className="font-mono text-muted-foreground text-xs">
<TimestampHoverCard date={new Date(report.date)} asChild>
<span>{formatDateTime(report.date)}</span>
@@ -360,6 +353,7 @@ export function StatusEventTimelineMaintenance({
<div>
<StatusEventTimelineTitle>
<span>Maintenance</span>{" "}
+ <span className="text-muted-foreground/70">·</span>{" "}
<span className="font-mono text-muted-foreground text-xs">
<TimestampHoverCard date={maintenance.from} asChild>
<span>{from}</span>