Skip to content

Open-source status page, incident response and uptime monitoring

fix: scope region metrics to monitor's configured regions (#2030)

Jonathan Barazany84b1b8bf6289
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 16f0c4a40..3256999ef 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 ?? []),