Skip to content

Open-source status page, incident response and uptime monitoring

fix: keep regions chart data after update (#1408)

Maximilian Kaske93fb277617dc
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 bf97213d1..e3916132b 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/client.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/client.tsx
@@ -26,6 +26,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { mapRegionMetrics } from "@/data/metrics.client";
import type { RegionMetric } from "@/data/region-metrics";
import { useTRPC } from "@/lib/trpc/client";
+import { flyRegions } from "@openstatus/db/src/schema/constants";
import { useQuery } from "@tanstack/react-query";
import { useParams } from "next/navigation";
import { useQueryStates } from "nuqs";
@@ -55,11 +56,19 @@ export function Client() {
enabled: !!monitor,
} as const;
- const { data: regionTimeline } = useQuery(regionTimelineQuery);
+ const { data: regionTimeline, isLoading } = useQuery(regionTimelineQuery);
const regionMetrics: RegionMetric[] = React.useMemo(() => {
- return mapRegionMetrics(regionTimeline, monitor?.regions ?? [], percentile);
- }, [regionTimeline, monitor, percentile]);
+ 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 ?? []
+ : (flyRegions as unknown as (typeof flyRegions)[number][]),
+ percentile,
+ );
+ }, [regionTimeline, monitor, percentile, isLoading]);
if (!monitor) return null;
@@ -105,9 +114,7 @@ export function Client() {
monitorId={id}
type={monitor.jobType as "http" | "tcp"}
period={period}
- regions={monitor.regions.filter((region) =>
- selectedRegions.includes(region),
- )}
+ regions={selectedRegions}
/>
</Section>
<Section>
@@ -185,9 +192,7 @@ export function Client() {
<TabsContent value="chart">
<ChartLineRegions
className="mt-3"
- regions={monitor.regions.filter((region) =>
- selectedRegions.includes(region),
- )}
+ regions={selectedRegions}
data={regionMetrics.reduce(
(acc, region) => {
region.trend.forEach((t) => {
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/create/page.tsx b/apps/dashboard/src/app/(dashboard)/monitors/create/page.tsx
index 5c0751bf3..aba2681b4 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/create/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/create/page.tsx
@@ -31,8 +31,10 @@ export default function Page() {
queryClient.invalidateQueries({
queryKey: trpc.monitor.list.queryKey(),
});
- triggerCheckMutation.mutate({ id: data.id });
- router.push(`/monitors/${data.id}/edit`);
+ if (data.active) {
+ triggerCheckMutation.mutate({ id: data.id });
+ router.push(`/monitors/${data.id}/edit`);
+ }
},
}),
);
diff --git a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
index bbb449baa..264fb53f9 100644
--- a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
+++ b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
@@ -99,7 +99,9 @@ export function Client() {
trpc.monitor.new.mutationOptions({
onSuccess: (data) => {
setSearchParams({ step: "2" });
- triggerCheckMutation.mutate({ id: data.id });
+ if (data.active) {
+ triggerCheckMutation.mutate({ id: data.id });
+ }
refetch();
queryClient.invalidateQueries({
queryKey: trpc.monitor.list.queryKey(),
diff --git a/apps/dashboard/src/components/chart/chart-area-timing-phases.tsx b/apps/dashboard/src/components/chart/chart-area-timing-phases.tsx
index 751428dc2..a1d282a38 100644
--- a/apps/dashboard/src/components/chart/chart-area-timing-phases.tsx
+++ b/apps/dashboard/src/components/chart/chart-area-timing-phases.tsx
@@ -89,7 +89,6 @@ export function ChartAreaTimingPhases({
? mapTimingPhases(timingPhases, percentile)
: [];
- console.log(refinedTimingPhases);
return (
<ChartContainer config={chartConfig} className="h-[250px] w-full">
<AreaChart accessibilityLayer data={refinedTimingPhases}>
diff --git a/apps/dashboard/src/components/forms/monitor/form-general.tsx b/apps/dashboard/src/components/forms/monitor/form-general.tsx
index cab76e292..8b47751f6 100644
--- a/apps/dashboard/src/components/forms/monitor/form-general.tsx
+++ b/apps/dashboard/src/components/forms/monitor/form-general.tsx
@@ -719,7 +719,7 @@ export function FormGeneral({
>
Assertions
</Link>
- .
+ . We test your endpoint before saving the monitor.
</FormCardFooterInfo>
<Button type="submit" disabled={isPending || disabled}>
{isPending ? "Submitting..." : "Submit"}