Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
chore: dashboard improve monitor list columns (#2474)
Maximilian Kaskefd8d80ca5933
diff --git a/apps/dashboard/src/components/data-table/monitors/columns.tsx b/apps/dashboard/src/components/data-table/monitors/columns.tsxindex 1a1d1afca..14c76aca5 100644--- a/apps/dashboard/src/components/data-table/monitors/columns.tsx+++ b/apps/dashboard/src/components/data-table/monitors/columns.tsx@@ -4,13 +4,14 @@ import type { RouterOutputs } from "@openstatus/api";import { Badge } from "@openstatus/ui/components/ui/badge";import { Checkbox } from "@openstatus/ui/components/ui/checkbox";import type { ColumnDef } from "@tanstack/react-table";-import { formatDistanceToNow } from "date-fns";import { TableCellLink } from "@/components/data-table/table-cell-link";import { DataTableColumnHeader } from "@/components/ui/data-table/data-table-column-header";+import { formatDistanceToNowShort } from "@/lib/formatter";import { TableCellSkeleton } from "../dable-cell-skeleton";import { TableCellDate } from "../table-cell-date";+import { TableCellIndicator } from "../table-cell-indicator";import { TableCellNumber } from "../table-cell-number";import { TableCellUnavailable } from "../table-cell-unavailable";import { DataTableRowActions } from "./data-table-row-actions";@@ -45,6 +46,44 @@ export const columns: ColumnDef<Monitor>[] = [enableSorting: false,enableHiding: false,},+ {+ id: "status",+ accessorFn: (row) => (row.active ? row.status : "inactive"),+ header: () => <span className="sr-only">Status</span>,+ cell: ({ row }) => {+ const value = String(row.getValue("status"));++ switch (value) {+ case "active":+ return <TableCellIndicator variant="success" label={value} />;+ case "degraded":+ return <TableCellIndicator variant="warning" label={value} />;+ case "error":+ return <TableCellIndicator variant="destructive" label={value} />;+ default:+ return <TableCellIndicator variant="muted" label={value} />;+ }+ },+ filterFn: (row, _, value) => {+ if (Array.isArray(value)) {+ if (value.includes("inactive")) {+ return !row.original.active;+ }+ if (value.includes("active")) {+ return !!row.original.active && row.original.status === "active";+ }+ return value.includes(row.original.status);+ }+ return row.original.status === value;+ },+ enableSorting: false,+ enableHiding: false,+ enableGlobalFilter: false,+ meta: {+ headerClassName: "pr-0",+ cellClassName: "w-8 pr-0",+ },+ },{accessorKey: "name",header: ({ column }) => (@@ -60,7 +99,7 @@ export const columns: ColumnDef<Monitor>[] = [},enableHiding: false,meta: {- cellClassName: "max-w-[150px] min-w-max",+ cellClassName: "max-w-[200px] min-w-max",},},{@@ -83,43 +122,6 @@ export const columns: ColumnDef<Monitor>[] = [header: "Type",enableHiding: true,},- {- id: "status",- accessorFn: (row) => {- console.log(row);- return row.active ? row.status : "inactive";- },- header: "Status",- cell: ({ row }) => {- const value = String(row.getValue("status"));-- switch (value) {- case "active":- return <div className="text-success font-mono">{value}</div>;- case "degraded":- return <div className="text-warning font-mono">{value}</div>;- case "error":- return <div className="text-destructive font-mono">{value}</div>;- default:- return <div className="text-muted-foreground font-mono">{value}</div>;- }- },- filterFn: (row, _, value) => {- if (Array.isArray(value)) {- if (value.includes("inactive")) {- return !row.original.active;- }- if (value.includes("active")) {- return !!row.original.active && row.original.status === "active";- }- return value.includes(row.original.status);- }- return row.original.status === value;- },- enableSorting: false,- enableHiding: false,- enableGlobalFilter: false,- },{accessorKey: "active",enableHiding: true,@@ -204,7 +206,7 @@ export const columns: ColumnDef<Monitor>[] = [<TableCellDatevalue={typeof value === "number"- ? formatDistanceToNow(new Date(value), { addSuffix: true })+ ? formatDistanceToNowShort(new Date(value)): value}/>diff --git a/apps/dashboard/src/components/data-table/table-cell-indicator.tsx b/apps/dashboard/src/components/data-table/table-cell-indicator.tsxnew file mode 100644index 000000000..9893af8b5--- /dev/null+++ b/apps/dashboard/src/components/data-table/table-cell-indicator.tsx@@ -0,0 +1,44 @@+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@openstatus/ui/components/ui/tooltip";++import { cn } from "@/lib/utils";++const variants = {+ success: "bg-success",+ warning: "bg-warning",+ destructive: "bg-destructive",+ muted: "bg-muted-foreground",+} as const;++export function TableCellIndicator({+ variant = "muted",+ label,+ className,+ ...props+}: React.ComponentProps<"div"> & {+ variant?: keyof typeof variants;+ label: string;+}) {+ return (+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <div+ className={cn("flex items-center justify-center", className)}+ {...props}+ >+ <div+ className={cn("size-2.5 rounded-full", variants[variant])}+ aria-label={label}+ />+ </div>+ </TooltipTrigger>+ <TooltipContent className="font-mono">{label}</TooltipContent>+ </Tooltip>+ </TooltipProvider>+ );+}diff --git a/apps/dashboard/src/lib/formatter.ts b/apps/dashboard/src/lib/formatter.tsindex ebc5cd6e0..f40d4255a 100644--- a/apps/dashboard/src/lib/formatter.ts+++ b/apps/dashboard/src/lib/formatter.ts@@ -83,6 +83,17 @@ export function formatDateRange(from?: Date, to?: Date) {return "All time";}+export function formatDistanceToNowShort(date: Date): string {+ const seconds = Math.max(0, Math.round((Date.now() - date.getTime()) / 1000));+ if (seconds < 60) return `${seconds}s ago`;+ const minutes = Math.round(seconds / 60);+ if (minutes < 60) return `${minutes}m ago`;+ const hours = Math.round(minutes / 60);+ if (hours < 24) return `${hours}h ago`;+ const days = Math.round(hours / 24);+ return `${days}d ago`;+}+export function formatDateForInput(date: Date): string {const year = date.getFullYear();const month = String(date.getMonth() + 1).padStart(2, "0");