Skip to content

Open-source status page, incident response and uptime monitoring

Updated prefetching in parallel (#2369)

Moulik Aggarwal7b4358f63884
diff --git a/apps/dashboard/src/app/(dashboard)/layout.tsx b/apps/dashboard/src/app/(dashboard)/layout.tsx
index 93d3f2b0a..b251d576f 100644
--- a/apps/dashboard/src/app/(dashboard)/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/layout.tsx
@@ -41,10 +41,12 @@ export default async function Layout({
async function HydrateSidebar({ children }: { children: React.ReactNode }) {
const queryClient = getQueryClient();
- await queryClient.prefetchQuery(trpc.page.list.queryOptions());
- await queryClient.prefetchQuery(trpc.monitor.list.queryOptions());
- await queryClient.prefetchQuery(trpc.workspace.get.queryOptions());
- await queryClient.prefetchQuery(trpc.user.get.queryOptions());
+ await Promise.all([
+ queryClient.prefetchQuery(trpc.page.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.workspace.get.queryOptions()),
+ queryClient.prefetchQuery(trpc.user.get.queryOptions()),
+ ]);
return <HydrateClient>{children}</HydrateClient>;
}
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx b/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx
index 322476240..d5ccaf94c 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx
@@ -12,9 +12,11 @@ export default async function Page({
}) {
const queryClient = getQueryClient();
- await searchParamsCache.parse(searchParams);
- await queryClient.prefetchQuery(trpc.monitor.list.queryOptions());
- await queryClient.prefetchQuery(trpc.monitorTag.list.queryOptions());
+ await Promise.all([
+ searchParamsCache.parse(searchParams),
+ queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.monitorTag.list.queryOptions()),
+ ]);
return (
<HydrateClient>
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 45bdf55a3..7132fc6b9 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/edit/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/edit/layout.tsx
@@ -6,8 +6,10 @@ export default async function Layout({
children: React.ReactNode;
}) {
const queryClient = getQueryClient();
- await queryClient.prefetchQuery(trpc.monitorTag.list.queryOptions());
- await queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions());
+ await Promise.all([
+ queryClient.prefetchQuery(trpc.monitorTag.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.privateLocation.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 de6ed5951..9bac32ea9 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx
@@ -28,8 +28,10 @@ export default async function Layout({
await fetchQueryOrNotFound(
trpc.monitor.get.queryOptions({ id: Number.parseInt(id) }),
);
- await queryClient.prefetchQuery(trpc.notification.list.queryOptions());
- await queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions());
+ await Promise.all([
+ queryClient.prefetchQuery(trpc.notification.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions()),
+ ]);
return (
<HydrateClient>
diff --git a/apps/dashboard/src/app/(dashboard)/overview/layout.tsx b/apps/dashboard/src/app/(dashboard)/overview/layout.tsx
index 5c7e0e83a..a26786793 100644
--- a/apps/dashboard/src/app/(dashboard)/overview/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/overview/layout.tsx
@@ -16,12 +16,14 @@ export default async function Layout({
}) {
const queryClient = getQueryClient();
- await queryClient.prefetchQuery(trpc.monitor.list.queryOptions());
- await queryClient.prefetchQuery(trpc.page.list.queryOptions());
// inputs must match page.tsx's queries exactly — a differing input misses the cache
- await queryClient.prefetchQuery(trpc.incident.list.queryOptions());
- await queryClient.prefetchQuery(trpc.statusReport.list.queryOptions({}));
- await queryClient.prefetchQuery(trpc.maintenance.list.queryOptions());
+ 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()),
+ ]);
return (
<HydrateClient>
diff --git a/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsx
index e2e98630f..a0f03113a 100644
--- a/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsx
@@ -16,9 +16,11 @@ export default async function Layout({
children: React.ReactNode;
}) {
const queryClient = getQueryClient();
- await queryClient.prefetchQuery(trpc.member.list.queryOptions());
- await queryClient.prefetchQuery(trpc.invitation.list.queryOptions());
- await queryClient.prefetchQuery(trpc.apiKeyRouter.getAll.queryOptions());
+ await Promise.all([
+ queryClient.prefetchQuery(trpc.member.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.invitation.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.apiKeyRouter.getAll.queryOptions()),
+ ]);
return (
<HydrateClient>
diff --git a/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsx
index d3bddd0dc..dbc79ae90 100644
--- a/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsx
@@ -16,8 +16,10 @@ export default async function Layout({
children: React.ReactNode;
}) {
const queryClient = getQueryClient();
- await queryClient.prefetchQuery(trpc.integrationRouter.list.queryOptions());
- await queryClient.prefetchQuery(trpc.workspace.get.queryOptions());
+ await Promise.all([
+ queryClient.prefetchQuery(trpc.integrationRouter.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.workspace.get.queryOptions()),
+ ]);
return (
<HydrateClient>
diff --git a/apps/dashboard/src/app/(dashboard)/settings/private-locations/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/private-locations/layout.tsx
index e35c2cc20..f33fb7f33 100644
--- a/apps/dashboard/src/app/(dashboard)/settings/private-locations/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/settings/private-locations/layout.tsx
@@ -16,8 +16,10 @@ export default async function Layout({
children: React.ReactNode;
}) {
const queryClient = getQueryClient();
- await queryClient.prefetchQuery(trpc.notification.list.queryOptions());
- await queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions());
+ await Promise.all([
+ queryClient.prefetchQuery(trpc.notification.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions()),
+ ]);
return (
<HydrateClient>
<div>
diff --git a/apps/dashboard/src/app/onboarding/layout.tsx b/apps/dashboard/src/app/onboarding/layout.tsx
index 4889c44ef..74f5e77c1 100644
--- a/apps/dashboard/src/app/onboarding/layout.tsx
+++ b/apps/dashboard/src/app/onboarding/layout.tsx
@@ -6,10 +6,12 @@ export default async function Layout({
children: React.ReactNode;
}) {
const queryClient = getQueryClient();
- await queryClient.prefetchQuery(trpc.workspace.get.queryOptions());
- await queryClient.prefetchQuery(trpc.user.get.queryOptions());
- await queryClient.prefetchQuery(trpc.monitor.list.queryOptions());
- await queryClient.prefetchQuery(trpc.page.list.queryOptions());
+ await Promise.all([
+ queryClient.prefetchQuery(trpc.workspace.get.queryOptions()),
+ queryClient.prefetchQuery(trpc.user.get.queryOptions()),
+ queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),
+ queryClient.prefetchQuery(trpc.page.list.queryOptions()),
+ ]);
return <HydrateClient>{children}</HydrateClient>;
}