Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
chore: add quantile, visit shortcut, add sorting
Maximilian Kaske92ecfd4e4828
diff --git a/apps/web/src/components/data-table/data-table-column-header.tsx b/apps/web/src/components/data-table/data-table-column-header.tsxindex fac90ee6c..68b1fea9d 100644--- a/apps/web/src/components/data-table/data-table-column-header.tsx+++ b/apps/web/src/components/data-table/data-table-column-header.tsx@@ -1,5 +1,5 @@import type { Column } from "@tanstack/react-table";-import { ChevronsUpDown, SortAsc, SortDesc } from "lucide-react";+import { ArrowDown, ArrowUp, ChevronsUpDown } from "lucide-react";import {Button,@@ -37,9 +37,9 @@ export function DataTableColumnHeader<TData, TValue>({><span>{title}</span>{column.getIsSorted() === "desc" ? (- <SortDesc className="ml-2 h-4 w-4" />+ <ArrowUp className="ml-2 h-4 w-4" />) : column.getIsSorted() === "asc" ? (- <SortAsc className="ml-2 h-4 w-4" />+ <ArrowDown className="ml-2 h-4 w-4" />) : (<ChevronsUpDown className="ml-2 h-4 w-4" />)}@@ -47,11 +47,11 @@ export function DataTableColumnHeader<TData, TValue>({</DropdownMenuTrigger><DropdownMenuContent align="start"><DropdownMenuItem onClick={() => column.toggleSorting(false)}>- <SortAsc className="mr-2 h-3.5 w-3.5 text-muted-foreground/70" />+ <ArrowDown className="mr-2 h-3.5 w-3.5 text-muted-foreground/70" />Asc</DropdownMenuItem><DropdownMenuItem onClick={() => column.toggleSorting(true)}>- <SortDesc className="mr-2 h-3.5 w-3.5 text-muted-foreground/70" />+ <ArrowUp className="mr-2 h-3.5 w-3.5 text-muted-foreground/70" />Desc</DropdownMenuItem>{/* <DropdownMenuSeparator />diff --git a/apps/web/src/components/data-table/data-table.tsx b/apps/web/src/components/data-table/data-table.tsxindex bf1158999..b55effde3 100644--- a/apps/web/src/components/data-table/data-table.tsx+++ b/apps/web/src/components/data-table/data-table.tsx@@ -84,7 +84,7 @@ export function DataTable<TData, TValue>({<DataTableToolbar table={table} /><div className="rounded-md border"><Table>- <TableHeader>+ <TableHeader className="bg-muted/50">{table.getHeaderGroups().map((headerGroup) => (<TableRow key={headerGroup.id}>{headerGroup.headers.map((header) => {@@ -94,7 +94,7 @@ export function DataTable<TData, TValue>({? null: flexRender(header.column.columnDef.header,- header.getContext(),+ header.getContext())}</TableHead>);@@ -121,7 +121,7 @@ export function DataTable<TData, TValue>({<TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell,- cell.getContext(),+ cell.getContext())}</TableCell>))}diff --git a/apps/web/src/components/data-table/monitor/columns.tsx b/apps/web/src/components/data-table/monitor/columns.tsxindex bdde401cd..2a566d962 100644--- a/apps/web/src/components/data-table/monitor/columns.tsx+++ b/apps/web/src/components/data-table/monitor/columns.tsx@@ -31,6 +31,8 @@ import { isActiveMaintenance } from "@/lib/maintenances/utils";import { Eye, EyeOff, Radio, View } from "lucide-react";import { DataTableRowActions } from "./data-table-row-actions";+import { DataTableColumnHeader } from "./data-table-column-header";+import type { ReactNode } from "react";export const columns: ColumnDef<{monitor: Monitor;@@ -88,11 +90,17 @@ export const columns: ColumnDef<{</div>);},+ filterFn: (row, _id, value) => {+ if (!Array.isArray(value)) return true;+ return value.includes(row.original.monitor.active);+ },},{accessorKey: "name",accessorFn: (row) => row.monitor.name, // used for filtering as name is nested within the monitor object- header: "Name",+ header: ({ column }) => (+ <DataTableColumnHeader column={column} title="Name" />+ ),cell: ({ row }) => {const { name, public: _public } = row.original.monitor;return (@@ -153,7 +161,9 @@ export const columns: ColumnDef<{{accessorKey: "tracker",header: () => (- <HeaderTooltip label="Last 7 days" content="UTC time period" />+ <HeaderTooltip text="UTC time period">+ <span className="underline decoration-dotted">Last 7 days</span>+ </HeaderTooltip>),cell: ({ row }) => {const tracker = new Tracker({@@ -190,8 +200,8 @@ export const columns: ColumnDef<{},{accessorKey: "uptime",- header: () => (- <HeaderTooltip label="Uptime" content="Data from the last 24h" />+ header: ({ column }) => (+ <DataTableColumnHeader column={column} title="Uptime" />),cell: ({ row }) => {const { count, ok } = row.original?.metrics || {};@@ -200,28 +210,84 @@ export const columns: ColumnDef<{const rounded = Math.round((ok / count) * 10_000) / 100;return <DisplayNumber value={rounded} suffix="%" />;},+ sortingFn: (rowA, rowB, columnId) => {+ const valueA = rowA.getValue(columnId) as number | undefined;+ const valueB = rowB.getValue(columnId) as number | undefined;+ if (!valueA || !valueB) return 0;+ return valueA - valueB;+ },},{accessorKey: "p50Latency",- header: () => (- <HeaderTooltip label="P50" content="Data from the last 24h" />+ accessorFn: (row) => row.metrics?.p50Latency,+ header: ({ column }) => (+ <DataTableColumnHeader column={column} title="P50" />),cell: ({ row }) => {const latency = row.original.metrics?.p50Latency;if (latency) return <DisplayNumber value={latency} suffix="ms" />;return <span className="text-muted-foreground">-</span>;},+ sortingFn: (rowA, rowB, columnId) => {+ const valueA = rowA.getValue(columnId) as number | undefined;+ const valueB = rowB.getValue(columnId) as number | undefined;+ if (!valueA || !valueB) return 0;+ return valueA - valueB;+ },+ },+ {+ accessorKey: "p75Latency",+ accessorFn: (row) => row.metrics?.p75Latency,+ header: ({ column }) => (+ <DataTableColumnHeader column={column} title="P75" />+ ),+ cell: ({ row }) => {+ const latency = row.original.metrics?.p75Latency;+ if (latency) return <DisplayNumber value={latency} suffix="ms" />;+ return <span className="text-muted-foreground">-</span>;+ },+ sortingFn: (rowA, rowB, columnId) => {+ const valueA = rowA.getValue(columnId) as number | undefined;+ const valueB = rowB.getValue(columnId) as number | undefined;+ if (!valueA || !valueB) return 0;+ return valueA - valueB;+ },},{accessorKey: "p95Latency",- header: () => (- <HeaderTooltip label="P95" content="Data from the last 24h" />+ accessorFn: (row) => row.metrics?.p95Latency,+ header: ({ column }) => (+ <DataTableColumnHeader column={column} title="P95" />),cell: ({ row }) => {const latency = row.original.metrics?.p95Latency;if (latency) return <DisplayNumber value={latency} suffix="ms" />;return <span className="text-muted-foreground">-</span>;},+ sortingFn: (rowA, rowB, columnId) => {+ const valueA = rowA.getValue(columnId) as number | undefined;+ const valueB = rowB.getValue(columnId) as number | undefined;+ if (!valueA || !valueB) return 0;+ return valueA - valueB;+ },+ },+ {+ accessorKey: "p99Latency",+ accessorFn: (row) => row.metrics?.p99Latency,+ header: ({ column }) => (+ <DataTableColumnHeader column={column} title="P99" />+ ),+ cell: ({ row }) => {+ const latency = row.original.metrics?.p99Latency;+ if (latency) return <DisplayNumber value={latency} suffix="ms" />;+ return <span className="text-muted-foreground">-</span>;+ },+ sortingFn: (rowA, rowB, columnId) => {+ const valueA = rowA.getValue(columnId) as number | undefined;+ const valueB = rowB.getValue(columnId) as number | undefined;+ if (!valueA || !valueB) return 0;+ return valueA - valueB;+ },},{id: "actions",@@ -235,14 +301,18 @@ export const columns: ColumnDef<{},];-function HeaderTooltip({ label, content }: { label: string; content: string }) {+function HeaderTooltip({+ text,+ children,+}: {+ text: string;+ children: ReactNode;+}) {return (<TooltipProvider><Tooltip>- <TooltipTrigger className="underline decoration-dotted">- {label}- </TooltipTrigger>- <TooltipContent>{content}</TooltipContent>+ <TooltipTrigger suppressHydrationWarning>{children}</TooltipTrigger>+ <TooltipContent>{text}</TooltipContent></Tooltip></TooltipProvider>);diff --git a/apps/web/src/components/data-table/monitor/data-table-column-header.tsx b/apps/web/src/components/data-table/monitor/data-table-column-header.tsxnew file mode 100644index 000000000..68b1fea9d--- /dev/null+++ b/apps/web/src/components/data-table/monitor/data-table-column-header.tsx@@ -0,0 +1,66 @@+import type { Column } from "@tanstack/react-table";+import { ArrowDown, ArrowUp, ChevronsUpDown } from "lucide-react";++import {+ Button,+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from "@openstatus/ui";++import { cn } from "@/lib/utils";++interface DataTableColumnHeaderProps<TData, TValue>+ extends React.HTMLAttributes<HTMLDivElement> {+ column: Column<TData, TValue>;+ title: string;+}++export function DataTableColumnHeader<TData, TValue>({+ column,+ title,+ className,+}: DataTableColumnHeaderProps<TData, TValue>) {+ if (!column.getCanSort()) {+ return <div className={cn(className)}>{title}</div>;+ }++ return (+ <div className={cn("flex items-center space-x-2", className)}>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ variant="ghost"+ size="sm"+ className="-ml-3 h-8 data-[state=open]:bg-accent"+ >+ <span>{title}</span>+ {column.getIsSorted() === "desc" ? (+ <ArrowUp className="ml-2 h-4 w-4" />+ ) : column.getIsSorted() === "asc" ? (+ <ArrowDown className="ml-2 h-4 w-4" />+ ) : (+ <ChevronsUpDown className="ml-2 h-4 w-4" />+ )}+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="start">+ <DropdownMenuItem onClick={() => column.toggleSorting(false)}>+ <ArrowDown className="mr-2 h-3.5 w-3.5 text-muted-foreground/70" />+ Asc+ </DropdownMenuItem>+ <DropdownMenuItem onClick={() => column.toggleSorting(true)}>+ <ArrowUp className="mr-2 h-3.5 w-3.5 text-muted-foreground/70" />+ Desc+ </DropdownMenuItem>+ {/* <DropdownMenuSeparator />+ <DropdownMenuItem onClick={() => column.toggleVisibility(false)}>+ <EyeOff className="text-muted-foreground/70 mr-2 h-3.5 w-3.5" />+ Hide+ </DropdownMenuItem> */}+ </DropdownMenuContent>+ </DropdownMenu>+ </div>+ );+}diff --git a/apps/web/src/components/data-table/monitor/data-table-toolbar.tsx b/apps/web/src/components/data-table/monitor/data-table-toolbar.tsxindex a4f7f8583..9786e91cc 100644--- a/apps/web/src/components/data-table/monitor/data-table-toolbar.tsx+++ b/apps/web/src/components/data-table/monitor/data-table-toolbar.tsx@@ -50,6 +50,16 @@ export function DataTableToolbar<TData>({]}/>)}+ {table.getColumn("active") && (+ <DataTableFacetedFilter+ column={table.getColumn("active")}+ title="Active"+ options={[+ { label: "True", value: true },+ { label: "False", value: false },+ ]}+ />+ )}{isFiltered && (<Buttonvariant="ghost"@@ -61,6 +71,11 @@ export function DataTableToolbar<TData>({</Button>)}</div>+ <div className="h-8 self-end rounded-lg border bg-muted/50 px-3">+ <p className="text-muted-foreground text-xs">+ Quantiles and Uptime are aggregated data from the last 24h.+ </p>+ </div></div>);}diff --git a/apps/web/src/components/data-table/monitor/data-table.tsx b/apps/web/src/components/data-table/monitor/data-table.tsxindex a37daae5d..9a44249c4 100644--- a/apps/web/src/components/data-table/monitor/data-table.tsx+++ b/apps/web/src/components/data-table/monitor/data-table.tsx@@ -4,6 +4,7 @@ import type {ColumnDef,ColumnFiltersState,PaginationState,+ SortingState,Table as TTable,VisibilityState,} from "@tanstack/react-table";@@ -11,8 +12,10 @@ import {flexRender,getCoreRowModel,getFacetedRowModel,+ getFacetedUniqueValues,getFilteredRowModel,getPaginationRowModel,+ getSortedRowModel,useReactTable,} from "@tanstack/react-table";import * as React from "react";@@ -48,6 +51,7 @@ export function DataTable<TData, TValue>({defaultColumnFilters = [],defaultPagination = { pageIndex: 0, pageSize: 10 },}: DataTableProps<TData, TValue>) {+ const [sorting, setSorting] = React.useState<SortingState>([]);const [columnFilters, setColumnFilters] =React.useState<ColumnFiltersState>(defaultColumnFilters);const [columnVisibility, setColumnVisibility] =@@ -66,6 +70,7 @@ export function DataTable<TData, TValue>({columnFilters,columnVisibility,pagination,+ sorting,},onPaginationChange: setPagination,getPaginationRowModel: getPaginationRowModel(),@@ -73,12 +78,14 @@ export function DataTable<TData, TValue>({onColumnVisibilityChange: setColumnVisibility,getFilteredRowModel: getFilteredRowModel(),getCoreRowModel: getCoreRowModel(),+ onSortingChange: setSorting,+ getSortedRowModel: getSortedRowModel(),getFacetedRowModel: getFacetedRowModel(),// TODO: check if we can optimize it - because it gets bigger and bigger with every new filter// getFacetedUniqueValues: getFacetedUniqueValues(),// REMINDER: We cannot use the default getFacetedUniqueValues as it doesnt support Array of ObjectsgetFacetedUniqueValues: (_table: TTable<TData>, columnId: string) => () => {- const map = new Map();+ const map = getFacetedUniqueValues<TData>()(_table, columnId)();if (columnId === "tags") {if (tags) {for (const tag of tags) {@@ -95,14 +102,6 @@ export function DataTable<TData, TValue>({}}}- if (columnId === "public") {- const values = table- .getCoreRowModel()- .flatRows.map((row) => row.getValue(columnId)) as boolean[];- const publicValue = values.filter((v) => v === true).length;- map.set(true, publicValue);- map.set(false, values.length - publicValue);- }return map;},});diff --git a/apps/web/src/components/data-table/status-page/columns.tsx b/apps/web/src/components/data-table/status-page/columns.tsxindex 744b82fcf..bedffdaa5 100644--- a/apps/web/src/components/data-table/status-page/columns.tsx+++ b/apps/web/src/components/data-table/status-page/columns.tsx@@ -14,7 +14,7 @@ import {TooltipTrigger,} from "@openstatus/ui";-import { Check } from "lucide-react";+import { ArrowUpRight, Check } from "lucide-react";import { DataTableRowActions } from "./data-table-row-actions";export const columns: ColumnDef<@@ -28,17 +28,35 @@ export const columns: ColumnDef<header: "Title",cell: ({ row }) => {return (- <Link- href={`./status-pages/${row.original.id}/edit`}- className="group flex items-center gap-2"- >- <span className="max-w-[125px] truncate group-hover:underline">- {row.getValue("title")}- </span>- {row.original.maintenancesToPages.length > 0 ? (- <Badge>Maintenance</Badge>- ) : null}- </Link>+ <div className="flex items-center gap-1">+ <Link+ href={`./status-pages/${row.original.id}/edit`}+ className="group flex items-center gap-2"+ >+ <span className="max-w-[125px] truncate group-hover:underline">+ {row.getValue("title")}+ </span>+ </Link>+ <TooltipProvider>+ <Tooltip delayDuration={100}>+ <TooltipTrigger>+ <a+ href={+ process.env.NODE_ENV === "production"+ ? `https://${row.original.slug}.openstatus.dev`+ : `/status-page/${row.original.slug}`+ }+ target="_blank"+ rel="noreferrer"+ className="text-muted-foreground hover:text-foreground"+ >+ <ArrowUpRight className="h-4 w-4 flex-shrink-0" />+ </a>+ </TooltipTrigger>+ <TooltipContent>Visit page</TooltipContent>+ </Tooltip>+ </TooltipProvider>+ </div>);},},