Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
chore: public monitor final touches (#766)
Maximilian Kaskee123384529e8
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsxindex 27620775a..d4c05357f 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx@@ -1,5 +1,7 @@import { notFound } from "next/navigation";+import { Badge } from "@openstatus/ui";+import { Header } from "@/components/dashboard/header";import AppPageWithSidebarLayout from "@/components/layout/app-page-with-sidebar-layout";import { StatusDotWithTooltip } from "@/components/monitor/status-dot-with-tooltip";@@ -49,6 +51,12 @@ export default async function Layout({<span className="text-sm">every <code>{monitor.periodicity}</code></span>+ {monitor.public ? (+ <>+ <span className="text-muted-foreground/50 text-xs">•</span>+ <Badge variant="secondary">public</Badge>+ </>+ ) : null}</div>}/>diff --git a/apps/web/src/app/public/monitors/[id]/page.tsx b/apps/web/src/app/public/monitors/[id]/page.tsxindex b84459321..1dcc0588b 100644--- a/apps/web/src/app/public/monitors/[id]/page.tsx+++ b/apps/web/src/app/public/monitors/[id]/page.tsx@@ -16,7 +16,6 @@ import { env } from "@/env";import {getMinutesByInterval,intervals,- periods,quantiles,} from "@/lib/monitor/utils";import { getPreferredSettings } from "@/lib/preferred-settings/server";@@ -28,6 +27,8 @@ const DEFAULT_QUANTILE = "p95";const DEFAULT_INTERVAL = "30m";const DEFAULT_PERIOD = "1d";+const periods = ["1d", "7d"] as const; // satisfies Period[]+/*** allowed URL search params*/diff --git a/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx b/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsxindex 83763001d..78c85437f 100644--- a/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx+++ b/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx@@ -100,10 +100,7 @@ export default async function Page({return (<div className="relative flex w-full flex-col gap-6">- <Header- title={monitor.name}- description={monitor.description || monitor.url}- />+ <Header title={monitor.name} description={monitor.url} /><div className="flex items-center justify-between gap-2"><DatePickerPreset defaultValue={period} values={periods} />{isDirty ? <ButtonReset /> : null}diff --git a/apps/web/src/components/data-table/monitor/columns.tsx b/apps/web/src/components/data-table/monitor/columns.tsxindex 47333b997..f56dee7dd 100644--- a/apps/web/src/components/data-table/monitor/columns.tsx+++ b/apps/web/src/components/data-table/monitor/columns.tsx@@ -11,6 +11,7 @@ import type {} from "@openstatus/tinybird";import { Tracker } from "@openstatus/tracker";import {+ Badge,Tooltip,TooltipContent,TooltipProvider,@@ -34,15 +35,18 @@ export const columns: ColumnDef<{accessorFn: (row) => row.monitor.name, // used for filtering as name is nested within the monitor objectheader: "Name",cell: ({ row }) => {- const { active, status, name } = row.original.monitor;+ const { active, status, name, public: _public } = row.original.monitor;return (- <Link- href={`./monitors/${row.original.monitor.id}/overview`}- className="group flex max-w-[150px] items-center gap-2 md:max-w-[250px]"- >- <StatusDotWithTooltip active={active} status={status} />- <span className="truncate group-hover:underline">{name}</span>- </Link>+ <div className="flex gap-2">+ <Link+ href={`./monitors/${row.original.monitor.id}/overview`}+ className="group flex max-w-[150px] items-center gap-2 md:max-w-[250px]"+ >+ <StatusDotWithTooltip active={active} status={status} />+ <span className="truncate group-hover:underline">{name}</span>+ </Link>+ {_public ? <Badge variant="secondary">public</Badge> : null}+ </div>);},},diff --git a/apps/web/src/components/monitor/tag-badge-with-tooltip.tsx b/apps/web/src/components/monitor/tag-badge-with-tooltip.tsxindex f64bdb7ac..9bbfa841a 100644--- a/apps/web/src/components/monitor/tag-badge-with-tooltip.tsx+++ b/apps/web/src/components/monitor/tag-badge-with-tooltip.tsx@@ -12,14 +12,16 @@ import { TagBadge } from "./tag-badge";export function TagBadgeWithTooltip({ tags }: { tags?: MonitorTag[] }) {const [first, second, ...rest] = tags || [];return (- <div className="flex gap-2">+ <div className="flex items-center gap-2">{first ? <TagBadge {...first} /> : null}{second ? <TagBadge {...second} /> : null}{rest.length > 0 ? (<TooltipProvider><Tooltip delayDuration={200}>- <TooltipTrigger>- <Badge variant="secondary">+{rest.length}</Badge>+ <TooltipTrigger asChild>+ <Badge variant="secondary" className="border">+ +{rest.length}+ </Badge></TooltipTrigger><TooltipContent side="top" className="flex gap-2">{rest.map((tag) => (diff --git a/apps/web/src/components/monitor/visible-icon-with-tooltip.tsx b/apps/web/src/components/monitor/visible-icon-with-tooltip.tsxnew file mode 100644index 000000000..a26d4f6d7--- /dev/null+++ b/apps/web/src/components/monitor/visible-icon-with-tooltip.tsx@@ -0,0 +1,27 @@+import { Eye, EyeOff } from "lucide-react";++import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@openstatus/ui";++export function VisibleIconWithTooltip({ visible }: { visible: boolean }) {+ return (+ <TooltipProvider>+ <Tooltip delayDuration={200}>+ <TooltipTrigger>+ {visible ? (+ <Eye className="text-muted-foreground hover:text-foreground h-4 w-4" />+ ) : (+ <EyeOff className="text-muted-foreground hover:text-foreground h-4 w-4" />+ )}+ </TooltipTrigger>+ <TooltipContent side="top">+ Monitor is {visible ? "public" : "private"}+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ );+}diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.tsindex cab46178f..0421ef661 100644--- a/apps/web/src/middleware.ts+++ b/apps/web/src/middleware.ts@@ -86,6 +86,8 @@ export default authMiddleware({"/status-page/(.*)","/incidents", // used when trying subdomain slug via status.documenso.com/incidents"/incidents/(.*)", // used when trying subdomain slug via status.documenso.com/incidents/123+ "/monitors", // used when trying subdomain slug via status.documenso.com/monitors+ "/monitors/(.*)", // used when trying subdomain slug via status.documenso.com/monitors/123"/verify/(.*)", // used when trying subdomain slug via status.documenso.com/incidents"/public/(.*)",],