Skip to content

Open-source status page, incident response and uptime monitoring

fix: nullable page id relations (#2634)

Maximilian Kaskee701720afd45
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/incidents/layout.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/incidents/layout.tsx
index 5c93f0259..f25ec0a8c 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/incidents/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/incidents/layout.tsx
@@ -1,4 +1,5 @@
import { SidebarProvider } from "@openstatus/ui/components/ui/sidebar";
+import { notFound } from "next/navigation";
import {
RIGHT_SIDEBAR_COOKIE,
@@ -17,8 +18,10 @@ export default async function Layout({
}) {
const queryClient = getQueryClient();
const { id } = await params;
+ const monitorId = Number.parseInt(id);
+ if (Number.isNaN(monitorId)) notFound();
await queryClient.prefetchQuery(
- trpc.incident.list.queryOptions({ monitorId: Number.parseInt(id) }),
+ trpc.incident.list.queryOptions({ monitorId }),
);
const defaultOpen = await getSidebarDefaultOpen(RIGHT_SIDEBAR_COOKIE, false);
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx
index c3027e419..2e3433d0f 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx
@@ -1,3 +1,5 @@
+import { notFound } from "next/navigation";
+
import {
AppHeader,
AppHeaderActions,
@@ -23,12 +25,12 @@ export default async function Layout({
params: Promise<{ id: string }>;
}) {
const { id } = await params;
+ const monitorId = Number.parseInt(id);
+ if (Number.isNaN(monitorId)) notFound();
const queryClient = getQueryClient();
await Promise.all([
- fetchQueryOrNotFound(
- trpc.monitor.get.queryOptions({ id: Number.parseInt(id) }),
- ),
+ fetchQueryOrNotFound(trpc.monitor.get.queryOptions({ id: monitorId })),
queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions()),
]);
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/components/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/components/layout.tsx
index 147ed517b..34155ed56 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/components/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/components/layout.tsx
@@ -1,4 +1,5 @@
import { SidebarProvider } from "@openstatus/ui/components/ui/sidebar";
+import { notFound } from "next/navigation";
import {
RIGHT_SIDEBAR_COOKIE,
@@ -16,10 +17,12 @@ export default async function Layout({
params: Promise<{ id: string }>;
}) {
const { id } = await params;
+ const pageId = Number.parseInt(id);
+ if (Number.isNaN(pageId)) notFound();
const queryClient = getQueryClient();
await queryClient.prefetchQuery(
- trpc.pageComponent.list.queryOptions({ pageId: Number.parseInt(id) }),
+ trpc.pageComponent.list.queryOptions({ pageId }),
);
const defaultOpen = await getSidebarDefaultOpen(RIGHT_SIDEBAR_COOKIE, false);
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/page.tsx
index 706e19c50..c37a21bcf 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/page.tsx
@@ -1,3 +1,4 @@
+import { notFound } from "next/navigation";
import type { SearchParams } from "nuqs";
import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
@@ -13,12 +14,14 @@ export default async function Page({
searchParams: Promise<SearchParams>;
}) {
const { id } = await params;
+ const pageId = Number.parseInt(id);
+ if (Number.isNaN(pageId)) notFound();
const queryClient = getQueryClient();
// NOTE: store in cache to avoid flicker on clients first render
await searchParamsCache.parse(searchParams);
await queryClient.prefetchQuery(
- trpc.page.getUptimeHistory.queryOptions({ id: Number.parseInt(id) }),
+ trpc.page.getUptimeHistory.queryOptions({ id: pageId }),
);
return (
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx
index 2dbe80f81..9d3e789ca 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx
@@ -1,3 +1,5 @@
+import { notFound } from "next/navigation";
+
import {
AppHeader,
AppHeaderActions,
@@ -18,10 +20,10 @@ export default async function Layout({
params: Promise<{ id: string }>;
}) {
const { id } = await params;
+ const pageId = Number.parseInt(id);
+ if (Number.isNaN(pageId)) notFound();
- await fetchQueryOrNotFound(
- trpc.page.get.queryOptions({ id: Number.parseInt(id) }),
- );
+ await fetchQueryOrNotFound(trpc.page.get.queryOptions({ id: pageId }));
return (
<HydrateClient>
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/layout.tsx
index 3b65d74b6..143aec60d 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/layout.tsx
@@ -1,4 +1,5 @@
import { SidebarProvider } from "@openstatus/ui/components/ui/sidebar";
+import { notFound } from "next/navigation";
import {
RIGHT_SIDEBAR_COOKIE,
@@ -16,12 +17,12 @@ export default async function Layout({
params: Promise<{ id: string }>;
}) {
const { id } = await params;
+ const pageId = Number.parseInt(id);
+ if (Number.isNaN(pageId)) notFound();
const queryClient = getQueryClient();
await queryClient.prefetchQuery(
- trpc.maintenance.list.queryOptions({
- pageId: Number.parseInt(id),
- }),
+ trpc.maintenance.list.queryOptions({ pageId }),
);
const defaultOpen = await getSidebarDefaultOpen(RIGHT_SIDEBAR_COOKIE, false);
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/layout.tsx
index 598562540..557874e90 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/layout.tsx
@@ -1,3 +1,5 @@
+import { notFound } from "next/navigation";
+
import { HydrateClient, fetchQueryOrNotFound, trpc } from "@/lib/trpc/server";
export default async function Layout({
@@ -8,8 +10,10 @@ export default async function Layout({
params: Promise<{ id: string; reportId: string }>;
}) {
const { reportId } = await params;
+ const statusReportId = Number.parseInt(reportId);
+ if (Number.isNaN(statusReportId)) notFound();
await fetchQueryOrNotFound(
- trpc.statusReport.get.queryOptions({ id: Number.parseInt(reportId) }),
+ trpc.statusReport.get.queryOptions({ id: statusReportId }),
);
return <HydrateClient>{children}</HydrateClient>;
}
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/layout.tsx
index 9a6eb9926..df7a4b6e8 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/layout.tsx
@@ -1,4 +1,5 @@
import { SidebarProvider } from "@openstatus/ui/components/ui/sidebar";
+import { notFound } from "next/navigation";
import {
RIGHT_SIDEBAR_COOKIE,
@@ -17,8 +18,10 @@ export default async function Layout({
}) {
const queryClient = getQueryClient();
const { id } = await params;
+ const pageId = Number.parseInt(id);
+ if (Number.isNaN(pageId)) notFound();
await queryClient.prefetchQuery(
- trpc.statusReport.list.queryOptions({ pageId: Number.parseInt(id) }),
+ trpc.statusReport.list.queryOptions({ pageId }),
);
const defaultOpen = await getSidebarDefaultOpen(RIGHT_SIDEBAR_COOKIE, false);
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/subscribers/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/subscribers/layout.tsx
index 012f9e6c7..dba0d471f 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/subscribers/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/subscribers/layout.tsx
@@ -1,3 +1,5 @@
+import { notFound } from "next/navigation";
+
import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
export default async function Layout({
@@ -9,9 +11,11 @@ export default async function Layout({
}) {
const queryClient = getQueryClient();
const { id } = await params;
+ const pageId = Number.parseInt(id);
+ if (Number.isNaN(pageId)) notFound();
await queryClient.prefetchQuery(
- trpc.pageSubscriber.list.queryOptions({ pageId: Number.parseInt(id) }),
+ trpc.pageSubscriber.list.queryOptions({ pageId }),
);
return <HydrateClient>{children}</HydrateClient>;
diff --git a/apps/server/src/routes/rpc/handlers/maintenance/__tests__/maintenance.test.ts b/apps/server/src/routes/rpc/handlers/maintenance/__tests__/maintenance.test.ts
index 5f8f6f0df..67d7b6dde 100644
--- a/apps/server/src/routes/rpc/handlers/maintenance/__tests__/maintenance.test.ts
+++ b/apps/server/src/routes/rpc/handlers/maintenance/__tests__/maintenance.test.ts
@@ -1191,7 +1191,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {
expect(afterRecord?.pageId).toBe(beforeRecord?.pageId);
});
- test("clears pageId when removing all components", async () => {
+ test("keeps pageId when removing all components", async () => {
const tempRecord = await db
.insert(maintenance)
.values({
@@ -1228,7 +1228,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {
.from(maintenance)
.where(eq(maintenance.id, tempRecord.id))
.get();
- expect(afterRecord?.pageId).toBeNull();
+ expect(afterRecord?.pageId).toBe(testPageId);
const afterAssociations = await db
.select()
diff --git a/packages/services/src/maintenance/__tests__/maintenance.test.ts b/packages/services/src/maintenance/__tests__/maintenance.test.ts
index 3b48ae006..7b6d96dcb 100644
--- a/packages/services/src/maintenance/__tests__/maintenance.test.ts
+++ b/packages/services/src/maintenance/__tests__/maintenance.test.ts
@@ -310,6 +310,57 @@ describe("updateMaintenance", () => {
});
});
+ test("keeps pageId when clearing all components", async () => {
+ await withTestTransaction(async (tx) => {
+ const ctx = { ...teamCtx, db: tx };
+ const record = await createMaintenance({
+ ctx,
+ input: {
+ title: `${TEST_PREFIX}-keep-page`,
+ message: "m",
+ ...futureRange(),
+ pageId: testPageId,
+ pageComponentIds: [testPageComponentId],
+ },
+ });
+
+ const updated = await updateMaintenance({
+ ctx,
+ input: { id: record.id, pageComponentIds: [] },
+ });
+ expect(updated.pageId).toBe(testPageId);
+
+ const assoc = await tx
+ .select()
+ .from(maintenancesToPageComponents)
+ .where(eq(maintenancesToPageComponents.maintenanceId, record.id))
+ .all();
+ expect(assoc).toHaveLength(0);
+ });
+ });
+
+ test("moves pageId when components belong to another page", async () => {
+ await withTestTransaction(async (tx) => {
+ const ctx = { ...teamCtx, db: tx };
+ const record = await createMaintenance({
+ ctx,
+ input: {
+ title: `${TEST_PREFIX}-move-page`,
+ message: "m",
+ ...futureRange(),
+ pageId: testPageId,
+ pageComponentIds: [testPageComponentId],
+ },
+ });
+
+ const updated = await updateMaintenance({
+ ctx,
+ input: { id: record.id, pageComponentIds: [otherPageComponentId] },
+ });
+ expect(updated.pageId).toBe(otherPageId);
+ });
+ });
+
test("throws NotFoundError for cross-workspace update", async () => {
await withTestTransaction(async (tx) => {
const record = await createMaintenance({
diff --git a/packages/services/src/maintenance/update.ts b/packages/services/src/maintenance/update.ts
index 47fa89f9d..95c72f357 100644
--- a/packages/services/src/maintenance/update.ts
+++ b/packages/services/src/maintenance/update.ts
@@ -49,13 +49,13 @@ export async function updateMaintenance(args: {
pageComponentIds: input.pageComponentIds,
});
- // `pageId` follows the association set: a new non-empty set moves
- // the maintenance to that page; an empty set nulls it. Matches the
- // pattern established on status-report update and what the Connect
- // `UpdateMaintenance` tests have encoded since the original handler.
- // Mixed-page inputs are rejected upstream by
- // `validatePageComponentIds` (all ids must share a page).
- updateValues.pageId = validated.pageId;
+ // A non-empty set moves the maintenance to that page; an empty set
+ // only clears associations and keeps `pageId` (same as status-report).
+ // The dashboard edit sheet always sends the array, so nulling here
+ // orphaned every maintenance edited without components.
+ if (validated.pageId !== null) {
+ updateValues.pageId = validated.pageId;
+ }
await updatePageComponentAssociations({
tx,