From 0bc9389c8fb879463d758d0cba58132a425a5413 Mon Sep 17 00:00:00 2001 From: Priyank Rajai Date: Fri, 26 Jul 2024 01:14:53 +0530 Subject: [PATCH] refactor: using promise.all for multiple api requests (#953) * refactor: using promise.all for multiple api requests * ci: apply automated fixes * refactor: moving search params condition to top * ci: apply automated fixes * refactor: moving isLimitReached to promise.all after getting all the monitors --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- .../(dashboard)/monitors/(overview)/page.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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? -- 2.54.0