fix: sync widget modernization with dev

This commit is contained in:
Thomas Camlong committed 2026-08-02 01:37:01 +02:00
commit 79ae42f0c3
55 files changed
+1613 -679

No files matched your search

@@ -40,6 +40,9 @@ export const toChartItem = (healthInfo: {
export const appendBoundedHistory = (history: ChartItem[], item: ChartItem, limit: number): ChartItem[] =>
[...history, item].slice(-limit);
export const getNetworkHistory = (items: readonly ChartItem[]) =>
items.flatMap((item) => (item.network === null ? [] : [item.network]));
export default function SystemResources({
integrationIds,
options,
@@ -135,8 +138,8 @@ const SystemCharts = ({
isAdvanced,
showTitle,
}: SystemChartsProps) => {
const showNetwork =
items.length > 0 && items[items.length - 1]?.network !== null && options.visibleCharts.includes("network");
const networkItems = getNetworkHistory(items);
const showNetwork = networkItems.length > 0 && options.visibleCharts.includes("network");
const chartCount = options.visibleCharts.filter((chart) => chart !== "network").length + Number(showNetwork);
const chartColumns = isAdvanced && width >= 560 ? 2 : 1;
const chartHeight = isAdvanced
@@ -183,13 +186,13 @@ const SystemCharts = ({
(width >= 300 ? (
<Group h={chartHeight} gap="xs" grow wrap="nowrap">
<NetworkTrafficChart
usageOverTime={items.map((item) => item.network?.down ?? 0)}
usageOverTime={networkItems.map((network) => network.down)}
isUp={false}
hasShadow={options.hasShadow}
labelDisplayMode={options.labelDisplayMode}
/>
<NetworkTrafficChart
usageOverTime={items.map((item) => item.network?.up ?? 0)}
usageOverTime={networkItems.map((network) => network.up)}
isUp
hasShadow={options.hasShadow}
labelDisplayMode={options.labelDisplayMode}
@@ -198,7 +201,7 @@ const SystemCharts = ({
) : (
<Box h={chartHeight}>
<CombinedNetworkTrafficChart
usageOverTime={items.map((item) => item.network ?? { up: 0, down: 0 })}
usageOverTime={networkItems}
hasShadow={options.hasShadow}
labelDisplayMode={options.labelDisplayMode}
/>
@@ -1,6 +1,6 @@
import { describe, expect, test } from "vitest";
import { appendBoundedHistory, toChartItem } from "./component";
import { appendBoundedHistory, getNetworkHistory, toChartItem } from "./component";
describe("system resource history", () => {
test("averages all GPU values", () => {
@@ -18,4 +18,16 @@ describe("system resource history", () => {
const item = toChartItem({ cpuUtilization: 1, memUsedInBytes: 2, gpu: [], network: null });
expect(appendBoundedHistory([item, item], item, 2)).toHaveLength(2);
});
test("omits unavailable network samples instead of inventing zero traffic", () => {
const missing = toChartItem({ cpuUtilization: 1, memUsedInBytes: 2, gpu: [], network: null });
const available = toChartItem({
cpuUtilization: 1,
memUsedInBytes: 2,
gpu: [],
network: { up: 12, down: 34 },
});
expect(getNetworkHistory([missing, available, missing])).toEqual([{ up: 12, down: 34 }]);
});
});