Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat: page-components [status-reports] [maintenance] [Part 2] (#1753)
Maximilian Kaskee37c94234d55
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/page.tsxindex 49b7f1f46..c8d897a24 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/page.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/page.tsx@@ -32,7 +32,7 @@ export default function Page() {const sendMaintenanceUpdateMutation = useMutation(trpc.emailRouter.sendMaintenance.mutationOptions(),);- const createStatusPageMutation = useMutation(+ const createMaintenanceMutation = useMutation(trpc.maintenance.new.mutationOptions({onSuccess: (maintenance) => {// TODO: move to server@@ -63,15 +63,15 @@ export default function Page() {</SectionHeader><div><FormSheetMaintenance- monitors={statusPage.monitors}+ pageComponents={statusPage.pageComponents}onSubmit={async (values) => {- await createStatusPageMutation.mutateAsync({+ await createMaintenanceMutation.mutateAsync({pageId: Number.parseInt(id),title: values.title,message: values.message,startDate: values.startDate,endDate: values.endDate,- monitors: values.monitors,+ pageComponents: values.pageComponents,notifySubscribers: values.notifySubscribers,});}}diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsxindex 51039180a..1c0678fa7 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx@@ -29,7 +29,6 @@ export default function Page() {const { data: statusReports, refetch } = useQuery(trpc.statusReport.list.queryOptions({ pageId: Number.parseInt(id) }),);- const { data: monitors } = useQuery(trpc.monitor.list.queryOptions());const sendStatusReportUpdateMutation = useMutation(trpc.emailRouter.sendStatusReport.mutationOptions(),);@@ -51,7 +50,7 @@ export default function Page() {}),);- if (!statusReports || !monitors || !page) return null;+ if (!statusReports || !page) return null;const hasUnresolvedIssue = statusReports.some((report) => report.status !== "resolved",@@ -82,7 +81,7 @@ export default function Page() {</>) : undefined}- monitors={page.monitors}+ pageComponents={page.pageComponents}onSubmit={async (values) => {// NOTE: for type safety, we need to check if the values have a date property// because of the union type@@ -91,7 +90,7 @@ export default function Page() {title: values.title,status: values.status,pageId: Number.parseInt(id),- monitors: values.monitors,+ pageComponents: values.pageComponents,date: values.date,message: values.message,notifySubscribers: values.notifySubscribers,diff --git a/apps/dashboard/src/components/data-table/maintenances/data-table-row-actions.tsx b/apps/dashboard/src/components/data-table/maintenances/data-table-row-actions.tsxindex b6412711a..eed2d2525 100644--- a/apps/dashboard/src/components/data-table/maintenances/data-table-row-actions.tsx+++ b/apps/dashboard/src/components/data-table/maintenances/data-table-row-actions.tsx@@ -74,13 +74,13 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {}}/><FormSheetMaintenance- monitors={statusPage?.monitors ?? []}+ pageComponents={statusPage?.pageComponents ?? []}defaultValues={{title: row.original.title,message: row.original.message,startDate: row.original.from,endDate: row.original.to,- monitors: row.original.monitors ?? [],+ pageComponents: row.original.pageComponents?.map((c) => c.id) ?? [],}}onSubmit={async (values) => {await updateMaintenanceMutation.mutateAsync({@@ -89,7 +89,7 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {message: values.message,startDate: values.startDate,endDate: values.endDate,- monitors: values.monitors,+ pageComponents: values.pageComponents,});}}>diff --git a/apps/dashboard/src/components/data-table/status-reports/columns.tsx b/apps/dashboard/src/components/data-table/status-reports/columns.tsxindex f0afeb004..6417c2047 100644--- a/apps/dashboard/src/components/data-table/status-reports/columns.tsx+++ b/apps/dashboard/src/components/data-table/status-reports/columns.tsx@@ -86,19 +86,23 @@ export const columns: ColumnDef<StatusReport>[] = [},},{- id: "monitors",- accessorFn: (row) => row.monitors,+ id: "pageComponents",+ accessorFn: (row) => row?.pageComponents,header: "Affected",cell: ({ row }) => {- const value = row.getValue("monitors");+ const value = row.getValue("pageComponents");if (Array.isArray(value) && value.length > 0 && "name" in value[0]) {return (<div className="flex flex-wrap gap-1">- {value.map((m) => (- <Link href={`/monitors/${m.id}`} key={m.id}>- <TableCellBadge value={m.name} />- </Link>- ))}+ {value.map((m) =>+ m.monitorId ? (+ <Link href={`/monitors/${m.monitorId}/overview`} key={m.id}>+ <TableCellBadge value={m.name} />+ </Link>+ ) : (+ <TableCellBadge value={m.name} key={m.id} />+ ),+ )}</div>);}diff --git a/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx b/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsxindex 9117ac51a..ba10faf5c 100644--- a/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx+++ b/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx@@ -123,16 +123,16 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {}}/><FormSheetStatusReport- monitors={page?.monitors ?? []}+ pageComponents={page?.pageComponents ?? []}defaultValues={{title: row.original.title,status: row.original.status,- monitors: row.original.monitors.map((m) => m.id),+ pageComponents: row.original.pageComponents?.map((c) => c.id) ?? [],}}onSubmit={async (values) => {await updateStatusReportMutation.mutateAsync({id: row.original.id,- monitors: values.monitors,+ pageComponents: values.pageComponents,title: values.title,status: values.status,});diff --git a/apps/dashboard/src/components/forms/maintenance/form.tsx b/apps/dashboard/src/components/forms/maintenance/form.tsxindex 70805090e..5b42b752a 100644--- a/apps/dashboard/src/components/forms/maintenance/form.tsx+++ b/apps/dashboard/src/components/forms/maintenance/form.tsx@@ -52,7 +52,7 @@ const schema = zmessage: z.string(),startDate: z.date(),endDate: z.date(),- monitors: z.array(z.number()),+ pageComponents: z.array(z.number()),notifySubscribers: z.boolean().optional(),}).refine((data) => data.endDate > data.startDate, {@@ -66,11 +66,11 @@ export function FormMaintenance({defaultValues,onSubmit,className,- monitors,+ pageComponents,...props}: Omit<React.ComponentProps<"form">, "onSubmit"> & {defaultValues?: FormValues;- monitors: { id: number; name: string; url: string }[];+ pageComponents: { id: number; name: string }[];onSubmit: (values: FormValues) => Promise<void>;}) {const trpc = useTRPC();@@ -86,7 +86,7 @@ export function FormMaintenance({message: "",startDate: new Date(),endDate: addDays(new Date(), 1),- monitors: [],+ pageComponents: [],notifySubscribers: true,},});@@ -416,31 +416,33 @@ export function FormMaintenance({<FormCardContent><FormFieldcontrol={form.control}- name="monitors"+ name="pageComponents"render={({ field }) => (<FormItem>- <FormLabel>Monitors</FormLabel>+ <FormLabel>Page Components</FormLabel><FormDescription>- Connected monitors will be automatically deactivated for the- period of time.+ Connected page components will be affected for the period of+ time.</FormDescription>- {monitors.length ? (+ {pageComponents.length ? (<div className="grid gap-3"><div className="flex items-center gap-2"><FormControl><Checkboxid="all"- checked={field.value?.length === monitors.length}+ checked={+ field.value?.length === pageComponents.length+ }onCheckedChange={(checked) => {field.onChange(- checked ? monitors.map((m) => m.id) : [],+ checked ? pageComponents.map((c) => c.id) : [],);}}/></FormControl><Label htmlFor="all">Select all</Label></div>- {monitors.map((item) => (+ {pageComponents.map((item) => (<div key={item.id} className="flex items-center gap-2"><FormControl><Checkbox@@ -460,7 +462,7 @@ export function FormMaintenance({</div>) : (<EmptyStateContainer>- <EmptyStateTitle>No monitors found</EmptyStateTitle>+ <EmptyStateTitle>No page components found</EmptyStateTitle></EmptyStateContainer>)}<FormMessage />diff --git a/apps/dashboard/src/components/forms/maintenance/sheet.tsx b/apps/dashboard/src/components/forms/maintenance/sheet.tsxindex 938e88587..71ac632e8 100644--- a/apps/dashboard/src/components/forms/maintenance/sheet.tsx+++ b/apps/dashboard/src/components/forms/maintenance/sheet.tsx@@ -22,11 +22,11 @@ export function FormSheetMaintenance({children,defaultValues,onSubmit,- monitors,+ pageComponents,...props}: Omit<React.ComponentProps<typeof FormSheetTrigger>, "onSubmit"> & {defaultValues?: FormValues;- monitors: { id: number; name: string; url: string }[];+ pageComponents: { id: number; name: string }[];onSubmit: (values: FormValues) => Promise<void>;}) {const [open, setOpen] = useState(false);@@ -46,7 +46,7 @@ export function FormSheetMaintenance({<FormCardGroup className="overflow-y-auto"><FormCard className="overflow-auto rounded-none border-none"><FormMaintenance- monitors={monitors}+ pageComponents={pageComponents}onSubmit={async (values) => {await onSubmit(values);setOpen(false);diff --git a/apps/dashboard/src/components/forms/status-report/form.tsx b/apps/dashboard/src/components/forms/status-report/form.tsxindex 6a2d24320..24355b932 100644--- a/apps/dashboard/src/components/forms/status-report/form.tsx+++ b/apps/dashboard/src/components/forms/status-report/form.tsx@@ -45,7 +45,10 @@ import { useIsMobile } from "@/hooks/use-mobile";import { useTRPC } from "@/lib/trpc/client";import { cn } from "@/lib/utils";import { zodResolver } from "@hookform/resolvers/zod";-import { statusReportStatus } from "@openstatus/db/src/schema";+import {+ type PageComponent,+ statusReportStatus,+} from "@openstatus/db/src/schema";import { useQuery } from "@tanstack/react-query";import { isTRPCClientError } from "@trpc/client";import { format } from "date-fns";@@ -60,7 +63,7 @@ const schema = z.object({title: z.string(),message: z.string(),date: z.date(),- monitors: z.array(z.number()),+ pageComponents: z.array(z.number()),notifySubscribers: z.boolean().optional(),});@@ -76,12 +79,12 @@ export function FormStatusReport({defaultValues,onSubmit,className,- monitors,+ pageComponents,...props}: Omit<React.ComponentProps<"form">, "onSubmit"> & {defaultValues?: FormValues;onSubmit: (values: FormValues) => Promise<void>;- monitors: { id: number; name: string }[];+ pageComponents: Pick<PageComponent, "id" | "name" | "type">[];}) {const trpc = useTRPC();const { data: workspace } = useQuery(@@ -96,7 +99,7 @@ export function FormStatusReport({title: "",message: "",date: new Date(),- monitors: [],+ pageComponents: [],notifySubscribers: true,},});@@ -349,30 +352,32 @@ export function FormStatusReport({<FormCardContent><FormFieldcontrol={form.control}- name="monitors"+ name="pageComponents"render={({ field }) => (<FormItem>- <FormLabel>Monitors</FormLabel>+ <FormLabel>Page Components</FormLabel><FormDescription>- Select the monitors you want to notify.+ Select the page components you want to notify.</FormDescription>- {monitors.length ? (+ {pageComponents.length ? (<div className="grid gap-3"><div className="flex items-center gap-2"><FormControl><Checkboxid="all"- checked={field.value?.length === monitors.length}+ checked={+ field.value?.length === pageComponents.length+ }onCheckedChange={(checked) => {field.onChange(- checked ? monitors.map((m) => m.id) : [],+ checked ? pageComponents.map((c) => c.id) : [],);}}/></FormControl><Label htmlFor="all">Select all</Label></div>- {monitors.map((item) => (+ {pageComponents.map((item) => (<div key={item.id} className="flex items-center gap-2"><FormControl><Checkbox@@ -392,7 +397,7 @@ export function FormStatusReport({</div>) : (<EmptyStateContainer>- <EmptyStateTitle>No monitors found</EmptyStateTitle>+ <EmptyStateTitle>No page components found</EmptyStateTitle></EmptyStateContainer>)}<FormMessage />diff --git a/apps/dashboard/src/components/forms/status-report/sheet.tsx b/apps/dashboard/src/components/forms/status-report/sheet.tsxindex 55054bfa7..d9bfdb2f4 100644--- a/apps/dashboard/src/components/forms/status-report/sheet.tsx+++ b/apps/dashboard/src/components/forms/status-report/sheet.tsx@@ -16,18 +16,19 @@ import {} from "@/components/forms/status-report/form";import { Button } from "@/components/ui/button";import { Separator } from "@/components/ui/separator";+import type { PageComponent } from "@openstatus/db/src/schema";import { useState } from "react";export function FormSheetStatusReport({children,defaultValues,onSubmit,- monitors,+ pageComponents,warning,}: Omit<React.ComponentProps<typeof FormSheetTrigger>, "onSubmit"> & {defaultValues?: FormValues;onSubmit: (values: FormValues) => Promise<void>;- monitors: { id: number; name: string }[];+ pageComponents: Pick<PageComponent, "id" | "name" | "type">[];warning?: React.ReactNode;}) {const [open, setOpen] = useState(false);@@ -58,7 +59,7 @@ export function FormSheetStatusReport({setOpen(false);}}defaultValues={defaultValues}- monitors={monitors}+ pageComponents={pageComponents}/></FormCard></FormCardGroup>diff --git a/packages/api/src/router/maintenance.ts b/packages/api/src/router/maintenance.tsindex 68280b172..2fe7e137f 100644--- a/packages/api/src/router/maintenance.ts+++ b/packages/api/src/router/maintenance.ts@@ -9,14 +9,16 @@ import {gte,inArray,lte,- syncMaintenanceToMonitorDeleteByMaintenance,- syncMaintenanceToMonitorInsertMany,+ syncMaintenanceToPageComponentDeleteByMaintenance,+ syncMaintenanceToPageComponentInsertMany,} from "@openstatus/db";import {maintenance,maintenancesToMonitors,- monitor,+ maintenancesToPageComponents,+ pageComponent,selectMaintenanceSchema,+ selectPageComponentSchema,} from "@openstatus/db/src/schema";import { Events } from "@openstatus/analytics";@@ -148,17 +150,28 @@ export const maintenanceRouter = createTRPCRouter({opts.input?.order === "asc"? asc(maintenance.createdAt): desc(maintenance.createdAt),- with: { maintenancesToMonitors: true },+ with: {+ maintenancesToMonitors: true,+ maintenancesToPageComponents: { with: { pageComponent: true } },+ },});const result = await query;- return selectMaintenanceSchema.array().parse(- result.map((m) => ({- ...m,- monitors: m.maintenancesToMonitors.map((m) => m.monitorId),- })),- );+ return selectMaintenanceSchema+ .extend({+ pageComponents: z.array(selectPageComponentSchema).prefault([]),+ })+ .array()+ .parse(+ result.map((m) => ({+ ...m,+ monitors: m.maintenancesToMonitors.map((m) => m.monitorId),+ pageComponents: m.maintenancesToPageComponents.map(+ ({ pageComponent }) => pageComponent,+ ),+ })),+ );}),new: protectedProcedure@@ -170,27 +183,27 @@ export const maintenanceRouter = createTRPCRouter({message: z.string(),startDate: z.coerce.date(),endDate: z.coerce.date(),- monitors: z.array(z.number()).optional(),+ pageComponents: z.array(z.number()).optional(),notifySubscribers: z.boolean().nullish(),}),).mutation(async (opts) => {// Check if the user has access to the monitors- if (opts.input.monitors?.length) {+ if (opts.input.pageComponents?.length) {const whereConditions: SQL[] = [- eq(monitor.workspaceId, opts.ctx.workspace.id),- inArray(monitor.id, opts.input.monitors),+ eq(pageComponent.workspaceId, opts.ctx.workspace.id),+ inArray(pageComponent.id, opts.input.pageComponents),];- const monitors = await opts.ctx.db+ const pageComponents = await opts.ctx.db.select()- .from(monitor)+ .from(pageComponent).where(and(...whereConditions)).all();- if (monitors.length !== opts.input.monitors.length) {+ if (pageComponents.length !== opts.input.pageComponents.length) {throw new TRPCError({code: "BAD_REQUEST",- message: "You do not have access to all the monitors",+ message: "You do not have access to all the page components",});}}@@ -209,18 +222,18 @@ export const maintenanceRouter = createTRPCRouter({.returning().get();- if (opts.input.monitors?.length) {- await tx.insert(maintenancesToMonitors).values(- opts.input.monitors.map((monitorId) => ({+ if (opts.input.pageComponents?.length) {+ await tx.insert(maintenancesToPageComponents).values(+ opts.input.pageComponents.map((pageComponentId) => ({maintenanceId: newMaintenance.id,- monitorId,+ pageComponentId,})),);- // Sync to page components- await syncMaintenanceToMonitorInsertMany(+ // Sync to monitors (inverse sync for backward compatibility)+ await syncMaintenanceToPageComponentInsertMany(tx,newMaintenance.id,- opts.input.monitors,+ opts.input.pageComponents,);}@@ -242,26 +255,26 @@ export const maintenanceRouter = createTRPCRouter({message: z.string(),startDate: z.coerce.date(),endDate: z.coerce.date(),- monitors: z.array(z.number()).optional(),+ pageComponents: z.array(z.number()).optional(),}),).mutation(async (opts) => {// Check if the user has access to the monitors- if (opts.input.monitors?.length) {+ if (opts.input.pageComponents?.length) {const whereConditions: SQL[] = [- eq(monitor.workspaceId, opts.ctx.workspace.id),- inArray(monitor.id, opts.input.monitors),+ eq(pageComponent.workspaceId, opts.ctx.workspace.id),+ inArray(pageComponent.id, opts.input.pageComponents),];- const monitors = await opts.ctx.db+ const pageComponents = await opts.ctx.db.select()- .from(monitor)+ .from(pageComponent).where(and(...whereConditions)).all();- if (monitors.length !== opts.input.monitors.length) {+ if (pageComponents.length !== opts.input.pageComponents.length) {throw new TRPCError({code: "BAD_REQUEST",- message: "You do not have access to all the monitors",+ message: "You do not have access to all the page components",});}}@@ -289,25 +302,30 @@ export const maintenanceRouter = createTRPCRouter({// Delete all existing relationsawait tx- .delete(maintenancesToMonitors)- .where(eq(maintenancesToMonitors.maintenanceId, _maintenance.id))+ .delete(maintenancesToPageComponents)+ .where(+ eq(maintenancesToPageComponents.maintenanceId, _maintenance.id),+ ).run();- // Sync delete to page components- await syncMaintenanceToMonitorDeleteByMaintenance(tx, _maintenance.id);+ // Sync to monitors (inverse sync for backward compatibility)+ await syncMaintenanceToPageComponentDeleteByMaintenance(+ tx,+ _maintenance.id,+ );- // Create new relations if monitors are provided- if (opts.input.monitors?.length) {- await tx.insert(maintenancesToMonitors).values(- opts.input.monitors.map((monitorId) => ({+ // Create new relations if page components are provided+ if (opts.input.pageComponents?.length) {+ await tx.insert(maintenancesToPageComponents).values(+ opts.input.pageComponents.map((pageComponentId) => ({maintenanceId: _maintenance.id,- monitorId,+ pageComponentId,})),);- // Sync to page components- await syncMaintenanceToMonitorInsertMany(+ // Sync to monitors (inverse sync for backward compatibility)+ await syncMaintenanceToPageComponentInsertMany(tx,_maintenance.id,- opts.input.monitors,+ opts.input.pageComponents,);}diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.tsindex 67feecf38..f2de0d831 100644--- a/packages/api/src/router/page.ts+++ b/packages/api/src/router/page.ts@@ -30,6 +30,7 @@ import {selectMaintenanceSchema,selectMonitorGroupSchema,selectMonitorSchema,+ selectPageComponentSchema,selectPageSchema,selectPageSchemaWithMonitorsRelation,statusReport,@@ -513,6 +514,7 @@ export const pageRouter = createTRPCRouter({with: {monitorsToPages: { with: { monitor: true, monitorGroup: true } },maintenances: true,+ pageComponents: true,},});@@ -529,6 +531,7 @@ export const pageRouter = createTRPCRouter({.prefault([]),monitorGroups: z.array(selectMonitorGroupSchema).prefault([]),maintenances: z.array(selectMaintenanceSchema).prefault([]),+ pageComponents: z.array(selectPageComponentSchema).prefault([]),}).parse({...data,@@ -546,6 +549,7 @@ export const pageRouter = createTRPCRouter({).values(),),maintenances: data?.maintenances,+ pageComponents: data?.pageComponents,});}),diff --git a/packages/api/src/router/statusReport.ts b/packages/api/src/router/statusReport.tsindex e004e516e..3becd0fef 100644--- a/packages/api/src/router/statusReport.ts+++ b/packages/api/src/router/statusReport.ts@@ -10,8 +10,9 @@ import {inArray,sql,syncStatusReportToMonitorDelete,- syncStatusReportToMonitorDeleteByStatusReport,syncStatusReportToMonitorInsertMany,+ syncStatusReportToPageComponentDeleteByStatusReport,+ syncStatusReportToPageComponentInsertMany,} from "@openstatus/db";import {insertStatusReportSchema,@@ -19,6 +20,7 @@ import {monitorsToStatusReport,page,selectMonitorSchema,+ selectPageComponentSchema,selectPageSchema,selectPublicStatusReportSchemaWithRelation,selectStatusReportSchema,@@ -27,6 +29,7 @@ import {statusReportStatus,statusReportStatusSchema,statusReportUpdate,+ statusReportsToPageComponents,} from "@openstatus/db/src/schema";import { Events } from "@openstatus/analytics";@@ -420,7 +423,8 @@ export const statusReportRouter = createTRPCRouter({with: {statusReportUpdates: true,monitorsToStatusReports: { with: { monitor: true } },- page: true,+ statusReportsToPageComponents: { with: { pageComponent: true } },+ page: { with: { pageComponents: true } },},orderBy: (statusReport) => [opts.input.order === "asc"@@ -433,7 +437,10 @@ export const statusReportRouter = createTRPCRouter({.extend({updates: z.array(selectStatusReportUpdateSchema).prefault([]),monitors: z.array(selectMonitorSchema).prefault([]),- page: selectPageSchema,+ pageComponents: z.array(selectPageComponentSchema).prefault([]),+ page: selectPageSchema.extend({+ pageComponents: z.array(selectPageComponentSchema).prefault([]),+ }),}).array().parse(@@ -443,6 +450,9 @@ export const statusReportRouter = createTRPCRouter({monitors: report.monitorsToStatusReports.map(({ monitor }) => monitor,),+ pageComponents: report.statusReportsToPageComponents.map(+ ({ pageComponent }) => pageComponent,+ ),})),);}),@@ -454,7 +464,7 @@ export const statusReportRouter = createTRPCRouter({title: z.string(),status: z.enum(statusReportStatus),pageId: z.number(),- monitors: z.array(z.number()),+ pageComponents: z.array(z.number()),date: z.coerce.date(),message: z.string(),notifySubscribers: z.boolean().nullish(),@@ -484,22 +494,21 @@ export const statusReportRouter = createTRPCRouter({.returning().get();- if (opts.input.monitors.length > 0) {+ if (opts.input.pageComponents.length > 0) {await tx- .insert(monitorsToStatusReport)+ .insert(statusReportsToPageComponents).values(- opts.input.monitors.map((monitor) => ({- monitorId: monitor,+ opts.input.pageComponents.map((pageComponent) => ({+ pageComponentId: pageComponent,statusReportId: newStatusReport.id,})),)- .returning()- .get();- // Sync to page components- await syncStatusReportToMonitorInsertMany(+ .run();+ // Reverse sync: page components -> monitors (for backward compatibility)+ await syncStatusReportToPageComponentInsertMany(tx,newStatusReport.id,- opts.input.monitors,+ opts.input.pageComponents,);}@@ -515,7 +524,7 @@ export const statusReportRouter = createTRPCRouter({.input(z.object({id: z.number(),- monitors: z.array(z.number()),+ pageComponents: z.array(z.number()),title: z.string(),status: z.enum(statusReportStatus),}),@@ -538,27 +547,32 @@ export const statusReportRouter = createTRPCRouter({.run();await tx- .delete(monitorsToStatusReport)- .where(eq(monitorsToStatusReport.statusReportId, opts.input.id))+ .delete(statusReportsToPageComponents)+ .where(+ eq(statusReportsToPageComponents.statusReportId, opts.input.id),+ ).run();- // Sync delete to page components- await syncStatusReportToMonitorDeleteByStatusReport(tx, opts.input.id);+ // Reverse sync: delete from monitors (for backward compatibility)+ await syncStatusReportToPageComponentDeleteByStatusReport(+ tx,+ opts.input.id,+ );- if (opts.input.monitors.length > 0) {+ if (opts.input.pageComponents.length > 0) {await tx- .insert(monitorsToStatusReport)+ .insert(statusReportsToPageComponents).values(- opts.input.monitors.map((monitor) => ({- monitorId: monitor,+ opts.input.pageComponents.map((pageComponent) => ({+ pageComponentId: pageComponent,statusReportId: opts.input.id,})),).run();- // Sync to page components- await syncStatusReportToMonitorInsertMany(+ // Reverse sync: page components -> monitors (for backward compatibility)+ await syncStatusReportToPageComponentInsertMany(tx,opts.input.id,- opts.input.monitors,+ opts.input.pageComponents,);}});diff --git a/packages/api/src/router/sync.test.ts b/packages/api/src/router/sync.test.tsindex d6766de04..127384db0 100644--- a/packages/api/src/router/sync.test.ts+++ b/packages/api/src/router/sync.test.ts@@ -63,6 +63,7 @@ function getTestContext(limits?: unknown) {const TEST_PREFIX = "sync-test";let testPageId: number;let testMonitorId: number;+let testPageComponentId: number;const monitorData = {name: `${TEST_PREFIX}-monitor`,@@ -109,6 +110,19 @@ beforeAll(async () => {const caller = appRouter.createCaller(ctx);const createdMonitor = await caller.monitor.create(monitorData);testMonitorId = createdMonitor.id;++ const createdPageComponent = await db+ .insert(pageComponent)+ .values({+ workspaceId: 1,+ pageId: testPageId,+ monitorId: testMonitorId,+ type: "monitor",+ name: `${TEST_PREFIX}-monitor`,+ })+ .returning()+ .get();+ testPageComponentId = createdPageComponent.id;});afterAll(async () => {@@ -377,7 +391,7 @@ describe("Sync: maintenance_to_monitor -> maintenance_to_page_component", () =>startDate: from,endDate: to,pageId: testPageId,- monitors: [testMonitorId],+ pageComponents: [testPageComponentId],});testMaintenanceId = createdMaintenance.id;@@ -428,7 +442,7 @@ describe("Sync: maintenance_to_monitor -> maintenance_to_page_component", () =>message: "Updated maintenance",startDate: from,endDate: to,- monitors: [],+ pageComponents: [],});// Verify maintenance_to_monitor was deleted@@ -496,7 +510,7 @@ describe("Sync: status_report_to_monitors -> status_report_to_page_component", (status: "investigating",message: "Test status report for sync",pageId: testPageId,- monitors: [testMonitorId],+ pageComponents: [testPageComponentId],date: new Date(),});testStatusReportId = createdReport.statusReportId;@@ -544,7 +558,7 @@ describe("Sync: status_report_to_monitors -> status_report_to_page_component", (await caller.statusReport.updateStatus({id: testStatusReportId,status: "resolved",- monitors: [],+ pageComponents: [],title: `${TEST_PREFIX} Status Report`,});diff --git a/packages/db/src/sync.ts b/packages/db/src/sync.tsindex d092dd9f0..b15df405d 100644--- a/packages/db/src/sync.ts+++ b/packages/db/src/sync.ts@@ -3,8 +3,10 @@ import { and, eq, inArray } from "drizzle-orm";import type { db } from "./db";import {maintenance,+ maintenancesToMonitors,maintenancesToPageComponents,monitor,+ monitorsToStatusReport,pageComponent,pageComponentGroup,statusReport,@@ -364,6 +366,68 @@ export async function syncStatusReportToMonitorDeleteByMonitors();}+/**+ * Syncs status_report_to_page_component inserts to status_report_to_monitors+ * This is the inverse of syncStatusReportToMonitorInsertMany+ */+export async function syncStatusReportToPageComponentInsertMany(+ db: DB | Transaction,+ statusReportId: number,+ pageComponentIds: number[],+) {+ if (pageComponentIds.length === 0) return;++ // Find monitor IDs from the page components+ // Only get components that have a monitorId (not external components)+ const components = await db+ .select({ monitorId: pageComponent.monitorId })+ .from(pageComponent)+ .where(+ and(+ inArray(pageComponent.id, pageComponentIds),+ eq(pageComponent.type, "monitor"),+ ),+ );++ if (components.length === 0) return;++ // Extract unique monitor IDs (filter out nulls)+ const monitorIds = [+ ...new Set(+ components+ .map((c) => c.monitorId)+ .filter((id): id is number => id !== null),+ ),+ ];++ if (monitorIds.length === 0) return;++ // Insert into monitorsToStatusReport+ await db+ .insert(monitorsToStatusReport)+ .values(+ monitorIds.map((monitorId) => ({+ statusReportId,+ monitorId,+ })),+ )+ .onConflictDoNothing();+}++/**+ * Syncs status_report_to_page_component deletes to status_report_to_monitors+ * This is the inverse of syncStatusReportToMonitorDeleteByStatusReport+ * When page components are removed from a status report, remove the corresponding monitors+ */+export async function syncStatusReportToPageComponentDeleteByStatusReport(+ db: DB | Transaction,+ statusReportId: number,+) {+ await db+ .delete(monitorsToStatusReport)+ .where(eq(monitorsToStatusReport.statusReportId, statusReportId));+}+// ============================================================================// Maintenance to Monitor <-> Maintenance to Page Component Sync// ============================================================================@@ -513,3 +577,65 @@ export async function syncMaintenanceToMonitorDeleteByMonitors(),);}++/**+ * Syncs maintenance_to_page_component inserts to maintenance_to_monitors+ * This is the inverse of syncMaintenanceToMonitorInsertMany+ */+export async function syncMaintenanceToPageComponentInsertMany(+ db: DB | Transaction,+ maintenanceId: number,+ pageComponentIds: number[],+) {+ if (pageComponentIds.length === 0) return;++ // Find monitor IDs from the page components+ // Only get components that have a monitorId (not external components)+ const components = await db+ .select({ monitorId: pageComponent.monitorId })+ .from(pageComponent)+ .where(+ and(+ inArray(pageComponent.id, pageComponentIds),+ eq(pageComponent.type, "monitor"),+ ),+ );++ if (components.length === 0) return;++ // Extract unique monitor IDs (filter out nulls)+ const monitorIds = [+ ...new Set(+ components+ .map((c) => c.monitorId)+ .filter((id): id is number => id !== null),+ ),+ ];++ if (monitorIds.length === 0) return;++ // Insert into maintenancesToMonitors+ await db+ .insert(maintenancesToMonitors)+ .values(+ monitorIds.map((monitorId) => ({+ maintenanceId,+ monitorId,+ })),+ )+ .onConflictDoNothing();+}++/**+ * Syncs maintenance_to_page_component deletes to maintenance_to_monitors+ * This is the inverse of syncMaintenanceToMonitorDeleteByMaintenance+ * When page components are removed from a maintenance, remove the corresponding monitors+ */+export async function syncMaintenanceToPageComponentDeleteByMaintenance(+ db: DB | Transaction,+ maintenanceId: number,+) {+ await db+ .delete(maintenancesToMonitors)+ .where(eq(maintenancesToMonitors.maintenanceId, maintenanceId));+}