From 84b1b8bf62892c83812a9b6dec26c63d2cfee86f Mon Sep 17 00:00:00 2001 From: Jonathan Barazany Date: Mon, 30 Mar 2026 15:21:33 +0300 Subject: [PATCH] fix: scope region metrics to monitor's configured regions (#2030) --- .../monitors/[id]/overview/client.tsx | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/client.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/client.tsx index 16f0c4a4..3256999e 100644 --- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/client.tsx +++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/client.tsx @@ -27,7 +27,6 @@ import { mapRegionMetrics } from "@/data/metrics.client"; import { periodToFromDate } from "@/data/metrics.client"; import type { RegionMetric } from "@/data/region-metrics"; import { useTRPC } from "@/lib/trpc/client"; -import { monitorRegions } from "@openstatus/db/src/schema/constants"; import { Tabs, TabsContent, @@ -69,24 +68,20 @@ export function Client() { enabled: !!monitor, } as const; - const { data: regionTimeline, isLoading } = useQuery(regionTimelineQuery); + const { data: regionTimeline } = useQuery(regionTimelineQuery); const regionMetrics: RegionMetric[] = React.useMemo(() => { return mapRegionMetrics( regionTimeline, - // NOTE: while loading, we show the selected regions with empty data, - // once the data is loaded, we show all the regions that we get from TB - isLoading - ? monitor?.regions ?? [] - : [ - ...monitorRegions, - ...(monitor?.privateLocations?.map((location) => - location.id.toString(), - ) ?? []), - ], + [ + ...(monitor?.regions ?? []), + ...(monitor?.privateLocations?.map((location) => + location.id.toString(), + ) ?? []), + ], percentile, ); - }, [regionTimeline, monitor, percentile, isLoading]); + }, [regionTimeline, monitor, percentile]); const regionColumns = useMemo( () => getRegionColumns(monitor?.privateLocations ?? []), -- 2.51.2