diff --git a/packages/widgets/src/beszel-system-stats/component.tsx b/packages/widgets/src/beszel-system-stats/component.tsx index 50a83a0e0..209e7e69a 100644 --- a/packages/widgets/src/beszel-system-stats/component.tsx +++ b/packages/widgets/src/beszel-system-stats/component.tsx @@ -132,16 +132,31 @@ export default function BeszelSystemStatsWidget({ const systemStats = activeStats?.systemStats; const containerStatsRaw = activeStats?.containerStats; - const cpuData = useSystemChartData(options.showCpu && systemStats || undefined, cpuMap, isLive); - const memoryData = useSystemChartData(options.showMemory && systemStats || undefined, memoryMap, isLive); - const diskData = useSystemChartData(options.showDisk && systemStats || undefined, diskMap, isLive); - const diskIOData = useSystemChartData(options.showDiskIO && systemStats || undefined, diskIOMap, isLive); - const networkData = useSystemChartData(options.showNetwork && systemStats || undefined, networkMap, isLive); + const cpuData = useSystemChartData((options.showCpu && systemStats) || undefined, cpuMap, isLive); + const memoryData = useSystemChartData((options.showMemory && systemStats) || undefined, memoryMap, isLive); + const diskData = useSystemChartData((options.showDisk && systemStats) || undefined, diskMap, isLive); + const diskIOData = useSystemChartData((options.showDiskIO && systemStats) || undefined, diskIOMap, isLive); + const networkData = useSystemChartData((options.showNetwork && systemStats) || undefined, networkMap, isLive); - const containerNames = useContainerNames(showDocker && containerStatsRaw || undefined); - const dockerCpuData = useDockerChartData(options.showDockerCpu && containerStatsRaw || undefined, containerNames, "cpu", isLive); - const dockerMemData = useDockerChartData(options.showDockerMemory && containerStatsRaw || undefined, containerNames, "memory", isLive); - const dockerNetData = useDockerChartData(options.showDockerNetwork && containerStatsRaw || undefined, containerNames, "network", isLive); + const containerNames = useContainerNames((showDocker && containerStatsRaw) || undefined); + const dockerCpuData = useDockerChartData( + (options.showDockerCpu && containerStatsRaw) || undefined, + containerNames, + "cpu", + isLive, + ); + const dockerMemData = useDockerChartData( + (options.showDockerMemory && containerStatsRaw) || undefined, + containerNames, + "memory", + isLive, + ); + const dockerNetData = useDockerChartData( + (options.showDockerNetwork && containerStatsRaw) || undefined, + containerNames, + "network", + isLive, + ); const containerSeries = useMemo( () => containerNames.map((name, i) => ({ name, color: containerColors[i % containerColors.length] as string })),