From cc06d1faa9f572cf3071e020a6eff871352769f8 Mon Sep 17 00:00:00 2001 From: VinGal <45609819+VinGal0@users.noreply.github.com> Date: Fri, 1 Jul 2022 01:23:27 +0100 Subject: [PATCH] Fixes rounding when 0.001% or less on CPU usage. (#4207) --- resources/scripts/components/server/console/StatGraphs.tsx | 5 ++--- resources/scripts/components/server/console/chart.ts | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/scripts/components/server/console/StatGraphs.tsx b/resources/scripts/components/server/console/StatGraphs.tsx index a0049fef1..4c17efe13 100644 --- a/resources/scripts/components/server/console/StatGraphs.tsx +++ b/resources/scripts/components/server/console/StatGraphs.tsx @@ -16,7 +16,7 @@ export default () => { const limits = ServerContext.useStoreState((state) => state.server.data!.limits); const previous = useRef>({ tx: -1, rx: -1 }); - const cpu = useChartTickLabel('CPU', limits.cpu, '%'); + const cpu = useChartTickLabel('CPU', limits.cpu, '%', 2); const memory = useChartTickLabel('Memory', limits.memory, 'MB'); const network = useChart('Network', { sets: 2, @@ -56,8 +56,7 @@ export default () => { } catch (e) { return; } - - cpu.push(values.cpu_absolute.toFixed(2)); + cpu.push(values.cpu_absolute); memory.push(Math.floor(values.memory_bytes / 1024 / 1024)); network.push([ previous.current.tx < 0 ? 0 : Math.max(0, values.network.tx_bytes - previous.current.tx), diff --git a/resources/scripts/components/server/console/chart.ts b/resources/scripts/components/server/console/chart.ts index 84e1a5889..65f919aa1 100644 --- a/resources/scripts/components/server/console/chart.ts +++ b/resources/scripts/components/server/console/chart.ts @@ -139,7 +139,7 @@ function useChart(label: string, opts?: UseChartOptions) { return { props: { data, options }, push, clear }; } -function useChartTickLabel(label: string, max: number, tickLabel: string) { +function useChartTickLabel(label: string, max: number, tickLabel: string, roundTo?: number) { return useChart(label, { sets: 1, options: { @@ -148,7 +148,7 @@ function useChartTickLabel(label: string, max: number, tickLabel: string) { suggestedMax: max, ticks: { callback(value) { - return `${value}${tickLabel}`; + return `${roundTo ? Number(value).toFixed(roundTo) : value}${tickLabel}`; }, }, },