Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
refactor: dashboard top navigation (#1931)
Maximilian Kaskecc88fbb5f309
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/breadcrumb.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/breadcrumb.tsxindex 9a3330bec..21c8631da 100644--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/breadcrumb.tsx+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/breadcrumb.tsx@@ -3,8 +3,9 @@import { NavBreadcrumb } from "@/components/nav/nav-breadcrumb";import { useTRPC } from "@/lib/trpc/client";import { useQuery } from "@tanstack/react-query";-import { Activity, Cog, LayoutGrid, Logs, Siren } from "lucide-react";+import { Activity } from "lucide-react";import { useParams, usePathname } from "next/navigation";+import { MONITOR_TABS } from "./constants";export function Breadcrumb() {const { id } = useParams<{ id: string }>();@@ -16,26 +17,27 @@ export function Breadcrumb() {if (!monitor) return null;+ const segment = pathname.split("/").pop() ?? "";+ const currentTab = MONITOR_TABS.find((tab) => tab.value === segment);+return (<NavBreadcrumbitems={[{ type: "link", label: "Monitors", href: "/monitors", icon: Activity },- pathname === `/monitors/${id}/overview`- ? { type: "page", label: monitor.name }- : {- type: "link",- label: monitor.name,- href: `/monitors/${id}/overview`,- },{- type: "select",- items: [- { value: "overview", label: "Overview", icon: LayoutGrid },- { value: "logs", label: "Logs", icon: Logs },- { value: "incidents", label: "Incidents", icon: Siren },- { value: "edit", label: "Settings", icon: Cog },- ],+ type: "link",+ label: monitor.name,+ href: `/monitors/${id}/overview`,},+ ...(currentTab+ ? [+ {+ type: "page" as const,+ label: currentTab.label,+ icon: currentTab.icon,+ },+ ]+ : []),]}/>);diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/constants.ts b/apps/dashboard/src/app/(dashboard)/monitors/[id]/constants.tsnew file mode 100644index 000000000..c50739367--- /dev/null+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/constants.ts@@ -0,0 +1,13 @@+import type { LucideIcon } from "lucide-react";+import { Cog, LayoutGrid, Logs, Siren } from "lucide-react";++export const MONITOR_TABS: {+ value: string;+ label: string;+ icon: LucideIcon;+}[] = [+ { value: "overview", label: "Overview", icon: LayoutGrid },+ { value: "logs", label: "Logs", icon: Logs },+ { value: "incidents", label: "Incidents", icon: Siren },+ { value: "edit", label: "Settings", icon: Cog },+];diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsxindex 077c3af56..ec400b9fa 100644--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx@@ -7,6 +7,7 @@ import { AppSidebarTrigger } from "@/components/nav/app-sidebar";import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";+import { Tabs } from "./tabs";export default async function Layout({children,@@ -36,6 +37,7 @@ export default async function Layout({<NavActions /></AppHeaderActions></AppHeader>+ <Tabs /><main className="flex-1">{children}</main></div></HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/tabs.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/tabs.tsxnew file mode 100644index 000000000..1da09ab79--- /dev/null+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/tabs.tsx@@ -0,0 +1,18 @@+"use client";++import { NavTabs } from "@/components/nav/nav-tabs";+import { useParams } from "next/navigation";+import { MONITOR_TABS } from "./constants";++export function Tabs() {+ const { id } = useParams<{ id: string }>();++ return (+ <NavTabs+ items={MONITOR_TABS.map((tab) => ({+ ...tab,+ href: `/monitors/${id}/${tab.value}`,+ }))}+ />+ );+}diff --git a/apps/dashboard/src/app/(dashboard)/settings/account/breadcrumb.tsx b/apps/dashboard/src/app/(dashboard)/settings/account/breadcrumb.tsxindex 897100e1c..fbc255b62 100644--- a/apps/dashboard/src/app/(dashboard)/settings/account/breadcrumb.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/account/breadcrumb.tsx@@ -1,22 +1,19 @@"use client";import { NavBreadcrumb } from "@/components/nav/nav-breadcrumb";-import { Blocks, Cog, CreditCard, User } from "lucide-react";+import { Cog, User } from "lucide-react";export function Breadcrumb() {return (<NavBreadcrumbitems={[- { type: "page", label: "Settings" },{- type: "select",- items: [- { value: "general", label: "General", icon: Cog },- { value: "account", label: "Account", icon: User },- { value: "billing", label: "Billing", icon: CreditCard },- { value: "integrations", label: "Integrations", icon: Blocks },- ],+ type: "link",+ label: "Settings",+ icon: Cog,+ href: "/settings/general",},+ { type: "page", label: "Account", icon: User },]}/>);diff --git a/apps/dashboard/src/app/(dashboard)/settings/account/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/account/layout.tsxindex 332498844..32eadc0bd 100644--- a/apps/dashboard/src/app/(dashboard)/settings/account/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/account/layout.tsx@@ -6,6 +6,7 @@ import {import { AppSidebarTrigger } from "@/components/nav/app-sidebar";import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";+import { Tabs } from "../tabs";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";@@ -19,16 +20,19 @@ export default async function Layout({return (<HydrateClient>- <AppHeader>- <AppHeaderContent>- <AppSidebarTrigger />- <Breadcrumb />- </AppHeaderContent>- <AppHeaderActions>- <NavActions />- </AppHeaderActions>- </AppHeader>- <main className="w-full flex-1">{children}</main>+ <div>+ <AppHeader>+ <AppHeaderContent>+ <AppSidebarTrigger />+ <Breadcrumb />+ </AppHeaderContent>+ <AppHeaderActions>+ <NavActions />+ </AppHeaderActions>+ </AppHeader>+ <Tabs />+ <main className="w-full flex-1">{children}</main>+ </div></HydrateClient>);}diff --git a/apps/dashboard/src/app/(dashboard)/settings/billing/breadcrumb.tsx b/apps/dashboard/src/app/(dashboard)/settings/billing/breadcrumb.tsxindex 897100e1c..6037d2851 100644--- a/apps/dashboard/src/app/(dashboard)/settings/billing/breadcrumb.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/billing/breadcrumb.tsx@@ -1,22 +1,19 @@"use client";import { NavBreadcrumb } from "@/components/nav/nav-breadcrumb";-import { Blocks, Cog, CreditCard, User } from "lucide-react";+import { Cog, CreditCard } from "lucide-react";export function Breadcrumb() {return (<NavBreadcrumbitems={[- { type: "page", label: "Settings" },{- type: "select",- items: [- { value: "general", label: "General", icon: Cog },- { value: "account", label: "Account", icon: User },- { value: "billing", label: "Billing", icon: CreditCard },- { value: "integrations", label: "Integrations", icon: Blocks },- ],+ type: "link",+ label: "Settings",+ icon: Cog,+ href: "/settings/general",},+ { type: "page", label: "Billing", icon: CreditCard },]}/>);diff --git a/apps/dashboard/src/app/(dashboard)/settings/billing/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/billing/layout.tsxindex affb067cb..1c2ffc8ab 100644--- a/apps/dashboard/src/app/(dashboard)/settings/billing/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/billing/layout.tsx@@ -5,6 +5,7 @@ import {} from "@/components/nav/app-header";import { AppSidebarTrigger } from "@/components/nav/app-sidebar";+import { Tabs } from "../tabs";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";@@ -20,6 +21,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {<NavActions /></AppHeaderActions></AppHeader>+ <Tabs /><main className="w-full flex-1">{children}</main></div>);diff --git a/apps/dashboard/src/app/(dashboard)/settings/general/breadcrumb.tsx b/apps/dashboard/src/app/(dashboard)/settings/general/breadcrumb.tsxindex 78465cfe0..aa6d60309 100644--- a/apps/dashboard/src/app/(dashboard)/settings/general/breadcrumb.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/general/breadcrumb.tsx@@ -1,22 +1,19 @@"use client";import { NavBreadcrumb } from "@/components/nav/nav-breadcrumb";-import { Blocks, Cog, CreditCard, User } from "lucide-react";+import { Cog, SlidersHorizontal } from "lucide-react";export function Breadcrumb() {return (<NavBreadcrumbitems={[- { type: "page", label: "Settings", icon: Cog },{- type: "select",- items: [- { value: "general", label: "General", icon: Cog },- { value: "account", label: "Account", icon: User },- { value: "billing", label: "Billing", icon: CreditCard },- { value: "integrations", label: "Integrations", icon: Blocks },- ],+ type: "link",+ label: "Settings",+ icon: Cog,+ href: "/settings/general",},+ { type: "page", label: "General", icon: SlidersHorizontal },]}/>);diff --git a/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsxindex e841c2255..9a4e2a860 100644--- a/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsx@@ -6,6 +6,7 @@ import {import { AppSidebarTrigger } from "@/components/nav/app-sidebar";import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";+import { Tabs } from "../tabs";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";@@ -31,6 +32,7 @@ export default async function Layout({<NavActions /></AppHeaderActions></AppHeader>+ <Tabs /><main className="w-full flex-1">{children}</main></div></HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/settings/integrations/breadcrumb.tsx b/apps/dashboard/src/app/(dashboard)/settings/integrations/breadcrumb.tsxindex 78465cfe0..d891fb604 100644--- a/apps/dashboard/src/app/(dashboard)/settings/integrations/breadcrumb.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/integrations/breadcrumb.tsx@@ -1,22 +1,19 @@"use client";import { NavBreadcrumb } from "@/components/nav/nav-breadcrumb";-import { Blocks, Cog, CreditCard, User } from "lucide-react";+import { Blocks, Cog } from "lucide-react";export function Breadcrumb() {return (<NavBreadcrumbitems={[- { type: "page", label: "Settings", icon: Cog },{- type: "select",- items: [- { value: "general", label: "General", icon: Cog },- { value: "account", label: "Account", icon: User },- { value: "billing", label: "Billing", icon: CreditCard },- { value: "integrations", label: "Integrations", icon: Blocks },- ],+ type: "link",+ label: "Settings",+ icon: Cog,+ href: "/settings/general",},+ { type: "page", label: "Integrations", icon: Blocks },]}/>);diff --git a/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsxindex 0b0b5d65a..6712a9f05 100644--- a/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsx@@ -6,6 +6,7 @@ import {import { AppSidebarTrigger } from "@/components/nav/app-sidebar";import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";+import { Tabs } from "../tabs";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";@@ -30,6 +31,7 @@ export default async function Layout({<NavActions /></AppHeaderActions></AppHeader>+ <Tabs /><main className="w-full flex-1">{children}</main></div></HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/settings/tabs.tsx b/apps/dashboard/src/app/(dashboard)/settings/tabs.tsxnew file mode 100644index 000000000..d6e8a8bb8--- /dev/null+++ b/apps/dashboard/src/app/(dashboard)/settings/tabs.tsx@@ -0,0 +1,37 @@+"use client";++import { NavTabs } from "@/components/nav/nav-tabs";+import { Blocks, Cog, CreditCard, User } from "lucide-react";++export function Tabs() {+ return (+ <NavTabs+ items={[+ {+ value: "general",+ label: "General",+ icon: Cog,+ href: "/settings/general",+ },+ {+ value: "account",+ label: "Account",+ icon: User,+ href: "/settings/account",+ },+ {+ value: "billing",+ label: "Billing",+ icon: CreditCard,+ href: "/settings/billing",+ },+ {+ value: "integrations",+ label: "Integrations",+ icon: Blocks,+ href: "/settings/integrations",+ },+ ]}+ />+ );+}diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/breadcrumb.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/breadcrumb.tsxindex b3647448e..c8b5126b3 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/breadcrumb.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/breadcrumb.tsx@@ -3,15 +3,9 @@import { NavBreadcrumb } from "@/components/nav/nav-breadcrumb";import { useTRPC } from "@/lib/trpc/client";import { useQuery } from "@tanstack/react-query";-import {- Cog,- Hammer,- LayoutTemplate,- Megaphone,- PanelTop,- Users,-} from "lucide-react";+import { PanelTop } from "lucide-react";import { useParams, usePathname } from "next/navigation";+import { STATUS_PAGE_TABS } from "./constants";export function Breadcrumb() {const { id } = useParams<{ id: string }>();@@ -23,6 +17,9 @@ export function Breadcrumb() {if (!statusPage) return null;+ const segment = pathname.split("/").pop() ?? "";+ const currentTab = STATUS_PAGE_TABS.find((tab) => tab.value === segment);+return (<NavBreadcrumbitems={[@@ -32,30 +29,20 @@ export function Breadcrumb() {href: "/status-pages",icon: PanelTop,},- pathname === `/status-pages/${id}/status-reports`- ? {- type: "page",- label: statusPage.title,- }- : {- type: "link",- label: statusPage.title,- href: `/status-pages/${id}/status-reports`,- },{- type: "select",- items: [- {- value: "status-reports",- label: "Status Reports",- icon: Megaphone,- },- { value: "maintenances", label: "Maintenances", icon: Hammer },- { value: "subscribers", label: "Subscribers", icon: Users },- { value: "components", label: "Components", icon: LayoutTemplate },- { value: "edit", label: "Settings", icon: Cog },- ],+ type: "link",+ label: statusPage.title,+ href: `/status-pages/${id}/status-reports`,},+ ...(currentTab+ ? [+ {+ type: "page" as const,+ label: currentTab.label,+ icon: currentTab.icon,+ },+ ]+ : []),]}/>);diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/constants.ts b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/constants.tsnew file mode 100644index 000000000..e49614738--- /dev/null+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/constants.ts@@ -0,0 +1,14 @@+import type { LucideIcon } from "lucide-react";+import { Cog, Hammer, LayoutTemplate, Megaphone, Users } from "lucide-react";++export const STATUS_PAGE_TABS: {+ value: string;+ label: string;+ icon: LucideIcon;+}[] = [+ { value: "status-reports", label: "Status Reports", icon: Megaphone },+ { value: "maintenances", label: "Maintenances", icon: Hammer },+ { value: "subscribers", label: "Subscribers", icon: Users },+ { value: "components", label: "Components", icon: LayoutTemplate },+ { value: "edit", label: "Settings", icon: Cog },+];diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsxindex b729f3d52..9c067825e 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx@@ -10,6 +10,7 @@ import { AppSidebarTrigger } from "@/components/nav/app-sidebar";import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";+import { Tabs } from "./tabs";export default async function Layout({children,@@ -43,6 +44,7 @@ export default async function Layout({<NavActions /></AppHeaderActions></AppHeader>+ <Tabs /><main className="flex-1">{children}</main></div></HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/tabs.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/tabs.tsxnew file mode 100644index 000000000..216e7ed87--- /dev/null+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/tabs.tsx@@ -0,0 +1,18 @@+"use client";++import { NavTabs } from "@/components/nav/nav-tabs";+import { useParams } from "next/navigation";+import { STATUS_PAGE_TABS } from "./constants";++export function Tabs() {+ const { id } = useParams<{ id: string }>();++ return (+ <NavTabs+ items={STATUS_PAGE_TABS.map((tab) => ({+ ...tab,+ href: `/status-pages/${id}/${tab.value}`,+ }))}+ />+ );+}diff --git a/apps/dashboard/src/components/nav/nav-breadcrumb.tsx b/apps/dashboard/src/components/nav/nav-breadcrumb.tsxindex 6af8ab193..dbb8b74a0 100644--- a/apps/dashboard/src/components/nav/nav-breadcrumb.tsx+++ b/apps/dashboard/src/components/nav/nav-breadcrumb.tsx@@ -8,16 +8,8 @@ import {BreadcrumbPage,BreadcrumbSeparator,} from "@openstatus/ui/components/ui/breadcrumb";-import {- Select,- SelectContent,- SelectItem,- SelectTrigger,- SelectValue,-} from "@openstatus/ui/components/ui/select";import type { LucideIcon } from "lucide-react";import Link from "next/link";-import { usePathname, useRouter } from "next/navigation";import { Fragment } from "react";interface NavBreadcrumbProps {@@ -33,41 +25,16 @@ interface NavBreadcrumbProps {label: string;icon?: LucideIcon;}- | {- type: "select";- items: { value: string; label: string; icon: LucideIcon }[];- })[];}export function NavBreadcrumb({ items }: NavBreadcrumbProps) {- const router = useRouter();- const pathname = usePathname();-- // Find the select item in the breadcrumb- const selectItem = items.find((item) => item.type === "select");-- // Get pathname segments- const segments = pathname.split("/").filter(Boolean);-- // Find the first segment that matches a select item value, or fall back to last segment- const value = selectItem- ? segments.find((segment) =>- selectItem.items.some((item) => item.value === segment),- ) ?? segments[segments.length - 1]- : segments[segments.length - 1];-- // Find the index of the current value in segments to construct base path- const valueIndex = segments.indexOf(value);- const basePath =- valueIndex >= 0 ? `/${segments.slice(0, valueIndex).join("/")}` : pathname;-return (<Breadcrumb><BreadcrumbList><BreadcrumbSeparator className="hidden md:block" />{items.map((item, i) => (- <Fragment key={`${item.type}-${i}`}>+ <Fragment key={item.type === "link" ? item.href : item.label}><BreadcrumbItem>{item.type === "link" ? (<BreadcrumbLink@@ -104,38 +71,6 @@ export function NavBreadcrumb({ items }: NavBreadcrumbProps) {</span></BreadcrumbPage>) : null}- {item.type === "select" ? (- <Select- value={value}- onValueChange={(newValue) => {- router.push(`${basePath}/${newValue}`);- }}- >- <SelectTrigger- id="select-option"- className="font-commit-mono text-foreground tracking-tight [&>span]:flex [&>span]:items-center [&>span]:gap-2 [&>span_svg]:shrink-0 [&>span_svg]:text-muted-foreground/80"- aria-label="Select option"- >- <SelectValue placeholder="Select option" />- </SelectTrigger>- <SelectContent>- {item.items.map((item, i) => (- <SelectItem- key={i}- value={item.value}- className="font-commit-mono tracking-tight"- >- <item.icon- size={16}- aria-hidden="true"- className="shrink-0"- />- {item.label}- </SelectItem>- ))}- </SelectContent>- </Select>- ) : null}</BreadcrumbItem>{i < items.length - 1 && (<BreadcrumbSeparator className="hidden md:block" />diff --git a/apps/dashboard/src/components/nav/nav-tabs.tsx b/apps/dashboard/src/components/nav/nav-tabs.tsxnew file mode 100644index 000000000..bc86c5654--- /dev/null+++ b/apps/dashboard/src/components/nav/nav-tabs.tsx@@ -0,0 +1,58 @@+"use client";++import type { LucideIcon } from "lucide-react";+import Link from "next/link";+import { usePathname } from "next/navigation";++import { cn } from "@/lib/utils";++interface NavTabsProps {+ items: {+ value: string;+ label: string;+ icon: LucideIcon;+ href: string;+ }[];+}++export function NavTabs({ items }: NavTabsProps) {+ const pathname = usePathname();+ const normalizedPath = pathname.replace(/\/+$/, "") || "/";++ return (+ <nav className="sticky top-14 z-10 h-[41px] w-full overflow-x-auto border-b bg-background px-2">+ <ul className="inline-flex h-full items-center gap-1 px-3 text-sm">+ {items.map((item) => {+ const normalizedHref = item.href.replace(/\/+$/, "") || "/";+ const isActive =+ normalizedPath === normalizedHref ||+ normalizedPath.startsWith(`${normalizedHref}/`);+ return (+ <li+ key={item.value}+ className={cn(+ "relative flex h-full items-center",+ isActive &&+ "after:absolute after:inset-x-0 after:bottom-0 after:h-px after:bg-foreground",+ )}+ >+ <Link+ href={item.href}+ aria-current={isActive ? "page" : undefined}+ className={cn(+ "relative inline-flex items-center justify-center gap-1.5 whitespace-nowrap rounded-md px-2 py-1 font-commit-mono tracking-tight focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",+ isActive+ ? "text-foreground"+ : "text-muted-foreground hover:text-foreground",+ )}+ >+ <item.icon size={16} aria-hidden="true" className="shrink-0" />+ {item.label}+ </Link>+ </li>+ );+ })}+ </ul>+ </nav>+ );+}