diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx index 94c07c9d7..f1ec07f14 100644 --- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx +++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx @@ -42,11 +42,9 @@ export default async function MonitorPage({ searchParams: { [key: string]: string | string[] | undefined }; }) { const search = searchParamsSchema.safeParse(searchParams); - const monitors = await api.monitor.getMonitorsByWorkspace.query(); - const isLimitReached = await api.monitor.isMonitorLimitReached.query(); - if (!search.success) return notFound(); + const monitors = await api.monitor.getMonitorsByWorkspace.query(); if (monitors?.length === 0) return ( ); - const _incidents = await api.incident.getIncidentsByWorkspace.query(); // TODO: filter by last 7 days - const tags = await api.monitorTag.getMonitorTagsByWorkspace.query(); - const _maintenances = await api.maintenance.getLast7DaysByWorkspace.query(); + const [_incidents, tags, _maintenances, isLimitReached] = await Promise.all([ + api.incident.getIncidentsByWorkspace.query(), + api.monitorTag.getMonitorTagsByWorkspace.query(), + api.maintenance.getLast7DaysByWorkspace.query(), + api.monitor.isMonitorLimitReached.query(), + ]); // maybe not very efficient? // use Suspense and Client call instead?