Skip to content

Open-source status page, incident response and uptime monitoring

fix: status code null data table (#486)

Maximilian Kaske432f4867a2f5
diff --git a/apps/web/src/components/data-table/columns.tsx b/apps/web/src/components/data-table/columns.tsx
index 4ea51df57..c336bca9b 100644
--- a/apps/web/src/components/data-table/columns.tsx
+++ b/apps/web/src/components/data-table/columns.tsx
@@ -2,8 +2,15 @@
import type { ColumnDef } from "@tanstack/react-table";
import { format } from "date-fns";
+import * as z from "zod";
import type { Ping } from "@openstatus/tinybird";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@openstatus/ui";
import { regionsDict } from "@openstatus/utils";
import { DataTableColumnHeader } from "./data-table-column-header";
@@ -29,8 +36,28 @@ export const columns: ColumnDef<Ping>[] = [
<DataTableColumnHeader column={column} title="Status" />
),
cell: ({ row }) => {
- const statusCode = String(row.getValue("statusCode"));
- return <DataTableStatusBadge {...{ statusCode }} />;
+ const unsafe_StatusCode = row.getValue("statusCode");
+ const statusCode = z.number().nullable().parse(unsafe_StatusCode);
+ const message = row.original.message;
+
+ if (statusCode !== null) {
+ return <DataTableStatusBadge {...{ statusCode }} />;
+ }
+
+ return (
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger>
+ <DataTableStatusBadge {...{ statusCode }} />
+ </TooltipTrigger>
+ <TooltipContent>
+ <p className="text-muted-foreground max-w-xs sm:max-w-sm">
+ {message}
+ </p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ );
},
filterFn: (row, id, value) => {
// get the first digit of the status code
diff --git a/apps/web/src/components/data-table/data-table-status-badge.tsx b/apps/web/src/components/data-table/data-table-status-badge.tsx
index 16fe5f72f..89ecf1668 100644
--- a/apps/web/src/components/data-table/data-table-status-badge.tsx
+++ b/apps/web/src/components/data-table/data-table-status-badge.tsx
@@ -1,3 +1,4 @@
+import type { Ping } from "@openstatus/tinybird";
import { Badge } from "@openstatus/ui";
import { cn } from "@/lib/utils";
@@ -5,7 +6,7 @@ import { cn } from "@/lib/utils";
export function DataTableStatusBadge({
statusCode,
}: {
- statusCode: string | number;
+ statusCode: Ping["statusCode"];
}) {
const isOk = String(statusCode).startsWith("2");
return (
@@ -16,7 +17,7 @@ export function DataTableStatusBadge({
isOk ? "border-green-100 bg-green-50" : "border-red-100 bg-red-50",
)}
>
- {statusCode}
+ {statusCode || "Error"}
<div
className={cn(
"bg-foreground ml-1 h-1.5 w-1.5 rounded-full",
diff --git a/apps/web/src/components/data-table/monitor/columns.tsx b/apps/web/src/components/data-table/monitor/columns.tsx
index a7320fd58..b4ff668b2 100644
--- a/apps/web/src/components/data-table/monitor/columns.tsx
+++ b/apps/web/src/components/data-table/monitor/columns.tsx
@@ -70,20 +70,13 @@ export const columns: ColumnDef<Monitor & { lastStatusCode?: number }>[] = [
header: "Last Status",
cell: ({ row }) => {
const lastStatusCode = row.getValue("lastStatusCode");
- const statusCode = z
- .string()
- .or(z.number())
- .optional()
- .parse(lastStatusCode);
- return (
- <>
- {statusCode ? (
- <DataTableStatusBadge {...{ statusCode }} />
- ) : (
- <span className="text-muted-foreground">Missing</span>
- )}
- </>
- );
+ const statusCode = z.number().nullable().optional().parse(lastStatusCode);
+
+ if (statusCode === undefined) {
+ return <span className="text-muted-foreground">Missing</span>;
+ }
+
+ return <DataTableStatusBadge {...{ statusCode }} />;
},
},
{
diff --git a/packages/tinybird/pipes/response_list.pipe b/packages/tinybird/pipes/response_list.pipe
index d2fc2b126..a40f0af25 100644
--- a/packages/tinybird/pipes/response_list.pipe
+++ b/packages/tinybird/pipes/response_list.pipe
@@ -4,7 +4,7 @@ NODE response_list_0
SQL >
%
- SELECT latency, monitorId, region, statusCode, timestamp, url, workspaceId, cronTimestamp
+ SELECT latency, monitorId, region, statusCode, timestamp, url, workspaceId, cronTimestamp, message
FROM ping_response__v5
WHERE monitorId = {{ String(monitorId, 'openstatusPing') }}
{% if defined(region) %}