Skip to content

Open-source status page, incident response and uptime monitoring

perf: improve db queries (#2550)

Maximilian Kaskedeebc6f7b0a4
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx b/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx
index d5ccaf94c..8e70d7406 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx
@@ -12,9 +12,10 @@ export default async function Page({
}) {
const queryClient = getQueryClient();
+ // `monitor.list` is prefetched by the root layout for the sidebar — the
+ // client cache already holds it on every route.
await Promise.all([
searchParamsCache.parse(searchParams),
- queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),
queryClient.prefetchQuery(trpc.monitorTag.list.queryOptions()),
]);
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/edit/layout.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/edit/layout.tsx
index 7132fc6b9..a0d468874 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/edit/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/edit/layout.tsx
@@ -9,6 +9,7 @@ export default async function Layout({
await Promise.all([
queryClient.prefetchQuery(trpc.monitorTag.list.queryOptions()),
queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.notification.list.queryOptions()),
]);
return <HydrateClient>{children}</HydrateClient>;
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx
index 9bac32ea9..c3027e419 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx
@@ -25,11 +25,10 @@ export default async function Layout({
const { id } = await params;
const queryClient = getQueryClient();
- await fetchQueryOrNotFound(
- trpc.monitor.get.queryOptions({ id: Number.parseInt(id) }),
- );
await Promise.all([
- queryClient.prefetchQuery(trpc.notification.list.queryOptions()),
+ fetchQueryOrNotFound(
+ trpc.monitor.get.queryOptions({ id: Number.parseInt(id) }),
+ ),
queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions()),
]);
diff --git a/apps/dashboard/src/app/(dashboard)/overview/layout.tsx b/apps/dashboard/src/app/(dashboard)/overview/layout.tsx
index a26786793..988a11e2c 100644
--- a/apps/dashboard/src/app/(dashboard)/overview/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/overview/layout.tsx
@@ -17,9 +17,8 @@ export default async function Layout({
const queryClient = getQueryClient();
// inputs must match page.tsx's queries exactly — a differing input misses the cache
+ // `monitor.list` / `page.list` come from the root layout's sidebar prefetch.
await Promise.all([
- queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),
- queryClient.prefetchQuery(trpc.page.list.queryOptions()),
queryClient.prefetchQuery(trpc.incident.list.queryOptions()),
queryClient.prefetchQuery(trpc.statusReport.list.queryOptions({})),
queryClient.prefetchQuery(trpc.maintenance.list.queryOptions()),
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/(list)/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/(list)/page.tsx
index fc3e62a68..771be6d82 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/(list)/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/(list)/page.tsx
@@ -1,12 +1,10 @@
-import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
+import { HydrateClient } from "@/lib/trpc/server";
import { Client } from "./client";
-export default async function Page() {
- const queryClient = getQueryClient();
-
- await queryClient.prefetchQuery(trpc.page.list.queryOptions());
-
+// `page.list` is prefetched by the root layout for the sidebar — the client
+// cache already holds it on every route.
+export default function Page() {
return (
<HydrateClient>
<Client />
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 9b18b101d..485029f79 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
@@ -22,7 +22,6 @@ export default async function Layout({
queryClient.prefetchQuery(
trpc.page.get.queryOptions({ id: Number.parseInt(id) }),
),
- queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),
queryClient.prefetchQuery(
trpc.pageComponent.list.queryOptions({ pageId: Number.parseInt(id) }),
),
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/layout.tsx
index 9b18b101d..485029f79 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/layout.tsx
@@ -22,7 +22,6 @@ export default async function Layout({
queryClient.prefetchQuery(
trpc.page.get.queryOptions({ id: Number.parseInt(id) }),
),
- queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),
queryClient.prefetchQuery(
trpc.pageComponent.list.queryOptions({ pageId: Number.parseInt(id) }),
),
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 eb9eac213..2dbe80f81 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx
@@ -4,12 +4,7 @@ import {
AppHeaderContent,
} from "@/components/nav/app-header";
import { AppSidebarTrigger } from "@/components/nav/app-sidebar";
-import {
- HydrateClient,
- fetchQueryOrNotFound,
- getQueryClient,
- trpc,
-} from "@/lib/trpc/server";
+import { HydrateClient, fetchQueryOrNotFound, trpc } from "@/lib/trpc/server";
import { Breadcrumb } from "./breadcrumb";
import { NavActions } from "./nav-actions";
@@ -23,12 +18,10 @@ export default async function Layout({
params: Promise<{ id: string }>;
}) {
const { id } = await params;
- const queryClient = getQueryClient();
await fetchQueryOrNotFound(
trpc.page.get.queryOptions({ id: Number.parseInt(id) }),
);
- await queryClient.prefetchQuery(trpc.monitor.list.queryOptions());
return (
<HydrateClient>