diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx index f055571..01e73ac 100644 --- a/webapp/src/App.tsx +++ b/webapp/src/App.tsx @@ -19,8 +19,7 @@ import { type TimelineBucket, } from './lib/api' import { DocsNavProvider } from './lib/docsNav' - -const POLL_MS = 2000 +import { POLL_MS } from './lib/polling' /// Reads the routing params `PopOutButton` writes: `section` picks which primary section to render full-page, and `startMs`/`endMs` carry over the range for sections with no `LogTimeline` of their own to pick one. function parsePopOutQuery(): { section: PopOutSectionId | null; range: TimeRange | null } { diff --git a/webapp/src/components/Dashboards.tsx b/webapp/src/components/Dashboards.tsx index 5b7e5ae..f076560 100644 --- a/webapp/src/components/Dashboards.tsx +++ b/webapp/src/components/Dashboards.tsx @@ -14,6 +14,7 @@ import { type Panel, type PromqlSeries, } from '../lib/api' +import { POLL_MS } from '../lib/polling' import { CollapseToggle, PopOutButton, @@ -40,11 +41,22 @@ function newPanelId(): string { return `panel-${Date.now()}-${Math.random().toString(36).slice(2, 8)}` } -/// Fetches the panel's PromQL series on query/chart-type/range change; a malformed query must render as an inline error rather than crash the page. +/// Fetches the panel's PromQL series on query/chart-type/range change, and also refetches on +/// the same cadence as the rest of the app's polling (`POLL_MS`) so a panel doesn't go stale +/// between rolling-preset ticks or under a fixed range. `tick` is the only thing that interval +/// touches; it's folded into this single effect's dependency array (rather than driving a +/// second, independent fetch effect) so a range change landing on the same tick still results +/// in exactly one fetch instead of two racing ones. function PanelPreview({ panel, range }: { panel: Panel; range: TimeRange | null }) { const [series, setSeries] = useState([]) const [error, setError] = useState(null) const [loading, setLoading] = useState(false) + const [tick, setTick] = useState(0) + + useEffect(() => { + const id = setInterval(() => setTick((t) => t + 1), POLL_MS) + return () => clearInterval(id) + }, []) useEffect(() => { if (!panel.promql.trim()) { @@ -71,7 +83,8 @@ function PanelPreview({ panel, range }: { panel: Panel; range: TimeRange | null return () => { cancelled = true } - }, [panel.promql, panel.chart_type, range?.startMs, range?.endMs]) + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [panel.promql, panel.chart_type, range?.startMs, range?.endMs, tick]) if (error) { return
{error}
diff --git a/webapp/src/lib/polling.ts b/webapp/src/lib/polling.ts new file mode 100644 index 0000000..95ec77a --- /dev/null +++ b/webapp/src/lib/polling.ts @@ -0,0 +1,4 @@ +/// Shared polling cadence for the whole app — the log/timeline poll in `App.tsx` and any +/// other section that should refresh on the same rhythm (e.g. dashboard panels) import this +/// instead of hardcoding their own interval, so they can never drift apart. +export const POLL_MS = 2000