Skip to content

Open-source status page, incident response and uptime monitoring

chore(status-page): set search-params for tab navigation (#1429)

Maximilian Kaske3bc57a5a67de
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx
index 2c76023a9..ea821ebd7 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx
@@ -24,10 +24,11 @@ import { useTRPC } from "@/lib/trpc/client";
import { useQuery } from "@tanstack/react-query";
import Link from "next/link";
import { useParams } from "next/navigation";
-
-// TODO: include ?filter=maintenance/reports
+import { useQueryStates } from "nuqs";
+import { searchParamsParsers } from "./search-params";
export default function Page() {
+ const [{ tab }, setSearchParams] = useQueryStates(searchParamsParsers);
const { domain } = useParams<{ domain: string }>();
const trpc = useTRPC();
const { data: page } = useQuery(
@@ -39,7 +40,13 @@ export default function Page() {
const { statusReports, maintenances } = page;
return (
- <Tabs defaultValue="reports" className="gap-4">
+ <Tabs
+ defaultValue={tab}
+ onValueChange={(value) =>
+ setSearchParams({ tab: value as "reports" | "maintenances" })
+ }
+ className="gap-4"
+ >
<TabsList>
<TabsTrigger value="reports">Reports</TabsTrigger>
<TabsTrigger value="maintenances">Maintenances</TabsTrigger>
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/search-params.ts b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/search-params.ts
new file mode 100644
index 000000000..0fcf16275
--- /dev/null
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/search-params.ts
@@ -0,0 +1,7 @@
+import { createSearchParamsCache, parseAsStringEnum } from "nuqs/server";
+
+export const searchParamsParsers = {
+ tab: parseAsStringEnum(["reports", "maintenances"]).withDefault("reports"),
+};
+
+export const searchParamsCache = createSearchParamsCache(searchParamsParsers);
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/[id]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/[id]/page.tsx
index a5800b136..0357705fb 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/[id]/page.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/[id]/page.tsx
@@ -47,9 +47,12 @@ import { useTRPC } from "@/lib/trpc/client";
import { useQuery } from "@tanstack/react-query";
import { TrendingUp } from "lucide-react";
import { useParams } from "next/navigation";
+import { useQueryStates } from "nuqs";
import { useMemo } from "react";
+import { searchParamsParsers } from "./search-params";
export default function Page() {
+ const [{ tab }, setSearchParams] = useQueryStates(searchParamsParsers);
const trpc = useTRPC();
const { id, domain } = useParams<{ id: string; domain: string }>();
const { data: page } = useQuery(
@@ -209,7 +212,12 @@ export default function Page() {
<ButtonBack href="./" />
<ButtonCopyLink />
</div>
- <StatusMonitorTabs defaultValue="global">
+ <StatusMonitorTabs
+ defaultValue={tab}
+ onValueChange={(value) =>
+ setSearchParams({ tab: value as "global" | "region" | "uptime" })
+ }
+ >
<StatusMonitorTabsList className="grid grid-cols-3">
<StatusMonitorTabsTrigger value="global">
<StatusMonitorTabsTriggerLabel>
@@ -303,6 +311,7 @@ export default function Page() {
<ChartLineRegions
className="h-[250px]"
data={regionLatencyData}
+ defaultRegions={tempMonitor?.regions}
/>
)}
</StatusChartContent>
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/[id]/search-params.ts b/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/[id]/search-params.ts
new file mode 100644
index 000000000..2d06776df
--- /dev/null
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/monitors/[id]/search-params.ts
@@ -0,0 +1,7 @@
+import { createSearchParamsCache, parseAsStringEnum } from "nuqs/server";
+
+export const searchParamsParsers = {
+ tab: parseAsStringEnum(["global", "region", "uptime"]).withDefault("global"),
+};
+
+export const searchParamsCache = createSearchParamsCache(searchParamsParsers);
diff --git a/apps/status-page/src/components/chart/chart-line-regions.tsx b/apps/status-page/src/components/chart/chart-line-regions.tsx
index ff79304c5..822f0b7f6 100644
--- a/apps/status-page/src/components/chart/chart-line-regions.tsx
+++ b/apps/status-page/src/components/chart/chart-line-regions.tsx
@@ -20,6 +20,7 @@ import { Skeleton } from "@/components/ui/skeleton";
import { regions } from "@/data/regions";
import { formatMilliseconds } from "@/lib/formatter";
import { cn } from "@/lib/utils";
+import type { MonitorRegion } from "@openstatus/db/src/schema";
import { useState } from "react";
import { ChartLegendBadge } from "./chart-legend-badge";
import { ChartTooltipNumber } from "./chart-tooltip-number";
@@ -67,17 +68,35 @@ function getChartConfig(
) satisfies ChartConfig;
}
+function getChartConfigDefault(regions: MonitorRegion[]) {
+ return regions.reduce(
+ (acc, region, index) => {
+ acc[region] = {
+ label: region,
+ color: `var(--rainbow-${((index + 5) % 17) + 1})`,
+ };
+ return acc;
+ },
+ {} as Record<string, { label: string; color: string }>,
+ ) satisfies ChartConfig;
+}
+
export function ChartLineRegions({
className,
data,
+ defaultRegions,
}: {
className?: string;
data: {
timestamp: string;
[key: string]: string | number | null;
}[];
+ defaultRegions?: MonitorRegion[];
}) {
- const chartConfig = getChartConfig(data);
+ const chartConfig =
+ data.length > 0
+ ? getChartConfig(data)
+ : getChartConfigDefault(defaultRegions ?? []);
const [activeSeries, setActiveSeries] = useState<
Array<keyof typeof chartConfig>
>(Object.keys(chartConfig).slice(0, 2));
diff --git a/apps/status-page/src/components/status-page/status-monitor-tabs.tsx b/apps/status-page/src/components/status-page/status-monitor-tabs.tsx
index b75dba38c..de3cf752c 100644
--- a/apps/status-page/src/components/status-page/status-monitor-tabs.tsx
+++ b/apps/status-page/src/components/status-page/status-monitor-tabs.tsx
@@ -52,7 +52,7 @@ export function StatusMonitorTabsTriggerValue({
return (
<div
className={cn(
- "flex flex-row flex-wrap items-center gap-1 text-left text-muted-foreground text-xs",
+ "flex min-h-5 flex-row flex-wrap items-center gap-1 text-left text-muted-foreground text-xs",
className,
)}
{...props}
@@ -64,7 +64,7 @@ export function StatusMonitorTabsTriggerValueSkeleton({
className,
...props
}: React.ComponentProps<typeof Skeleton>) {
- return <Skeleton className={cn("h-4 w-24", className)} {...props} />;
+ return <Skeleton className={cn("h-5 w-24", className)} {...props} />;
}
export function StatusMonitorTabsContent({