Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Keep drawer History dots round and its readout steady

rcourtman5bfa2468561e
diff --git a/docs/release-control/v6/internal/subsystems/frontend-primitives.md b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
index 6faa009c10..8d4b66fd10 100644
--- a/docs/release-control/v6/internal/subsystems/frontend-primitives.md
+++ b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
@@ -1163,6 +1163,14 @@ invalid data, refresh and replacement. `browser-tests/history-window.cjs` also
checks sparse/empty/current states through the production PBS drawer and direct
shared renderer. This is presentation proof, not provider collection or #1723
installed acceptance.
+Because the plot stretches its viewBox to the panel
+(`preserveAspectRatio="none"`), single-observation dots and hover markers are
+zero-length, round-capped strokes with `vector-effect="non-scaling-stroke"`,
+drawn in screen pixels so they stay round at any width; never a `<circle>` in
+the plot. Series lines carry `data-history-series`, which is how tests tell a
+line from a dot. A series without a reading at the inspected time reads
+`no reading` in the readout itself; there is no separate explanatory line that
+would appear and vanish, and move the chart, as the inspected time changes.
Shared history-chart gridlines must carry numeric labels derived from the
plotted scale rather than semantic `Avg` / `Max` placeholders. Byte and
byte-rate axes include their human-readable unit at each gridline, and the
diff --git a/docs/release-control/v6/internal/subsystems/performance-and-scalability.md b/docs/release-control/v6/internal/subsystems/performance-and-scalability.md
index 24fa10a6fd..fdb2c062a6 100644
--- a/docs/release-control/v6/internal/subsystems/performance-and-scalability.md
+++ b/docs/release-control/v6/internal/subsystems/performance-and-scalability.md
@@ -3994,6 +3994,10 @@ only explicit matching refreshes; the full `GuestDrawer.test.tsx` pins the
unchanged cap and no live-recovery read. `guestHistorySegments.test.ts` pins
complete point preservation at the existing request bound. Neither claims a
timing benchmark, fleet CPU attribution or native incident relief.
+Round dot markers (zero-length round-capped strokes) and the in-place
+`no reading` readout change presentation only: they add no read, timer or DOM
+node per observation beyond the marker's two paths, and the readout no longer
+inserts or removes a line as the inspected time changes.
The default stored-history legend resolves one latest timestamp from that
same bounded, normalized panel index, then looks up each configured series at
diff --git a/frontend-modern/browser-verification/f6989ba2b7f307f0.json b/frontend-modern/browser-verification/f6989ba2b7f307f0.json
new file mode 100644
index 0000000000..e325b3b80e
--- /dev/null
+++ b/frontend-modern/browser-verification/f6989ba2b7f307f0.json
@@ -0,0 +1,36 @@
+{
+ "version": 1,
+ "base_sha": "0a44d276db4bdb53c7187f6074ee4b005c1d4872",
+ "verified_at": "2026-10-13T14:21:44Z",
+ "result": "passed",
+ "changed_paths": [
+ "frontend-modern/src/components/Workloads/GuestDrawerHistory.tsx"
+ ],
+ "content_sha256": {
+ "frontend-modern/src/components/Workloads/GuestDrawerHistory.tsx": "751bdc1f976171edfad5f340d60c08e6163a30cbfa8f16d5ee55ed81ced6858a"
+ },
+ "routes": [
+ "/proxmox/overview"
+ ],
+ "viewports": [
+ {
+ "width": 1024,
+ "height": 900
+ },
+ {
+ "width": 390,
+ "height": 844
+ }
+ ],
+ "states": [
+ "private preview: origin/main plus this GuestDrawerHistory.tsx (and the separate 7-day default change), frontend embedded, run locally in mock mode with a seeded metrics store whose per-metric timestamps are misaligned, so single-observation dots appear across every panel",
+ "guest artifact-cache-310 History at 24 hours: single-observation dots and hover markers render round in a zoomed screenshot of the 906px-wide plot; the plot contains no <circle>",
+ "readout at a stored time where Memory and Disk have no reading shows 'Memory no reading' and 'Disk no reading'; the 'A dash means' line is absent",
+ "390px phone: no element extends past the viewport, page scrollWidth equals the viewport"
+ ],
+ "interactions": [
+ "swept the pointer across the Utilization plot in 21 steps at 1024px: chart height stayed 202px throughout (previously the dash note appeared and vanished, moving the chart)",
+ "repeated the sweep in 16 steps at 390px: chart height stayed 327px",
+ "switched the History range to 24 hours with the range control"
+ ]
+}
diff --git a/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.history.test.tsx b/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.history.test.tsx
index 3a90099671..38b47d45af 100644
--- a/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.history.test.tsx
+++ b/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.history.test.tsx
@@ -240,7 +240,7 @@ describe('ResourceDetailDrawer change history section', () => {
'50.0%current',
);
expect(chart.querySelector('[data-history-deferred]')).toBeNull();
- expect(chart.querySelector('path')).toBeNull();
+ expect(chart.querySelector('path[data-history-series]')).toBeNull();
expect(read).toHaveBeenCalledTimes(1);
} finally {
view.unmount();
@@ -306,7 +306,7 @@ describe('ResourceDetailDrawer change history section', () => {
expect(chart.querySelector('[data-history-current="disk"]')).toHaveTextContent('0.0%current');
expect(chart.querySelector('[data-history-deferred="disk"]')).toBeNull();
expect(view.container.querySelector('[data-history-group="utilization"]')).toBe(chart);
- expect(chart.querySelector('path')).toBeNull();
+ expect(chart.querySelector('path[data-history-series]')).toBeNull();
expect(read).toHaveBeenCalledTimes(1);
expect(screen.getByRole('tab', { name: 'History' })).toHaveAttribute('aria-selected', 'true');
} finally {
@@ -404,7 +404,7 @@ describe('ResourceDetailDrawer change history section', () => {
'10.0%current',
);
expect(view.container.querySelector('[data-history-group="utilization"]')).toBe(chart);
- expect(chart.querySelector('path')).toBeNull();
+ expect(chart.querySelector('path[data-history-series]')).toBeNull();
expect(read).toHaveBeenCalledTimes(1);
} finally {
view.unmount();
diff --git a/frontend-modern/src/components/Workloads/GuestDrawer.test.tsx b/frontend-modern/src/components/Workloads/GuestDrawer.test.tsx
index ab4891ad26..2a54bf127a 100644
--- a/frontend-modern/src/components/Workloads/GuestDrawer.test.tsx
+++ b/frontend-modern/src/components/Workloads/GuestDrawer.test.tsx
@@ -222,7 +222,7 @@ describe('GuestDrawer', () => {
expect(screen.getAllByTestId('guest-history-group-chart')[0]).toBe(chart);
expect(chart.querySelector('[data-history-current="memory"]')).toHaveTextContent('0.0%current');
expect(chart.querySelector('[data-history-deferred="memory"]')).toBeNull();
- expect(chart.querySelector('path')).toBeNull();
+ expect(chart.querySelector('path[data-history-series]')).toBeNull();
expect(chartsApiMocks.getMetricsHistory).toHaveBeenCalledTimes(1);
});
@@ -245,7 +245,7 @@ describe('GuestDrawer', () => {
fireEvent.click(screen.getByRole('tab', { name: 'History' }));
await screen.findByRole('slider', { name: 'Inspect Utilization history' });
const chart = screen.getAllByTestId('guest-history-group-chart')[0];
- expect(chart.querySelectorAll('path')).toHaveLength(1);
+ expect(chart.querySelectorAll('path[data-history-series]')).toHaveLength(1);
expect(chart.querySelectorAll('[data-history-observation="memory"]')).toHaveLength(2);
expect(chart.querySelector('[data-history-gaps]')).toHaveTextContent(
'Missing observations: Memory.',
@@ -276,7 +276,7 @@ describe('GuestDrawer', () => {
});
fireEvent.click(screen.getByRole('button', { name: 'Refresh history' }));
await waitFor(() => expect(chart.querySelector('[data-history-gaps]')).toBeNull());
- expect(chart.querySelectorAll('path')).toHaveLength(2);
+ expect(chart.querySelectorAll('path[data-history-series]')).toHaveLength(2);
expect(chart.querySelector('[data-history-observation="memory"]')).toBeNull();
expect(chartsApiMocks.getMetricsHistory).toHaveBeenCalledTimes(2);
});
@@ -382,7 +382,7 @@ describe('GuestDrawer', () => {
expect(history.querySelector('[data-history-deferred="memory"]')).toHaveTextContent(
'Not a current measurement.',
);
- expect(history.querySelector('path')).toBeNull();
+ expect(history.querySelector('path[data-history-series]')).toBeNull();
// Same target/range snapshots retain the chart and original History read.
expect(chartsApiMocks.getMetricsHistory).toHaveBeenCalledTimes(1);
for (const [request] of chartsApiMocks.getMetricsHistory.mock.calls) {
@@ -651,7 +651,7 @@ describe('GuestDrawer', () => {
const utilizationChart = screen.getAllByTestId('guest-history-group-chart')[0];
expect(utilizationChart).toHaveTextContent('CPU25.0%current');
expect(utilizationChart).toHaveTextContent('No stored history in this range');
- expect(utilizationChart.querySelector('path')).toBeNull();
+ expect(utilizationChart.querySelector('path[data-history-series]')).toBeNull();
});
it('renders unavailable current disk usage as a dash', async () => {
diff --git a/frontend-modern/src/components/Workloads/GuestDrawerHistory.tsx b/frontend-modern/src/components/Workloads/GuestDrawerHistory.tsx
index c64c303e63..dea5016d41 100644
--- a/frontend-modern/src/components/Workloads/GuestDrawerHistory.tsx
+++ b/frontend-modern/src/components/Workloads/GuestDrawerHistory.tsx
@@ -175,6 +175,48 @@ const findClosestGuestDrawerHistoryTimestamp = (
return closest;
};
+interface HistoryPointMarkerProps {
+ x: number;
+ y: number;
+ diameter: number;
+ color: string;
+ 'data-history-observation'?: string;
+ 'data-history-hover-marker'?: string;
+}
+
+// The plot stretches its viewBox to the panel (preserveAspectRatio="none"), so
+// a <circle> renders as an oval. A zero-length, round-capped stroke with a
+// non-scaling stroke is drawn in screen pixels and stays round at any width.
+// The surface-coloured ring underneath keeps the dot legible over a line.
+const HistoryPointMarker: Component<HistoryPointMarkerProps> = (props) => {
+ const d = () => `M${props.x} ${props.y}h0`;
+ return (
+ <g
+ aria-hidden="true"
+ data-history-observation={props['data-history-observation']}
+ data-history-hover-marker={props['data-history-hover-marker']}
+ data-x={props.x}
+ data-y={props.y}
+ >
+ <path
+ d={d()}
+ stroke="currentColor"
+ class="text-surface"
+ stroke-width={props.diameter + 2}
+ stroke-linecap="round"
+ vector-effect="non-scaling-stroke"
+ />
+ <path
+ d={d()}
+ stroke={props.color}
+ stroke-width={props.diameter}
+ stroke-linecap="round"
+ vector-effect="non-scaling-stroke"
+ />
+ </g>
+ );
+};
+
const GuestDrawerHistoryGroupChart: Component<GuestDrawerHistoryGroupChartProps> = (props) => {
const [hoverTimestamp, setHoverTimestamp] = createSignal<number | null>(null);
const [selectedTimestamp, setSelectedTimestamp] = createSignal<number | null>(null);
@@ -325,8 +367,11 @@ const GuestDrawerHistoryGroupChart: Component<GuestDrawerHistoryGroupChartProps>
isUnknown: isFallback && deferred?.valueLabel === 'freshness unknown',
valueLabel: point
? getGuestDrawerHistoryValueLabel([point], item.unit)
- : timestamp !== null
- ? '-'
+ : // A stored time where this series has no reading says so in place,
+ // rather than through a note that appears and disappears (and moves
+ // the chart) as the inspected time changes.
+ timestamp !== null
+ ? 'no reading'
: typeof fallbackValue === 'number' && Number.isFinite(fallbackValue)
? formatHistoryChartTooltipValue(fallbackValue, item.unit)
: '-',
@@ -418,14 +463,6 @@ const GuestDrawerHistoryGroupChart: Component<GuestDrawerHistoryGroupChartProps>
</div>
</div>
- <Show
- when={
- readoutTimestamp() !== null && displaySeries().some((item) => item.valueLabel === '-')
- }
- >
- <p class="mb-2 text-xs text-muted">A dash means no stored observation at this time.</p>
- </Show>
-
<For each={displaySeries().filter((item) => item.deferred)}>
{(item) => (
<p
@@ -482,6 +519,7 @@ const GuestDrawerHistoryGroupChart: Component<GuestDrawerHistoryGroupChartProps>
<For each={drawableSeries()}>
{(item) => (
<path
+ data-history-series={item.metric}
d={buildGuestDrawerHistoryPath(
item.points,
scale(),
@@ -501,21 +539,16 @@ const GuestDrawerHistoryGroupChart: Component<GuestDrawerHistoryGroupChartProps>
</For>
<For each={singlePointSeries()}>
{(item) => (
- <circle
- aria-hidden="true"
+ <HistoryPointMarker
data-history-observation={item.metric}
- cx={getGuestDrawerHistoryX(
+ x={getGuestDrawerHistoryX(
item.points[0].timestamp,
rangeBounds().startTime,
rangeBounds().endTime,
)}
- cy={getGuestDrawerHistoryY(item.points[0].value, scale())}
- r="3.5"
- fill={item.color}
- stroke="currentColor"
- stroke-width="1"
- class="text-surface"
- vector-effect="non-scaling-stroke"
+ y={getGuestDrawerHistoryY(item.points[0].value, scale())}
+ diameter={7}
+ color={item.color}
/>
)}
</For>
@@ -536,15 +569,12 @@ const GuestDrawerHistoryGroupChart: Component<GuestDrawerHistoryGroupChartProps>
/>
<For each={hoveredSeries()}>
{(item) => (
- <circle
- cx={item.x}
- cy={item.y}
- fill={item.color}
- r="3"
- stroke="currentColor"
- stroke-width="1"
- class="text-surface"
- vector-effect="non-scaling-stroke"
+ <HistoryPointMarker
+ data-history-hover-marker={item.metric}
+ x={item.x}
+ y={item.y}
+ diameter={6}
+ color={item.color}
/>
)}
</For>
diff --git a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.disk-provenance.test.tsx b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.disk-provenance.test.tsx
index 7ccd2bc3bc..62f1012a27 100644
--- a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.disk-provenance.test.tsx
+++ b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.disk-provenance.test.tsx
@@ -87,9 +87,13 @@ describe('GuestDrawerHistory filesystem provenance', () => {
expect(getGuestDrawerCurrentMetrics(value()).disk).toBe(90);
mount(value);
const chart = utilization();
- await waitFor(() => expect(chart.querySelectorAll('path').length).toBeGreaterThan(0));
+ await waitFor(() =>
+ expect(chart.querySelectorAll('path[data-history-series]').length).toBeGreaterThan(0),
+ );
const paths = () =>
- Array.from(chart.querySelectorAll('path'), (item) => item.getAttribute('d'));
+ Array.from(chart.querySelectorAll('path[data-history-series]'), (item) =>
+ item.getAttribute('d'),
+ );
const storedPaths = paths();
setValue({ ...value(), status: 'stopped', diskStatusReason: undefined });
expect(chart.querySelector('[data-history-current="disk"]')).toBeNull();
@@ -138,7 +142,7 @@ describe('GuestDrawerHistory filesystem provenance', () => {
expect(chart.querySelector('[data-history-current="memory"]')).toHaveTextContent(
'Memory25.0%current',
);
- expect(chart.querySelector('path')).toBeNull();
+ expect(chart.querySelector('path[data-history-series]')).toBeNull();
expect(chart.querySelector('[data-history-observation]')).toBeNull();
expect(fetch).toHaveBeenCalledTimes(1);
},
@@ -213,7 +217,9 @@ describe('GuestDrawerHistory filesystem provenance', () => {
}),
);
mount(() => guest('prev-agent-timeout'));
- await waitFor(() => expect(utilization().querySelectorAll('path')).toHaveLength(2));
+ await waitFor(() =>
+ expect(utilization().querySelectorAll('path[data-history-series]')).toHaveLength(2),
+ );
const chart = utilization();
expect(chart).toHaveTextContent('Disk30.0%');
expect(chart.querySelector('[data-history-last-known]')).toBeNull();
@@ -242,7 +248,7 @@ describe('GuestDrawerHistory filesystem provenance', () => {
const slider = screen.getByRole('slider');
slider.focus();
fireEvent.input(slider, { target: { value: '0' } });
- expect(utilization()).toHaveTextContent('Disk-');
+ expect(utilization()).toHaveTextContent('Diskno reading');
expect(utilization().querySelector('[data-history-last-known]')).toBeNull();
expect(slider).toHaveAttribute(
'aria-valuetext',
@@ -250,7 +256,7 @@ describe('GuestDrawerHistory filesystem provenance', () => {
);
fireEvent.blur(slider);
expect(utilization().querySelector('[data-history-last-known="disk"]')).toBeNull();
- expect(utilization()).toHaveTextContent('Disk-');
+ expect(utilization()).toHaveTextContent('Diskno reading');
expect(within(utilization()).getByTestId('guest-history-hover-time')).toHaveAttribute(
'datetime',
new Date(end).toISOString(),
diff --git a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.gaps.test.tsx b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.gaps.test.tsx
index f4c659a21e..c4e1cb3f1a 100644
--- a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.gaps.test.tsx
+++ b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.gaps.test.tsx
@@ -41,7 +41,7 @@ const response = (
const group = (id = 'utilization') =>
screen.getAllByTestId('guest-history-group-chart').find((el) => el.dataset.historyGroup === id)!;
const paths = (colour: string, id = 'utilization') => [
- ...group(id).querySelectorAll(`path[stroke="${colour}"]`),
+ ...group(id).querySelectorAll(`path[data-history-series][stroke="${colour}"]`),
];
const marks = (metric: string, id = 'utilization') =>
group(id).querySelectorAll(`[data-history-observation="${metric}"]`);
@@ -84,7 +84,7 @@ describe('drawer History does not join missing stored observations', () => {
'aria-valuetext',
expect.stringContaining('Memory no observation.'),
);
- expect(group()).toHaveTextContent('Memory-');
+ expect(group()).toHaveTextContent('Memoryno reading');
fireEvent.input(slider, { target: { value: '2' } });
expect(group()).toHaveTextContent('Memory0.0%');
});
@@ -98,7 +98,7 @@ describe('drawer History does not join missing stored observations', () => {
);
mount();
await screen.findByRole('slider', { name: 'Inspect Utilization history' });
- expect(group().querySelectorAll('path')).toHaveLength(0);
+ expect(group().querySelectorAll('path[data-history-series]')).toHaveLength(0);
expect(marks('cpu')).toHaveLength(2);
expect(marks('memory')).toHaveLength(2);
expect(note()).toHaveTextContent('Missing observations: CPU, Memory.');
diff --git a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.inspection.test.tsx b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.inspection.test.tsx
index 530ec35222..6074b5caf5 100644
--- a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.inspection.test.tsx
+++ b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.inspection.test.tsx
@@ -86,14 +86,14 @@ describe('GuestDrawerHistory stored-observation inspection', () => {
`${new Date(time).toLocaleString()}. CPU 11.0%. Memory no observation. Disk no observation.`,
);
expect(utilization()).toHaveTextContent('CPU11.0%');
- expect(utilization()).toHaveTextContent('Memory-');
+ expect(utilization()).toHaveTextContent('Memoryno reading');
expect(utilization()).not.toHaveTextContent('88.0%');
choose(slider, 1);
expect(slider).toHaveAttribute(
'aria-valuetext',
`${new Date(time + 30_000).toLocaleString()}. CPU no observation. Memory 30.0%. Disk no observation.`,
);
- expect(utilization()).toHaveTextContent('CPU-');
+ expect(utilization()).toHaveTextContent('CPUno reading');
expect(utilization()).toHaveTextContent('Memory30.0%');
expect(slider).toHaveFocus();
});
@@ -191,7 +191,7 @@ describe('GuestDrawerHistory stored-observation inspection', () => {
const restoredTime = within(utilization()).getByTestId('guest-history-hover-time');
expect(restoredTime).toHaveTextContent('Latest stored');
expect(restoredTime).toHaveAttribute('datetime', new Date(time + 120_000).toISOString());
- expect(utilization().querySelectorAll('circle[r="3"]')).toHaveLength(0);
+ expect(utilization().querySelectorAll('[data-history-hover-marker]')).toHaveLength(0);
},
);
@@ -243,7 +243,7 @@ describe('GuestDrawerHistory stored-observation inspection', () => {
`1 stored observation time. ${new Date(time).toLocaleString()}. CPU 11.0%. Memory no observation. Disk no observation.`,
);
expect(screen.queryByRole('slider')).not.toBeInTheDocument();
- expect(utilization().querySelector('path')).toBeNull();
+ expect(utilization().querySelector('path[data-history-series]')).toBeNull();
});
it.each(['empty', 'invalid'] as const)(
diff --git a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.memory-provenance.test.tsx b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.memory-provenance.test.tsx
index 86f106771d..a3bd641608 100644
--- a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.memory-provenance.test.tsx
+++ b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.memory-provenance.test.tsx
@@ -212,7 +212,7 @@ describe('guest memory original-observation provenance', () => {
expect(chart.querySelector('[data-history-current="memory"]')).toHaveTextContent(
'Memory35.0%current',
);
- expect(chart.querySelector('path')).toBeNull();
+ expect(chart.querySelector('path[data-history-series]')).toBeNull();
expect(fetch).toHaveBeenCalledTimes(1);
});
@@ -227,7 +227,9 @@ describe('guest memory original-observation provenance', () => {
response({ memory: [point(original, 20), point(later, 30)] }),
);
mount(() => guest(annotation('last-known'), 25));
- await waitFor(() => expect(utilization().querySelectorAll('path')).toHaveLength(1));
+ await waitFor(() =>
+ expect(utilization().querySelectorAll('path[data-history-series]')).toHaveLength(1),
+ );
const chart = utilization();
expect(chart).toHaveTextContent('Memory30.0%');
expect(chart.querySelector('[data-history-current="memory"]')).toBeNull();
diff --git a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.pointer.test.tsx b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.pointer.test.tsx
index 402718bf58..1dc6b8fe63 100644
--- a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.pointer.test.tsx
+++ b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.pointer.test.tsx
@@ -60,9 +60,9 @@ describe('GuestDrawerHistory common-time pointer inspection', () => {
expect(within(utilization()).getByTestId('guest-history-hover-time')).toHaveTextContent(
formatHistoryChartTimeLabel(time + 30_000, '24h'),
);
- expect(utilization()).toHaveTextContent('CPU-');
+ expect(utilization()).toHaveTextContent('CPUno reading');
expect(utilization()).toHaveTextContent('Memory30.0%');
- expect(utilization().querySelectorAll('circle[r="3"]')).toHaveLength(1);
+ expect(utilization().querySelectorAll('[data-history-hover-marker]')).toHaveLength(1);
expect(fetch).toHaveBeenCalledTimes(1);
});
@@ -78,8 +78,8 @@ describe('GuestDrawerHistory common-time pointer inspection', () => {
await screen.findByRole('slider', { name: 'Inspect Utilization history' });
const plot = hover(utilization(), 0);
expect(utilization()).toHaveTextContent('CPU11.0%');
- expect(utilization()).toHaveTextContent('Memory-');
- expect(utilization()).toHaveTextContent('Disk-');
+ expect(utilization()).toHaveTextContent('Memoryno reading');
+ expect(utilization()).toHaveTextContent('Diskno reading');
expect(utilization()).not.toHaveTextContent('98.0%');
expect(
within(utilization()).getByRole('img', { name: 'Utilization history' }),
@@ -92,7 +92,7 @@ describe('GuestDrawerHistory common-time pointer inspection', () => {
expect(within(utilization()).getByTestId('guest-history-hover-time')).toHaveTextContent(
'Latest stored',
);
- expect(utilization()).toHaveTextContent('Disk-');
+ expect(utilization()).toHaveTextContent('Diskno reading');
});
it('can inspect a lone zero observation without drawing a synthetic trend', async () => {
@@ -100,11 +100,11 @@ describe('GuestDrawerHistory common-time pointer inspection', () => {
render(() => <GuestDrawerHistory target={target} range="24h" />);
await screen.findByRole('slider', { name: 'Inspect Utilization history' });
hover(utilization(), 45_000);
- expect(utilization()).toHaveTextContent('CPU-');
- expect(utilization()).toHaveTextContent('Memory-');
+ expect(utilization()).toHaveTextContent('CPUno reading');
+ expect(utilization()).toHaveTextContent('Memoryno reading');
expect(utilization()).toHaveTextContent('Disk0.0%');
- expect(utilization().querySelectorAll('circle[r="3"]')).toHaveLength(1);
- expect(utilization().querySelectorAll('path')).toHaveLength(1);
+ expect(utilization().querySelectorAll('[data-history-hover-marker]')).toHaveLength(1);
+ expect(utilization().querySelectorAll('path[data-history-series]')).toHaveLength(1);
expect(utilization().querySelectorAll('[data-history-observation]')).toHaveLength(4);
});
@@ -115,10 +115,10 @@ describe('GuestDrawerHistory common-time pointer inspection', () => {
hover(utilization(), 120_000);
expect(utilization()).toHaveTextContent('CPU43.0%');
expect(utilization()).toHaveTextContent('Memory55.0%');
- expect(utilization()).toHaveTextContent('Disk-');
- const markers = [...utilization().querySelectorAll('circle[r="3"]')];
+ expect(utilization()).toHaveTextContent('Diskno reading');
+ const markers = [...utilization().querySelectorAll('[data-history-hover-marker]')];
expect(markers).toHaveLength(2);
- expect(markers[0].getAttribute('cx')).toBe(markers[1].getAttribute('cx'));
+ expect(markers[0].getAttribute('data-x')).toBe(markers[1].getAttribute('data-x'));
});
it('snaps between observations and resolves a tie to the earlier actual time', async () => {
@@ -126,9 +126,9 @@ describe('GuestDrawerHistory common-time pointer inspection', () => {
render(() => <GuestDrawerHistory target={target} range="24h" />);
await screen.findByRole('slider', { name: 'Inspect Utilization history' });
hover(utilization(), 37_500);
- expect(utilization()).toHaveTextContent('CPU-');
+ expect(utilization()).toHaveTextContent('CPUno reading');
expect(utilization()).toHaveTextContent('Memory30.0%');
- expect(utilization()).toHaveTextContent('Disk-');
+ expect(utilization()).toHaveTextContent('Diskno reading');
});
it('keeps keyboard selection authoritative and restores pointer inspection after blur', async () => {
@@ -139,10 +139,10 @@ describe('GuestDrawerHistory common-time pointer inspection', () => {
fireEvent.input(slider, { target: { value: '0' } });
hover(utilization(), 30_000);
expect(utilization()).toHaveTextContent('CPU11.0%');
- expect(utilization()).toHaveTextContent('Memory-');
+ expect(utilization()).toHaveTextContent('Memoryno reading');
fireEvent.blur(slider);
hover(utilization(), 30_000);
- expect(utilization()).toHaveTextContent('CPU-');
+ expect(utilization()).toHaveTextContent('CPUno reading');
expect(utilization()).toHaveTextContent('Memory30.0%');
});
@@ -155,10 +155,10 @@ describe('GuestDrawerHistory common-time pointer inspection', () => {
await vi.advanceTimersByTimeAsync(0);
hover(utilization(), 30_000);
await vi.advanceTimersByTimeAsync(30_000);
- expect(utilization()).toHaveTextContent('CPU-');
+ expect(utilization()).toHaveTextContent('CPUno reading');
expect(utilization()).toHaveTextContent('Memory31.0%');
- expect(utilization().querySelectorAll('path')).toHaveLength(0);
- expect(utilization().querySelectorAll('circle[r="3"]')).toHaveLength(1);
+ expect(utilization().querySelectorAll('path[data-history-series]')).toHaveLength(0);
+ expect(utilization().querySelectorAll('[data-history-hover-marker]')).toHaveLength(1);
});
it.each(['target', 'range'] as const)(
@@ -177,7 +177,7 @@ describe('GuestDrawerHistory common-time pointer inspection', () => {
await waitFor(() =>
expect(within(utilization()).queryByTestId('guest-history-hover-time')).toBeNull(),
);
- expect(utilization().querySelectorAll('circle[r="3"]')).toHaveLength(0);
+ expect(utilization().querySelectorAll('[data-history-hover-marker]')).toHaveLength(0);
},
);
@@ -197,9 +197,9 @@ describe('GuestDrawerHistory common-time pointer inspection', () => {
const network = groups.find((group) => group.dataset.historyGroup === 'network')!;
hover(network, 0);
expect(network).toHaveTextContent('In0 B/s');
- expect(network).toHaveTextContent('Out-');
+ expect(network).toHaveTextContent('Outno reading');
hover(network, 30_000);
- expect(network).toHaveTextContent('In-');
+ expect(network).toHaveTextContent('Inno reading');
expect(network).toHaveTextContent('Out4.00 KB/s');
const thermals = groups.find((group) => group.dataset.historyGroup === 'thermals')!;
hover(thermals, 0);
diff --git a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.readout.test.tsx b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.readout.test.tsx
index ec20cbcb2c..efed674ef9 100644
--- a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.readout.test.tsx
+++ b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.readout.test.tsx
@@ -58,8 +58,8 @@ describe('drawer History default readout belongs to one stored time', () => {
));
await ready();
expect(group()).toHaveTextContent('CPU22.0%');
- expect(group()).toHaveTextContent('Memory-');
- expect(group()).toHaveTextContent('Disk-');
+ expect(group()).toHaveTextContent('Memoryno reading');
+ expect(group()).toHaveTextContent('Diskno reading');
expect(group()).not.toHaveTextContent(/95.0%|98.0%|88.0%|99.0%/);
expect(group().querySelector('[data-history-current]')).toBeNull();
expect(readoutTime()).toHaveTextContent('Latest stored');
@@ -81,7 +81,7 @@ describe('drawer History default readout belongs to one stored time', () => {
expect(group()).toHaveTextContent('Memory0.0%');
expect(group()).toHaveTextContent('Disk0.0%');
expect(readoutTime()).toHaveAttribute('datetime', new Date(start + 60_000).toISOString());
- expect(group().querySelector('path')).toBeNull();
+ expect(group().querySelector('path[data-history-series]')).toBeNull();
expect(group().querySelectorAll('[data-history-observation]')).toHaveLength(3);
});
@@ -112,8 +112,8 @@ describe('drawer History default readout belongs to one stored time', () => {
fetch.mockResolvedValue(response({ cpu: [point(2, 22)] }));
refresh();
await waitFor(() => expect(group()).toHaveTextContent('CPU22.0%'));
- expect(group()).toHaveTextContent('Memory-');
- expect(group()).toHaveTextContent('Disk-');
+ expect(group()).toHaveTextContent('Memoryno reading');
+ expect(group()).toHaveTextContent('Diskno reading');
expect(group().querySelector('[data-history-last-known]')).toBeNull();
expect(group().querySelector('[data-history-unknown]')).toBeNull();
});
@@ -128,10 +128,10 @@ describe('drawer History default readout belongs to one stored time', () => {
slider.focus();
fireEvent.input(slider, { target: { value: '1' } });
expect(group()).toHaveTextContent('Memory95.0%');
- expect(group()).toHaveTextContent('CPU-');
+ expect(group()).toHaveTextContent('CPUno reading');
fireEvent.blur(slider);
expect(group()).toHaveTextContent('CPU22.0%');
- expect(group()).toHaveTextContent('Memory-');
+ expect(group()).toHaveTextContent('Memoryno reading');
expect(readoutTime()).toHaveTextContent('Latest stored');
setLive(77);
expect(group()).not.toHaveTextContent('77.0%');
@@ -139,7 +139,7 @@ describe('drawer History default readout belongs to one stored time', () => {
fetch.mockResolvedValue(response({ cpu: [point(2, 22)], memory: [point(3, 25)] }));
refresh();
await waitFor(() => expect(group()).toHaveTextContent('Memory25.0%'));
- expect(group()).toHaveTextContent('CPU-');
+ expect(group()).toHaveTextContent('CPUno reading');
expect(readoutTime()).toHaveAttribute('datetime', new Date(start + 180_000).toISOString());
});
@@ -155,14 +155,14 @@ describe('drawer History default readout belongs to one stored time', () => {
);
render(() => <GuestDrawerHistory target={target} range="1h" />);
await screen.findByRole('slider', { name: 'Inspect Network I/O history' });
- expect(group('network')).toHaveTextContent('In-');
+ expect(group('network')).toHaveTextContent('Inno reading');
expect(group('network')).toHaveTextContent('Out0 B/s');
expect(readoutTime('network')).toHaveAttribute(
'datetime',
new Date(start + 120_000).toISOString(),
);
expect(group('disk-io')).toHaveTextContent('Read0 B/s');
- expect(group('disk-io')).toHaveTextContent('Write-');
+ expect(group('disk-io')).toHaveTextContent('Writeno reading');
expect(readoutTime('disk-io')).toHaveAttribute(
'datetime',
new Date(start + 180_000).toISOString(),
@@ -179,7 +179,7 @@ describe('drawer History default readout belongs to one stored time', () => {
refresh();
await screen.findByRole('button', { name: 'Retry history' });
expect(readoutTime()).toHaveAttribute('datetime', new Date(start + 120_000).toISOString());
- expect(group()).toHaveTextContent('Memory-');
+ expect(group()).toHaveTextContent('Memoryno reading');
fireEvent.click(screen.getByRole('button', { name: 'Retry history' }));
await waitFor(() => expect(screen.queryByTestId('guest-history-group-chart')).toBeNull());
expect(screen.queryByTestId('guest-history-hover-time')).toBeNull();
diff --git a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.sparse.test.tsx b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.sparse.test.tsx
index 0a0caf6b7b..36744c6f53 100644
--- a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.sparse.test.tsx
+++ b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.sparse.test.tsx
@@ -104,7 +104,7 @@ describe('GuestDrawerHistory sparse observations and current provenance', () =>
);
expect(group().querySelector('[data-history-current]')).toBeNull();
expect(group().querySelector('[data-history-last-known]')).toBeNull();
- expect(group().querySelector('path')).toBeNull();
+ expect(group().querySelector('path[data-history-series]')).toBeNull();
expect(dots()).toHaveLength(0);
});
@@ -128,7 +128,7 @@ describe('GuestDrawerHistory sparse observations and current provenance', () =>
expect(group().querySelector('[data-history-last-known="disk"]')).toHaveAccessibleDescription(
'Disk reading: Guest reads paused.',
);
- expect(group().querySelector('path')).toBeNull();
+ expect(group().querySelector('path[data-history-series]')).toBeNull();
expect(dots()).toHaveLength(0);
});
@@ -146,9 +146,15 @@ describe('GuestDrawerHistory sparse observations and current provenance', () =>
await waitFor(() => expect(dots()).toHaveLength(1));
const chart = group(id);
const dot = chart.querySelector(`[data-history-observation="${metric}"]`)!;
- expect(Number(dot.getAttribute('cx'))).toBeCloseTo(193);
- expect(Number(dot.getAttribute('cy'))).toBeCloseTo(74);
- expect(chart.querySelector('path')).toBeNull();
+ expect(Number(dot.getAttribute('data-x'))).toBeCloseTo(193);
+ expect(Number(dot.getAttribute('data-y'))).toBeCloseTo(74);
+ // The plot stretches non-uniformly; a <circle> there renders as an oval.
+ // Dots are round-capped, non-scaling strokes drawn in screen pixels.
+ expect(chart.querySelector('[data-testid="guest-history-plot"] circle')).toBeNull();
+ expect(
+ dot.querySelectorAll('path[stroke-linecap="round"][vector-effect="non-scaling-stroke"]'),
+ ).toHaveLength(2);
+ expect(chart.querySelector('path[data-history-series]')).toBeNull();
expect(chart.querySelector('[data-history-current]')).toBeNull();
expect(chart).not.toHaveTextContent('No stored history in this range');
expect(chart).toHaveTextContent('Single observation. No trend yet.');
@@ -174,19 +180,19 @@ describe('GuestDrawerHistory sparse observations and current provenance', () =>
);
mount({ cpu: 99, memory: 98, disk: 88 });
await waitFor(() => expect(dots()).toHaveLength(3));
- expect(group().querySelectorAll('path')).toHaveLength(0);
+ expect(group().querySelectorAll('path[data-history-series]')).toHaveLength(0);
expect(group().querySelectorAll('[data-history-observation="memory"]')).toHaveLength(1);
expect(group().querySelectorAll('[data-history-observation="cpu"]')).toHaveLength(2);
expect(group().querySelectorAll('[data-history-current]')).toHaveLength(0);
- expect(group()).toHaveTextContent('Memory-');
- expect(group()).toHaveTextContent('Disk-');
+ expect(group()).toHaveTextContent('Memoryno reading');
+ expect(group()).toHaveTextContent('Diskno reading');
expect(group()).not.toHaveTextContent('Single observation. No trend yet.');
const slider = within(group()).getByRole('slider');
slider.focus();
fireEvent.input(slider, { target: { value: '1' } });
- expect(group()).toHaveTextContent('CPU-');
+ expect(group()).toHaveTextContent('CPUno reading');
expect(group()).toHaveTextContent('Memory0.0%');
- expect(group()).toHaveTextContent('Disk-');
+ expect(group()).toHaveTextContent('Diskno reading');
expect(group().querySelector('[data-history-current]')).toBeNull();
expect(dots()).toHaveLength(3);
});
@@ -200,10 +206,13 @@ describe('GuestDrawerHistory sparse observations and current provenance', () =>
);
mount();
await waitFor(() => expect(dots()).toHaveLength(2));
- expect(group().querySelector('path')).toBeNull();
- expect(group().querySelector('[data-history-observation="cpu"]')).toHaveAttribute('cx', '34');
+ expect(group().querySelector('path[data-history-series]')).toBeNull();
+ expect(group().querySelector('[data-history-observation="cpu"]')).toHaveAttribute(
+ 'data-x',
+ '34',
+ );
expect(group().querySelector('[data-history-observation="memory"]')).toHaveAttribute(
- 'cx',
+ 'data-x',
'352',
);
const slider = within(group()).getByRole('slider');
@@ -237,7 +246,7 @@ describe('GuestDrawerHistory sparse observations and current provenance', () =>
);
expect(document.querySelectorAll('[data-history-current]')).toHaveLength(1);
expect(dots()).toHaveLength(0);
- expect(document.querySelectorAll('path')).toHaveLength(0);
+ expect(document.querySelectorAll('path[data-history-series]')).toHaveLength(0);
expect(screen.queryByRole('slider')).not.toBeInTheDocument();
expect(screen.queryByText('Single observation. No trend yet.')).not.toBeInTheDocument();
},
@@ -258,7 +267,7 @@ describe('GuestDrawerHistory sparse observations and current provenance', () =>
expect(document.body).not.toHaveTextContent('private diagnostic');
fireEvent.click(screen.getByRole('button', { name: 'Retry history' }));
await screen.findByRole('slider');
- expect(group().querySelectorAll('path')).toHaveLength(1);
+ expect(group().querySelectorAll('path[data-history-series]')).toHaveLength(1);
expect(dots()).toHaveLength(0);
expect(group()).not.toHaveTextContent('Single observation. No trend yet.');
expect(fetch).toHaveBeenCalledTimes(3);
diff --git a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.window.test.tsx b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.window.test.tsx
index 4492aa1a35..2822bb2d6e 100644
--- a/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.window.test.tsx
+++ b/frontend-modern/src/components/Workloads/__tests__/GuestDrawerHistory.window.test.tsx
@@ -56,7 +56,7 @@ const group = (id: string) =>
const pathXs = (chart: HTMLElement) =>
[
...chart
- .querySelector('path')!
+ .querySelector('path[data-history-series]')!
.getAttribute('d')!
.matchAll(/[ML](-?[\d.]+),/g),
].map((match) => Number(match[1]));
@@ -67,7 +67,7 @@ const selectSharedTime = (chart: HTMLElement) => {
const slider = within(chart).getByRole('slider');
slider.focus();
fireEvent.input(slider, { target: { value: '1' } });
- return chart.querySelector('circle[r="3"]')!;
+ return chart.querySelector('[data-history-hover-marker]')!;
};
describe('GuestDrawerHistory shared time window', () => {
@@ -85,8 +85,8 @@ describe('GuestDrawerHistory shared time window', () => {
vi.spyOn(ChartsAPI, 'getMetricsHistory').mockResolvedValue(response());
mount();
await screen.findByRole('slider', { name: 'Inspect Network I/O history' });
- const utilizationX = selectSharedTime(group('utilization')).getAttribute('cx');
- const networkX = selectSharedTime(group('network')).getAttribute('cx');
+ const utilizationX = selectSharedTime(group('utilization')).getAttribute('data-x');
+ const networkX = selectSharedTime(group('network')).getAttribute('data-x');
expect(networkX).toBe(utilizationX);
expect(Number(networkX)).toBeCloseTo(expectedX(end - 5 * 60_000));
});
@@ -112,10 +112,15 @@ describe('GuestDrawerHistory shared time window', () => {
.mockRejectedValueOnce(new Error('Private fixture detail'));
mount();
await screen.findByRole('slider', { name: 'Inspect Utilization history' });
- const before = group('utilization').querySelector('path')!.getAttribute('d');
+ const before = group('utilization')
+ .querySelector('path[data-history-series]')!
+ .getAttribute('d');
fireEvent.click(screen.getByRole('button', { name: 'Refresh history' }));
await screen.findByText('History refresh failed. Showing previously loaded history.');
- expect(group('utilization').querySelector('path')).toHaveAttribute('d', before);
+ expect(group('utilization').querySelector('path[data-history-series]')).toHaveAttribute(
+ 'd',
+ before,
+ );
expect(axis(group('utilization')).querySelector('time')).toHaveAttribute(
'datetime',
new Date(start).toISOString(),
@@ -141,7 +146,9 @@ describe('GuestDrawerHistory shared time window', () => {
valueText,
);
expect(
- Number(group('utilization').querySelector('circle[r="3"]')!.getAttribute('cx')),
+ Number(
+ group('utilization').querySelector('[data-history-hover-marker]')!.getAttribute('data-x'),
+ ),
).toBeCloseTo(expectedX(end - 5 * 60_000, start + shift, end + shift));
expect(axis(group('utilization')).querySelectorAll('time')[1]).toHaveAttribute(
'datetime',
@@ -168,7 +175,7 @@ describe('GuestDrawerHistory shared time window', () => {
await waitFor(() =>
expect(screen.queryAllByTestId('guest-history-time-window')).toHaveLength(0),
);
- expect(group('utilization').querySelectorAll('path')).toHaveLength(0);
+ expect(group('utilization').querySelectorAll('path[data-history-series]')).toHaveLength(0);
finish(response({ range: '1h', start: end - hour }));
await waitFor(() => expect(screen.getAllByTestId('guest-history-time-window')).toHaveLength(4));
expect(pathXs(group('utilization'))[0]).toBeCloseTo(expectedX(end - 10 * 60_000, end - hour));
@@ -181,7 +188,7 @@ describe('GuestDrawerHistory shared time window', () => {
expect(screen.getAllByText('No stored history in this range')).toHaveLength(4),
);
expect(screen.queryByRole('slider')).toBeNull();
- expect(document.querySelectorAll('path')).toHaveLength(0);
+ expect(document.querySelectorAll('path[data-history-series]')).toHaveLength(0);
expect(screen.getAllByTestId('guest-history-time-window')).toHaveLength(4);
});
@@ -197,8 +204,8 @@ describe('GuestDrawerHistory shared time window', () => {
'datetime',
new Date(end - hour).toISOString(),
);
- expect(selectSharedTime(group('utilization')).getAttribute('cx')).toBe(
- selectSharedTime(group('network')).getAttribute('cx'),
+ expect(selectSharedTime(group('utilization')).getAttribute('data-x')).toBe(
+ selectSharedTime(group('network')).getAttribute('data-x'),
);
});