Skip to content

Open-source status page, incident response and uptime monitoring

chore: minor status-page improvements (#2070)

Maximilian Kaskea856722ae4a8
diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/layout.tsx
index ff9fe0c06..a5d972003 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/layout.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/layout.tsx
@@ -1,4 +1,5 @@
import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
+import { notFound } from "next/navigation";
export default async function Layout({
children,
@@ -8,10 +9,16 @@ export default async function Layout({
params: Promise<{ id: string; domain: string }>;
}) {
const { id, domain } = await params;
+ const numericId = Number(id);
+
+ if (Number.isNaN(numericId)) {
+ return notFound();
+ }
+
const queryClient = getQueryClient();
await queryClient.prefetchQuery(
trpc.statusPage.getMaintenance.queryOptions({
- id: Number(id),
+ id: numericId,
slug: domain,
}),
);
diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/layout.tsx
index 721f855dc..f8d85f206 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/layout.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/layout.tsx
@@ -1,4 +1,5 @@
import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
+import { notFound } from "next/navigation";
export default async function Layout({
children,
@@ -8,10 +9,16 @@ export default async function Layout({
params: Promise<{ id: string; domain: string }>;
}) {
const { id, domain } = await params;
+ const numericId = Number(id);
+
+ if (Number.isNaN(numericId)) {
+ return notFound();
+ }
+
const queryClient = getQueryClient();
await queryClient.prefetchQuery(
trpc.statusPage.getReport.queryOptions({
- id: Number(id),
+ id: numericId,
slug: domain,
}),
);
diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/layout.tsx
new file mode 100644
index 000000000..a9bf09737
--- /dev/null
+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/layout.tsx
@@ -0,0 +1,21 @@
+import { notFound } from "next/navigation";
+
+export default async function Layout({
+ children,
+ params,
+}: {
+ children: React.ReactNode;
+ params: Promise<{ id: string; domain: string }>;
+}) {
+ const { id } = await params;
+ const numericId = Number(id);
+
+ if (Number.isNaN(numericId)) {
+ return notFound();
+ }
+
+ // NOTE: we are not prefetching the `statusPage.getMonitor` query as we want to lazy load it
+ // mainly because it's data from tinybird and we don't want to prefetch it (like the uptime data from the homepage)
+
+ return children;
+}
diff --git a/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts b/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts
index ee69b118c..4d07aa311 100644
--- a/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts
+++ b/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts
@@ -13,8 +13,22 @@ const handler = (req: NextRequest) =>
router: edgeRouter,
req: req,
createContext: () => createTRPCContext({ req, auth }),
- onError: ({ error }) => {
+ onError: ({ error, path, input, type }) => {
console.log("Error in tRPC handler (edge)");
+ // TEMP: extra diagnostic context to trace malformed tRPC batch calls
+ console.error({
+ path,
+ type,
+ input,
+ url: req.url,
+ method: req.method,
+ userAgent: req.headers.get("user-agent"),
+ referer: req.headers.get("referer"),
+ trpcSource: req.headers.get("x-trpc-source"),
+ secFetchSite: req.headers.get("sec-fetch-site"),
+ secFetchMode: req.headers.get("sec-fetch-mode"),
+ secFetchDest: req.headers.get("sec-fetch-dest"),
+ });
console.error(error);
},
});