Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat: improve monitor overview and settings (#638)
Maximilian Kaskeb1fdfd7f26fd
diff --git a/apps/web/src/app/api/checker/test/route.ts b/apps/web/src/app/api/checker/test/route.tsindex 7bea37006..e076f259f 100644--- a/apps/web/src/app/api/checker/test/route.ts+++ b/apps/web/src/app/api/checker/test/route.ts@@ -1,32 +1,33 @@import { NextResponse } from "next/server";+import { z } from "zod";-import { ping } from "../regions/_checker";+import { monitorFlyRegionSchema } from "@openstatus/db/src/schema";++import { checkRegion } from "@/app/play/checker/[id]/utils"; // TODO: move into a shared packageimport { payloadSchema } from "../schema";export const runtime = "edge";export const preferredRegion = "auto";export const dynamic = "force-dynamic";-// TODO: if only ID, then we should query db for the monitor data and test endpoint+export function GET() {+ return NextResponse.json({ success: true });+}export async function POST(request: Request) {const json = await request.json();const _valid = payloadSchema.pick({ url: true, method: true, headers: true, body: true })+ .merge(z.object({ region: monitorFlyRegionSchema.default("ams") })).safeParse(json);if (!_valid.success) {return NextResponse.json({ success: false }, { status: 400 });}- // TODO: let's use our own go checker to check the endpoint- const check = await ping(_valid.data);+ const { url, region, method, headers, body } = _valid.data;- console.log(check.status);+ const res = await checkRegion(url, region, { method, headers, body });- if (!check.ok) {- return NextResponse.json({ success: false }, { status: 400 });- }-- return NextResponse.json({ success: true });+ return NextResponse.json(res);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/button-reset.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/button-reset.tsxnew file mode 100644index 000000000..8867ab561--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/button-reset.tsx@@ -0,0 +1,40 @@+"use client";++import { usePathname, useRouter } from "next/navigation";+import { X } from "lucide-react";++import {+ Button,+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@openstatus/ui";++export function ButtonReset() {+ const router = useRouter();+ const pathname = usePathname();++ return (+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ onClick={() => {+ router.push(pathname);+ }}+ variant="ghost"+ size="lg"+ className="px-3"+ >+ Reset+ <X className="ml-2 h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ <p>Reset your filters</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/date-picker-preset.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/date-picker-preset.tsxindex ea1cf1be9..954d51dd4 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/date-picker-preset.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/date-picker-preset.tsx@@ -2,13 +2,9 @@import * as React from "react";import { usePathname, useRouter } from "next/navigation";-import { CalendarIcon, HelpCircle } from "lucide-react";+import { CalendarIcon } from "lucide-react";import {- Label,- Popover,- PopoverContent,- PopoverTrigger,Select,SelectContent,SelectItem,@@ -17,7 +13,7 @@ import {} from "@openstatus/ui";import useUpdateSearchParams from "@/hooks/use-update-search-params";-import { periods } from "../utils";+import { periodFormatter, periods } from "../utils";import type { Period } from "../utils";export function DatePickerPreset({ period }: { period: Period }) {@@ -30,41 +26,21 @@ export function DatePickerPreset({ period }: { period: Period }) {router.replace(`${pathname}?${searchParams}`);}- function renderLabel(period?: Period) {- if (period === "1h") return "Last hour";- if (period === "1d") return "Last day";- if (period === "3d") return "Last 3 days";- return "Pick a range";- }-return (- <div className="grid gap-1">- <div className="flex items-center gap-1.5">- <Label htmlFor="period">Period</Label>- <Popover>- <PopoverTrigger>- <HelpCircle className="text-muted-foreground h-4 w-4" />- </PopoverTrigger>- <PopoverContent side="top" className="text-sm">- <p>Specifies a time range for analysis.</p>- </PopoverContent>- </Popover>- </div>- <Select defaultValue={period} onValueChange={onSelect}>- <SelectTrigger className="w-[150px] text-left" id="period">- <span className="flex items-center gap-2">- <CalendarIcon className="h-4 w-4" />- <SelectValue placeholder="Pick a range" />- </span>- </SelectTrigger>- <SelectContent>- {periods.map((period) => (- <SelectItem key={period} value={period}>- {renderLabel(period)}- </SelectItem>- ))}- </SelectContent>- </Select>- </div>+ <Select defaultValue={period} onValueChange={onSelect}>+ <SelectTrigger className="bg-background w-[150px] text-left" id="period">+ <span className="flex items-center gap-2">+ <CalendarIcon className="h-4 w-4" />+ <SelectValue placeholder="Pick a range" />+ </span>+ </SelectTrigger>+ <SelectContent>+ {periods.map((period) => (+ <SelectItem key={period} value={period}>+ {periodFormatter(period)}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/interval-preset.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/interval-preset.tsxindex 9a99fce21..6963c00b3 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/interval-preset.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/interval-preset.tsx@@ -18,10 +18,17 @@ import {} from "@openstatus/ui";import useUpdateSearchParams from "@/hooks/use-update-search-params";+import { cn } from "@/lib/utils";import { intervals } from "../utils";import type { Interval } from "../utils";-export function IntervalPreset({ interval }: { interval: Interval }) {+export function IntervalPreset({+ interval,+ className,+}: {+ interval: Interval;+ className?: string;+}) {const router = useRouter();const pathname = usePathname();const updateSearchParams = useUpdateSearchParams();@@ -41,7 +48,7 @@ export function IntervalPreset({ interval }: { interval: Interval }) {</PopoverTrigger><PopoverContent side="top" className="text-sm"><p>Aggregate and process data at regular time intervals.</p>- <Separator className="my-1" />+ <Separator className="my-2" /><p className="text-muted-foreground">30m should be aligned to the beginning of 30-minute intervals fordata analysis and aggregation purposes@@ -50,7 +57,7 @@ export function IntervalPreset({ interval }: { interval: Interval }) {</Popover></div><Select onValueChange={onSelect} defaultValue={interval}>- <SelectTrigger className="w-[150px]" id="interval">+ <SelectTrigger className={cn("w-[150px]", className)} id="interval"><span className="flex items-center gap-2"><Hourglass className="h-4 w-4" /><SelectValue />diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics-card.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics-card.tsxnew file mode 100644index 000000000..fa4282871--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics-card.tsx@@ -0,0 +1,118 @@+import type { VariantProps } from "class-variance-authority";+import { cva } from "class-variance-authority";+import { ChevronDown, ChevronUp } from "lucide-react";++import { Badge } from "@openstatus/ui";++import { cn } from "@/lib/utils";++const metricsCardVariants = cva("flex flex-col px-3 py-2 border rounded-lg", {+ variants: {+ variant: {+ default: "border-transparent",+ positive:+ "border-green-500/20 bg-green-500/10 [&>p]:text-green-600 dark:[&>p]:text-green-400",+ negative:+ "border-red-500/20 bg-red-500/10 [&>p]:text-red-600 dark:[&>p]:text-red-400",+ neutral: "border-border/80 bg-muted/30",+ warning:+ "border-yellow-500/20 bg-yellow-500/10 [&>p]:text-yellow-600 dark:[&>p]:text-yellow-400",+ info: "border-blue-500/20 bg-blue-500/10 [&>p]:text-blue-600 dark:[&>p]:text-blue-400",+ },+ fading: {+ true: "opacity-70",+ },+ },+ defaultVariants: {+ variant: "default",+ },+});++interface MetricsCardProps extends VariantProps<typeof metricsCardVariants> {+ title: string;+ value?: number;+ suffix: string;+ /**+ * Value indicating the change in the metric compared to the previous period.+ * e.g. 1 means no change, 2 means a 100% increase, 0.5 means a 50% decrease.+ */+ delta?: number;+ /**+ * If true, the card will have a fading effect. Useful for cards that are+ * not yet ready to be displayed or data is empty.+ */+ fading?: boolean;+ className?: string;+}++export function MetricsCard({+ title,+ value,+ suffix,+ delta,+ className,+ variant,+ fading,+}: MetricsCardProps) {+ return (+ <div className={cn(metricsCardVariants({ variant, fading, className }))}>+ <p className="text-muted-foreground text-sm font-light uppercase">+ {title}+ </p>+ <div className="flex flex-1 items-center gap-2">+ <p className="flex">+ <code className="mr-1 font-mono text-xl font-semibold empty:mr-0">+ {typeof value === "number"+ ? new Intl.NumberFormat().format(value)+ : null}+ </code>+ <span className="text-muted-foreground self-center text-xs">+ {suffix}+ </span>+ </p>+ {delta || delta === 0 ? <DeltaBadge value={delta} /> : null}+ </div>+ </div>+ );+}++// --- DeltaBadge.tsx ---++const badgeVariants = cva("", {+ variants: {+ variant: {+ default: "border-border",+ increase:+ "border-red-500/20 bg-red-500/10 hover:bg-red-500/10 text-red-500",+ decrease:+ "border-green-500/20 bg-green-500/10 hover:bg-green-500/10 text-green-500",+ },+ },+ defaultVariants: {+ variant: "default",+ },+});++function DeltaBadge({+ value,+ decimal = 1,+}: {+ value: number;+ decimal?: number;+}) {+ const round = Math.pow(10, decimal); // 10^1 = 10 (1 decimal), 10^2 = 100 (2 decimals), etc.+ const percentage = Math.round((value - 1) * round) / round;++ const variant: VariantProps<typeof badgeVariants>["variant"] =+ percentage > 0 ? "increase" : percentage < 0 ? "decrease" : "default";++ return (+ <Badge variant="secondary" className={badgeVariants({ variant })}>+ <span>+ {percentage > 0 ? <ChevronUp className="mr-0.5 h-3 w-3" /> : null}+ {percentage < 0 ? <ChevronDown className="mr-0.5 h-3 w-3" /> : null}+ </span>+ {Math.abs(percentage)}%+ </Badge>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics.tsxnew file mode 100644index 000000000..29d54e32b--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics.tsx@@ -0,0 +1,105 @@+import { formatDistanceToNowStrict } from "date-fns";++import type { LatencyMetric, ResponseTimeMetrics } from "@openstatus/tinybird";++import { periodFormatter } from "../utils";+import type { Period } from "../utils";+import { MetricsCard } from "./metrics-card";++const metricsOrder = [+ "avgLatency",+ "p75Latency",+ "p90Latency",+ "p95Latency",+ "p99Latency",+] satisfies LatencyMetric[];++export function Metrics({+ metrics,+ period,+}: {+ metrics?: ResponseTimeMetrics[];+ period: Period;+}) {+ if (!metrics) return null;++ const [current, last] = metrics.sort((a, b) =>+ a.time - b.time < 0 ? 1 : -1,+ );++ const isEmpty = current.count === 0;++ const uptime = isEmpty ? 1 : current.ok / current.count;+ const lastUptime = last.ok / last.count;++ const failures = current.ok === 0 ? 0 : current.count - current.ok;+ const lastFailures = last.count - last.ok;++ console.log(metrics);++ const distance = current.lastTimestamp+ ? formatDistanceToNowStrict(new Date(current.lastTimestamp))+ : undefined;++ return (+ <div className="grid gap-6">+ <div className="grid grid-cols-2 gap-4 sm:grid-cols-4 md:grid-cols-5 md:gap-6">+ <MetricsCard+ title="uptime"+ value={uptime * 100}+ suffix="%"+ delta={!isEmpty ? lastUptime / uptime : undefined}+ variant="positive"+ />+ <MetricsCard+ title="fails"+ value={failures}+ suffix="#"+ delta={+ !isEmpty+ ? failures === 0+ ? 1+ : lastFailures / failures+ : undefined+ }+ variant="negative"+ />+ {distance ? (+ <MetricsCard+ title="last ping"+ value={parseInt(distance.split(" ")[0])}+ suffix={`${distance.split(" ")[1]} ago`}+ variant="neutral"+ />+ ) : null}+ <MetricsCard title="total pings" value={current.count} suffix="#" />+ </div>+ <div>+ <div className="grid grid-cols-2 gap-4 sm:grid-cols-4 md:grid-cols-5 md:gap-6">+ {metricsOrder.map((key) => {+ const value = current[key];+ const lastValue = last[key];+ const delta = value && lastValue ? lastValue / value : undefined;+ return (+ <MetricsCard+ key={key}+ title={key.replace("Latency", "")}+ value={value || 0}+ suffix="ms"+ delta={delta}+ fading={isEmpty}+ />+ );+ })}+ </div>+ <p className="text-muted-foreground mt-4 text-xs">+ Metrics calculated from the{" "}+ <span className="font-medium lowercase">+ {periodFormatter(period)}+ </span>{" "}+ over all the regions and compared with the previous period.+ </p>+ </div>+ </div>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/monitor-informations.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/monitor-informations.tsxnew file mode 100644index 000000000..6b69234bc--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/monitor-informations.tsx@@ -0,0 +1,42 @@+import type { MonitorPeriodicity } from "@openstatus/db/src/schema";++import { MetricsCard } from "./metrics-card";++export function MonitorInformations({+ periodicity,+}: {+ periodicity: MonitorPeriodicity;+}) {+ return <div className="flex flex-wrap gap-4 md:gap-6"></div>;+}++const periodicityDict = {+ "30s": {+ value: 30,+ unit: "seconds",+ },+ "1m": {+ value: 1,+ unit: "minute",+ },+ "5m": {+ value: 5,+ unit: "minutes",+ },+ "10m": {+ value: 10,+ unit: "minutes",+ },+ "30m": {+ value: 30,+ unit: "minutes",+ },+ "1h": {+ value: 1,+ unit: "hour",+ },+ other: {+ value: 0,+ unit: "",+ },+} satisfies Record<MonitorPeriodicity, { value: number; unit: string }>;diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/quantile-preset.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/quantile-preset.tsxindex 09c40ccd4..2895a6936 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/quantile-preset.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/quantile-preset.tsx@@ -19,15 +19,18 @@ import {} from "@openstatus/ui";import useUpdateSearchParams from "@/hooks/use-update-search-params";+import { cn } from "@/lib/utils";import { quantiles } from "../utils";import type { Quantile } from "../utils";export function QuantilePreset({quantile,disabled,+ className,}: {quantile: Quantile;disabled?: boolean;+ className?: string;}) {const router = useRouter();const pathname = usePathname();@@ -50,7 +53,7 @@ export function QuantilePreset({<p>Defines a statistical measure representing a specific percentile.</p>- <Separator className="my-1" />+ <Separator className="my-2" /><p className="text-muted-foreground">The p95 quantile represents the value below which 95% of the datapoints in a dataset fall, indicating a high percentile level@@ -64,7 +67,10 @@ export function QuantilePreset({defaultValue={quantile}disabled={disabled}>- <SelectTrigger className="w-[150px] uppercase" id="quantile">+ <SelectTrigger+ className={cn("w-[150px] uppercase", className)}+ id="quantile"+ ><span className="flex items-center gap-2"><CandlestickChart className="h-4 w-4" /><SelectValue />diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/region-preset.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/region-preset.tsxnew file mode 100644index 000000000..e08a5274f--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/region-preset.tsx@@ -0,0 +1,89 @@+"use client";++import * as React from "react";+import { usePathname, useRouter } from "next/navigation";+import { Globe2 } from "lucide-react";++import type { Region } from "@openstatus/tinybird";+import {+ Button,+ DropdownMenu,+ DropdownMenuCheckboxItem,+ DropdownMenuContent,+ DropdownMenuSeparator,+ DropdownMenuTrigger,+} from "@openstatus/ui";+import { flyRegionsDict } from "@openstatus/utils";++import useUpdateSearchParams from "@/hooks/use-update-search-params";+import { cn } from "@/lib/utils";++export function RegionsPreset({+ regions,+ selectedRegions,+ className,+}: {+ regions: Region[];+ selectedRegions: Region[];+ className?: string;+}) {+ const [selected, setSelected] = React.useState<Region[]>(selectedRegions);+ const router = useRouter();+ const pathname = usePathname();+ const updateSearchParams = useUpdateSearchParams();++ function onOpenChange(open: boolean) {+ if (!open) {+ const searchParams = updateSearchParams({ regions: selected.join(",") });+ router.replace(`${pathname}?${searchParams}`);+ }+ }++ const allSelected = regions.every((r) => selected.includes(r));++ return (+ <DropdownMenu onOpenChange={onOpenChange}>+ <DropdownMenuTrigger asChild>+ <Button+ size="lg"+ variant="outline"+ className={cn("px-3 shadow-none", className)}+ >+ <span className="flex items-center gap-2">+ <Globe2 className="h-4 w-4" />+ <code>{selected.length}</code> Regions+ </span>+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ <DropdownMenuCheckboxItem+ checked={allSelected}+ onCheckedChange={(checked) => setSelected(checked ? regions : [])}+ >+ All regions+ </DropdownMenuCheckboxItem>+ <DropdownMenuSeparator />+ {regions.map((region) => {+ const { code, flag } = flyRegionsDict[region];+ return (+ <DropdownMenuCheckboxItem+ key={region}+ onSelect={(e) => e.preventDefault()}+ checked={selected.includes(region)}+ onCheckedChange={(checked) => {+ setSelected((prev) =>+ checked+ ? [...prev, region]+ : prev.filter((r) => r !== region),+ );+ }}+ className="font-mono"+ >+ {flag} {code}+ </DropdownMenuCheckboxItem>+ );+ })}+ </DropdownMenuContent>+ </DropdownMenu>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/response-details.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/response-details.tsxindex 1951941b0..cdd8a8e8e 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/response-details.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/response-details.tsx@@ -3,6 +3,12 @@ import type { ResponseDetailsParams } from "@openstatus/tinybird";import { RegionInfo } from "@/app/play/checker/[id]/_components/region-info";import { ResponseHeaderTable } from "@/app/play/checker/[id]/_components/response-header-table";import { ResponseTimingTable } from "@/app/play/checker/[id]/_components/response-timing-table";+import {+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,+} from "@/components/dashboard/tabs";import { getResponseDetailsData } from "@/lib/tb";export async function ResponseDetails(props: ResponseDetailsParams) {@@ -12,6 +18,8 @@ export async function ResponseDetails(props: ResponseDetailsParams) {const response = details[0];+ const { timing, headers, message } = response;+return (<div className="grid gap-8"><RegionInfo@@ -22,22 +30,35 @@ export async function ResponseDetails(props: ResponseDetailsParams) {time: response.cronTimestamp || 0,}}/>- {response.timing ? (- <ResponseTimingTable timing={response.timing} hideInfo />- ) : null}- {response?.headers ? (- <ResponseHeaderTable headers={response.headers} />- ) : null}- {response.message ? (- <div>- <pre className="bg-muted rounded-md p-4 text-sm">- {response.message}- </pre>- <p className="text-muted-foreground mt-4 text-center text-sm">- Response Message- </p>- </div>- ) : null}+ <Tabs defaultValue="headers">+ <TabsList>+ <TabsTrigger value="headers" disabled={!headers}>+ Headers+ </TabsTrigger>+ <TabsTrigger value="timing" disabled={!timing}>+ Timing+ </TabsTrigger>+ <TabsTrigger value="message" disabled={!message}>+ Message+ </TabsTrigger>+ </TabsList>+ <TabsContent value="headers">+ {headers ? <ResponseHeaderTable headers={headers} /> : null}+ </TabsContent>+ <TabsContent value="timing">+ {timing ? <ResponseTimingTable timing={timing} hideInfo /> : null}+ </TabsContent>+ <TabsContent value="message">+ {message ? (+ <div>+ <pre className="bg-muted rounded-md p-4 text-sm">{message}</pre>+ <p className="text-muted-foreground mt-4 text-center text-sm">+ Response Message+ </p>+ </div>+ ) : null}+ </TabsContent>+ </Tabs></div>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/@modal/(..)details/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/@modal/(..)details/page.tsxindex 386f077b3..4f291c4cf 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/@modal/(..)details/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/@modal/(..)details/page.tsx@@ -38,7 +38,7 @@ export default async function DetailsModal({return (<Modal>- <Separator className="my-4" />+ <Separator className="mb-4" /><ResponseDetails {...search.data} /></Modal>);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsxindex 05d80cd2d..b3e2a5360 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx@@ -1,10 +1,18 @@-import { MonitorForm } from "@/components/forms/monitor-form";+import { z } from "zod";++import { MonitorForm } from "@/components/forms/monitor/form";import { api } from "@/trpc/server";+const searchParamsSchema = z.object({+ section: z.string().optional().default("request"),+});+export default async function EditPage({params,+ searchParams,}: {params: { workspaceSlug: string; id: string };+ searchParams: { [key: string]: string | string[] | undefined };}) {const id = Number(params.id);const monitor = await api.monitor.getMonitorById.query({ id });@@ -16,14 +24,26 @@ export default async function EditPage({const notifications =await api.notification.getNotificationsByWorkspace.query();+ const pages = await api.page.getPagesByWorkspace.query();++ // default is request+ const search = searchParamsSchema.safeParse(searchParams);+return (<MonitorForm+ defaultSection={search.success ? search.data.section : undefined}defaultValues={{...monitor,+ pages: pages+ .filter((page) =>+ page.monitorsToPages.map(({ monitorId }) => monitorId).includes(id),+ )+ .map(({ id }) => id),notifications: monitorNotifications?.map(({ id }) => id),}}plan={workspace?.plan}notifications={notifications}+ pages={pages}/>);}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 18441cd6b..9e3fb1455 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@@ -3,7 +3,6 @@ import { notFound } from "next/navigation";import { Header } from "@/components/dashboard/header";import { Navbar } from "@/components/dashboard/navbar";import { api } from "@/trpc/server";-import { PauseButton } from "./_components/pause-button";export default async function Layout({children,@@ -42,11 +41,7 @@ export default async function Layout({return (<div className="grid grid-cols-1 gap-6 md:gap-8">- <Header- title={monitor.name}- description={monitor.url}- actions={<PauseButton monitor={monitor} />}- />+ <Header title={monitor.name} description={monitor.url} /><Navbar className="col-span-full" navigation={navigation} />{children}</div>diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart-wrapper.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart-wrapper.tsxindex ee74959f7..71493f6da 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart-wrapper.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart-wrapper.tsx@@ -1,10 +1,8 @@-"use client";--import type { Region, ResponseGraph } from "@openstatus/tinybird";-import { regionsDict } from "@openstatus/utils";+import type { ResponseGraph } from "@openstatus/tinybird";import type { Period, Quantile } from "../../utils";import { Chart } from "./chart";+import { groupDataByTimestamp } from "./utils";export function ChartWrapper({data,@@ -18,66 +16,3 @@ export function ChartWrapper({const group = groupDataByTimestamp(data, period, quantile);return <Chart data={group.data} regions={group.regions} />;}-/**- *- * @param data expects to be sorted by cronTimestamp- * @param period- * @returns- */-function groupDataByTimestamp(- data: ResponseGraph[],- period: Period,- quantile: Quantile,-) {- let currentTimestamp = 0;- const regions: Record<string, null> = {};- const _data = data.reduce(- (acc, curr) => {- const { timestamp, region } = curr;- const latency = curr[`${quantile}Latency`];- const { flag, code } = regionsDict[region];- const fullNameRegion = `${flag} ${code}`;- regions[fullNameRegion] = null; // to get the region keys- if (timestamp === currentTimestamp) {- // overwrite last object in acc- const last = acc.pop();- if (last) {- acc.push({- ...last,- [fullNameRegion]: latency,- });- }- } else if (timestamp) {- currentTimestamp = timestamp;- // create new object in acc- acc.push({- timestamp: renderTimestamp(timestamp, period),- [fullNameRegion]: latency,- });- }- return acc;- },- [] as (Partial<Record<Region, string>> & { timestamp: string })[],- );-- return { regions: Object.keys(regions), data: _data.reverse() };-}--/**- * in case we need to change the format of the timestamp- * based on the period- * @param timestamp- * @param period- * @returns- */-function renderTimestamp(timestamp: number, period: Period) {- const isInDay = ["hour", "day"].includes(period);- return new Date(timestamp).toLocaleString("en-US", {- year: !isInDay ? "numeric" : undefined,- month: !isInDay ? "numeric" : undefined,- day: !isInDay ? "numeric" : undefined,- hour: "2-digit",- minute: "2-digit",- hour12: false,- });-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart.tsxindex dd0bb1a99..90fda83a7 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart.tsx@@ -1,10 +1,11 @@"use client";import type { CustomTooltipProps } from "@tremor/react";-import { Card, LineChart, Title } from "@tremor/react";+import { LineChart } from "@tremor/react";-const dataFormatter = (number: number) =>- `${Intl.NumberFormat("us").format(number).toString()}ms`;+import type { Region } from "@openstatus/tinybird";++import { dataFormatter, regionFormatter } from "./utils";interface ChartProps {data: { timestamp: string; [key: string]: string }[];@@ -13,48 +14,48 @@ interface ChartProps {export function Chart({ data, regions }: ChartProps) {return (- <Card>- <Title>Response Time</Title>- <LineChart- data={data}- yAxisWidth={64}- index="timestamp"- categories={regions}- colors={[- "blue",- "amber",- "cyan",- "yellow",- "red",- "indigo",- "lime",- "purple",- "green",- "orange",- "sky",- "rose",- "violet",- "teal",- "fuchsia",- "pink",- "emerald",- ]}- onValueChange={(v) => void 0} // that prop makes the chart interactive- valueFormatter={dataFormatter}- curveType="monotone"- intervalType="equidistantPreserveStart"- // customTooltip={customTooltip}- />- </Card>+ <LineChart+ data={data}+ yAxisWidth={64}+ index="timestamp"+ categories={regions}+ colors={[+ "blue",+ "amber",+ "cyan",+ "yellow",+ "red",+ "lime",+ "green",+ "purple",+ "indigo",+ "orange",+ "sky",+ "rose",+ "violet",+ "teal",+ "fuchsia",+ "pink",+ "emerald",+ ]}+ onValueChange={(v) => void 0} // that prop makes the chart interactive+ valueFormatter={dataFormatter}+ curveType="monotone"+ intervalType="equidistantPreserveStart"+ customTooltip={customTooltip}+ />);}// TBD: add custom tooltip-const customTooltip = ({ payload, active }: CustomTooltipProps) => {+const customTooltip = ({ payload, active, label }: CustomTooltipProps) => {if (!active || !payload) return null;return (- <div className="rounded-tremor-default text-tremor-default bg-tremor-background shadow-tremor-dropdown border-tremor-border w-36 border p-2">- <div className="flex flex-col gap-3">+ <div className="rounded-tremor-default text-tremor-default dark:text-dark-tremor-default bg-tremor-background dark:bg-dark-tremor-background shadow-tremor-dropdown border-tremor-border dark:border-dark-tremor-border border p-2">+ <div className="flex flex-col gap-2">+ <p className="text-tremor-content dark:text-dark-tremor-content">+ {label}+ </p>{payload.filter((category) => category.type !== undefined) // tremor adds additional data to the payload, we don't want that.map((category, idx) => (@@ -62,9 +63,11 @@ const customTooltip = ({ payload, active }: CustomTooltipProps) => {<divclassName={`flex w-1 flex-col bg-${category.color}-500 rounded`}/>- <div className="flex gap-1">- <p className="text-tremor-content">{category.dataKey}</p>- <p className="text-tremor-content-emphasis font-mono font-medium">+ <div className="flex w-full justify-between gap-2">+ <p className="text-tremor-content dark:text-dark-tremor-content shrink-0">+ {regionFormatter(category.dataKey as Region)}+ </p>+ <p className="text-tremor-content-emphasis dark:text-dark-tremor-content-emphasis font-mono font-medium">{dataFormatter(category.value as number)}</p></div>diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/combined-chart-wrapper.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/combined-chart-wrapper.tsxnew file mode 100644index 000000000..2f7fd4682--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/combined-chart-wrapper.tsx@@ -0,0 +1,127 @@+"use client";++import { useMemo, useState } from "react";+import { LineChart } from "lucide-react";++import type { Monitor } from "@openstatus/db/src/schema";+import type { Region, ResponseGraph } from "@openstatus/tinybird";+import { Toggle } from "@openstatus/ui";+import { flyRegionsDict } from "@openstatus/utils";++import { EmptyState } from "@/components/dashboard/empty-state";+import { IntervalPreset } from "../../_components/interval-preset";+import { QuantilePreset } from "../../_components/quantile-preset";+import { RegionsPreset } from "../../_components/region-preset";+import type { Interval, Period, Quantile } from "../../utils";+import { Chart } from "./chart";+import { SimpleChart } from "./simple-chart";+import { groupDataByTimestamp } from "./utils";++export function CombinedChartWrapper({+ data,+ period,+ quantile,+ interval,+ regions,+ monitor,+ isQuantileDisabled,+}: {+ data: ResponseGraph[];+ period: Period;+ quantile: Quantile;+ interval: Interval;+ regions: Region[];+ monitor: Monitor;+ isQuantileDisabled: boolean;+}) {+ const chartData = useMemo(+ () => groupDataByTimestamp(data, period, quantile),+ [data, period, quantile],+ );+ const [combinedRegions, setCombinedRegions] = useState(false);++ const hasData = chartData.data.length > 0;+ const hasRegions = regions.length > 0;++ return (+ <>+ <div className="flex flex-col gap-2 sm:flex-row sm:items-end sm:justify-between">+ <div className="flex w-full gap-2 sm:flex-row sm:justify-between">+ <Toggle+ pressed={combinedRegions}+ onPressedChange={setCombinedRegions}+ variant="outline"+ disabled={!hasData}+ >+ <LineChart className="mr-2 h-4 w-4" />+ Combine Regions+ </Toggle>+ <RegionsPreset+ regions={monitor.regions as Region[]}+ selectedRegions={regions as Region[]}+ />+ </div>+ <div className="flex gap-2">+ <QuantilePreset quantile={quantile} disabled={isQuantileDisabled} />+ {/* TODO: add a minInterval and disabled for the once having e.g. only 30min monitor.periodicity */}+ <IntervalPreset interval={interval} />+ </div>+ </div>+ <div className="grid gap-3">+ {combinedRegions ? (+ <Chart data={chartData.data} regions={regions} />+ ) : (+ <div className="grid gap-1">+ {chartData.regions+ .filter((region) => regions.includes(region))+ .map((region) => {+ const { code, flag, location } = flyRegionsDict[region];+ return (+ <div key={region} className="flex items-end gap-2">+ <div className="grid w-24 gap-1">+ <p className="text-muted-foreground text-xs">+ {location}+ </p>+ <p className="font-mono text-xs">+ {flag} {code}+ </p>+ </div>+ <SimpleChart data={chartData.data} region={region} />+ </div>+ );+ })}+ </div>+ )}+ <ChartEmptyState hasData={hasData} hasRegions={hasRegions} />+ </div>+ </>+ );+}++export function ChartEmptyState({+ hasData,+ hasRegions,+}: {+ hasData: boolean;+ hasRegions: boolean;+}) {+ if (!hasData) {+ return (+ <EmptyState+ icon="line-chart"+ title="No data available"+ description="There is no data available for the selected period."+ />+ );+ }+ if (!hasRegions) {+ return (+ <EmptyState+ icon="globe"+ title="No regions selected"+ description="Select at least one region to display the data."+ />+ );+ }+ return null;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart-wrapper.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart-wrapper.tsxnew file mode 100644index 000000000..cb9032830--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart-wrapper.tsx@@ -0,0 +1,27 @@+import type { Region, ResponseGraph } from "@openstatus/tinybird";++import type { Period, Quantile } from "../../utils";+import { SimpleChart } from "./simple-chart";+import { groupDataByTimestamp } from "./utils";++export function SimpleChartWrapper({+ data,+ period,+ quantile,+ region,+}: {+ data: ResponseGraph[];+ period: Period;+ quantile: Quantile;+ region: Region;+}) {+ const group = groupDataByTimestamp(data, period, quantile);+ return (+ <div className="flex items-center gap-2">+ <div className="w-24">+ <p className="font-mono">{region}</p>+ </div>+ <SimpleChart data={group.data} region={region} />+ </div>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart.tsxnew file mode 100644index 000000000..ced89bb32--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart.tsx@@ -0,0 +1,59 @@+"use client";++import type { CustomTooltipProps } from "@tremor/react";+import { LineChart } from "@tremor/react";++import { dataFormatter } from "./utils";++interface ChartProps {+ data: { timestamp: string; [key: string]: string }[];+ region: string;+}++export function SimpleChart({ data, region }: ChartProps) {+ return (+ <LineChart+ data={data}+ index="timestamp"+ categories={[region]}+ colors={["green"]}+ className="h-20 w-full" // cannot take parent height+ valueFormatter={dataFormatter}+ curveType="monotone"+ autoMinValue+ noDataText=""+ showXAxis={false}+ showYAxis={false}+ showGridLines={false}+ showLegend={false}+ customTooltip={customTooltip}+ />+ );+}++const customTooltip = ({ payload, active, label }: CustomTooltipProps) => {+ if (!active || !payload) return null;+ return (+ <div className="rounded-tremor-default text-tremor-default dark:text-dark-tremor-default bg-tremor-background dark:bg-dark-tremor-background shadow-tremor-dropdown border-tremor-border dark:border-dark-tremor-border border p-2">+ <div className="flex flex-col gap-3">+ {payload.map((category, idx) => {+ return (+ <div key={idx} className="flex flex-1 gap-2">+ <div+ className={`flex w-1 flex-col bg-${category.color}-500 rounded`}+ />+ <div className="flex flex-col gap-1">+ <p className="text-tremor-content dark:text-dark-tremor-content">+ {label}+ </p>+ <p className="text-tremor-content-emphasis dark:text-dark-tremor-content-emphasis font-mono font-medium">+ {dataFormatter(category.value as number)}+ </p>+ </div>+ </div>+ );+ })}+ </div>+ </div>+ );+};diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/utils.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/utils.tsxnew file mode 100644index 000000000..c30e569b7--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/utils.tsx@@ -0,0 +1,84 @@+import type { Region, ResponseGraph } from "@openstatus/tinybird";+import { regionsDict } from "@openstatus/utils";++import type { Period, Quantile } from "../../utils";++/**+ *+ * @param data expects to be sorted by cronTimestamp+ * @param period+ * @returns+ */+export function groupDataByTimestamp(+ data: ResponseGraph[],+ period: Period,+ quantile: Quantile,+) {+ let currentTimestamp = 0;+ const regions: Record<+ string,+ { code: string; location: string; flag: string }+ > = {};+ const _data = data.reduce(+ (acc, curr) => {+ const { timestamp, region } = curr;+ const latency = curr[`${quantile}Latency`];+ const { flag, code, location } = regionsDict[region];+ const fullNameRegion = `${code}`;+ regions[fullNameRegion] = { flag, code, location }; // to get the region keys+ if (timestamp === currentTimestamp) {+ // overwrite last object in acc+ const last = acc.pop();+ if (last) {+ acc.push({+ ...last,+ [fullNameRegion]: latency,+ });+ }+ } else if (timestamp) {+ currentTimestamp = timestamp;+ // create new object in acc+ acc.push({+ timestamp: renderTimestamp(timestamp, period),+ [fullNameRegion]: latency,+ });+ }+ return acc;+ },+ [] as (Partial<Record<Region, string>> & { timestamp: string })[],+ );++ // regions are sorted by the flag utf-8 code+ return {+ regions: Object.keys(regions).sort() as Region[],+ data: _data.reverse(),+ };+}++/**+ * in case we need to change the format of the timestamp+ * based on the period+ * @param timestamp+ * @param period+ * @returns+ */+export function renderTimestamp(timestamp: number, period: Period) {+ const isInDay = ["1h", "1d"].includes(period);+ return new Date(timestamp).toLocaleString("en-US", {+ year: !isInDay ? "numeric" : undefined,+ month: !isInDay ? "numeric" : undefined,+ day: !isInDay ? "numeric" : undefined,+ hour: "2-digit",+ minute: "2-digit",+ hour12: false,+ });+}++export function dataFormatter(number: number) {+ return `${Intl.NumberFormat("us").format(number).toString()}ms`;+}++export function regionFormatter(region: Region) {+ const { code, flag } = regionsDict[region];+ return `${flag} ${code}`;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsxindex edb57e1f3..ed173af84 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsx@@ -1,21 +1,39 @@-import { Skeleton } from "@openstatus/ui";+import { Separator, Skeleton } from "@openstatus/ui";export default function Loading() {return (<div className="grid gap-4">- <Skeleton className="h-5 w-40" />- <div className="flex flex-wrap items-center gap-2 sm:justify-end">- <div className="grid gap-1">- <Skeleton className="h-4 w-12" />- <Skeleton className="h-10 w-[150px]" />+ <Skeleton className="h-10 w-[150px]" />+ <div className="grid gap-6">+ <div className="grid grid-cols-2 gap-4 sm:grid-cols-4 md:grid-cols-5 md:gap-6">+ {new Array(4).fill(0).map((_, i) => (+ <Skeleton key={i} className="h-16 w-full" />+ ))}</div>- <div className="grid gap-1">- <Skeleton className="h-4 w-12" />- <Skeleton className="h-10 w-[150px]" />+ <div className="grid gap-4">+ <div className="grid grid-cols-2 gap-4 sm:grid-cols-4 md:grid-cols-5 md:gap-6">+ {new Array(5).fill(0).map((_, i) => (+ <Skeleton key={i} className="h-16 w-full" />+ ))}+ </div>+ <Skeleton className="h-3 w-40" /></div>- <div className="grid gap-1">- <Skeleton className="h-4 w-12" />+ </div>+ <Separator className="my-8" />+ <div className="flex flex-col gap-2 sm:flex-row sm:items-end sm:justify-between">+ <div className="flex w-full gap-2 sm:flex-row sm:justify-between"><Skeleton className="h-10 w-[150px]" />+ <Skeleton className="h-10 w-[150px]" />+ </div>+ <div className="flex gap-2">+ <div className="grid gap-1">+ <Skeleton className="h-4 w-12" />+ <Skeleton className="h-10 w-[150px]" />+ </div>+ <div className="grid gap-1">+ <Skeleton className="h-4 w-12" />+ <Skeleton className="h-10 w-[150px]" />+ </div></div></div><Skeleton className="h-[396px] w-full" />diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsxindex 031f258d3..fff454c84 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx@@ -1,22 +1,29 @@import * as React from "react";import { notFound } from "next/navigation";-import { endOfDay, startOfDay } from "date-fns";import * as z from "zod";-import { StatusDot } from "@/components/monitor/status-dot";-import { getResponseGraphData } from "@/lib/tb";+import { flyRegions } from "@openstatus/db/src/schema";+import type { Region } from "@openstatus/tinybird";+import { Separator } from "@openstatus/ui";++import { getResponseGraphData, getResponseTimeMetricsData } from "@/lib/tb";import { api } from "@/trpc/server";+import { ButtonReset } from "../_components/button-reset";import { DatePickerPreset } from "../_components/date-picker-preset";-import { IntervalPreset } from "../_components/interval-preset";-import { QuantilePreset } from "../_components/quantile-preset";+import { Metrics } from "../_components/metrics";import {getDateByPeriod,+ getHoursByPeriod,getMinutesByInterval,intervals,periods,quantiles,} from "../utils";-import { ChartWrapper } from "./_components/chart-wrapper";+import { CombinedChartWrapper } from "./_components/combined-chart-wrapper";++const DEFAULT_QUANTILE = "p95";+const DEFAULT_INTERVAL = "30m";+const DEFAULT_PERIOD = "1d";/*** allowed URL search params@@ -24,14 +31,24 @@ import { ChartWrapper } from "./_components/chart-wrapper";const searchParamsSchema = z.object({statusCode: z.coerce.number().optional(),cronTimestamp: z.coerce.number().optional(),- quantile: z.enum(quantiles).optional().default("p95"),- interval: z.enum(intervals).optional().default("30m"),- period: z.enum(periods).optional().default("1d"),- fromDate: z.coerce- .number()+ quantile: z.enum(quantiles).optional().default(DEFAULT_QUANTILE),+ interval: z.enum(intervals).optional().default(DEFAULT_INTERVAL),+ period: z.enum(periods).optional().default(DEFAULT_PERIOD),+ regions: z+ .string().optional()- .default(startOfDay(new Date()).getTime()),- toDate: z.coerce.number().optional().default(endOfDay(new Date()).getTime()),+ .transform(+ (value) =>+ value+ ?.trim()+ ?.split(",")+ .filter((i) => flyRegions.includes(i as Region)) ?? flyRegions,+ ),+ // fromDate: z.coerce+ // .number()+ // .optional()+ // .default(startOfDay(new Date()).getTime()),+ // toDate: z.coerce.number().optional().default(endOfDay(new Date()).getTime()),});export default async function Page({@@ -55,6 +72,7 @@ export default async function Page({const date = getDateByPeriod(search.data.period);const intervalMinutes = getMinutesByInterval(search.data.interval);const periodicityMinutes = getMinutesByInterval(monitor.periodicity);+ const periodicityHours = getHoursByPeriod(search.data.period);const isQuantileDisabled = intervalMinutes <= periodicityMinutes;const minutes = isQuantileDisabled ? periodicityMinutes : intervalMinutes;@@ -70,37 +88,38 @@ export default async function Page({interval: minutes,});- if (!data) return null;+ const metrics = await getResponseTimeMetricsData({+ monitorId: id,+ interval: periodicityHours,+ });- const { period, quantile, interval } = search.data;+ if (!data || !metrics) return null;++ const { period, quantile, interval, regions } = search.data;++ const isDirty =+ period !== DEFAULT_PERIOD ||+ quantile !== DEFAULT_QUANTILE ||+ interval !== DEFAULT_INTERVAL ||+ flyRegions.length !== regions.length;return (<div className="grid gap-4">- <div>- <p className="text-muted-foreground inline-flex items-center gap-2 text-sm">- <StatusDot status={monitor.status} active={monitor.active} />- <span>- {monitor.active- ? monitor.status === "active"- ? "up"- : "down"- : "pause"}{" "}- · checked every{" "}- <code className="text-foreground">{monitor.periodicity}</code>- </span>- </p>- </div>- <div className="flex flex-wrap items-center gap-2 sm:justify-end">- {/* IDEA: add tooltip for description */}+ <div className="flex justify-between gap-2"><DatePickerPreset period={period} />- <QuantilePreset quantile={quantile} disabled={isQuantileDisabled} />- <IntervalPreset interval={interval} />+ {isDirty ? <ButtonReset /> : null}</div>- <ChartWrapper period={period} quantile={quantile} data={data} />- <p className="text-muted-foreground text-center text-xs">- Select your preferred time range, percentile for insights, and time- interval for granular analysis.- </p>+ <Metrics metrics={metrics} period={period} />+ <Separator className="my-8" />+ <CombinedChartWrapper+ data={data}+ period={period}+ quantile={quantile}+ interval={interval}+ regions={regions as Region[]}+ monitor={monitor}+ isQuantileDisabled={isQuantileDisabled}+ /></div>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/utils.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/utils.tsindex b91e44c02..069d526f6 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/utils.ts+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/utils.ts@@ -9,7 +9,7 @@ import {import type { MonitorPeriodicity } from "@openstatus/db/src/schema";-export const periods = ["1h", "1d", "3d"] as const; // If neeeded (e.g. Pro plans), "7d", "30d"+export const periods = ["1h", "1d", "3d", "7d", "14d"] as const; // If neeeded (e.g. Pro plans), "7d", "30d"export const quantiles = ["p99", "p95", "p90", "p75", "avg"] as const;export const intervals = ["1m", "10m", "30m", "1h"] as const;@@ -34,12 +34,58 @@ export function getDateByPeriod(period: Period) {from: subDays(startOfDay(new Date()), 3),to: endOfDay(new Date()),};+ case "7d":+ return {+ from: subDays(startOfDay(new Date()), 14),+ to: endOfDay(new Date()),+ };+ case "14d":+ return {+ from: subDays(startOfDay(new Date()), 14),+ to: endOfDay(new Date()),+ };+ default:+ const _exhaustiveCheck: never = period;+ throw new Error(`Unhandled period: ${_exhaustiveCheck}`);+ }+}++export function getHoursByPeriod(period: Period) {+ switch (period) {+ case "1h":+ return 1;+ case "1d":+ return 24;+ case "3d":+ return 72;+ case "7d":+ return 168;+ case "14d":+ return 336;default:const _exhaustiveCheck: never = period;throw new Error(`Unhandled period: ${_exhaustiveCheck}`);}}+export function periodFormatter(period: Period) {+ switch (period) {+ case "1h":+ return "Last hour";+ case "1d":+ return "Last day";+ case "3d":+ return "Last 3 days";+ case "7d":+ return "Last 7 days";+ case "14d":+ return "Last 14 days";+ default:+ const _exhaustiveCheck: never = period;+ return _exhaustiveCheck;+ }+}+export function getMinutesByInterval(interval: MonitorPeriodicity) {switch (interval) {case "30s":diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsxindex 857c33162..9fc1ec363 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsx@@ -1,20 +1,35 @@import { redirect } from "next/navigation";+import { z } from "zod";-import { MonitorForm } from "@/components/forms/monitor-form";+import { MonitorForm } from "@/components/forms/monitor/form";import { api } from "@/trpc/server";-export default async function Page() {+const searchParamsSchema = z.object({+ section: z.string().optional().default("request"),+});++export default async function Page({+ searchParams,+}: {+ searchParams: { [key: string]: string | string[] | undefined };+}) {const workspace = await api.workspace.getWorkspace.query();const notifications =await api.notification.getNotificationsByWorkspace.query();const isLimitReached = await api.monitor.isMonitorLimitReached.query();+ const pages = await api.page.getPagesByWorkspace.query();+if (isLimitReached) return redirect("./");+ const search = searchParamsSchema.safeParse(searchParams);+return (<MonitorFormplan={workspace?.plan}+ defaultSection={search.success ? search.data.section : undefined}notifications={notifications}+ pages={pages}nextUrl="./" // back to the overview page/>);diff --git a/apps/web/src/app/app/[workspaceSlug]/onboarding/_components/description.tsx b/apps/web/src/app/app/[workspaceSlug]/onboarding/_components/description.tsxindex df58fd480..35b01b0c2 100644--- a/apps/web/src/app/app/[workspaceSlug]/onboarding/_components/description.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/onboarding/_components/description.tsx@@ -73,9 +73,9 @@ export function Description({</div>{config?.description.map(({ title, text }, i) => {return (- <dl key={i} className="grid gap-2">- <dt>{title}</dt>- <dd className="text-muted-foreground text-sm">{text}</dd>+ <dl key={i} className="grid gap-1">+ <dt className="font-medium">{title}</dt>+ <dd className="text-muted-foreground">{text}</dd></dl>);})}diff --git a/apps/web/src/app/play/checker/[id]/_components/response-detail-tabs.tsx b/apps/web/src/app/play/checker/[id]/_components/response-detail-tabs.tsxnew file mode 100644index 000000000..dd0866154--- /dev/null+++ b/apps/web/src/app/play/checker/[id]/_components/response-detail-tabs.tsx@@ -0,0 +1,32 @@+import {+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,+} from "@/components/dashboard/tabs";+import type { Timing } from "../utils";+import { ResponseHeaderTable } from "./response-header-table";+import { ResponseTimingTable } from "./response-timing-table";++export async function ResponseDetailTabs({+ timing,+ headers,+}: {+ timing: Timing;+ headers: Record<string, string>;+}) {+ return (+ <Tabs defaultValue="headers">+ <TabsList>+ <TabsTrigger value="headers">Headers</TabsTrigger>+ <TabsTrigger value="timing">Timing</TabsTrigger>+ </TabsList>+ <TabsContent value="headers">+ {headers ? <ResponseHeaderTable headers={headers} /> : null}+ </TabsContent>+ <TabsContent value="timing">+ {timing ? <ResponseTimingTable timing={timing} /> : null}+ </TabsContent>+ </Tabs>+ );+}diff --git a/apps/web/src/app/play/checker/[id]/page.tsx b/apps/web/src/app/play/checker/[id]/page.tsxindex 7e00bfb86..bfc3f6a84 100644--- a/apps/web/src/app/play/checker/[id]/page.tsx+++ b/apps/web/src/app/play/checker/[id]/page.tsx@@ -16,6 +16,7 @@ import { BackButton } from "@/components/layout/back-button";import { CopyLinkButton } from "./_components/copy-link-button";import { MultiRegionTabs } from "./_components/multi-region-tabs";import { RegionInfo } from "./_components/region-info";+import { ResponseDetailTabs } from "./_components/response-detail-tabs";import { ResponseHeaderTable } from "./_components/response-header-table";import { ResponseTimingTable } from "./_components/response-timing-table";import { SelectRegion } from "./_components/select-region";@@ -75,8 +76,7 @@ export default async function CheckPage({ params, searchParams }: Props) {<RegionInfo check={check} /></div></div>- <ResponseTimingTable timing={timing} />- <ResponseHeaderTable headers={headers} />+ <ResponseDetailTabs timing={timing} headers={headers} /></div><Separator /><p className="text-muted-foreground text-sm">diff --git a/apps/web/src/app/play/checker/[id]/utils.ts b/apps/web/src/app/play/checker/[id]/utils.tsindex 00acce63c..f004368d6 100644--- a/apps/web/src/app/play/checker/[id]/utils.ts+++ b/apps/web/src/app/play/checker/[id]/utils.ts@@ -74,24 +74,38 @@ export const cachedCheckerSchema = z.object({export type Timing = z.infer<typeof timingSchema>;export type Checker = z.infer<typeof checkerSchema>;export type RegionChecker = Checker & { region: MonitorFlyRegion };-export type Method = "GET" | "POST" | "PUT" | "DELETE";+export type Method = "GET" | "POST" | "PUT" | "DELETE" | "HEAD";export async function checkRegion(url: string,region: MonitorFlyRegion,- opts?: { method: Method },-) {+ opts?: {+ method?: Method;+ headers?: { value: string; key: string }[];+ body?: string;+ },+): Promise<RegionChecker> {//const res = await fetch(`https://checker.openstatus.dev/ping/${region}`, {headers: {+ Authorization: `Basic ${process.env.CRON_SECRET}`,"Content-Type": "application/json",- // TODO: move to @/env- "x-openstatus-key": process.env.PLAYGROUND_UNKEY_API_KEY!,"fly-prefer-region": region,},method: "POST",- body: JSON.stringify({ url, method: opts?.method || "GET" }),- // cache: "force-cache",+ body: JSON.stringify({+ url,+ method: opts?.method || "GET",+ headers: opts?.headers?.reduce((acc, { key, value }) => {+ if (!key) return acc; // key === "" is an invalid header++ return {+ ...acc,+ [key]: value,+ };+ }, {}),+ body: opts?.body,+ }),next: { revalidate: 0 },});diff --git a/apps/web/src/components/dashboard/navbar.tsx b/apps/web/src/components/dashboard/navbar.tsxindex a3e4090ec..847ff469f 100644--- a/apps/web/src/components/dashboard/navbar.tsx+++ b/apps/web/src/components/dashboard/navbar.tsx@@ -1,12 +1,9 @@"use client";import * as React from "react";-import Link from "next/link";import { useSelectedLayoutSegment } from "next/navigation";-import { Separator } from "@openstatus/ui";--import { cn } from "@/lib/utils";+import { TabsContainer, TabsLink } from "./tabs-link";type Props = {// TODO: add disabled state for pro/hobby plan users@@ -18,38 +15,15 @@ export const Navbar = ({ navigation, className }: Props) => {const selectedSegment = useSelectedLayoutSegment();return (- <nav className={cn(className)}>- <div className="flex w-full items-center overflow-x-auto">- <ul className="flex flex-row gap-4">- {navigation.map(({ label, href, segment }) => {- const active = segment === selectedSegment;- return (- <li- key={label}- className={cn(- "flex shrink-0 list-none border-b-2 border-transparent p-2 ",- {- "border-primary ": active,- },- )}- >- <Link- href={href}- className={cn(- "text-muted-foreground hover:text-primary -mx-3 rounded-md px-3 py-2 text-sm font-medium",- {- "text-primary": active,- },- )}- >- {label}- </Link>- </li>- );- })}- </ul>- </div>- <Separator />- </nav>+ <TabsContainer className={className}>+ {navigation.map(({ label, href, segment }) => {+ const active = segment === selectedSegment;+ return (+ <TabsLink key={href} href={href} active={active}>+ {label}+ </TabsLink>+ );+ })}+ </TabsContainer>);};diff --git a/apps/web/src/components/dashboard/tabs-link.tsx b/apps/web/src/components/dashboard/tabs-link.tsxnew file mode 100644index 000000000..390c96920--- /dev/null+++ b/apps/web/src/components/dashboard/tabs-link.tsx@@ -0,0 +1,50 @@+"use client";++import * as React from "react";+import type { LinkProps } from "next/link";+import Link from "next/link";++import { Separator } from "@openstatus/ui";++import { cn } from "@/lib/utils";++export interface TabsContainerProps+ extends React.HTMLAttributes<HTMLDivElement> {}++export function TabsContainer({ className, children }: TabsContainerProps) {+ return (+ <nav className={cn(className)}>+ <div className="flex w-full items-center overflow-x-auto">+ <ul className="flex flex-row">{children}</ul>+ </div>+ <Separator />+ </nav>+ );+}++export interface TabsLinkProps extends LinkProps {+ children: React.ReactNode;+ active?: boolean;+}++export function TabsLink({ href, children, active }: TabsLinkProps) {+ return (+ <li+ className={cn("flex shrink-0 list-none border-b-2 border-transparent", {+ "border-primary": active,+ })}+ >+ <Link+ href={href}+ className={cn(+ "text-muted-foreground hover:text-primary rounded-md px-4 pb-3 pt-2 text-sm font-medium",+ {+ "text-primary": active,+ },+ )}+ >+ {children}+ </Link>+ </li>+ );+}diff --git a/apps/web/src/components/dashboard/tabs.tsx b/apps/web/src/components/dashboard/tabs.tsxnew file mode 100644index 000000000..6e2007b15--- /dev/null+++ b/apps/web/src/components/dashboard/tabs.tsx@@ -0,0 +1,53 @@+import {+ Separator,+ Tabs as ShadcnTabs,+ TabsContent as ShadcnTabsContent,+ TabsList as ShadcnTabsList,+ TabsTrigger as ShadcnTabsTrigger,+} from "@openstatus/ui";++import { cn } from "@/lib/utils";++export function TabsList({+ className,+ ...props+}: React.ComponentPropsWithoutRef<typeof ShadcnTabsList>) {+ return (+ <>+ <ShadcnTabsList+ className={cn(+ "w-full justify-start rounded-none bg-transparent p-0",+ className,+ )}+ {...props}+ />+ <Separator className="mb-6" />+ </>+ );+}++export function TabsTrigger({+ className,+ ...props+}: React.ComponentPropsWithoutRef<typeof ShadcnTabsTrigger>) {+ return (+ <ShadcnTabsTrigger+ className={cn(+ "text-muted-foreground hover:text-primary data-[state=active]:border-b-primary data-[state=active]:text-foreground relative rounded-none border-b-2 border-b-transparent bg-transparent px-4 pb-3 pt-2 shadow-none transition-none data-[state=active]:shadow-none",+ className,+ )}+ {...props}+ />+ );+}++export function Tabs(props: React.ComponentPropsWithoutRef<typeof ShadcnTabs>) {+ return <ShadcnTabs {...props} />;+}++export function TabsContent({+ className,+ ...props+}: React.ComponentPropsWithoutRef<typeof ShadcnTabsContent>) {+ return <ShadcnTabsContent className={cn("w-full", className)} {...props} />;+}diff --git a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsxindex b980581b1..efebc2005 100644--- a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx+++ b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx@@ -25,6 +25,7 @@ import {DropdownMenuTrigger,} from "@openstatus/ui";+import type { RegionChecker } from "@/app/play/checker/[id]/utils";import { LoadingAnimation } from "@/components/loading-animation";import { useToastAction } from "@/hooks/use-toast-action";import { api } from "@/trpc/client";@@ -77,17 +78,23 @@ export function DataTableRowActions<TData>({startTransition(async () => {const { url, body, method, headers } = monitor;- const res = await fetch("/api/checker/test", {- method: "POST",- headers: new Headers({- "Content-Type": "application/json",- }),- body: JSON.stringify({ url, body, method, headers }),- });- if (res.ok) {- toast("test-success");- } else {- toast("test-error");+ try {+ const res = await fetch(`/api/checker/test`, {+ method: "POST",+ headers: new Headers({+ "Content-Type": "application/json",+ }),+ body: JSON.stringify({ url, body, method, headers }),+ });+ const data = (await res.json()) as RegionChecker;++ if (data.status >= 200 && data.status < 300) {+ toast("test-success");+ } else {+ toast("test-error");+ }+ } catch {+ toast("error");}});}diff --git a/apps/web/src/components/forms/monitor-form.tsx b/apps/web/src/components/forms/monitor-form.tsxindex cd1c8da83..ce9c16ba7 100644--- a/apps/web/src/components/forms/monitor-form.tsx+++ b/apps/web/src/components/forms/monitor-form.tsx@@ -62,6 +62,7 @@ import {} from "@openstatus/ui";import { flyRegionsDict } from "@openstatus/utils";+import type { RegionChecker } from "@/app/play/checker/[id]/utils";import { LoadingAnimation } from "@/components/loading-animation";import { FailedPingAlertConfirmation } from "@/components/modals/failed-ping-alert-confirmation";import { useToastAction } from "@/hooks/use-toast-action";@@ -184,7 +185,8 @@ export function MonitorForm({}),body: JSON.stringify({ url, body, method, headers }),});- return res.ok;+ const data = (await res.json()) as RegionChecker;+ return data;};const sendTestPing = () => {@@ -198,11 +200,15 @@ export function MonitorForm({}startTestTransition(async () => {- const isSuccessful = await pingEndpoint();- if (isSuccessful) {- toast("test-success");- } else {- toast("test-error");+ try {+ const data = await pingEndpoint();+ if (data.status >= 200 && data.status < 300) {+ toast("test-success");+ } else {+ toast("test-error");+ }+ } catch {+ toast("error");}});};diff --git a/apps/web/src/components/forms/monitor/checkbox-label.tsx b/apps/web/src/components/forms/monitor/checkbox-label.tsxnew file mode 100644index 000000000..cf60d7f29--- /dev/null+++ b/apps/web/src/components/forms/monitor/checkbox-label.tsx@@ -0,0 +1,37 @@+import { CheckCircle2 } from "lucide-react";++import { Checkbox, Label } from "@openstatus/ui";++interface Props {+ id: string;+ children: React.ReactNode;+ checked?: boolean;+ onCheckedChange(checked: boolean): void;+}++export function CheckboxLabel({+ id,+ children,+ checked,+ onCheckedChange,+}: Props) {+ return (+ <div className="relative h-full">+ <Checkbox+ id={id}+ className="peer sr-only"+ checked={checked}+ onCheckedChange={onCheckedChange}+ />+ <Label+ htmlFor={id}+ className="border-muted bg-popover hover:bg-accent hover:text-accent-foreground peer-data-[state=checked]:border-primary [&:has([data-state=checked])]:border-primary flex h-full items-center gap-1 rounded-md border-2 p-4 pr-10"+ >+ {children}+ </Label>+ <div className="absolute inset-y-0 right-4 hidden items-center peer-data-[state=checked]:flex [&:has([data-state=checked])]:flex">+ <CheckCircle2 className="h-4 w-4" />+ </div>+ </div>+ );+}diff --git a/apps/web/src/components/forms/monitor/form.tsx b/apps/web/src/components/forms/monitor/form.tsxnew file mode 100644index 000000000..94bf76170--- /dev/null+++ b/apps/web/src/components/forms/monitor/form.tsx@@ -0,0 +1,244 @@+"use client";++import * as React from "react";+import { usePathname, useRouter } from "next/navigation";+import { zodResolver } from "@hookform/resolvers/zod";+import { useForm } from "react-hook-form";++import type {+ InsertMonitor,+ MonitorFlyRegion,+ Notification,+ Page,+ WorkspacePlan,+} from "@openstatus/db/src/schema";+import { flyRegions, insertMonitorSchema } from "@openstatus/db/src/schema";+import { Badge, Button, Form } from "@openstatus/ui";++import type { RegionChecker } from "@/app/play/checker/[id]/utils";+import {+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,+} from "@/components/dashboard/tabs";+import { Kbd } from "@/components/kbd";+import { LoadingAnimation } from "@/components/loading-animation";+import { FailedPingAlertConfirmation } from "@/components/modals/failed-ping-alert-confirmation";+import { useToastAction } from "@/hooks/use-toast-action";+import { api } from "@/trpc/client";+import type { Writeable } from "@/types/utils";+import { General } from "./general";+import { SectionDanger } from "./section-danger";+import { SectionNotifications } from "./section-notifications";+import { SectionRequests } from "./section-requests";+import { SectionScheduling } from "./section-scheduling";+import { SectionStatusPage } from "./section-status-page";++interface Props {+ defaultSection?: string;+ defaultValues?: InsertMonitor;+ plan?: WorkspacePlan;+ notifications?: Notification[];+ pages?: Page[];+ nextUrl?: string;+}++export function MonitorForm({+ defaultSection,+ defaultValues,+ plan = "free",+ notifications,+ pages,+ nextUrl,+}: Props) {+ const form = useForm<InsertMonitor>({+ resolver: zodResolver(insertMonitorSchema),+ defaultValues: {+ url: defaultValues?.url || "",+ name: defaultValues?.name || "",+ description: defaultValues?.description || "",+ periodicity: defaultValues?.periodicity || "30m",+ active: defaultValues?.active ?? true,+ id: defaultValues?.id || 0,+ regions:+ defaultValues?.regions || (flyRegions as Writeable<typeof flyRegions>),+ headers: Boolean(defaultValues?.headers?.length)+ ? defaultValues?.headers+ : [{ key: "", value: "" }],+ body: defaultValues?.body ?? "",+ method: defaultValues?.method ?? "GET",+ notifications: defaultValues?.notifications ?? [],+ pages: defaultValues?.pages ?? [],+ },+ });+ const router = useRouter();+ const pathname = usePathname();+ const [isPending, startTransition] = React.useTransition();+ const [pingFailed, setPingFailed] = React.useState(false);+ const { toast } = useToastAction();++ React.useEffect(() => {+ const callback = (event: KeyboardEvent) => {+ // event.metaKey - pressed Command key on Macs+ // event.ctrlKey - pressed Control key on Linux or Windows+ if ((event.metaKey || event.ctrlKey) && event.key === "s") {+ event.preventDefault();+ form.handleSubmit(onSubmit)();+ }+ };+ document.addEventListener("keydown", callback);+ return () => {+ document.removeEventListener("keydown", callback);+ };+ // no need to listen to `onSubmit` changes+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [form]);++ const handleDataUpdateOrInsertion = async (props: InsertMonitor) => {+ try {+ if (defaultValues) {+ await api.monitor.update.mutate(props);+ } else {+ await api.monitor.create.mutate(props);+ }+ if (nextUrl) {+ router.push(nextUrl);+ }+ // to reset the `isDirty` state of them form while keeping the values for optimistic UI+ form.reset(undefined, { keepValues: true });+ router.refresh();+ toast("saved");+ } catch (error) {+ toast("error");+ }+ };++ const onSubmit = ({ ...props }: InsertMonitor) => {+ startTransition(async () => {+ try {+ const pingResult = await pingEndpoint();+ const isOk = pingResult?.status >= 200 && pingResult?.status < 300;+ if (!isOk) {+ setPingFailed(true);+ return;+ }+ await handleDataUpdateOrInsertion(props);+ } catch {+ toast("error");+ }+ });+ };++ const pingEndpoint = async (region?: MonitorFlyRegion) => {+ const { url, body, method, headers } = form.getValues();+ const res = await fetch(`/api/checker/test`, {+ method: "POST",+ headers: new Headers({+ "Content-Type": "application/json",+ }),+ body: JSON.stringify({ url, body, method, headers, region }),+ });+ const data = (await res.json()) as RegionChecker;+ return data;+ };++ function onValueChange(value: string) {+ // REMINDER: we are not merging the searchParams here+ // we are just setting the section to allow refreshing the page+ const params = new URLSearchParams();+ params.set("section", value);+ router.push(`${pathname}?${params.toString()}`);+ }++ return (+ <>+ <Form {...form}>+ <form+ onSubmit={form.handleSubmit(onSubmit)}+ onKeyDown={(e) => e.key === "Enter" && e.preventDefault()}+ className="flex w-full flex-col gap-6"+ >+ <General {...{ form, plan }} />+ <Tabs+ defaultValue={defaultSection}+ className="w-full"+ onValueChange={onValueChange}+ >+ <TabsList>+ <TabsTrigger value="request">Request</TabsTrigger>+ <TabsTrigger value="scheduling">Scheduling</TabsTrigger>+ <TabsTrigger value="notifications">+ Notifications{" "}+ {defaultValues?.notifications?.length ? (+ <Badge variant="secondary" className="ml-1">+ {defaultValues.notifications.length}+ </Badge>+ ) : null}+ </TabsTrigger>+ <TabsTrigger value="status-page">+ Status Page{" "}+ {defaultValues?.pages?.length ? (+ <Badge variant="secondary" className="ml-1">+ {defaultValues.pages.length}+ </Badge>+ ) : null}+ </TabsTrigger>+ {defaultValues?.id ? (+ <TabsTrigger value="danger">Danger</TabsTrigger>+ ) : null}+ </TabsList>+ <TabsContent value="request">+ <SectionRequests {...{ form, plan, pingEndpoint }} />+ </TabsContent>+ <TabsContent value="scheduling">+ <SectionScheduling {...{ form, plan }} />+ </TabsContent>+ <TabsContent value="notifications">+ <SectionNotifications {...{ form, plan, notifications }} />+ </TabsContent>+ <TabsContent value="status-page">+ <SectionStatusPage {...{ form, plan, pages }} />+ </TabsContent>+ {defaultValues?.id ? (+ <TabsContent value="danger">+ <SectionDanger monitorId={defaultValues.id} />+ </TabsContent>+ ) : null}+ </Tabs>+ <div className="grid gap-3 sm:justify-end">+ <div className="flex flex-col gap-6 sm:col-span-full sm:flex-row sm:justify-end">+ <Button+ className="w-full sm:w-auto"+ size="lg"+ disabled={isPending}+ >+ {!isPending ? (+ <span className="flex gap-2">+ Confirm+ <Kbd>+ <span>⌘</span>+ <span>S</span>+ </Kbd>+ </span>+ ) : (+ <LoadingAnimation />+ )}+ </Button>+ </div>+ {form.formState.isDirty ? (+ <p className="text-muted-foreground text-xs">+ You have unsaved changes+ </p>+ ) : null}+ </div>+ </form>+ </Form>+ <FailedPingAlertConfirmation+ monitor={form.getValues()}+ {...{ pingFailed, setPingFailed }}+ onConfirm={handleDataUpdateOrInsertion}+ />+ </>+ );+}diff --git a/apps/web/src/components/forms/monitor/general.tsx b/apps/web/src/components/forms/monitor/general.tsxnew file mode 100644index 000000000..14f084c14--- /dev/null+++ b/apps/web/src/components/forms/monitor/general.tsx@@ -0,0 +1,60 @@+"use client";++import * as React from "react";+import type { UseFormReturn } from "react-hook-form";++import type { InsertMonitor, WorkspacePlan } from "@openstatus/db/src/schema";+import {+ FormControl,+ FormDescription,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+ Input,+ Switch,+} from "@openstatus/ui";++interface Props {+ form: UseFormReturn<InsertMonitor>;+ plan: WorkspacePlan;+}++export function General({ form }: Props) {+ return (+ <div className="flex w-full flex-col gap-3">+ <div className="flex items-center gap-3">+ <FormField+ control={form.control}+ name="name"+ render={({ field }) => (+ <FormItem className="w-full">+ <FormLabel>Name</FormLabel>+ <FormControl>+ <Input placeholder="Documenso" {...field} />+ </FormControl>+ <FormDescription>Displayed on the status page.</FormDescription>+ <FormMessage />+ </FormItem>+ )}+ />+ <FormField+ control={form.control}+ name="active"+ render={({ field }) => (+ <FormItem className="flex flex-row items-center justify-between space-x-1 space-y-0 sm:col-span-2">+ <FormLabel>Active</FormLabel>+ <FormControl>+ <Switch+ checked={field.value || false}+ onCheckedChange={(value) => field.onChange(value)}+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ </div>+ );+}diff --git a/apps/web/src/components/forms/monitor/request-test-button.tsx b/apps/web/src/components/forms/monitor/request-test-button.tsxnew file mode 100644index 000000000..0b87bb345--- /dev/null+++ b/apps/web/src/components/forms/monitor/request-test-button.tsx@@ -0,0 +1,126 @@+import React from "react";+import { Send } from "lucide-react";+import type { UseFormReturn } from "react-hook-form";++import type {+ InsertMonitor,+ MonitorFlyRegion,+} from "@openstatus/db/src/schema";+import {+ Button,+ Dialog,+ DialogContent,+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@openstatus/ui";+import { flyRegions, flyRegionsDict } from "@openstatus/utils";++import { RegionInfo } from "@/app/play/checker/[id]/_components/region-info";+import { ResponseDetailTabs } from "@/app/play/checker/[id]/_components/response-detail-tabs";+import type { RegionChecker } from "@/app/play/checker/[id]/utils";+import { LoadingAnimation } from "@/components/loading-animation";+import { useToastAction } from "@/hooks/use-toast-action";++interface Props {+ form: UseFormReturn<InsertMonitor>;+ pingEndpoint(region?: MonitorFlyRegion): Promise<RegionChecker>;+}++export function RequestTestButton({ form, pingEndpoint }: Props) {+ const [check, setCheck] = React.useState<RegionChecker | undefined>();+ const [value, setValue] = React.useState<MonitorFlyRegion>(flyRegions[0]);+ const { toast } = useToastAction();+ const [isPending, startTransition] = React.useTransition();++ const onClick = () => {+ if (isPending) return;++ const { url } = form.getValues();++ if (!url) {+ toast("test-warning-empty-url");+ return;+ }++ startTransition(async () => {+ try {+ const data = await pingEndpoint(value);+ setCheck(data);+ const isOk = data.status >= 200 && data.status < 300;+ if (isOk) {+ toast("test-success");+ } else {+ toast("test-error");+ }+ } catch {+ toast("error");+ }+ });+ };+ return (+ <Dialog open={!!check} onOpenChange={() => setCheck(undefined)}>+ <div className="ring-offset-background focus-within:ring-ring group flex flex h-10 max-w-max items-center rounded-md bg-transparent text-sm focus-within:outline-none focus-within:ring-2 focus-within:ring-offset-2">+ <Select+ value={value}+ onValueChange={(value: MonitorFlyRegion) => setValue(value)}+ >+ <SelectTrigger+ className="w-16 rounded-r-none focus:ring-0"+ aria-label={value}+ >+ <SelectValue>+ {flyRegionsDict[value as keyof typeof flyRegionsDict]?.flag}+ </SelectValue>+ </SelectTrigger>+ <SelectContent>+ {flyRegions.map((region) => {+ const { flag } = flyRegionsDict[region];+ return (+ <SelectItem key={region} value={region}>+ {flag} <span className="ml-1 font-mono">{region}</span>+ </SelectItem>+ );+ })}+ </SelectContent>+ </Select>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ onClick={onClick}+ disabled={isPending}+ className="h-full rounded-l-none focus:ring-0"+ >+ {isPending ? (+ <LoadingAnimation />+ ) : (+ <>+ Ping <Send className="ml-2 h-4 w-4" />+ </>+ )}+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ <p>Send a request to your endpoint</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ </div>+ <DialogContent className="max-h-screen w-full overflow-auto sm:max-w-3xl sm:p-8">+ {check ? (+ <div className="grid gap-8">+ <RegionInfo check={check} />+ <ResponseDetailTabs timing={check.timing} headers={check.headers} />+ </div>+ ) : null}+ </DialogContent>+ </Dialog>+ );+}diff --git a/apps/web/src/components/forms/monitor/section-danger.tsx b/apps/web/src/components/forms/monitor/section-danger.tsxnew file mode 100644index 000000000..2d9ced7e9--- /dev/null+++ b/apps/web/src/components/forms/monitor/section-danger.tsx@@ -0,0 +1,86 @@+"use client";++import React from "react";+import { useRouter } from "next/navigation";++import {+ AlertDialog,+ AlertDialogAction,+ AlertDialogCancel,+ AlertDialogContent,+ AlertDialogDescription,+ AlertDialogFooter,+ AlertDialogHeader,+ AlertDialogTitle,+ AlertDialogTrigger,+ Button,+} from "@openstatus/ui";++import { LoadingAnimation } from "@/components/loading-animation";+import { useToastAction } from "@/hooks/use-toast-action";+import { api } from "@/trpc/client";++interface Props {+ monitorId: number;+}++export function SectionDanger({ monitorId }: Props) {+ const router = useRouter();+ const { toast } = useToastAction();+ const [open, setOpen] = React.useState(false);+ const [isPending, startTransition] = React.useTransition();++ async function onDelete() {+ startTransition(async () => {+ try {+ await api.monitor.delete.mutate({ id: monitorId });+ toast("deleted");+ router.refresh();+ setOpen(false);+ } catch {+ toast("error");+ }+ });+ }++ return (+ <div className="grid w-full gap-4">+ <div className="grid gap-1">+ <h4 className="text-foreground font-medium">Delete monitor</h4>+ <p className="text-muted-foreground">+ This action cannot be undone. This will permanently delete the+ monitor.+ </p>+ </div>+ <div>+ <AlertDialog open={open} onOpenChange={setOpen}>+ <AlertDialogTrigger asChild>+ <Button variant="destructive">Delete</Button>+ </AlertDialogTrigger>+ <AlertDialogContent>+ <AlertDialogHeader>+ <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>+ <AlertDialogDescription>+ This action cannot be undone. This will permanently delete the+ monitor.+ </AlertDialogDescription>+ </AlertDialogHeader>+ <AlertDialogFooter>+ <AlertDialogCancel>Cancel</AlertDialogCancel>+ <AlertDialogAction+ onClick={(e) => {+ e.preventDefault();+ onDelete();+ }}+ disabled={isPending}+ className="bg-destructive text-destructive-foreground hover:bg-destructive/90"+ >+ {!isPending ? "Delete" : <LoadingAnimation />}+ </AlertDialogAction>+ </AlertDialogFooter>+ </AlertDialogContent>+ </AlertDialog>+ </div>+ </div>+ );+}diff --git a/apps/web/src/components/forms/monitor/section-notifications.tsx b/apps/web/src/components/forms/monitor/section-notifications.tsxnew file mode 100644index 000000000..8aa2294e4--- /dev/null+++ b/apps/web/src/components/forms/monitor/section-notifications.tsx@@ -0,0 +1,134 @@+"use client";++import * as React from "react";+import type { UseFormReturn } from "react-hook-form";++import type {+ InsertMonitor,+ Notification,+ WorkspacePlan,+} from "@openstatus/db/src/schema";+import { getLimit } from "@openstatus/plans";+import {+ Badge,+ Button,+ Dialog,+ DialogContent,+ DialogDescription,+ DialogHeader,+ DialogTitle,+ DialogTrigger,+ FormControl,+ FormDescription,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from "@openstatus/ui";++import { NotificationForm } from "../notification-form";+import { CheckboxLabel } from "./checkbox-label";++interface Props {+ form: UseFormReturn<InsertMonitor>;+ plan: WorkspacePlan;+ notifications?: Notification[];+}++export function SectionNotifications({ form, plan, notifications }: Props) {+ const [openDialog, setOpenDialog] = React.useState(false);++ const notificationLimit = getLimit(plan, "notification-channels");+ const notificationLimitReached = notifications+ ? notifications.length >= notificationLimit+ : false;+ return (+ <div className="grid w-full gap-4">+ {/* <div className="grid gap-1">+ <h4 className="text-foreground font-medium">Schedule and Regions</h4>+ <p className="text-muted-foreground text-sm">+ Customize the period of time and the regions where your endpoint will+ be monitored.+ </p>+ </div> */}+ <FormField+ control={form.control}+ name="notifications"+ render={({ field }) => {+ return (+ <FormItem>+ <div className="mb-4">+ <FormLabel className="text-base">Notifications</FormLabel>+ <FormDescription>+ Select the notification channels you want to be informed.+ </FormDescription>+ </div>+ <div className="grid grid-cols-1 grid-rows-1 gap-6 sm:grid-cols-2 md:grid-cols-3">+ {notifications?.map((item) => (+ <FormField+ key={item.id}+ control={form.control}+ name="notifications"+ render={({ field }) => {+ return (+ <FormItem key={item.id} className="h-full w-full">+ <FormControl className="h-full">+ <CheckboxLabel+ id={String(item.id)}+ checked={field.value?.includes(item.id)}+ onCheckedChange={(checked) => {+ return checked+ ? field.onChange([+ ...(field.value ? field.value : []),+ item.id,+ ])+ : field.onChange(+ field.value?.filter(+ (value) => value !== item.id,+ ),+ );+ }}+ >+ <span>{item.name}</span>+ <span>+ <Badge variant="secondary">+ {item.provider}+ </Badge>+ </span>+ </CheckboxLabel>+ </FormControl>+ </FormItem>+ );+ }}+ />+ ))}+ </div>+ <FormMessage />+ </FormItem>+ );+ }}+ />+ <Dialog open={openDialog} onOpenChange={(val) => setOpenDialog(val)}>+ <div>+ <DialogTrigger asChild>+ <Button variant="outline" disabled={notificationLimitReached}>+ Add Notification Channel+ </Button>+ </DialogTrigger>+ </div>+ <DialogContent className="sm:max-w-2xl">+ <DialogHeader>+ <DialogTitle>Add Notification</DialogTitle>+ <DialogDescription>+ Get alerted when your endpoint is down.+ </DialogDescription>+ </DialogHeader>+ <NotificationForm+ onSubmit={() => setOpenDialog(false)}+ workspacePlan={plan}+ />+ </DialogContent>+ </Dialog>+ </div>+ );+}diff --git a/apps/web/src/components/forms/monitor/section-requests.tsx b/apps/web/src/components/forms/monitor/section-requests.tsxnew file mode 100644index 000000000..38d162cd6--- /dev/null+++ b/apps/web/src/components/forms/monitor/section-requests.tsx@@ -0,0 +1,235 @@+"use client";++import * as React from "react";+import { Wand2, X } from "lucide-react";+import { useFieldArray } from "react-hook-form";+import type { UseFormReturn } from "react-hook-form";++import {+ monitorMethods,+ monitorMethodsSchema,+} from "@openstatus/db/src/schema";+import type {+ InsertMonitor,+ MonitorFlyRegion,+ WorkspacePlan,+} from "@openstatus/db/src/schema";+import {+ Button,+ FormControl,+ FormDescription,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+ Input,+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+ Textarea,+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@openstatus/ui";++import type { RegionChecker } from "@/app/play/checker/[id]/utils";+import { useToastAction } from "@/hooks/use-toast-action";+import { RequestTestButton } from "./request-test-button";++interface Props {+ form: UseFormReturn<InsertMonitor>;+ plan: WorkspacePlan;+ pingEndpoint(region?: MonitorFlyRegion): Promise<RegionChecker>;+}++// TODO: add Dialog with response informations when pingEndpoint!++export function SectionRequests({ form, pingEndpoint }: Props) {+ const { fields, append, remove } = useFieldArray({+ name: "headers",+ control: form.control,+ });+ const watchMethod = form.watch("method");++ const validateJSON = (value?: string) => {+ if (!value) return;+ try {+ const obj = JSON.parse(value) as Record<string, unknown>;+ form.clearErrors("body");+ return obj;+ } catch (e) {+ form.setError("body", {+ message: "Not a valid JSON object",+ });+ return false;+ }+ };++ const onPrettifyJSON = () => {+ const body = form.getValues("body");+ const obj = validateJSON(body);+ if (obj) {+ const pretty = JSON.stringify(obj, undefined, 4);+ form.setValue("body", pretty);+ }+ };++ return (+ <div className="grid w-full gap-4">+ <div className="grid gap-1">+ <h4 className="text-foreground font-medium">HTTP request settings</h4>+ <p className="text-muted-foreground text-sm">+ Create your HTTP. Add custom headers, payload and test your endpoint+ before submitting.+ </p>+ </div>+ <div className="flex items-end gap-3">+ <FormField+ control={form.control}+ name="method"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Method</FormLabel>+ <Select+ onValueChange={(value) => {+ field.onChange(monitorMethodsSchema.parse(value));+ form.resetField("body", { defaultValue: "" });+ }}+ defaultValue={field.value}+ >+ <FormControl>+ <SelectTrigger className="w-[120px]">+ <SelectValue placeholder="Select" />+ </SelectTrigger>+ </FormControl>+ <SelectContent>+ {monitorMethods.map((method) => (+ <SelectItem key={method} value={method}>+ {method}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ <FormMessage />+ </FormItem>+ )}+ />+ <FormField+ control={form.control}+ name="url"+ render={({ field }) => (+ <FormItem className="w-full">+ <FormLabel>URL</FormLabel>+ <FormControl>+ {/* <InputWithAddons+ leading="https://"+ placeholder="documenso.com/api/health"+ {...field}+ /> */}+ <Input+ className="bg-muted"+ placeholder="https://documenso.com/api/health"+ {...field}+ />+ </FormControl>+ {/* <FormMessage /> */}+ </FormItem>+ )}+ />+ <RequestTestButton {...{ form, pingEndpoint }} />+ </div>+ <div className="space-y-2 sm:col-span-full">+ <FormLabel>Request Header</FormLabel>+ {fields.map((field, index) => (+ <div key={field.id} className="grid grid-cols-6 gap-6">+ <FormField+ control={form.control}+ name={`headers.${index}.key`}+ render={({ field }) => (+ <FormItem className="col-span-2">+ <FormControl>+ <Input placeholder="key" {...field} />+ </FormControl>+ </FormItem>+ )}+ />+ <div className="col-span-4 flex items-center space-x-2">+ <FormField+ control={form.control}+ name={`headers.${index}.value`}+ render={({ field }) => (+ <FormItem className="w-full">+ <FormControl>+ <Input placeholder="value" {...field} />+ </FormControl>+ </FormItem>+ )}+ />+ <Button+ size="icon"+ variant="ghost"+ type="button"+ onClick={() => remove(Number(field.id))}+ >+ <X className="h-4 w-4" />+ </Button>+ </div>+ </div>+ ))}+ <div>+ <Button+ type="button"+ variant="outline"+ onClick={() => append({ key: "", value: "" })}+ >+ Add Custom Header+ </Button>+ </div>+ </div>+ {watchMethod === "POST" && (+ <div className="sm:col-span-full">+ <FormField+ control={form.control}+ name="body"+ render={({ field }) => (+ <FormItem>+ <div className="flex items-end justify-between">+ <FormLabel>Body</FormLabel>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ type="button"+ variant="ghost"+ size="icon"+ onClick={onPrettifyJSON}+ >+ <Wand2 className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ <p>Prettify JSON</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ </div>+ <FormControl>+ <Textarea+ rows={8}+ placeholder='{ "hello": "world" }'+ {...field}+ />+ </FormControl>+ <FormDescription>Write your json payload.</FormDescription>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ )}+ </div>+ );+}diff --git a/apps/web/src/components/forms/monitor/section-scheduling.tsx b/apps/web/src/components/forms/monitor/section-scheduling.tsxnew file mode 100644index 000000000..d7234a943--- /dev/null+++ b/apps/web/src/components/forms/monitor/section-scheduling.tsx@@ -0,0 +1,144 @@+"use client";++import type { UseFormReturn } from "react-hook-form";++import type { InsertMonitor, WorkspacePlan } from "@openstatus/db/src/schema";+import { monitorPeriodicitySchema } from "@openstatus/db/src/schema";+import { getLimit } from "@openstatus/plans";+import {+ FormControl,+ FormDescription,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from "@openstatus/ui";+import { flyRegions, flyRegionsDict } from "@openstatus/utils";++import { CheckboxLabel } from "./checkbox-label";++// TODO: centralize in a shared file!+const cronJobs = [+ { value: "30s", label: "30 seconds" },+ { value: "1m", label: "1 minute" },+ { value: "5m", label: "5 minutes" },+ { value: "10m", label: "10 minutes" },+ { value: "30m", label: "30 minutes" },+ { value: "1h", label: "1 hour" },+] as const;++interface Props {+ form: UseFormReturn<InsertMonitor>;+ plan: WorkspacePlan;+}++export function SectionScheduling({ form, plan }: Props) {+ const periodicityLimit = getLimit(plan, "periodicity");+ return (+ <div className="grid w-full gap-4">+ <div className="grid gap-1">+ <h4 className="text-foreground font-medium">Schedule and Regions</h4>+ <p className="text-muted-foreground text-sm">+ Customize the period of time and the regions where your endpoint will+ be monitored.+ </p>+ </div>+ <div className="grid sm:grid-cols-2 md:grid-cols-3">+ <FormField+ control={form.control}+ name="periodicity"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Frequency</FormLabel>+ <Select+ onValueChange={(value) =>+ field.onChange(monitorPeriodicitySchema.parse(value))+ }+ defaultValue={field.value}+ >+ <FormControl>+ <SelectTrigger className="w-full">+ <SelectValue placeholder="How often should it check your endpoint?" />+ </SelectTrigger>+ </FormControl>+ <SelectContent>+ {cronJobs.map(({ label, value }) => (+ <SelectItem+ key={value}+ value={value}+ disabled={!periodicityLimit.includes(value)}+ >+ {label}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ <FormDescription>+ Frequency of how often your endpoint will be pinged.+ </FormDescription>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ <FormField+ control={form.control}+ name="regions"+ render={({ field }) => {+ return (+ <FormItem>+ <div className="mb-4">+ <FormLabel className="text-base">Regions</FormLabel>+ <FormDescription>+ Select the regions you want to monitor your endpoint from.+ </FormDescription>+ </div>+ <div className="grid grid-cols-1 grid-rows-1 gap-6 sm:grid-cols-2 md:grid-cols-3">+ {flyRegions.map((item) => (+ <FormField+ key={item}+ control={form.control}+ name="regions"+ render={({ field }) => {+ const { flag, location } = flyRegionsDict[item];+ return (+ <FormItem key={item} className="h-full w-full">+ <FormControl className="h-full">+ <CheckboxLabel+ id={item}+ checked={field.value?.includes(item)}+ onCheckedChange={(checked) => {+ return checked+ ? field.onChange([+ ...(field.value ? field.value : []),+ item,+ ])+ : field.onChange(+ field.value?.filter(+ (value) => value !== item,+ ),+ );+ }}+ >+ {location} {flag}+ </CheckboxLabel>+ </FormControl>+ </FormItem>+ );+ }}+ />+ ))}+ </div>+ <FormMessage />+ </FormItem>+ );+ }}+ />+ </div>+ );+}diff --git a/apps/web/src/components/forms/monitor/section-status-page.tsx b/apps/web/src/components/forms/monitor/section-status-page.tsxnew file mode 100644index 000000000..6187e4152--- /dev/null+++ b/apps/web/src/components/forms/monitor/section-status-page.tsx@@ -0,0 +1,113 @@+"use client";++import type { UseFormReturn } from "react-hook-form";++import type {+ InsertMonitor,+ Page,+ WorkspacePlan,+} from "@openstatus/db/src/schema";+import {+ FormControl,+ FormDescription,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+ Input,+} from "@openstatus/ui";++import { CheckboxLabel } from "./checkbox-label";++interface Props {+ form: UseFormReturn<InsertMonitor>;+ plan: WorkspacePlan;+ pages?: Page[];+}++// FIXME: the `CheckLabel` doesn't take the full space++export function SectionStatusPage({ form, pages }: Props) {+ return (+ <div className="flex w-full flex-col gap-4">+ <div className="grid gap-1">+ <h4 className="text-foreground font-medium">Status Page</h4>+ <p className="text-muted-foreground text-sm">+ Customize the informations about your monitor on the corresponding+ status page.+ </p>+ </div>+ <FormField+ control={form.control}+ name="description"+ render={({ field }) => (+ <FormItem className="sm:col-span-2">+ <FormLabel>Description</FormLabel>+ <FormControl>+ <Input+ placeholder="Determines the api health of our services."+ {...field}+ />+ </FormControl>+ <FormDescription>+ Provide your users with information about it.+ </FormDescription>+ <FormMessage />+ </FormItem>+ )}+ />+ <FormField+ control={form.control}+ name="pages"+ render={({ field }) => {+ return (+ <FormItem>+ <div className="mb-4">+ <FormLabel className="text-base">Status Pages</FormLabel>+ <FormDescription>+ Select the pages where you want to display the monitor.+ </FormDescription>+ </div>+ <div className="grid grid-cols-1 grid-rows-1 gap-6 sm:grid-cols-2 md:grid-cols-3">+ {pages?.map((item) => (+ <FormField+ key={item.id}+ control={form.control}+ name="pages"+ render={({ field }) => {+ return (+ <FormItem key={item.id} className="h-full w-full">+ <FormControl className="h-full">+ <CheckboxLabel+ id={String(item.id)}+ checked={field.value?.includes(item.id)}+ onCheckedChange={(checked) => {+ return checked+ ? field.onChange([+ ...(field.value ? field.value : []),+ item.id,+ ])+ : field.onChange(+ field.value?.filter(+ (value) => value !== item.id,+ ),+ );+ }}+ >+ <span>{item.title}</span>+ </CheckboxLabel>+ </FormControl>+ </FormItem>+ );+ }}+ />+ ))}+ </div>+ <FormMessage />+ </FormItem>+ );+ }}+ />+ </div>+ );+}diff --git a/apps/web/src/components/icons.tsx b/apps/web/src/components/icons.tsxindex 08f4e432c..872f24f97 100644--- a/apps/web/src/components/icons.tsx+++ b/apps/web/src/components/icons.tsx@@ -9,10 +9,11 @@ import {Cog,Copy,Fingerprint,- Globe,+ Globe2,Image,Laptop,LayoutDashboard,+ LineChart,Link,Megaphone,MessageCircle,@@ -60,7 +61,7 @@ export const Icons = {tag: Tag,trash: Trash,twitter: TwitterIcon,- globe: Globe,+ globe: Globe2,plug: Plug,copy: Copy,check: Check,@@ -80,6 +81,7 @@ export const Icons = {sparkles: Sparkles,timer: Timer,clock: Clock,+ "line-chart": LineChart,discord: ({ ...props }: LucideProps) => (<svg viewBox="0 0 640 512" {...props}><pathdiff --git a/apps/web/src/components/kbd.tsx b/apps/web/src/components/kbd.tsxnew file mode 100644index 000000000..eef433a50--- /dev/null+++ b/apps/web/src/components/kbd.tsx@@ -0,0 +1,7 @@+export function Kbd({ children }: { children: React.ReactNode }) {+ return (+ <kbd className="bg-muted text-foreground pointer-events-none flex h-5 select-none items-center gap-1 rounded border px-1.5 font-mono font-mono text-[10px] font-medium opacity-100">+ {children}+ </kbd>+ );+}diff --git a/apps/web/src/lib/tb.ts b/apps/web/src/lib/tb.tsindex ab9c954fb..462760c82 100644--- a/apps/web/src/lib/tb.ts+++ b/apps/web/src/lib/tb.ts@@ -4,6 +4,7 @@ import type {ResponseDetailsParams,ResponseGraphParams,ResponseListParams,+ ResponseTimeMetricsParams,} from "@openstatus/tinybird";import {getHomeMonitorList,@@ -12,6 +13,7 @@ import {getResponseDetails,getResponseGraph,getResponseList,+ getResponseTimeMetrics,Tinybird,} from "@openstatus/tinybird";@@ -86,3 +88,15 @@ export async function getResponseGraphData(}return;}++export async function getResponseTimeMetricsData(+ props: ResponseTimeMetricsParams,+) {+ try {+ const res = await getResponseTimeMetrics(tb)(props);+ return res.data;+ } catch (e) {+ console.error(e);+ }+ return;+}diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.tsindex 20a245c82..d01a2fd59 100644--- a/packages/api/src/router/monitor.ts+++ b/packages/api/src/router/monitor.ts@@ -11,6 +11,7 @@ import {monitorsToPages,notification,notificationsToMonitors,+ page,selectMonitorSchema,selectMonitorStatusSchema,selectNotificationSchema,@@ -60,7 +61,8 @@ export const monitorRouter = createTRPCRouter({}// FIXME: this is a hotfix- const { regions, headers, notifications, id, ...data } = opts.input;+ const { regions, headers, notifications, id, pages, ...data } =+ opts.input;const newMonitor = await opts.ctx.db.insert(monitor)@@ -89,6 +91,20 @@ export const monitorRouter = createTRPCRouter({await opts.ctx.db.insert(notificationsToMonitors).values(values).run();}+ if (pages.length > 0) {+ // We should make sure the user has access to the notifications+ const allPages = await opts.ctx.db.query.page.findMany({+ where: inArray(page.id, pages),+ });++ const values = allPages.map((page) => ({+ monitorId: newMonitor.id,+ pageId: page.id,+ }));++ await opts.ctx.db.insert(monitorsToPages).values(values).run();+ }+await trackNewMonitor(opts.ctx.user, {url: newMonitor.url,periodicity: newMonitor.periodicity,@@ -133,7 +149,7 @@ export const monitorRouter = createTRPCRouter({});}- const { regions, headers, notifications, ...data } = opts.input;+ const { regions, headers, notifications, pages, ...data } = opts.input;const currentMonitor = await opts.ctx.db.update(monitor)@@ -192,6 +208,41 @@ export const monitorRouter = createTRPCRouter({).run();}++ const currentMonitorPages = await opts.ctx.db+ .select()+ .from(monitorsToPages)+ .where(eq(monitorsToPages.monitorId, currentMonitor.id))+ .all();++ const addedPages = pages.filter(+ (x) => !currentMonitorPages.map(({ pageId }) => pageId)?.includes(x),+ );++ if (addedPages.length > 0) {+ const values = addedPages.map((pageId) => ({+ monitorId: currentMonitor.id,+ pageId,+ }));++ await opts.ctx.db.insert(monitorsToPages).values(values).run();+ }++ const removedPages = currentMonitorPages+ .map(({ pageId }) => pageId)+ .filter((x) => !pages?.includes(x));++ if (removedPages.length > 0) {+ await opts.ctx.db+ .delete(monitorsToPages)+ .where(+ and(+ eq(monitorsToPages.monitorId, currentMonitor.id),+ inArray(monitorsToPages.pageId, removedPages),+ ),+ )+ .run();+ }}),delete: protectedProcedurediff --git a/packages/db/src/schema/monitors/validation.ts b/packages/db/src/schema/monitors/validation.tsindex b5260e2db..7115bc630 100644--- a/packages/db/src/schema/monitors/validation.ts+++ b/packages/db/src/schema/monitors/validation.ts@@ -70,6 +70,7 @@ export const insertMonitorSchema = createInsertSchema(monitor, {}).extend({method: monitorMethodsSchema.default("GET"),notifications: z.array(z.number()).optional().default([]),+ pages: z.array(z.number()).optional().default([]),body: z.string().default("").optional(),});diff --git a/packages/tinybird/pipes/response_time_metrics.pipe b/packages/tinybird/pipes/response_time_metrics.pipenew file mode 100644index 000000000..f9a9fe60e--- /dev/null+++ b/packages/tinybird/pipes/response_time_metrics.pipe@@ -0,0 +1,52 @@+VERSION 0++NODE response_time_metrics__v0_0+SQL >++ %+ SELECT+ round(avg(latency)) as avgLatency,+ round(quantile(0.75)(latency)) as p75Latency,+ round(quantile(0.9)(latency)) as p90Latency,+ round(quantile(0.95)(latency)) as p95Latency,+ round(quantile(0.99)(latency)) as p99Latency,+ count() as count,+ count(multiIf((statusCode >= 200) AND (statusCode <= 299), 1, NULL)) AS ok,+ -- TODO: make it more efficient+ (+ SELECT max(timestamp)+ FROM materialized_view_ping_response_45d_ttl__v7+ WHERE+ monitorId = {{ String(monitorId, '1') }}+ AND timestamp+ >= toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL {{ Int32(interval, 24)}} HOUR, 3))+ ) as lastTimestamp,+ -- for sorting+ toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL {{ Int32(interval, 24)}} HOUR, 3)) as time+ FROM materialized_view_ping_response_45d_ttl__v7+ WHERE+ monitorId = {{ String(monitorId, '1') }}+ AND timestamp+ >= toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL {{ Int32(interval, 24)}} HOUR, 3))+ UNION ALL+ SELECT+ round(avg(latency)) AS avgLatency,+ round(quantile(0.75)(latency)) AS p75Latency,+ round(quantile(0.9)(latency)) AS p90Latency,+ round(quantile(0.95)(latency)) AS p95Latency,+ round(quantile(0.99)(latency)) AS p99Latency,+ count() as count,+ count(multiIf((statusCode >= 200) AND (statusCode <= 299), 1, NULL)) AS ok,+ NULL as lastTimestamp, -- no need to query the `lastTimestamp` as not relevant+ -- for sorting+ toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL {{ Int32(interval, 24)}}*2 HOUR, 3)) as time+ FROM materialized_view_ping_response_45d_ttl__v7+ WHERE+ monitorId = {{ String(monitorId, '1') }}+ AND timestamp+ >= toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL {{ Int32(interval, 24)}}*2 HOUR, 3))+ AND timestamp+ < toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL {{ Int32(interval, 24)}} HOUR, 3))+++diff --git a/packages/tinybird/src/client.ts b/packages/tinybird/src/client.tsindex 339ab09ef..23b9936cc 100644--- a/packages/tinybird/src/client.ts+++ b/packages/tinybird/src/client.ts@@ -7,6 +7,7 @@ import {tbBuildResponseDetails,tbBuildResponseGraph,tbBuildResponseList,+ tbBuildResponseTimeMetrics,tbIngestPingResponse,tbParameterHomeStats,tbParameterMonitorList,@@ -14,6 +15,7 @@ import {tbParameterResponseDetails,tbParameterResponseGraph,tbParameterResponseList,+ tbParameterResponseTimeMetrics,} from "./validation";// REMINDER:@@ -107,3 +109,14 @@ export function getPublicStatus(tb: Tinybird) {data: tbBuildPublicStatus,});}++export function getResponseTimeMetrics(tb: Tinybird) {+ return tb.buildPipe({+ pipe: "response_time_metrics__v0",+ parameters: tbParameterResponseTimeMetrics,+ data: tbBuildResponseTimeMetrics,+ opts: {+ revalidate: 30, // 30 sec cache - mostly for timestamp metric+ },+ });+}diff --git a/packages/tinybird/src/validation.ts b/packages/tinybird/src/validation.tsindex 4595032d5..3d62ec908 100644--- a/packages/tinybird/src/validation.ts+++ b/packages/tinybird/src/validation.ts@@ -110,18 +110,23 @@ export const tbBuildResponseDetails = tbBuildResponseList.extend({}),});+export const latencyMetrics = z.object({+ avgLatency: z.number().int().nullable(),+ p75Latency: z.number().int().nullable(),+ p90Latency: z.number().int().nullable(),+ p95Latency: z.number().int().nullable(),+ p99Latency: z.number().int().nullable(),+});+/*** Values from pipe response_graph*/-export const tbBuildResponseGraph = z.object({- region: z.enum(flyRegions),- timestamp: z.number().int(),- avgLatency: z.number().int(),- p75Latency: z.number().int(),- p90Latency: z.number().int(),- p95Latency: z.number().int(),- p99Latency: z.number().int(),-});+export const tbBuildResponseGraph = z+ .object({+ region: z.enum(flyRegions),+ timestamp: z.number().int(),+ })+ .merge(latencyMetrics);/*** Params for pipe response_graph@@ -145,19 +150,16 @@ export const tbParameterMonitorList = z.object({/*** Values from the pipe status_timezone*/-export const tbBuildMonitorList = z.object({- count: z.number().int(),- ok: z.number().int(),- avgLatency: z.number().int(),- p75Latency: z.number().int(),- p90Latency: z.number().int(),- p95Latency: z.number().int(),- p99Latency: z.number().int(),- day: z.string().transform((val) => {- // That's a hack because clickhouse return the date in UTC but in shitty format (2021-09-01 00:00:00)- return new Date(`${val} GMT`).toISOString();- }),-});+export const tbBuildMonitorList = z+ .object({+ count: z.number().int(),+ ok: z.number().int(),+ day: z.string().transform((val) => {+ // That's a hack because clickhouse return the date in UTC but in shitty format (2021-09-01 00:00:00)+ return new Date(`${val} GMT`).toISOString();+ }),+ })+ .merge(latencyMetrics);/*** Params for pipe home_stats@@ -191,6 +193,26 @@ export const tbBuildPublicStatus = z.object({cronTimestamp: z.number().int(),});+/**+ * Params for pipe response_time_metrics+ */+export const tbParameterResponseTimeMetrics = z.object({+ monitorId: z.string(),+ interval: z.number().int().default(24), // 24 hours+});++/**+ * Values from the pipe response_time_metrics+ */+export const tbBuildResponseTimeMetrics = z+ .object({+ count: z.number().int(),+ ok: z.number().int(),+ lastTimestamp: z.number().int().nullable().optional(),+ time: z.number().int(), // only to sort the data - cannot be done on server because of UNION ALL+ })+ .merge(latencyMetrics);+export type Ping = z.infer<typeof tbBuildResponseList>;export type Region = (typeof flyRegions)[number]; // TODO: rename type AvailabeRegionexport type Monitor = z.infer<typeof tbBuildMonitorList>;@@ -202,3 +224,8 @@ export type MonitorListParams = z.infer<typeof tbParameterMonitorList>;export type HomeStatsParams = z.infer<typeof tbParameterHomeStats>;export type ResponseDetails = z.infer<typeof tbBuildResponseDetails>;export type ResponseDetailsParams = z.infer<typeof tbParameterResponseDetails>;+export type LatencyMetric = keyof z.infer<typeof latencyMetrics>;+export type ResponseTimeMetrics = z.infer<typeof tbBuildResponseTimeMetrics>;+export type ResponseTimeMetricsParams = z.infer<+ typeof tbParameterResponseTimeMetrics+>;diff --git a/packages/ui/package.json b/packages/ui/package.jsonindex c250116a9..1e60c159f 100644--- a/packages/ui/package.json+++ b/packages/ui/package.json@@ -37,6 +37,7 @@"@radix-ui/react-switch": "1.0.3","@radix-ui/react-tabs": "1.0.4","@radix-ui/react-toast": "1.1.5",+ "@radix-ui/react-toggle": "^1.0.3","@radix-ui/react-tooltip": "1.0.7","class-variance-authority": "0.7.0","clsx": "2.0.0",diff --git a/packages/ui/src/components/toggle.tsx b/packages/ui/src/components/toggle.tsxnew file mode 100644index 000000000..1def5f518--- /dev/null+++ b/packages/ui/src/components/toggle.tsx@@ -0,0 +1,46 @@+"use client";++import * as React from "react";+import * as TogglePrimitive from "@radix-ui/react-toggle";+import { cva } from "class-variance-authority";+import type { VariantProps } from "class-variance-authority";++import { cn } from "@/lib/utils";++const toggleVariants = cva(+ "inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground",+ {+ variants: {+ variant: {+ default: "bg-transparent",+ outline:+ "border border-input bg-transparent hover:bg-accent hover:text-accent-foreground",+ },+ size: {+ default: "h-10 px-3",+ sm: "h-9 px-2.5",+ lg: "h-11 px-5",+ },+ },+ defaultVariants: {+ variant: "default",+ size: "default",+ },+ },+);++const Toggle = React.forwardRef<+ React.ElementRef<typeof TogglePrimitive.Root>,+ React.ComponentPropsWithoutRef<typeof TogglePrimitive.Root> &+ VariantProps<typeof toggleVariants>+>(({ className, variant, size, ...props }, ref) => (+ <TogglePrimitive.Root+ ref={ref}+ className={cn(toggleVariants({ variant, size, className }))}+ {...props}+ />+));++Toggle.displayName = TogglePrimitive.Root.displayName;++export { Toggle, toggleVariants };diff --git a/packages/ui/src/index.tsx b/packages/ui/src/index.tsxindex 8053fbd20..1394ff6af 100644--- a/packages/ui/src/index.tsx+++ b/packages/ui/src/index.tsx@@ -36,3 +36,4 @@ export * from "./components/date-time-picker";export * from "./components/sheet";export * from "./components/use-toast";export * from "./components/multi-select";+export * from "./components/toggle";diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 84063a540..c643cd1a3 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -797,6 +797,9 @@ importers:'@radix-ui/react-toast':specifier: 1.1.5version: 1.1.5(@types/[email protected])(@types/[email protected])([email protected])([email protected])+ '@radix-ui/react-toggle':+ specifier: ^1.0.3+ version: 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])'@radix-ui/react-tooltip':specifier: 1.0.7version: 1.0.7(@types/[email protected])(@types/[email protected])([email protected])([email protected])@@ -4089,6 +4092,29 @@ packages:react-dom: 18.2.0([email protected])dev: false+ /@radix-ui/[email protected](@types/[email protected])(@types/[email protected])([email protected])([email protected]):+ resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0+ react-dom: ^16.8 || ^17.0 || ^18.0+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+ dependencies:+ '@babel/runtime': 7.23.2+ '@radix-ui/primitive': 1.0.1+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])+ '@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])+ '@types/react': 18.2.24+ '@types/react-dom': 18.2.8+ react: 18.2.0+ react-dom: 18.2.0([email protected])+ dev: false+/@radix-ui/[email protected](@types/[email protected])(@types/[email protected])([email protected])([email protected]):resolution: {integrity: sha512-lPh5iKNFVQ/jav/j6ZrWq3blfDJ0OH9R6FlNUHPMqdLuQ9vwDgFsRxvl8b7Asuy5c8xmoojHUxKHQSOAvMHxyw==}peerDependencies: