Skip to content

Open-source status page, incident response and uptime monitoring

feat: table layout (#328)

Maximilian Kaske66b7cbdf0d2f
diff --git a/README.md b/README.md
index d13f0a8ec..4c1733a74 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,8 @@ You can choose to host it yourself or use our hosted version at
## Contact us
If you want to learn more about this project or have any questions, book a call
-with us or send us an email at
+with us or send us an email at [[email protected]](mailto:[email protected])
+<br/><br/>
<a href="https://cal.com/team/openstatus/30min"><img alt="Book us with Cal.com" src="https://cal.com/book-with-cal-dark.svg" /></a>
## Built with
diff --git a/apps/web/src/app/api/checker/test/route.ts b/apps/web/src/app/api/checker/test/route.ts
index e6d2c8919..2ecaa9e2a 100644
--- a/apps/web/src/app/api/checker/test/route.ts
+++ b/apps/web/src/app/api/checker/test/route.ts
@@ -6,7 +6,8 @@ import { payloadSchema } from "../schema";
export const runtime = "edge";
export const preferredRegion = "auto";
export const dynamic = "force-dynamic";
-// Fix is a random region let's figure where does vercel push it
+
+// TODO: if only ID, then we should query db for the monitor data and test endpoint
export async function POST(request: Request) {
const json = await request.json();
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/incidents/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/incidents/page.tsx
index 896683fa3..ba3fcf561 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/incidents/page.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/incidents/page.tsx
@@ -6,6 +6,7 @@ import { Button } from "@openstatus/ui";
import { Container } from "@/components/dashboard/container";
import { Header } from "@/components/dashboard/header";
+import { HelpCallout } from "@/components/dashboard/help-callout";
import { Icons } from "@/components/icons";
import { AffectedMonitors } from "@/components/incidents/affected-monitors";
import { Events } from "@/components/incidents/events";
@@ -24,7 +25,7 @@ export default async function IncidentPage({
workspaceSlug: params.workspaceSlug,
});
return (
- <div className="grid gap-6 md:grid-cols-1 md:gap-8">
+ <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-1 md:gap-8">
<Header
title="Incidents"
description="Overview of all your incidents."
@@ -35,7 +36,7 @@ export default async function IncidentPage({
}
/>
{Boolean(incidents?.length) ? (
- <div className="col-span-full grid sm:grid-cols-6">
+ <div className="col-span-full">
<ul role="list" className="grid gap-4 sm:col-span-6">
{incidents?.map((incident, i) => {
const { label, icon } =
@@ -49,10 +50,10 @@ export default async function IncidentPage({
</time>
<Container
title={
- <>
+ <span className="flex flex-wrap gap-2">
{incident.title}
<StatusBadge status={incident.status} />
- </>
+ </span>
}
actions={[
<Button key="status-button" variant="outline" size="sm">
@@ -98,8 +99,13 @@ export default async function IncidentPage({
</ul>
</div>
) : (
- <EmptyState />
+ <div className="col-span-full">
+ <EmptyState />
+ </div>
)}
+ <div className="mt-8 md:mt-12">
+ <HelpCallout />
+ </div>
</div>
);
}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/[id]/data/loading.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/[id]/data/loading.tsx
index ca16974a8..fe2b832b5 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/[id]/data/loading.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/[id]/data/loading.tsx
@@ -2,6 +2,7 @@ import { Skeleton } from "@openstatus/ui";
import { Container } from "@/components/dashboard/container";
import { Header } from "@/components/dashboard/header";
+import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton";
export default function Loading() {
return (
@@ -12,7 +13,7 @@ export default function Loading() {
<Skeleton className="h-8 w-64" />
<Skeleton className="h-8 w-64" />
</div>
- <Container.Skeleton />
+ <DataTableSkeleton rows={7} />
</div>
</div>
);
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/loading.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/loading.tsx
index 99f872a29..5fab49f41 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/loading.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/loading.tsx
@@ -1,7 +1,7 @@
import { Skeleton } from "@openstatus/ui";
-import { Container } from "@/components/dashboard/container";
import { Header } from "@/components/dashboard/header";
+import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton";
export default function Loading() {
return (
@@ -11,9 +11,9 @@ export default function Loading() {
<Skeleton className="h-9 w-20" />
</Header.Skeleton>
</div>
- <Container.Skeleton />
- <Container.Skeleton />
- <Container.Skeleton />
+ <div className="col-span-full w-full">
+ <DataTableSkeleton />
+ </div>
</div>
);
}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx
index b7bcc04a6..48b65f970 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx
@@ -1,18 +1,16 @@
import * as React from "react";
import Link from "next/link";
-import type { ExtendedMonitor } from "@openstatus/db/src/schema";
import { allPlans } from "@openstatus/plans";
-import { Badge, ButtonWithDisableTooltip } from "@openstatus/ui";
+import { ButtonWithDisableTooltip } from "@openstatus/ui";
-import { Container } from "@/components/dashboard/container";
import { Header } from "@/components/dashboard/header";
+import { HelpCallout } from "@/components/dashboard/help-callout";
import { Limit } from "@/components/dashboard/limit";
-import { DataTableStatusBadge } from "@/components/data-table/data-table-status-badge";
+import { columns } from "@/components/data-table/monitor/columns";
+import { DataTable } from "@/components/data-table/monitor/data-table";
import { getResponseListData } from "@/lib/tb";
-import { cn } from "@/lib/utils";
import { api } from "@/trpc/server";
-import { ActionButton } from "./_components/action-button";
import { EmptyState } from "./_components/empty-state";
export default async function MonitorPage({
@@ -31,10 +29,25 @@ export default async function MonitorPage({
(monitors?.length || 0) >=
allPlans[workspace?.plan || "free"].limits.monitors;
- const { workspaceSlug } = params;
+ async function getMonitorLastStatusCode(monitorId: string) {
+ const ping = await getResponseListData({
+ monitorId,
+ limit: 1,
+ });
+ const lastStatusCode = ping && ping.length > 0 ? ping[0].statusCode : 0;
+ return lastStatusCode;
+ }
+
+ const lastStatusCodes = (
+ await Promise.allSettled(
+ monitors?.map((monitor) =>
+ getMonitorLastStatusCode(String(monitor.id)),
+ ) || [],
+ )
+ ).map((code) => (code.status === "fulfilled" && code.value) || 0);
return (
- <div className="grid gap-6 md:grid-cols-2 md:gap-8">
+ <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-2 md:gap-8">
<Header
title="Monitors"
description="Overview of all your monitors."
@@ -49,77 +62,26 @@ export default async function MonitorPage({
}
/>
{Boolean(monitors?.length) ? (
- monitors?.map((monitor, index) => (
- <Monitor key={index} {...{ monitor, workspaceSlug }} />
- ))
+ <div className="col-span-full">
+ {monitors && (
+ <DataTable
+ columns={columns}
+ data={monitors.map((_, i) => ({
+ ..._,
+ lastStatusCode: lastStatusCodes[i],
+ }))}
+ />
+ )}
+ </div>
) : (
- <EmptyState />
+ <div className="col-span-full">
+ <EmptyState />
+ <div className="mt-3">{isLimit ? <Limit /> : null}</div>
+ </div>
)}
- {isLimit ? <Limit /> : null}
+ <div className="mt-8 md:mt-12">
+ <HelpCallout />
+ </div>
</div>
);
}
-
-async function Monitor({
- monitor,
- workspaceSlug,
-}: {
- monitor: ExtendedMonitor;
- workspaceSlug: string;
-}) {
- const lastResponses = await getResponseListData({
- monitorId: String(monitor.id),
- limit: 1,
- });
-
- const lastStatusCode =
- lastResponses && lastResponses.length > 0
- ? lastResponses[0].statusCode
- : undefined;
-
- return (
- <Container
- title={monitor.name}
- description={monitor.description}
- actions={[
- <Badge
- key="status-badge"
- variant={monitor.active ? "default" : "outline"}
- className="capitalize"
- >
- {monitor.active ? "active" : "inactive"}
- <span
- className={cn(
- "ml-1 h-1.5 w-1.5 rounded-full",
- monitor.active ? "bg-green-500" : "bg-red-500",
- )}
- />
- </Badge>,
- <ActionButton key="action-button" {...{ ...monitor, workspaceSlug }} />,
- ]}
- >
- <dl className="[&_dt]:text-muted-foreground grid gap-2 [&>*]:text-sm [&_dt]:font-light">
- <div className="flex min-w-0 items-center justify-between gap-3">
- <dt>Frequency</dt>
- <dd className="font-mono">{monitor.periodicity}</dd>
- </div>
- <div className="flex min-w-0 items-center justify-between gap-3">
- <dt>URL</dt>
- <dd className="overflow-hidden text-ellipsis font-semibold">
- {monitor.url}
- </dd>
- </div>
- <div className="flex min-w-0 items-center justify-between gap-3">
- <dt>Last Status</dt>
- <dd className="overflow-hidden text-ellipsis">
- {lastStatusCode ? (
- <DataTableStatusBadge statusCode={lastStatusCode} />
- ) : (
- <span className="text-muted-foreground">No data</span>
- )}
- </dd>
- </div>
- </dl>
- </Container>
- );
-}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/loading.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/loading.tsx
index 99f872a29..1caabf7e4 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/loading.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/loading.tsx
@@ -1,7 +1,7 @@
import { Skeleton } from "@openstatus/ui";
-import { Container } from "@/components/dashboard/container";
import { Header } from "@/components/dashboard/header";
+import {DataTableSkeleton} from "@/components/data-table/data-table-skeleton";
export default function Loading() {
return (
@@ -11,9 +11,9 @@ export default function Loading() {
<Skeleton className="h-9 w-20" />
</Header.Skeleton>
</div>
- <Container.Skeleton />
- <Container.Skeleton />
- <Container.Skeleton />
+ <div className="col-span-full w-full">
+ <DataTableSkeleton />
+ </div>
</div>
);
}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx
index 5ee81e667..80a57d834 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx
@@ -2,14 +2,14 @@ import * as React from "react";
import Link from "next/link";
import { allPlans } from "@openstatus/plans";
-import { Badge, Button, ButtonWithDisableTooltip } from "@openstatus/ui";
+import { ButtonWithDisableTooltip } from "@openstatus/ui";
-import { Container } from "@/components/dashboard/container";
import { Header } from "@/components/dashboard/header";
+import { HelpCallout } from "@/components/dashboard/help-callout";
import { Limit } from "@/components/dashboard/limit";
-import { cn } from "@/lib/utils";
+import { columns } from "@/components/data-table/status-page/columns";
+import { DataTable } from "@/components/data-table/status-page/data-table";
import { api } from "@/trpc/server";
-import { ActionButton } from "./_components/action-button";
import { EmptyState } from "./_components/empty-state";
// export const revalidate = 0;
@@ -38,7 +38,7 @@ export default async function Page({
const disableButton = isLimit || !Boolean(monitors);
return (
- <div className="grid gap-6 md:grid-cols-2 md:gap-8">
+ <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-2 md:gap-8">
<Header
title="Status Page"
description="Overview of all your status pages."
@@ -53,55 +53,18 @@ export default async function Page({
}
/>
{Boolean(pages?.length) ? (
- pages?.map((page, index) => (
- <Container
- key={index}
- title={page.title}
- description={page.description}
- actions={
- <ActionButton
- page={{
- ...page,
- workspaceSlug: params.workspaceSlug,
- monitors: page.monitorsToPages.map(
- ({ monitor }) => monitor.id,
- ),
- }}
- />
- }
- >
- <dl className="[&_dt]:text-muted-foreground grid gap-2 [&>*]:text-sm [&_dt]:font-light">
- <div className="flex min-w-0 items-center justify-between gap-3">
- <dt>Slug</dt>
- <dd className="font-mono">{page.slug}</dd>
- </div>
- <div className="flex min-w-0 items-center justify-between gap-3">
- <dt>Monitors</dt>
- <dd className="flex flex-wrap justify-end gap-2">
- {page.monitorsToPages.map(
- ({ monitor: { id, name, active } }) => (
- <Link key={id} href={`./monitors/edit?id=${id}`}>
- <Badge variant={active ? "default" : "outline"}>
- {name}
- <span
- className={cn(
- "ml-1 inline-block h-1.5 w-1.5 rounded-full",
- active ? "bg-green-500" : "bg-red-500",
- )}
- />
- </Badge>
- </Link>
- ),
- )}
- </dd>
- </div>
- </dl>
- </Container>
- ))
+ <div className="col-span-full">
+ {pages && <DataTable columns={columns} data={pages} />}
+ <div className="mt-3">{isLimit ? <Limit /> : null}</div>
+ </div>
) : (
- <EmptyState allMonitors={monitors} />
+ <div className="col-span-full">
+ <EmptyState allMonitors={monitors} />
+ </div>
)}
- {isLimit ? <Limit /> : null}
+ <div className="mt-8 md:mt-12">
+ <HelpCallout />
+ </div>
</div>
);
}
diff --git a/apps/web/src/components/dashboard/help-callout.tsx b/apps/web/src/components/dashboard/help-callout.tsx
new file mode 100644
index 000000000..3af7642ee
--- /dev/null
+++ b/apps/web/src/components/dashboard/help-callout.tsx
@@ -0,0 +1,30 @@
+import { HelpCircle } from "lucide-react";
+
+import { Alert, AlertDescription, AlertTitle } from "@openstatus/ui";
+
+export function HelpCallout() {
+ return (
+ <Alert className="max-w-xl">
+ <HelpCircle className="h-4 w-4" />
+ <AlertTitle className="">Need help?</AlertTitle>
+ <AlertDescription className="text-muted-foreground">
+ Let us know at{" "}
+ <a
+ href="mailto:[email protected]"
+ className="text-foreground font-medium underline hover:no-underline"
+ >
+ </a>{" "}
+ or join our{" "}
+ <a
+ href="/discord"
+ target="_blank"
+ className="text-foreground font-medium underline hover:no-underline"
+ >
+ Discord
+ </a>
+ .
+ </AlertDescription>
+ </Alert>
+ );
+}
diff --git a/apps/web/src/components/data-table/columns.tsx b/apps/web/src/components/data-table/columns.tsx
index ad438887f..2bd81dab5 100644
--- a/apps/web/src/components/data-table/columns.tsx
+++ b/apps/web/src/components/data-table/columns.tsx
@@ -4,7 +4,6 @@ import type { ColumnDef } from "@tanstack/react-table";
import { format } from "date-fns";
import type { Ping } from "@openstatus/tinybird";
-import { Badge } from "@openstatus/ui";
import { regionsDict } from "@/data/regions-dictionary";
import { DataTableColumnHeader } from "./data-table-column-header";
diff --git a/apps/web/src/components/data-table/data-table-skeleton.tsx b/apps/web/src/components/data-table/data-table-skeleton.tsx
new file mode 100644
index 000000000..9e709e800
--- /dev/null
+++ b/apps/web/src/components/data-table/data-table-skeleton.tsx
@@ -0,0 +1,64 @@
+import {
+ Skeleton, // @/components/skeleton
+ Table, // @/components/table
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@openstatus/ui";
+
+interface DataTableSkeletonProps {
+ /**
+ * Number of rows to render
+ * @default 3
+ */
+ rows?: number;
+}
+
+export function DataTableSkeleton({ rows = 3 }: DataTableSkeletonProps) {
+ return (
+ <div className="rounded-md border">
+ <Table>
+ <TableHeader className="bg-muted/50">
+ <TableRow className="hover:bg-transparent">
+ <TableHead>
+ <Skeleton className="my-1.5 h-4 w-24" />
+ </TableHead>
+ <TableHead className="hidden sm:table-cell">
+ <Skeleton className="my-1.5 h-4 w-32" />
+ </TableHead>
+ <TableHead className="hidden md:table-cell">
+ <Skeleton className="my-1.5 h-4 w-16" />
+ </TableHead>
+ <TableHead>
+ <Skeleton className="my-1.5 h-4 w-20" />
+ </TableHead>
+ <TableHead className="flex items-center justify-end"></TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {new Array(rows).fill(0).map((_, i) => (
+ <TableRow key={i} className="hover:bg-transparent">
+ <TableCell>
+ <Skeleton className="my-1.5 h-4 w-full max-w-[10rem]" />
+ </TableCell>
+ <TableCell className="hidden sm:table-cell">
+ <Skeleton className="my-1.5 h-4 w-full max-w-[13rem]" />
+ </TableCell>
+ <TableCell className="hidden md:table-cell">
+ <Skeleton className="my-1.5 h-4 w-24" />
+ </TableCell>
+ <TableCell>
+ <Skeleton className="my-1.5 h-4 w-full max-w-[10rem]" />
+ </TableCell>
+ <TableCell className="flex justify-end">
+ <Skeleton className="my-1.5 h-5 w-5" />
+ </TableCell>
+ </TableRow>
+ ))}
+ </TableBody>
+ </Table>
+ </div>
+ );
+}
diff --git a/apps/web/src/components/data-table/monitor/columns.tsx b/apps/web/src/components/data-table/monitor/columns.tsx
new file mode 100644
index 000000000..3572dcbd4
--- /dev/null
+++ b/apps/web/src/components/data-table/monitor/columns.tsx
@@ -0,0 +1,102 @@
+"use client";
+
+import type { ColumnDef } from "@tanstack/react-table";
+import * as z from "zod";
+
+import type { ExtendedMonitor } from "@openstatus/db/src/schema";
+import { Badge } from "@openstatus/ui";
+
+import { DataTableStatusBadge } from "../data-table-status-badge";
+import { DataTableRowActions } from "./data-table-row-actions";
+
+export const columns: ColumnDef<
+ ExtendedMonitor & { lastStatusCode?: number }
+>[] = [
+ {
+ accessorKey: "name",
+ header: "Name",
+ cell: ({ row }) => {
+ const active = row.getValue("active");
+ return (
+ // TODO: add Link on click when we have a better details page
+ <div className="flex items-center gap-2">
+ {active ? (
+ <span className="relative flex h-2 w-2">
+ <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75 duration-1000" />
+ <span className="relative inline-flex h-2 w-2 rounded-full bg-green-500" />
+ </span>
+ ) : (
+ <span className="relative flex h-2 w-2">
+ <span className="absolute inline-flex h-2 w-2 rounded-full bg-red-500" />
+ </span>
+ )}
+ <span className="max-w-[125px] truncate">{row.getValue("name")}</span>
+ {!active ? <Badge variant="outline">paused</Badge> : null}
+ </div>
+ );
+ },
+ },
+ {
+ accessorKey: "url",
+ header: "URL",
+ cell: ({ row }) => {
+ return (
+ <div className="flex">
+ <span className="max-w-[150px] truncate font-medium sm:max-w-[200px] lg:max-w-[250px] xl:max-w-[350px]">
+ {row.getValue("url")}
+ </span>
+ </div>
+ );
+ },
+ },
+ {
+ // hidden by `columnVisibility` in `data-table.tsx` but used via row.getValue("active")
+ accessorKey: "active",
+ header: "Active",
+ cell: ({ row }) => {
+ const active = row.getValue("active");
+ if (!active) {
+ return <span className="text-muted-foreground">paused</span>;
+ }
+ return <span>running</span>;
+ },
+ },
+ {
+ accessorKey: "lastStatusCode",
+ 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>
+ )}
+ </>
+ );
+ },
+ },
+ {
+ accessorKey: "periodicity",
+ header: "Frequency",
+ cell: ({ row }) => {
+ return <span className="font-mono">{row.getValue("periodicity")}</span>;
+ },
+ },
+ {
+ id: "actions",
+ cell: ({ row }) => {
+ return (
+ <div className="text-right">
+ <DataTableRowActions row={row} />
+ </div>
+ );
+ },
+ },
+];
diff --git a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
new file mode 100644
index 000000000..d02edd8f4
--- /dev/null
+++ b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
@@ -0,0 +1,129 @@
+"use client";
+
+import type { Row } from "@tanstack/react-table";
+import { MoreHorizontal } from "lucide-react";
+
+import {
+ Button,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+ AlertDialogTrigger,
+} from "@openstatus/ui";
+import { selectMonitorExtendedSchema } from "@openstatus/db/src/schema";
+
+import * as React from "react";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { LoadingAnimation } from "@/components/loading-animation";
+import { useToastAction } from "@/hooks/use-toast-action";
+import { api } from "@/trpc/client";
+
+interface DataTableRowActionsProps<TData> {
+ row: Row<TData>;
+}
+
+export function DataTableRowActions<TData>({
+ row,
+}: DataTableRowActionsProps<TData>) {
+ const monitor = selectMonitorExtendedSchema.parse(row.original);
+ const router = useRouter();
+ const { toast } = useToastAction();
+ const [alertOpen, setAlertOpen] = React.useState(false);
+ const [isPending, startTransition] = React.useTransition();
+
+ async function onDelete() {
+ startTransition(async () => {
+ try {
+ if (!monitor.id) return;
+ await api.monitor.deleteMonitor.mutate({ id: monitor.id });
+ toast("deleted");
+ router.refresh();
+ setAlertOpen(false);
+ } catch {
+ toast("error");
+ }
+ });
+ }
+
+ async function onTest() {
+ startTransition(async () => {
+ const { url, body, method, headers } = monitor;
+ const res = await fetch(`/api/checker/test`, {
+ method: "POST",
+ headers: new Headers({
+ "Content-Type": "application/json",
+ }),
+ body: JSON.stringify({ url, body, method, headers }),
+ });
+ if (res.ok) {
+ toast("test-success");
+ } else {
+ toast("test-error");
+ }
+ });
+ }
+
+ return (
+ <AlertDialog open={alertOpen} onOpenChange={(value) => setAlertOpen(value)}>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ variant="ghost"
+ className="data-[state=open]:bg-accent h-8 w-8 p-0"
+ >
+ <span className="sr-only">Open menu</span>
+ <MoreHorizontal className="h-4 w-4" />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <Link href={`./monitors/edit?id=${monitor.id}`}>
+ <DropdownMenuItem>Edit</DropdownMenuItem>
+ </Link>
+ <Link href={`./monitors/${monitor.id}/data`}>
+ <DropdownMenuItem>Details</DropdownMenuItem>
+ </Link>
+ <DropdownMenuItem onClick={onTest}>Test</DropdownMenuItem>
+ <AlertDialogTrigger asChild>
+ <DropdownMenuItem className="text-destructive focus:bg-destructive focus:text-background">
+ Delete
+ </DropdownMenuItem>
+ </AlertDialogTrigger>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ <AlertDialogContent>
+ <AlertDialogHeader>
+ <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+ <AlertDialogDescription>
+ This action cannot be undone. This will permanently delete the
+ monitor.
+ </AlertDialogDescription>
+ </AlertDialogHeader>
+ <AlertDialogFooter>
+ <AlertDialogCancel>Cancel</AlertDialogCancel>
+ <AlertDialogAction
+ onClick={(e) => {
+ e.preventDefault();
+ onDelete();
+ }}
+ disabled={isPending}
+ className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+ >
+ {!isPending ? "Delete" : <LoadingAnimation />}
+ </AlertDialogAction>
+ </AlertDialogFooter>
+ </AlertDialogContent>
+ </AlertDialog>
+ );
+}
+
+
diff --git a/apps/web/src/components/data-table/monitor/data-table.tsx b/apps/web/src/components/data-table/monitor/data-table.tsx
new file mode 100644
index 000000000..3043f47f0
--- /dev/null
+++ b/apps/web/src/components/data-table/monitor/data-table.tsx
@@ -0,0 +1,111 @@
+"use client";
+
+import * as React from "react";
+import type { ColumnDef, VisibilityState } from "@tanstack/react-table";
+import {
+ flexRender,
+ getCoreRowModel,
+ useReactTable,
+} from "@tanstack/react-table";
+
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@openstatus/ui";
+
+interface DataTableProps<TData, TValue> {
+ columns: ColumnDef<TData, TValue>[];
+ data: TData[];
+}
+
+// FIXME: right now, the mobile layout is messed up
+// https://github.com/TanStack/table/discussions/3192#discussioncomment-6458134
+
+export function DataTable<TData, TValue>({
+ columns,
+ data,
+}: DataTableProps<TData, TValue>) {
+ const [columnVisibility, setColumnVisibility] =
+ React.useState<VisibilityState>({ active: false });
+ const table = useReactTable({
+ data,
+ columns,
+ state: { columnVisibility },
+ onColumnVisibilityChange: setColumnVisibility,
+ getCoreRowModel: getCoreRowModel(),
+ // defaultColumn: {
+ // minSize: 0,
+ // size: Number.MAX_SAFE_INTEGER,
+ // maxSize: Number.MAX_SAFE_INTEGER,
+ // },
+ });
+
+ return (
+ <div className="rounded-md border">
+ <Table>
+ <TableHeader className="bg-muted/50">
+ {table.getHeaderGroups().map((headerGroup) => (
+ <TableRow key={headerGroup.id} className="hover:bg-transparent">
+ {headerGroup.headers.map((header) => {
+ return (
+ <TableHead
+ key={header.id}
+ // className="max-w-0 truncate sm:max-w-full"
+ // style={{
+ // width:
+ // header.getSize() === Number.MAX_SAFE_INTEGER
+ // ? "auto"
+ // : header.getSize(),
+ // }}
+ >
+ {header.isPlaceholder
+ ? null
+ : flexRender(
+ header.column.columnDef.header,
+ header.getContext(),
+ )}
+ </TableHead>
+ );
+ })}
+ </TableRow>
+ ))}
+ </TableHeader>
+ <TableBody>
+ {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}
+ // className="max-w-0 truncate md:max-w-full"
+ // style={{
+ // width:
+ // cell.column.getSize() === Number.MAX_SAFE_INTEGER
+ // ? "auto"
+ // : cell.column.getSize(),
+ // }}
+ >
+ {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>
+ </div>
+ );
+}
diff --git a/apps/web/src/components/data-table/status-page/columns.tsx b/apps/web/src/components/data-table/status-page/columns.tsx
new file mode 100644
index 000000000..d4a206b59
--- /dev/null
+++ b/apps/web/src/components/data-table/status-page/columns.tsx
@@ -0,0 +1,95 @@
+"use client";
+
+import Image from "next/image";
+import type { ColumnDef } from "@tanstack/react-table";
+import * as z from "zod";
+
+import type { Page } from "@openstatus/db/src/schema";
+import { Badge } from "@openstatus/ui";
+
+import { formatDate } from "@/lib/utils";
+import { DataTableRowActions } from "./data-table-row-actions";
+
+// TODO: add total number of monitors
+
+export const columns: ColumnDef<
+ Page & { monitorsToPages: { monitor: { name: string } }[] }
+>[] = [
+ {
+ accessorKey: "title",
+ header: "Title",
+ cell: ({ row }) => {
+ return <span className="truncate">{row.getValue("title")}</span>;
+ },
+ },
+ {
+ accessorKey: "slug",
+ header: "Slug",
+ cell: ({ row }) => {
+ return <span className="font-mono">{row.getValue("slug")}</span>;
+ },
+ },
+ {
+ accessorKey: "monitorsToPages",
+ header: "Monitors",
+ cell: ({ row }) => {
+ const monitorsToPages = row.getValue("monitorsToPages");
+ const monitors = z
+ .object({ monitor: z.object({ name: z.string() }) })
+ .array()
+ .parse(monitorsToPages);
+ const amount = 3;
+ return (
+ <div className="flex items-center gap-2">
+ <span className="flex max-w-[150px] gap-2 truncate font-medium sm:max-w-[200px] lg:max-w-[250px] xl:max-w-[350px]">
+ {monitors.slice(0, amount).map(({ monitor: { name } }, i) => (
+ <Badge key={i} variant="outline">
+ {name}
+ </Badge>
+ ))}
+ </span>
+ <span className="font-medium">
+ {monitors.length > amount ? (
+ <span>+{monitors.length - amount}</span>
+ ) : null}
+ </span>
+ </div>
+ );
+ },
+ },
+ {
+ accessorKey: "icon",
+ header: "Favicon",
+ cell: ({ row }) => {
+ if (!row.getValue("icon")) {
+ return <span className="text-muted-foreground">Missing</span>;
+ }
+ return (
+ <Image
+ src={row.getValue("icon")}
+ alt=""
+ className="border-border rounded-sm border"
+ width={20}
+ height={20}
+ />
+ );
+ },
+ },
+ // {
+ // accessorKey: "createdAt",
+ // header: "Created",
+ // cell: ({ row }) => {
+ // return <span>{formatDate(row.getValue("createdAt"))}</span>;
+ // },
+ // },
+ {
+ id: "actions",
+ cell: ({ row }) => {
+ return (
+ <div className="text-right">
+ <DataTableRowActions row={row} />
+ </div>
+ );
+ },
+ },
+];
diff --git a/apps/web/src/components/data-table/status-page/data-table-row-actions.tsx b/apps/web/src/components/data-table/status-page/data-table-row-actions.tsx
new file mode 100644
index 000000000..0ec22df29
--- /dev/null
+++ b/apps/web/src/components/data-table/status-page/data-table-row-actions.tsx
@@ -0,0 +1,115 @@
+"use client";
+
+import * as React from "react";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import type { Row } from "@tanstack/react-table";
+import { MoreHorizontal } from "lucide-react";
+
+import { selectPageSchema } from "@openstatus/db/src/schema";
+import {
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+ AlertDialogTrigger,
+ Button,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from "@openstatus/ui";
+
+import { LoadingAnimation } from "@/components/loading-animation";
+import { useToastAction } from "@/hooks/use-toast-action";
+import { api } from "@/trpc/client";
+
+interface DataTableRowActionsProps<TData> {
+ row: Row<TData>;
+}
+
+export function DataTableRowActions<TData>({
+ row,
+}: DataTableRowActionsProps<TData>) {
+ const page = selectPageSchema.parse(row.original);
+ const router = useRouter();
+ const { toast } = useToastAction();
+ const [alertOpen, setAlertOpen] = React.useState(false);
+ const [isPending, startTransition] = React.useTransition();
+
+ async function onDelete() {
+ startTransition(async () => {
+ try {
+ if (!page.id) return;
+ await api.page.deletePage.mutate({ id: page.id });
+ toast("deleted");
+ router.refresh();
+ setAlertOpen(false);
+ } catch {
+ toast("error");
+ }
+ });
+ }
+
+ return (
+ <AlertDialog open={alertOpen} onOpenChange={(value) => setAlertOpen(value)}>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ variant="ghost"
+ className="data-[state=open]:bg-accent h-8 w-8 p-0"
+ >
+ <span className="sr-only">Open menu</span>
+ <MoreHorizontal className="h-4 w-4" />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <Link href={`./status-pages/edit?id=${page.id}`}>
+ <DropdownMenuItem>Edit</DropdownMenuItem>
+ </Link>
+ <Link
+ href={
+ process.env.NODE_ENV === "production"
+ ? `https://${page.slug}.openstatus.dev`
+ : `/status-page/${page.slug}`
+ }
+ target="_blank"
+ >
+ <DropdownMenuItem>Visit</DropdownMenuItem>
+ </Link>
+ <AlertDialogTrigger asChild>
+ <DropdownMenuItem className="text-destructive focus:bg-destructive focus:text-background">
+ Delete
+ </DropdownMenuItem>
+ </AlertDialogTrigger>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ <AlertDialogContent>
+ <AlertDialogHeader>
+ <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+ <AlertDialogDescription>
+ This action cannot be undone. This will permanently delete the
+ monitor.
+ </AlertDialogDescription>
+ </AlertDialogHeader>
+ <AlertDialogFooter>
+ <AlertDialogCancel>Cancel</AlertDialogCancel>
+ <AlertDialogAction
+ onClick={(e) => {
+ e.preventDefault();
+ onDelete();
+ }}
+ disabled={isPending}
+ className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+ >
+ {!isPending ? "Delete" : <LoadingAnimation />}
+ </AlertDialogAction>
+ </AlertDialogFooter>
+ </AlertDialogContent>
+ </AlertDialog>
+ );
+}
diff --git a/apps/web/src/components/data-table/status-page/data-table.tsx b/apps/web/src/components/data-table/status-page/data-table.tsx
new file mode 100644
index 000000000..bbe2814b4
--- /dev/null
+++ b/apps/web/src/components/data-table/status-page/data-table.tsx
@@ -0,0 +1,81 @@
+"use client";
+
+import * as React from "react";
+import type { ColumnDef } from "@tanstack/react-table";
+import {
+ flexRender,
+ getCoreRowModel,
+ useReactTable,
+} from "@tanstack/react-table";
+
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@openstatus/ui";
+
+interface DataTableProps<TData, TValue> {
+ columns: ColumnDef<TData, TValue>[];
+ data: TData[];
+}
+
+export function DataTable<TData, TValue>({
+ columns,
+ data,
+}: DataTableProps<TData, TValue>) {
+ const table = useReactTable({
+ data,
+ columns,
+ getCoreRowModel: getCoreRowModel(),
+ });
+
+ return (
+ <div className="rounded-md border">
+ <Table>
+ <TableHeader className="bg-muted/50">
+ {table.getHeaderGroups().map((headerGroup) => (
+ <TableRow key={headerGroup.id} className="hover:bg-transparent">
+ {headerGroup.headers.map((header) => {
+ return (
+ <TableHead key={header.id}>
+ {header.isPlaceholder
+ ? null
+ : flexRender(
+ header.column.columnDef.header,
+ header.getContext(),
+ )}
+ </TableHead>
+ );
+ })}
+ </TableRow>
+ ))}
+ </TableHeader>
+ <TableBody>
+ {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>
+ </div>
+ );
+}
diff --git a/apps/web/src/components/incidents/status-badge.tsx b/apps/web/src/components/incidents/status-badge.tsx
index 9e917dc26..537942876 100644
--- a/apps/web/src/components/incidents/status-badge.tsx
+++ b/apps/web/src/components/incidents/status-badge.tsx
@@ -4,19 +4,32 @@ import { statusDict } from "@/data/incidents-dictionary";
import { cn } from "@/lib/utils";
import { Icons } from "../icons";
-export function StatusBadge({ status }: { status: keyof typeof statusDict }) {
+export function StatusBadge({
+ status,
+ className,
+}: {
+ status: keyof typeof statusDict;
+ className?: string;
+}) {
const { label, icon } = statusDict[status];
const Icon = Icons[icon];
return (
<Badge
variant="outline"
- className={cn("ml-2 font-normal", {
- "border-red-600/20 bg-red-50 text-red-600": status === "investigating",
- "border-yellow-600/20 bg-yellow-50 text-yellow-600":
- status === "identified",
- "border-blue-600/20 bg-blue-50 text-blue-600": status === "monitoring",
- "border-green-600/20 bg-green-50 text-green-600": status === "resolved",
- })}
+ className={cn(
+ "font-normal",
+ {
+ "border-red-600/20 bg-red-50 text-red-600":
+ status === "investigating",
+ "border-yellow-600/20 bg-yellow-50 text-yellow-600":
+ status === "identified",
+ "border-blue-600/20 bg-blue-50 text-blue-600":
+ status === "monitoring",
+ "border-green-600/20 bg-green-50 text-green-600":
+ status === "resolved",
+ },
+ className,
+ )}
>
<Icon className="mr-1 h-3 w-3" />
{label}
diff --git a/apps/web/src/components/layout/app-header.tsx b/apps/web/src/components/layout/app-header.tsx
index 2af2f04c2..3b39cbc0b 100644
--- a/apps/web/src/components/layout/app-header.tsx
+++ b/apps/web/src/components/layout/app-header.tsx
@@ -2,6 +2,7 @@
import Link from "next/link";
import { UserButton, useUser } from "@clerk/nextjs";
+import { ArrowUpRight } from "lucide-react";
import { Button, Skeleton } from "@openstatus/ui";
@@ -30,8 +31,15 @@ export function AppHeader() {
OpenStatus
</Link>
<div className="flex items-center gap-4">
- {/* can be moved to a different place */}
<ul className="flex gap-2">
+ <li className="w-full">
+ <Button variant="link" asChild>
+ <Link href="https://docs.openstatus.dev" target="_blank">
+ Docs
+ <ArrowUpRight className="ml-1 h-4 w-4 flex-shrink-0" />
+ </Link>
+ </Button>
+ </li>
{socialsConfig.map(({ title, href, icon }) => {
const Icon = Icons[icon];
return (
@@ -45,11 +53,12 @@ export function AppHeader() {
);
})}
</ul>
- {!isLoaded && !isSignedIn ? (
+ <div className="relative">
<Skeleton className="h-8 w-8 rounded-full" />
- ) : (
- <UserButton />
- )}
+ <div className="absolute inset-0">
+ {isLoaded && isSignedIn && <UserButton />}
+ </div>
+ </div>
</div>
</Shell>
</header>
diff --git a/apps/web/src/components/layout/app-sidebar.tsx b/apps/web/src/components/layout/app-sidebar.tsx
index 2a46d38da..e8dcf860f 100644
--- a/apps/web/src/components/layout/app-sidebar.tsx
+++ b/apps/web/src/components/layout/app-sidebar.tsx
@@ -17,14 +17,14 @@ export function AppSidebar() {
{pagesConfig.map(({ title, href, icon, disabled }) => {
const Icon = Icons[icon];
const link = `/app/${params?.workspaceSlug}${href}`;
+ const isActive = pathname?.startsWith(link);
return (
<li key={title} className="w-full">
<Link
href={link}
className={cn(
"hover:bg-muted/50 hover:text-foreground text-muted-foreground group flex w-full min-w-[200px] items-center rounded-md border border-transparent px-3 py-1",
- pathname?.startsWith(link) &&
- "bg-muted/50 border-border text-foreground",
+ isActive && "bg-muted/50 border-border text-foreground", // font-semibold
disabled && "pointer-events-none opacity-60",
)}
>
diff --git a/apps/web/src/components/status-page/incident-list.tsx b/apps/web/src/components/status-page/incident-list.tsx
index 80a828b97..02fccdb8f 100644
--- a/apps/web/src/components/status-page/incident-list.tsx
+++ b/apps/web/src/components/status-page/incident-list.tsx
@@ -49,7 +49,7 @@ export const IncidentList = ({
<div key={incident.id} className="grid gap-4 text-left">
<div className="max-w-3xl font-semibold">
{incident.title}
- <StatusBadge status={incident.status} />
+ <StatusBadge status={incident.status} className="ml-2" />
</div>
<div className="overflow-hidden text-ellipsis">
<p className="text-muted-foreground mb-2 text-xs">
diff --git a/packages/db/src/schema/monitor.ts b/packages/db/src/schema/monitor.ts
index 9b1334762..f70a86e35 100644
--- a/packages/db/src/schema/monitor.ts
+++ b/packages/db/src/schema/monitor.ts
@@ -141,6 +141,7 @@ export const selectMonitorSchema = createSelectSchema(monitor, {
method: z.enum(METHODS).default("GET"),
});
+// FIXME: can be removed as we do not use the advanced tab anymore
export const selectMonitorExtendedSchema = selectMonitorSchema.extend({
method: z.enum(METHODS).default("GET"),
body: z
@@ -160,6 +161,7 @@ export const selectMonitorExtendedSchema = selectMonitorSchema.extend({
),
});
+// FIXME: ExtendedMonitor can be renamed to Monitor
export const allMonitorsExtendedSchema = z.array(selectMonitorExtendedSchema);
export type ExtendedMonitor = z.infer<typeof selectMonitorExtendedSchema>;
export type ExtendedMonitors = z.infer<typeof allMonitorsExtendedSchema>;
diff --git a/packages/db/src/schema/page.ts b/packages/db/src/schema/page.ts
index 936463bea..f26792f4d 100644
--- a/packages/db/src/schema/page.ts
+++ b/packages/db/src/schema/page.ts
@@ -3,7 +3,7 @@ import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
import { createInsertSchema, createSelectSchema } from "drizzle-zod";
import { z } from "zod";
-import { monitorsToPages } from "./monitor";
+import { monitor, monitorsToPages, selectMonitorSchema } from "./monitor";
import { workspace } from "./workspace";
export const page = sqliteTable("page", {
@@ -69,3 +69,4 @@ export const insertPageSchemaWithMonitors = insertPageSchema.extend({
// Schema for selecting a Page - can be used to validate API responses
export const selectPageSchema = createSelectSchema(page);
+export type Page = z.infer<typeof selectPageSchema>;