From e67e0830eb31f1788ad853c89a3dcfd74a33963c Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Tue, 15 Apr 2025 07:27:35 +0800 Subject: [PATCH] Fix `Node` graph not rendering correctly (#1253) * use round instead of `Number::format` * remove unused * also replace `Number::format` in cpu & memory charts --------- Co-authored-by: Boy132 --- .../Admin/Resources/NodeResource/Widgets/NodeCpuChart.php | 2 +- .../Admin/Resources/NodeResource/Widgets/NodeMemoryChart.php | 2 +- .../Resources/NodeResource/Widgets/NodeStorageChart.php | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeCpuChart.php b/app/Filament/Admin/Resources/NodeResource/Widgets/NodeCpuChart.php index da2752415..4cb23b787 100644 --- a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeCpuChart.php +++ b/app/Filament/Admin/Resources/NodeResource/Widgets/NodeCpuChart.php @@ -23,7 +23,7 @@ class NodeCpuChart extends ChartWidget $cpu = collect(cache()->get("nodes.{$this->node->id}.cpu_percent")) ->slice(-10) ->map(fn ($value, $key) => [ - 'cpu' => Number::format($value * $threads, maxPrecision: 2), + 'cpu' => round($value * $threads, 2), 'timestamp' => Carbon::createFromTimestamp($key, auth()->user()->timezone ?? 'UTC')->format('H:i:s'), ]) ->all(); diff --git a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeMemoryChart.php b/app/Filament/Admin/Resources/NodeResource/Widgets/NodeMemoryChart.php index 4b18d846e..23147f9cc 100644 --- a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeMemoryChart.php +++ b/app/Filament/Admin/Resources/NodeResource/Widgets/NodeMemoryChart.php @@ -20,7 +20,7 @@ class NodeMemoryChart extends ChartWidget { $memUsed = collect(cache()->get("nodes.{$this->node->id}.memory_used"))->slice(-10) ->map(fn ($value, $key) => [ - 'memory' => Number::format(config('panel.use_binary_prefix') ? $value / 1024 / 1024 / 1024 : $value / 1000 / 1000 / 1000, maxPrecision: 2), + 'memory' => round(config('panel.use_binary_prefix') ? $value / 1024 / 1024 / 1024 : $value / 1000 / 1000 / 1000, 2), 'timestamp' => Carbon::createFromTimestamp($key, auth()->user()->timezone ?? 'UTC')->format('H:i:s'), ]) ->all(); diff --git a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeStorageChart.php b/app/Filament/Admin/Resources/NodeResource/Widgets/NodeStorageChart.php index 7f9be2d6f..c70eec8d2 100644 --- a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeStorageChart.php +++ b/app/Filament/Admin/Resources/NodeResource/Widgets/NodeStorageChart.php @@ -4,7 +4,6 @@ namespace App\Filament\Admin\Resources\NodeResource\Widgets; use App\Models\Node; use Filament\Widgets\ChartWidget; -use Illuminate\Support\Number; class NodeStorageChart extends ChartWidget { @@ -46,8 +45,8 @@ class NodeStorageChart extends ChartWidget $unused = $total - $used; - $used = Number::format($used, maxPrecision: 2); - $unused = Number::format($unused, maxPrecision: 2); + $used = round($used, 2); + $unused = round($unused, 2); return [ 'datasets' => [