From 4e3f919d8eed0ac94ac5aa8d87f39ddba227cadf Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 14 May 2024 10:41:06 +0200 Subject: [PATCH 1/6] change all GB/ MB to GiB/ MiB --- app/Filament/Resources/NodeResource/Pages/EditNode.php | 2 +- app/Filament/Resources/NodeResource/Pages/ListNodes.php | 8 ++++---- .../Resources/ServerResource/Pages/CreateServer.php | 6 +++--- .../Resources/ServerResource/Pages/EditServer.php | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Filament/Resources/NodeResource/Pages/EditNode.php b/app/Filament/Resources/NodeResource/Pages/EditNode.php index 184d533b7..cdacedd42 100644 --- a/app/Filament/Resources/NodeResource/Pages/EditNode.php +++ b/app/Filament/Resources/NodeResource/Pages/EditNode.php @@ -146,7 +146,7 @@ class EditNode extends EditRecord ->dehydratedWhenHidden() ->hidden(fn (Forms\Get $get) => $get('unlimited_disk')) ->label('Disk Limit')->inlineLabel() - ->suffix('MB') + ->suffix('MiB') ->required() ->columnSpan(2) ->numeric(), diff --git a/app/Filament/Resources/NodeResource/Pages/ListNodes.php b/app/Filament/Resources/NodeResource/Pages/ListNodes.php index 4a30e8e65..3f5cbfb48 100644 --- a/app/Filament/Resources/NodeResource/Pages/ListNodes.php +++ b/app/Filament/Resources/NodeResource/Pages/ListNodes.php @@ -42,15 +42,15 @@ class ListNodes extends ListRecords ->visibleFrom('sm') ->icon('tabler-device-desktop-analytics') ->numeric() - ->suffix(' GB') - ->formatStateUsing(fn ($state) => number_format($state / 1000, 2)) + ->suffix(' GiB') + ->formatStateUsing(fn ($state) => number_format($state / 1024, 2)) ->sortable(), Tables\Columns\TextColumn::make('disk') ->visibleFrom('sm') ->icon('tabler-file') ->numeric() - ->suffix(' GB') - ->formatStateUsing(fn ($state) => number_format($state / 1000, 2)) + ->suffix(' GiB') + ->formatStateUsing(fn ($state) => number_format($state / 1024, 2)) ->sortable(), Tables\Columns\IconColumn::make('scheme') ->visibleFrom('xl') diff --git a/app/Filament/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Resources/ServerResource/Pages/CreateServer.php index b2e2a0705..e5dc9c492 100644 --- a/app/Filament/Resources/ServerResource/Pages/CreateServer.php +++ b/app/Filament/Resources/ServerResource/Pages/CreateServer.php @@ -487,7 +487,7 @@ class CreateServer extends CreateRecord ->dehydratedWhenHidden() ->hidden(fn (Forms\Get $get) => $get('unlimited_mem')) ->label('Memory Limit')->inlineLabel() - ->suffix('MB') + ->suffix('MiB') ->default(0) ->required() ->columnSpan(2) @@ -517,7 +517,7 @@ class CreateServer extends CreateRecord ->dehydratedWhenHidden() ->hidden(fn (Forms\Get $get) => $get('unlimited_disk')) ->label('Disk Space Limit')->inlineLabel() - ->suffix('MB') + ->suffix('MiB') ->default(0) ->required() ->columnSpan(2) @@ -593,7 +593,7 @@ class CreateServer extends CreateRecord }) ->label('Swap Memory') ->default(0) - ->suffix('MB') + ->suffix('MiB') ->minValue(-1) ->columnSpan(2) ->inlineLabel() diff --git a/app/Filament/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Resources/ServerResource/Pages/EditServer.php index 3fe7114fe..2929d8705 100644 --- a/app/Filament/Resources/ServerResource/Pages/EditServer.php +++ b/app/Filament/Resources/ServerResource/Pages/EditServer.php @@ -333,7 +333,7 @@ class EditServer extends EditRecord ->dehydratedWhenHidden() ->hidden(fn (Forms\Get $get) => $get('unlimited_mem')) ->label('Memory Limit')->inlineLabel() - ->suffix('MB') + ->suffix('MiB') ->required() ->columnSpan(2) ->numeric(), @@ -362,7 +362,7 @@ class EditServer extends EditRecord ->dehydratedWhenHidden() ->hidden(fn (Forms\Get $get) => $get('unlimited_disk')) ->label('Disk Space Limit')->inlineLabel() - ->suffix('MB') + ->suffix('MiB') ->required() ->columnSpan(2) ->numeric(), @@ -439,7 +439,7 @@ class EditServer extends EditRecord 'limited', false => false, }) ->label('Swap Memory')->inlineLabel() - ->suffix('MB') + ->suffix('MiB') ->minValue(-1) ->columnSpan(2) ->required() From 5f13c15c707b11f5a3dee241b3e3c8f3a129a921 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 14 May 2024 10:50:26 +0200 Subject: [PATCH 2/6] convert chart data from bytes to GiB --- .../Resources/NodeResource/Widgets/NodeMemoryChart.php | 4 ++-- .../Resources/NodeResource/Widgets/NodeStorageChart.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Filament/Resources/NodeResource/Widgets/NodeMemoryChart.php b/app/Filament/Resources/NodeResource/Widgets/NodeMemoryChart.php index 8c90adc68..8ed87046a 100644 --- a/app/Filament/Resources/NodeResource/Widgets/NodeMemoryChart.php +++ b/app/Filament/Resources/NodeResource/Widgets/NodeMemoryChart.php @@ -40,8 +40,8 @@ class NodeMemoryChart extends ChartWidget /** @var Node $node */ $node = $this->record; - $total = $node->statistics()['memory_total'] ?? 0; - $used = $node->statistics()['memory_used'] ?? 0; + $total = ($node->statistics()['memory_total'] ?? 0) / 1024 / 1024 / 1024; + $used = ($node->statistics()['memory_used'] ?? 0) / 1024 / 1024 / 1024; $unused = $total - $used; return [ diff --git a/app/Filament/Resources/NodeResource/Widgets/NodeStorageChart.php b/app/Filament/Resources/NodeResource/Widgets/NodeStorageChart.php index bd1ac0f6e..b278cf94e 100644 --- a/app/Filament/Resources/NodeResource/Widgets/NodeStorageChart.php +++ b/app/Filament/Resources/NodeResource/Widgets/NodeStorageChart.php @@ -40,8 +40,8 @@ class NodeStorageChart extends ChartWidget /** @var Node $node */ $node = $this->record; - $total = $node->statistics()['disk_total'] ?? 0; - $used = $node->statistics()['disk_used'] ?? 0; + $total = ($node->statistics()['disk_total'] ?? 0) / 1024 / 1024 / 1024; + $used = ($node->statistics()['disk_used'] ?? 0) / 1024 / 1024 / 1024; $unused = $total - $used; return [ From 7d239de7f62d80f6def12f1cace2b574669688ea Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 14 May 2024 10:53:04 +0200 Subject: [PATCH 3/6] add min values for resources --- app/Filament/Resources/NodeResource/Pages/EditNode.php | 8 ++++++-- .../Resources/ServerResource/Pages/CreateServer.php | 9 ++++++--- .../Resources/ServerResource/Pages/EditServer.php | 9 ++++++--- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/Filament/Resources/NodeResource/Pages/EditNode.php b/app/Filament/Resources/NodeResource/Pages/EditNode.php index cdacedd42..1b223b917 100644 --- a/app/Filament/Resources/NodeResource/Pages/EditNode.php +++ b/app/Filament/Resources/NodeResource/Pages/EditNode.php @@ -110,7 +110,8 @@ class EditNode extends EditRecord ->suffix('MiB') ->required() ->columnSpan(2) - ->numeric(), + ->numeric() + ->minValue(0), Forms\Components\TextInput::make('memory_overallocate') ->dehydratedWhenHidden() ->label('Overallocate')->inlineLabel() @@ -120,6 +121,7 @@ class EditNode extends EditRecord ->hintIconTooltip('The % allowable to go over the set limit.') ->columnSpan(2) ->numeric() + ->minValue(-1) ->maxValue(100) ->suffix('%'), ]), @@ -149,7 +151,8 @@ class EditNode extends EditRecord ->suffix('MiB') ->required() ->columnSpan(2) - ->numeric(), + ->numeric() + ->minValue(0), Forms\Components\TextInput::make('disk_overallocate') ->dehydratedWhenHidden() ->hidden(fn (Forms\Get $get) => $get('unlimited_disk')) @@ -159,6 +162,7 @@ class EditNode extends EditRecord ->columnSpan(2) ->required() ->numeric() + ->minValue(-1) ->maxValue(100) ->suffix('%'), ]), diff --git a/app/Filament/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Resources/ServerResource/Pages/CreateServer.php index e5dc9c492..63e9ff4cf 100644 --- a/app/Filament/Resources/ServerResource/Pages/CreateServer.php +++ b/app/Filament/Resources/ServerResource/Pages/CreateServer.php @@ -491,7 +491,8 @@ class CreateServer extends CreateRecord ->default(0) ->required() ->columnSpan(2) - ->numeric(), + ->numeric() + ->minValue(0), ]), Forms\Components\Grid::make() @@ -521,7 +522,8 @@ class CreateServer extends CreateRecord ->default(0) ->required() ->columnSpan(2) - ->numeric(), + ->numeric() + ->minValue(0), ]), Forms\Components\Grid::make() @@ -551,7 +553,8 @@ class CreateServer extends CreateRecord ->default(0) ->required() ->columnSpan(2) - ->numeric(), + ->numeric() + ->minValue(0), ]), Forms\Components\Grid::make() diff --git a/app/Filament/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Resources/ServerResource/Pages/EditServer.php index 2929d8705..eafd57e47 100644 --- a/app/Filament/Resources/ServerResource/Pages/EditServer.php +++ b/app/Filament/Resources/ServerResource/Pages/EditServer.php @@ -336,7 +336,8 @@ class EditServer extends EditRecord ->suffix('MiB') ->required() ->columnSpan(2) - ->numeric(), + ->numeric() + ->minValue(0), ]), Forms\Components\Grid::make() @@ -365,7 +366,8 @@ class EditServer extends EditRecord ->suffix('MiB') ->required() ->columnSpan(2) - ->numeric(), + ->numeric() + ->minValue(0), ]), Forms\Components\Grid::make() @@ -394,7 +396,8 @@ class EditServer extends EditRecord ->suffix('%') ->required() ->columnSpan(2) - ->numeric(), + ->numeric() + ->minValue(0), ]), Forms\Components\Grid::make() From 586d1b413c6684014ea393ce421f7dacb5c0cc41 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 14 May 2024 10:53:28 +0200 Subject: [PATCH 4/6] set default overallocation to 0 --- app/Filament/Resources/NodeResource/Pages/EditNode.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Filament/Resources/NodeResource/Pages/EditNode.php b/app/Filament/Resources/NodeResource/Pages/EditNode.php index 1b223b917..810e955be 100644 --- a/app/Filament/Resources/NodeResource/Pages/EditNode.php +++ b/app/Filament/Resources/NodeResource/Pages/EditNode.php @@ -91,7 +91,7 @@ class EditNode extends EditRecord Forms\Components\ToggleButtons::make('unlimited_mem') ->label('Memory')->inlineLabel()->inline() ->afterStateUpdated(fn (Forms\Set $set) => $set('memory', 0)) - ->afterStateUpdated(fn (Forms\Set $set) => $set('memory_overallocate', -1)) + ->afterStateUpdated(fn (Forms\Set $set) => $set('memory_overallocate', 0)) ->formatStateUsing(fn (Forms\Get $get) => $get('memory') == 0) ->live() ->options([ @@ -133,7 +133,7 @@ class EditNode extends EditRecord ->label('Disk')->inlineLabel()->inline() ->live() ->afterStateUpdated(fn (Forms\Set $set) => $set('disk', 0)) - ->afterStateUpdated(fn (Forms\Set $set) => $set('disk_overallocate', -1)) + ->afterStateUpdated(fn (Forms\Set $set) => $set('disk_overallocate', 0)) ->formatStateUsing(fn (Forms\Get $get) => $get('disk') == 0) ->options([ true => 'Unlimited', From e5146e0dbbfb1c155bb0455b92255087b3079dff Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 14 May 2024 11:21:58 +0200 Subject: [PATCH 5/6] add helper to cpu input --- app/Filament/Resources/ServerResource/Pages/CreateServer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Filament/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Resources/ServerResource/Pages/CreateServer.php index 63e9ff4cf..c03de3fce 100644 --- a/app/Filament/Resources/ServerResource/Pages/CreateServer.php +++ b/app/Filament/Resources/ServerResource/Pages/CreateServer.php @@ -554,7 +554,8 @@ class CreateServer extends CreateRecord ->required() ->columnSpan(2) ->numeric() - ->minValue(0), + ->minValue(0) + ->helperText('100% equals one logical thread'), ]), Forms\Components\Grid::make() From af797b30186e671c94760f0abe977aed09eeed03 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 14 May 2024 11:40:01 +0200 Subject: [PATCH 6/6] run pint --- .../Resources/NodeResource/Widgets/NodeStorageChart.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Filament/Resources/NodeResource/Widgets/NodeStorageChart.php b/app/Filament/Resources/NodeResource/Widgets/NodeStorageChart.php index b278cf94e..bcfbfcf4f 100644 --- a/app/Filament/Resources/NodeResource/Widgets/NodeStorageChart.php +++ b/app/Filament/Resources/NodeResource/Widgets/NodeStorageChart.php @@ -40,8 +40,8 @@ class NodeStorageChart extends ChartWidget /** @var Node $node */ $node = $this->record; - $total = ($node->statistics()['disk_total'] ?? 0) / 1024 / 1024 / 1024; - $used = ($node->statistics()['disk_used'] ?? 0) / 1024 / 1024 / 1024; + $total = ($node->statistics()['disk_total'] ?? 0) / 1024 / 1024 / 1024; + $used = ($node->statistics()['disk_used'] ?? 0) / 1024 / 1024 / 1024; $unused = $total - $used; return [