fix: orphaned monitor page components

Author: mxkaske

apps/server/src/routes/rpc/services/monitor/index.ts

@@ -3,7 +3,16 @@ import { getCheckerPayload, getCheckerUrl } from "@/libs/checker";
 import { tb } from "@/libs/clients";
 import type { ServiceImpl } from "@connectrpc/connect";
 import { and, db, eq, gte, inArray, isNull, sql } from "@openstatus/db";
-import { monitor, monitorRun } from "@openstatus/db/src/schema";
+import {
+  maintenancesToMonitors,
+  monitor,
+  monitorRun,
+  monitorTagsToMonitors,
+  monitorsToPages,
+  monitorsToStatusReport,
+  notificationsToMonitors,
+  pageComponent,
+} from "@openstatus/db/src/schema";
 import { monitorStatusTable } from "@openstatus/db/src/schema/monitor_status/monitor_status";
 import { selectMonitorSchema } from "@openstatus/db/src/schema/monitors/validation";
 import type {
@@ -572,6 +581,28 @@ export const monitorServiceImpl: ServiceImpl<typeof MonitorService> = {
       })
       .where(eq(monitor.id, dbMon.id));
 
+    // Clean up related junction tables and page components
+    await db.transaction(async (tx) => {
+      await tx
+        .delete(monitorsToPages)
+        .where(eq(monitorsToPages.monitorId, dbMon.id));
+      await tx
+        .delete(monitorTagsToMonitors)
+        .where(eq(monitorTagsToMonitors.monitorId, dbMon.id));
+      await tx
+        .delete(monitorsToStatusReport)
+        .where(eq(monitorsToStatusReport.monitorId, dbMon.id));
+      await tx
+        .delete(notificationsToMonitors)
+        .where(eq(notificationsToMonitors.monitorId, dbMon.id));
+      await tx
+        .delete(maintenancesToMonitors)
+        .where(eq(maintenancesToMonitors.monitorId, dbMon.id));
+      await tx
+        .delete(pageComponent)
+        .where(eq(pageComponent.monitorId, dbMon.id));
+    });
+
     return { success: true };
   },
 

packages/api/src/router/monitor.ts

@@ -27,6 +27,7 @@ import {
   monitorsToStatusReport,
   notification,
   notificationsToMonitors,
+  pageComponent,
   privateLocation,
   privateLocationToMonitors,
   selectIncidentSchema,
@@ -85,6 +86,9 @@ export const monitorRouter = createTRPCRouter({
         await tx
           .delete(maintenancesToMonitors)
           .where(eq(maintenancesToMonitors.monitorId, monitorToDelete.id));
+        await tx
+          .delete(pageComponent)
+          .where(eq(pageComponent.monitorId, monitorToDelete.id));
       });
     }),
 
@@ -131,6 +135,9 @@ export const monitorRouter = createTRPCRouter({
         await tx
           .delete(maintenancesToMonitors)
           .where(inArray(maintenancesToMonitors.monitorId, opts.input.ids));
+        await tx
+          .delete(pageComponent)
+          .where(inArray(pageComponent.monitorId, opts.input.ids));
       });
     }),
 

packages/api/src/router/pageComponent.ts

@@ -157,6 +157,18 @@ export const pageComponentRouter = createTRPCRouter({
 
         const pageComponentLimit = opts.ctx.workspace.limits["page-components"];
 
+        // Validate the incoming component count against the limit
+        const newComponentCount =
+          opts.input.components.length +
+          opts.input.groups.reduce((sum, g) => sum + g.components.length, 0);
+
+        if (newComponentCount > pageComponentLimit) {
+          throw new TRPCError({
+            code: "FORBIDDEN",
+            message: "You reached your page component limits.",
+          });
+        }
+
         // Get existing state
         const existingComponents = await tx
           .select()
@@ -169,13 +181,6 @@ export const pageComponentRouter = createTRPCRouter({
           )
           .all();
 
-        if (existingComponents.length >= pageComponentLimit) {
-          throw new TRPCError({
-            code: "FORBIDDEN",
-            message: "You reached your page component limits.",
-          });
-        }
-
         const existingGroups = await tx
           .select()
           .from(pageComponentGroup)