Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
fix: monitor to page relation including form defaults (#82)
Maximilian Kaske33b40db8aa9f
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/_components/action-button.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/_components/action-button.tsxindex 812d9b87a..31a29a6bb 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/_components/action-button.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/_components/action-button.tsx@@ -1,6 +1,7 @@"use client";import * as React from "react";+import Link from "next/link";import { useRouter } from "next/navigation";import { MoreVertical } from "lucide-react";import type * as z from "zod";@@ -8,7 +9,6 @@ import type * as z from "zod";import type {allMonitorsSchema,insertPageSchemaWithMonitors,- selectPageSchema,} from "@openstatus/db/src/schema";import { StatusPageForm } from "@/components/forms/status-page-form";@@ -42,7 +42,7 @@ import {} from "@/components/ui/dropdown-menu";import { api } from "@/trpc/client";-type PageSchema = z.infer<typeof selectPageSchema>;+type PageSchema = z.infer<typeof insertPageSchemaWithMonitors>;// allMonitorsinterface ActionButtonProps {@@ -99,6 +99,9 @@ export function ActionButton({ page, allMonitors }: ActionButtonProps) {<DialogTrigger asChild><DropdownMenuItem>Edit</DropdownMenuItem></DialogTrigger>+ <DropdownMenuItem>+ <Link href={`/status-page/${page.slug}`}>View</Link>+ </DropdownMenuItem><AlertDialogTrigger asChild><DropdownMenuItem className="text-destructive focus:bg-destructive focus:text-background">Deletediff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/page.tsxindex 1b24cef69..ec205aa20 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/page.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/page.tsx@@ -13,7 +13,7 @@ export default async function Page({params: { workspaceId: string };}) {const workspaceId = Number(params.workspaceId);- const pages = await api.page.getPageByWorkspace.query({+ const pages = await api.page.getPagesByWorkspace.query({workspaceId,});const monitors = await api.monitor.getMonitorsByWorkspace.query({@@ -39,7 +39,13 @@ export default async function Page({title={page.title}description={page.description}>- <ActionButton page={page} allMonitors={monitors} />+ <ActionButton+ page={{+ ...page,+ monitors: page.monitorsToPages.map(({ monitor }) => monitor.id),+ }}+ allMonitors={monitors}+ /><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>diff --git a/apps/web/src/app/status-page/[domain]/page.tsx b/apps/web/src/app/status-page/[domain]/page.tsxindex 99cae098f..146ecfe90 100644--- a/apps/web/src/app/status-page/[domain]/page.tsx+++ b/apps/web/src/app/status-page/[domain]/page.tsx@@ -20,7 +20,7 @@ export default async function Page({ params }: { params: { domain: string } }) {<Headertitle={page.title}description={page.description}- className="max-w-lg"+ className="mx-auto max-w-lg lg:mx-auto"/><MonitorList monitors={page.monitors} /></div>diff --git a/apps/web/src/components/forms/status-page-form.tsx b/apps/web/src/components/forms/status-page-form.tsxindex a5a5a2dd7..e5eb7f479 100644--- a/apps/web/src/components/forms/status-page-form.tsx+++ b/apps/web/src/components/forms/status-page-form.tsx@@ -46,7 +46,7 @@ export function StatusPageForm({title: defaultValues?.title || "",slug: defaultValues?.slug || "",description: defaultValues?.description || "",- monitors: [],+ monitors: defaultValues?.monitors ?? [],workspaceId: 0,},});diff --git a/apps/web/src/components/status-page/monitor-list.tsx b/apps/web/src/components/status-page/monitor-list.tsxindex 802384741..f6e0763ec 100644--- a/apps/web/src/components/status-page/monitor-list.tsx+++ b/apps/web/src/components/status-page/monitor-list.tsx@@ -1,7 +1,10 @@+import Link from "next/link";import type { z } from "zod";import type { selectMonitorSchema } from "@openstatus/db/src/schema";+import { EmptyState } from "../dashboard/empty-state";+import { Button } from "../ui/button";import { Monitor } from "./monitor";export const MonitorList = ({@@ -11,12 +14,25 @@ export const MonitorList = ({}) => {return (<div className="grid gap-4">- {monitors?.map((monitor, index) => (- <div key={index}>- {/* Fetch tracker and data */}- <Monitor monitor={monitor} />- </div>- ))}+ {Boolean(monitors.length) ? (+ monitors.map((monitor, index) => (+ <div key={index}>+ {/* Fetch tracker and data */}+ <Monitor monitor={monitor} />+ </div>+ ))+ ) : (+ <EmptyState+ icon="activity"+ title="Missing Monitors"+ description="Fill your status page with monitors."+ action={+ <Button asChild>+ <Link href="/app">Go to Dashboard</Link>+ </Button>+ }+ />+ )}</div>);};diff --git a/apps/web/src/components/tracker.tsx b/apps/web/src/components/tracker.tsxindex c79ecd004..8bd6d9176 100644--- a/apps/web/src/components/tracker.tsx+++ b/apps/web/src/components/tracker.tsx@@ -69,7 +69,10 @@ export function Tracker({},);- const totalUptime = ((reducedData.ok / reducedData.count) * 100).toFixed(2);+ const uptime =+ reducedData.count !== 0+ ? `${((reducedData.ok / reducedData.count) * 100).toFixed(2)}% uptime`+ : "";return (<div className="mx-auto max-w-max">@@ -78,9 +81,7 @@ export function Tracker({<p className="text-foreground font-semibold">{name}</p><MoreInfo {...{ url, id, context }} /></div>- <p className="text-muted-foreground font-light">- {`${totalUptime}%`} uptime- </p>+ <p className="text-muted-foreground font-light">{uptime}</p></div><div className="relative"><div className="z-[-1] flex gap-0.5">diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.tsindex 8720dad9b..d67ca16d4 100644--- a/packages/api/src/router/monitor.ts+++ b/packages/api/src/router/monitor.ts@@ -5,6 +5,7 @@ import {allMonitorsSchema,insertMonitorSchema,monitor,+ monitorsToPages,user,usersToWorkspaces,} from "@openstatus/db/src/schema";@@ -187,8 +188,15 @@ export const monitorRouter = createTRPCRouter({.get();if (!result || !result.users_to_workspaces) return;-- opts.ctx.db.delete(monitor).where(eq(monitor.id, opts.input.monitorId));+ // TODO: remove all the many-to-many relations to `pages`+ opts.ctx.db+ .delete(monitorsToPages)+ .where(eq(monitorsToPages.monitorId, opts.input.monitorId))+ .run();+ opts.ctx.db+ .delete(monitor)+ .where(eq(monitor.id, opts.input.monitorId))+ .run();}),getMonitorsByWorkspace: protectedProcedure.input(z.object({ workspaceId: z.number() }))diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.tsindex 70ee8bda0..3b1f786ea 100644--- a/packages/api/src/router/page.ts+++ b/packages/api/src/router/page.ts@@ -27,7 +27,7 @@ export const pageRouter = createTRPCRouter({.values(pageInput).returning().get();- if (monitors) {+ if (monitors && monitors.length > 0) {// We should make sure the user has access to the monitorsconst values = monitors.map((monitorId) => ({monitorId: monitorId,@@ -67,26 +67,57 @@ export const pageRouter = createTRPCRouter({.mutation(async (opts) => {const { monitors, ...pageInput } = opts.input;- await opts.ctx.db+ const currentPage = await opts.ctx.db.update(page).set(pageInput).where(eq(page.id, Number(opts.input.id))).returning().get();- if (monitors) {- // We should make sure the user has access to the monitors- const values = monitors.map((monitorId) => ({+ // TODO: optimize!+ const currentMonitorsToPages = await opts.ctx.db+ .select()+ .from(monitorsToPages)+ .where(eq(monitorsToPages.pageId, currentPage.id))+ .all();++ const currentMonitorsToPagesIds = currentMonitorsToPages.map(+ ({ monitorId }) => monitorId,+ );++ const removedMonitors = currentMonitorsToPagesIds.filter(+ (x) => !monitors?.includes(x),+ );++ const addedMonitors = monitors?.filter(+ (x) => !currentMonitorsToPagesIds?.includes(x),+ );++ if (addedMonitors && addedMonitors.length > 0) {+ const values = addedMonitors.map((monitorId) => ({monitorId: monitorId,pageId: Number(opts.input.id),}));await opts.ctx.db.insert(monitorsToPages).values(values).run();}++ if (removedMonitors && removedMonitors.length > 0) {+ await opts.ctx.db+ .delete(monitorsToPages)+ .where(+ and(+ eq(monitorsToPages.pageId, Number(opts.input.id)),+ inArray(monitorsToPages.monitorId, removedMonitors),+ ),+ )+ .run();+ }}),deletePage: protectedProcedure.input(z.object({ pageId: z.number() })).mutation(async (opts) => {+ // TODO: this looks not very affectiveconst currentUser = await opts.ctx.db.select().from(user)@@ -99,6 +130,7 @@ export const pageRouter = createTRPCRouter({.where(eq(usersToWorkspaces.userId, Number(currentUser.id))).all();const workspaceIds = result.map((workspace) => workspace.workspaceId);+ // two queries - can we reduce it?const pageToDelete = await opts.ctx.db.select()@@ -111,9 +143,15 @@ export const pageRouter = createTRPCRouter({).get();if (!pageToDelete) return;- await opts.ctx.db.delete(page).where(eq(page.id, opts.input.pageId));+ // TODO: remove all the many-to-many monitors+ opts.ctx.db+ .delete(monitorsToPages)+ .where(eq(monitorsToPages.pageId, opts.input.pageId))+ .run();+ opts.ctx.db.delete(page).where(eq(page.id, opts.input.pageId)).run();}),- getPageByWorkspace: protectedProcedure++ getPagesByWorkspace: protectedProcedure.input(z.object({ workspaceId: z.number() })).query(async (opts) => {const currentUser = await opts.ctx.db@@ -129,16 +167,15 @@ export const pageRouter = createTRPCRouter({.all();const workspaceIds = result.map((workspace) => workspace.workspaceId);- return opts.ctx.db- .select()- .from(page)- .where(- and(- eq(page.workspaceId, opts.input.workspaceId),- inArray(page.workspaceId, workspaceIds),- ),- )- .all();+ return opts.ctx.db.query.page.findMany({+ where: and(+ eq(page.workspaceId, opts.input.workspaceId),+ inArray(page.workspaceId, workspaceIds),+ ),+ with: {+ monitorsToPages: { with: { monitor: true } },+ },+ });}),// public if we use trpc hooks to get the page from the url@@ -160,18 +197,25 @@ export const pageRouter = createTRPCRouter({.from(monitorsToPages).where(eq(monitorsToPages.pageId, result.id)).all();+const monitorsId = monitorsToPagesResult.map((monitor) => monitor.monitorId,);++ const selectPageSchemaWithRelation = selectPageSchema.extend({+ monitors: z.array(selectMonitorSchema),+ incidents: z.array(selectIncidentSchema),+ });++ if (monitorsId.length === 0) {+ return selectPageSchemaWithRelation.parse({ ...result, monitors: [] });+ } // no monitors for that page+const monitors = await opts.ctx.db.select().from(monitor).where(inArray(monitor.id, monitorsId)).all();- const selectPageSchemaWithRelation = selectPageSchema.extend({- monitors: z.array(selectMonitorSchema),- incidents: z.array(selectIncidentSchema),- });return selectPageSchemaWithRelation.parse({ ...result, monitors });}),