Skip to content

Open-source status page, incident response and uptime monitoring

🧑‍🎨 improve table (#885)

Thibault Le Ouaydb12f7b2afb7
diff --git a/apps/web/src/components/ping-response-analysis/columns.tsx b/apps/web/src/components/ping-response-analysis/columns.tsx
new file mode 100644
index 000000000..dbb87a2e4
--- /dev/null
+++ b/apps/web/src/components/ping-response-analysis/columns.tsx
@@ -0,0 +1,65 @@
+"use client";
+
+import type { ColumnDef } from "@tanstack/react-table";
+import { latencyFormatter, regionFormatter, type RegionChecker } from "./utils";
+
+import { DataTableColumnHeader } from "../data-table/data-table-column-header";
+import { StatusCodeBadge } from "../monitor/status-code-badge";
+
+export const columns: ColumnDef<RegionChecker>[] = [
+ {
+ accessorKey: "region",
+ cell: ({ row }) => {
+ return <div>{regionFormatter(row.original.region)}</div>;
+ },
+ header: ({ column }) => {
+ return <DataTableColumnHeader column={column} title="Region" />;
+ },
+ },
+ {
+ accessorKey: "status",
+ header: "Status",
+ cell: ({ row }) => {
+ return <StatusCodeBadge statusCode={row.original.status} />;
+ },
+ },
+ {
+ id: "dns",
+ header: ({ column }) => {
+ return <DataTableColumnHeader column={column} title="DNS" />;
+ },
+ accessorFn: (row) => `${row.timing.dnsDone - row.timing.dnsStart}`,
+ },
+ {
+ id: "connect",
+ accessorFn: (row) => `${row.timing.connectDone - row.timing.connectStart}`,
+ header: ({ column }) => {
+ return <DataTableColumnHeader column={column} title="Connect" />;
+ },
+ },
+ {
+ id: "tls",
+ accessorFn: (row) =>
+ `${row.timing.tlsHandshakeDone - row.timing.tlsHandshakeStart}`,
+ header: ({ column }) => {
+ return <DataTableColumnHeader column={column} title="TLS" />;
+ },
+ },
+ {
+ id: "ttfb",
+ accessorFn: (row) =>
+ `${row.timing.firstByteDone - row.timing.firstByteStart}`,
+ header: ({ column }) => {
+ return <DataTableColumnHeader column={column} title="TTFB" />;
+ },
+ },
+ {
+ accessorKey: "latency",
+ header: ({ column }) => {
+ return <DataTableColumnHeader column={column} title="Latency" />;
+ },
+ cell: ({ row }) => {
+ return <div>{latencyFormatter(row.original.latency)}</div>;
+ },
+ },
+];
diff --git a/apps/web/src/components/ping-response-analysis/multi-region-table.tsx b/apps/web/src/components/ping-response-analysis/multi-region-table.tsx
index 06a42dc7a..64c86e3eb 100644
--- a/apps/web/src/components/ping-response-analysis/multi-region-table.tsx
+++ b/apps/web/src/components/ping-response-analysis/multi-region-table.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import {
Table,
TableBody,
@@ -17,53 +19,82 @@ import {
} from "./utils";
import type { RegionChecker } from "./utils";
+import {
+ type ColumnDef,
+ getCoreRowModel,
+ useReactTable,
+ flexRender,
+ type SortingState,
+ getSortedRowModel,
+} from "@tanstack/react-table";
+import { useState } from "react";
+
// TBD: add the popover infos about timing details
-export function MultiRegionTable({ regions }: { regions: RegionChecker[] }) {
+interface DataTableProps<TData, TValue> {
+ columns: ColumnDef<TData, TValue>[];
+ data: TData[];
+}
+
+export function MultiRegionTable<TData, TValue>({
+ columns,
+ data,
+}: DataTableProps<TData, TValue>) {
+ const [sorting, setSorting] = useState<SortingState>([]);
+
+ const table = useReactTable({
+ data,
+ columns,
+ onSortingChange: setSorting,
+ getCoreRowModel: getCoreRowModel(),
+ getSortedRowModel: getSortedRowModel(),
+
+ state: {
+ sorting,
+ },
+ });
return (
<Table>
<TableCaption>Multi Regions</TableCaption>
<TableHeader>
- <TableRow>
- <TableHead>Region</TableHead>
- <TableHead>Status</TableHead>
- <TableHead>DNS</TableHead>
- <TableHead>Connect</TableHead>
- <TableHead>TLS</TableHead>
- <TableHead>TTFB</TableHead>
- <TableHead>Total</TableHead>
- </TableRow>
+ {table.getHeaderGroups().map((headerGroup) => (
+ <TableRow key={headerGroup.id}>
+ {headerGroup.headers.map((header) => {
+ return (
+ <TableHead key={header.id}>
+ {header.isPlaceholder
+ ? null
+ : flexRender(
+ header.column.columnDef.header,
+ header.getContext()
+ )}
+ </TableHead>
+ );
+ })}
+ </TableRow>
+ ))}
</TableHeader>
<TableBody>
- {regions.map(({ region, status, timing }) => {
- const { dns, connection, tls, ttfb } = getTimingPhases(timing);
- const total = getTotalLatency(timing);
- return (
- <TableRow key={region}>
- <TableCell className="font-medium">
- {regionFormatter(region)}
- </TableCell>
- <TableCell>
- <StatusCodeBadge statusCode={status} />
- </TableCell>
- <TableCell className="text-muted-foreground">
- <code>{latencyFormatter(dns)}</code>
- </TableCell>
- <TableCell className="text-muted-foreground">
- <code>{latencyFormatter(connection)}</code>
- </TableCell>
- <TableCell className="text-muted-foreground">
- <code>{latencyFormatter(tls)}</code>
- </TableCell>
- <TableCell className="text-muted-foreground">
- <code>{latencyFormatter(ttfb)}</code>
- </TableCell>
- <TableCell>
- <code>{latencyFormatter(total)}</code>
- </TableCell>
+ {table.getRowModel().rows?.length ? (
+ table.getRowModel().rows.map((row) => (
+ <TableRow
+ key={row.id}
+ data-state={row.getIsSelected() && "selected"}
+ >
+ {row.getVisibleCells().map((cell) => (
+ <TableCell key={cell.id}>
+ {flexRender(cell.column.columnDef.cell, cell.getContext())}
+ </TableCell>
+ ))}
</TableRow>
- );
- })}
+ ))
+ ) : (
+ <TableRow>
+ <TableCell colSpan={columns.length} className="h-24 text-center">
+ No results.
+ </TableCell>
+ </TableRow>
+ )}
</TableBody>
</Table>
);
diff --git a/apps/web/src/components/ping-response-analysis/multi-region-tabs.tsx b/apps/web/src/components/ping-response-analysis/multi-region-tabs.tsx
index 2524368ec..05c4c7dde 100644
--- a/apps/web/src/components/ping-response-analysis/multi-region-tabs.tsx
+++ b/apps/web/src/components/ping-response-analysis/multi-region-tabs.tsx
@@ -3,6 +3,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@openstatus/ui";
import { MultiRegionChart } from "./multi-region-chart";
import { MultiRegionTable } from "./multi-region-table";
import type { RegionChecker } from "./utils";
+import { columns } from "./columns";
export function MultiRegionTabs({ regions }: { regions: RegionChecker[] }) {
return (
@@ -15,7 +16,7 @@ export function MultiRegionTabs({ regions }: { regions: RegionChecker[] }) {
<MultiRegionChart regions={regions} />
</TabsContent>
<TabsContent value="table">
- <MultiRegionTable regions={regions} />
+ <MultiRegionTable data={regions} columns={columns} />
</TabsContent>
</Tabs>
);
diff --git a/apps/web/src/components/ping-response-analysis/utils.ts b/apps/web/src/components/ping-response-analysis/utils.ts
index de467a455..5324d25f6 100644
--- a/apps/web/src/components/ping-response-analysis/utils.ts
+++ b/apps/web/src/components/ping-response-analysis/utils.ts
@@ -15,7 +15,7 @@ export function timestampFormatter(timestamp: number) {
export function regionFormatter(
region: MonitorFlyRegion,
- type: "short" | "long" = "short",
+ type: "short" | "long" = "short"
) {
const { code, flag, location } = flyRegionsDict[region];
if (type === "short") return `${code} ${flag}`;
@@ -118,7 +118,7 @@ export async function checkRegion(
method?: Method;
headers?: { value: string; key: string }[];
body?: string;
- },
+ }
): Promise<RegionChecker> {
//
const res = await fetch(`https://checker.openstatus.dev/ping/${region}`, {
@@ -152,7 +152,7 @@ export async function checkRegion(
if (!data.success) {
console.log(json);
console.error(
- `something went wrong with result ${json} request to ${url} error ${data.error.message}`,
+ `something went wrong with result ${json} request to ${url} error ${data.error.message}`
);
throw new Error(data.error.message);
}
@@ -169,7 +169,7 @@ export async function checkAllRegions(url: string, opts?: { method: Method }) {
flyRegions.map(async (region) => {
const check = await checkRegion(url, region, opts);
return check;
- }),
+ })
);
}