Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat(dashboard): display private location metadata in table, search, … (#2748)
Sandip Godhani60cf06c2bb9c
diff --git a/apps/dashboard/src/components/chat/tool-renderers/list-private-locations.tsx b/apps/dashboard/src/components/chat/tool-renderers/list-private-locations.tsxindex 0e4f62770..3471bbf6c 100644--- a/apps/dashboard/src/components/chat/tool-renderers/list-private-locations.tsx+++ b/apps/dashboard/src/components/chat/tool-renderers/list-private-locations.tsx@@ -2,6 +2,7 @@ import type { AgentToolOutput } from "@openstatus/services/agent-tools";import { TableCellDate } from "@/components/data-table/table-cell-date";import { TableCellLink } from "@/components/data-table/table-cell-link";+import { TableCellMetadata } from "@/components/data-table/table-cell-metadata";import { TableCellNumber } from "@/components/data-table/table-cell-number";import { TableCellText } from "@/components/data-table/table-cell-text";@@ -11,13 +12,14 @@ type Output = AgentToolOutput<"list_private_locations">;export function listPrivateLocationsTable(output: Output,-): ResultTableData<"name" | "monitors" | "lastSeenAt" | "id"> {+): ResultTableData<"name" | "monitors" | "metadata" | "lastSeenAt" | "id"> {const items = output?.items ?? [];return {empty: "No private locations.",columns: [{ key: "name", header: "Name" },{ key: "monitors", header: "Monitors" },+ { key: "metadata", header: "Metadata" },{ key: "lastSeenAt", header: "Last seen" },{ key: "id", header: "ID" },],@@ -40,6 +42,7 @@ export function listPrivateLocationsTable(className="text-muted-foreground font-mono"/>),+ metadata: <TableCellMetadata value={location.metadata} />,lastSeenAt: location.lastSeenAt ? (<TableCellDate value={new Date(location.lastSeenAt)} />) : (diff --git a/apps/dashboard/src/components/controls-search/command-region.tsx b/apps/dashboard/src/components/controls-search/command-region.tsxindex db8f7dbea..5b0805c8c 100644--- a/apps/dashboard/src/components/controls-search/command-region.tsx+++ b/apps/dashboard/src/components/controls-search/command-region.tsx@@ -28,6 +28,10 @@ import {BillingOverlayButton,BillingOverlayDescription,} from "@/components/content/billing-overlay";+import {+ TableCellMetadata,+ getMetadataEntries,+} from "@/components/data-table/table-cell-metadata";import type { REGIONS } from "@/data/metrics.client";import { useTRPC } from "@/lib/trpc/client";@@ -36,7 +40,11 @@ export function CommandRegion({privateLocations,}: {regions: (typeof REGIONS)[number][];- privateLocations?: { id: number; name: string }[];+ privateLocations?: {+ id: number;+ name: string;+ metadata?: Record<string, string> | null;+ }[];}) {const trpc = useTRPC();const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());@@ -151,31 +159,44 @@ export function CommandRegion({)}{privateLocations && privateLocations.length > 0 ? (<CommandGroup heading="Private Locations">- {privateLocations.map((location) => (- <CommandItem- key={location.id}- keywords={[location.name]}- value={location.id.toString()}- onSelect={() => {- setSelectedRegions((prev) =>- prev.includes(location.id.toString())- ? prev.filter((r) => r !== location.id.toString())- : [...prev, location.id.toString()],- );- }}- >- <Globe className="size-3" />- <span className="truncate font-mono">{location.name}</span>- <Check- className={cn(- "ml-auto",- selectedRegions.includes(location.id.toString())- ? "opacity-100"- : "opacity-0",- )}- />- </CommandItem>- ))}+ {privateLocations.map((location) => {+ const metadata = getMetadataEntries(location.metadata);+ const keywords = [location.name, ...metadata.flat()];++ return (+ <CommandItem+ key={location.id}+ keywords={keywords}+ value={location.id.toString()}+ onSelect={() => {+ setSelectedRegions((prev) =>+ prev.includes(location.id.toString())+ ? prev.filter((r) => r !== location.id.toString())+ : [...prev, location.id.toString()],+ );+ }}+ >+ <Globe className="size-3 shrink-0" />+ <span className="truncate font-mono">+ {location.name}+ </span>+ {metadata.length > 0 ? (+ <TableCellMetadata+ value={location.metadata}+ maxEntries={2}+ />+ ) : null}+ <Check+ className={cn(+ "ml-auto",+ selectedRegions.includes(location.id.toString())+ ? "opacity-100"+ : "opacity-0",+ )}+ />+ </CommandItem>+ );+ })}</CommandGroup>) : null}<CommandEmpty>No region found.</CommandEmpty>diff --git a/apps/dashboard/src/components/data-table/private-locations/columns.tsx b/apps/dashboard/src/components/data-table/private-locations/columns.tsxindex d01f8cc29..c4c2a6cda 100644--- a/apps/dashboard/src/components/data-table/private-locations/columns.tsx+++ b/apps/dashboard/src/components/data-table/private-locations/columns.tsx@@ -9,6 +9,7 @@ import { cn } from "@/lib/utils";import { TableCellBadge } from "../table-cell-badge";import { TableCellDate } from "../table-cell-date";+import { TableCellMetadata } from "../table-cell-metadata";import { TableCellText } from "../table-cell-text";import { DataTableRowActions } from "./data-table-row-actions";@@ -43,6 +44,15 @@ export const columns: ColumnDef<PrivateLocation>[] = [);},},+ {+ accessorKey: "metadata",+ header: ({ column }) => (+ <DataTableColumnHeader column={column} title="Metadata" />+ ),+ enableSorting: false,+ enableHiding: true,+ cell: ({ row }) => <TableCellMetadata value={row.original.metadata} />,+ },{accessorKey: "lastSeenAt",header: ({ column }) => (diff --git a/apps/dashboard/src/components/data-table/table-cell-metadata.tsx b/apps/dashboard/src/components/data-table/table-cell-metadata.tsxnew file mode 100644index 000000000..40a6e3342--- /dev/null+++ b/apps/dashboard/src/components/data-table/table-cell-metadata.tsx@@ -0,0 +1,109 @@+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@openstatus/ui/components/ui/tooltip";+import { useEffect, useRef, useState } from "react";++import { Pill } from "@/components/common/pill";+import { cn } from "@/lib/utils";++/** Sorted `[key, value]` pairs with empty values dropped; `[]` for non-objects. */+export function getMetadataEntries(value: unknown): [string, string][] {+ if (!value || typeof value !== "object" || Array.isArray(value)) return [];+ return Object.entries(value)+ .filter((entry): entry is [string, string] => {+ return typeof entry[1] === "string" && entry[1].trim().length > 0;+ })+ .sort(([a], [b]) => a.localeCompare(b));+}++export function TableCellMetadata({+ value,+ maxEntries,+ className,+ ...props+}: React.ComponentProps<"div"> & {+ value: unknown;+ /** Collapse the rest into a `+n` chip with the full list in a tooltip. */+ maxEntries?: number;+}) {+ const entries = getMetadataEntries(value);++ if (entries.length === 0) {+ return (+ <div className={cn("text-muted-foreground", className)} {...props}>+ -+ </div>+ );+ }++ const visible = maxEntries ? entries.slice(0, maxEntries) : entries;+ const hidden = maxEntries ? entries.slice(maxEntries) : [];++ return (+ <div+ className={cn("flex flex-wrap items-center gap-1", className)}+ {...props}+ >+ <TooltipProvider>+ {visible.map(([key, val]) => (+ <MetadataPill key={key} label={key} value={val} />+ ))}+ {hidden.length > 0 ? (+ <Tooltip>+ <TooltipTrigger asChild>+ <span className="text-muted-foreground bg-muted inline-flex items-center rounded-md px-1.5 py-0.5 font-mono text-xs font-medium">+ +{hidden.length}+ </span>+ </TooltipTrigger>+ <TooltipContent className="flex flex-col gap-1 font-mono text-xs">+ {hidden.map(([key, val]) => (+ <div key={key}>+ {key}: {val}+ </div>+ ))}+ </TooltipContent>+ </Tooltip>+ ) : null}+ </TooltipProvider>+ </div>+ );+}++function MetadataPill({ label, value }: { label: string; value: string }) {+ const ref = useRef<HTMLSpanElement>(null);+ const [isTruncated, setIsTruncated] = useState(false);++ useEffect(() => {+ if (ref.current) {+ setIsTruncated(ref.current.scrollWidth > ref.current.clientWidth);+ }+ }, [value]);++ const pill = (+ <Pill+ label={label}+ value={+ <span ref={ref} className="block max-w-32 truncate">+ {value}+ </span>+ }+ variant="outline"+ />+ );++ if (!isTruncated) return pill;++ return (+ <Tooltip>+ <TooltipTrigger onPointerDown={(event) => event.preventDefault()} asChild>+ <div className="inline-flex">{pill}</div>+ </TooltipTrigger>+ <TooltipContent className="font-mono text-xs">+ {label}: {value}+ </TooltipContent>+ </Tooltip>+ );+}diff --git a/apps/dashboard/src/components/forms/monitor/form-scheduling-regions.tsx b/apps/dashboard/src/components/forms/monitor/form-scheduling-regions.tsxindex 884e1cff1..df06bf1b9 100644--- a/apps/dashboard/src/components/forms/monitor/form-scheduling-regions.tsx+++ b/apps/dashboard/src/components/forms/monitor/form-scheduling-regions.tsx@@ -33,6 +33,10 @@ import { z } from "zod";import { IconCloudProviderTooltip } from "@/components/common/icon-cloud-provider";import { Link } from "@/components/common/link";import { Note, NoteButton } from "@/components/common/note";+import {+ TableCellMetadata,+ getMetadataEntries,+} from "@/components/data-table/table-cell-metadata";import { UpgradeDialog } from "@/components/dialogs/upgrade";import {FormCard,@@ -49,7 +53,11 @@ import { useTRPC } from "@/lib/trpc/client";const DEFAULT_PERIODICITY = "10m";const DEFAULT_REGIONS = ["ams", "fra", "iad", "syd", "jnb", "gru"];const PERIODICITY = monitorPeriodicity.filter((p) => p !== "other");-const DEFAULT_PRIVATE_LOCATIONS = [] satisfies { id: number; name: string }[];+const DEFAULT_PRIVATE_LOCATIONS = [] satisfies {+ id: number;+ name: string;+ metadata?: Record<string, string> | null;+}[];const schema = z.object({regions: z.array(z.string()),@@ -67,7 +75,11 @@ export function FormSchedulingRegions({}: Omit<React.ComponentProps<"form">, "onSubmit"> & {defaultValues?: FormValues;onSubmit: (values: FormValues) => Promise<void>;- privateLocations: { id: number; name: string }[];+ privateLocations: {+ id: number;+ name: string;+ metadata?: Record<string, string> | null;+ }[];}) {const trpc = useTRPC();const [openDialog, setOpenDialog] = useState(false);@@ -402,6 +414,7 @@ export function FormSchedulingRegions({><FormControl><Checkbox+ id={`private-location-${item.id}`}checked={field.value?.includes(item.id) || false}@@ -419,8 +432,17 @@ export function FormSchedulingRegions({}}/></FormControl>- <FormLabel className="w-full truncate font-mono text-sm font-normal">- {item.name}+ <FormLabel+ htmlFor={`private-location-${item.id}`}+ className="w-full truncate font-mono text-sm font-normal"+ >+ <span className="text-nowrap">+ {item.name}+ </span>+ {getMetadataEntries(item.metadata).length >+ 0 ? (+ <TableCellMetadata value={item.metadata} />+ ) : null}<Globe className="size-3" /></FormLabel></FormItem>