banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-20 08:44:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add config variable to change between MiB and MB (#374)

Browse Source
This commit is contained in:
Boy132 2024-06-13 08:22:29 +02:00 committed by GitHub
parent 0c0b468525
commit cd4fc1a95d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Filament/Resources/NodeResource/Pages/CreateNode.php
View File

@ -239,7 +239,7 @@ class CreateNode extends CreateRecord
->default(256) ->default(256)
->minValue(1) ->minValue(1)
->maxValue(1024) ->maxValue(1024)
->suffix('MiB'), ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
Forms\Components\TextInput::make('daemon_sftp') Forms\Components\TextInput::make('daemon_sftp')
->columnSpan(1) ->columnSpan(1)
->label('SFTP Port') ->label('SFTP Port')
@ -275,7 +275,7 @@ class CreateNode extends CreateRecord
->dehydratedWhenHidden() ->dehydratedWhenHidden()
->hidden(fn (Forms\Get $get) => $get('unlimited_mem')) ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
->label('Memory Limit')->inlineLabel() ->label('Memory Limit')->inlineLabel()
->suffix('MiB') ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
->columnSpan(2) ->columnSpan(2)
->numeric() ->numeric()
->minValue(0) ->minValue(0)
@ -316,7 +316,7 @@ class CreateNode extends CreateRecord
->dehydratedWhenHidden() ->dehydratedWhenHidden()
->hidden(fn (Forms\Get $get) => $get('unlimited_disk')) ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
->label('Disk Limit')->inlineLabel() ->label('Disk Limit')->inlineLabel()
->suffix('MiB') ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
->columnSpan(2) ->columnSpan(2)
->numeric() ->numeric()
->minValue(0) ->minValue(0)

6
app/Filament/Resources/NodeResource/Pages/EditNode.php
View File

@ -214,7 +214,7 @@ class EditNode extends EditRecord
->numeric()->required() ->numeric()->required()
->minValue(1) ->minValue(1)
->maxValue(1024) ->maxValue(1024)
->suffix('MiB'), ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
Forms\Components\TextInput::make('daemon_sftp') Forms\Components\TextInput::make('daemon_sftp')
->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3]) ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
->label('SFTP Port') ->label('SFTP Port')
@ -274,7 +274,7 @@ class EditNode extends EditRecord
->dehydratedWhenHidden() ->dehydratedWhenHidden()
->hidden(fn (Forms\Get $get) => $get('unlimited_mem')) ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
->label('Memory Limit')->inlineLabel() ->label('Memory Limit')->inlineLabel()
->suffix('MiB') ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
->required() ->required()
->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2]) ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
->numeric() ->numeric()
@ -314,7 +314,7 @@ class EditNode extends EditRecord
->dehydratedWhenHidden() ->dehydratedWhenHidden()
->hidden(fn (Forms\Get $get) => $get('unlimited_disk')) ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
->label('Disk Limit')->inlineLabel() ->label('Disk Limit')->inlineLabel()
->suffix('MiB') ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
->required() ->required()
->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2]) ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
->numeric() ->numeric()

8
app/Filament/Resources/NodeResource/Pages/ListNodes.php
View File

@ -42,15 +42,15 @@ class ListNodes extends ListRecords
->visibleFrom('sm') ->visibleFrom('sm')
->icon('tabler-device-desktop-analytics') ->icon('tabler-device-desktop-analytics')
->numeric() ->numeric()
->suffix(' GiB') ->suffix(config('panel.use_binary_prefix') ? ' GiB' : ' GB')
->formatStateUsing(fn ($state) => number_format($state / 1024, 2)) ->formatStateUsing(fn ($state) => number_format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), 2))
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('disk') Tables\Columns\TextColumn::make('disk')
->visibleFrom('sm') ->visibleFrom('sm')
->icon('tabler-file') ->icon('tabler-file')
->numeric() ->numeric()
->suffix(' GiB') ->suffix(config('panel.use_binary_prefix') ? ' GiB' : ' GB')
->formatStateUsing(fn ($state) => number_format($state / 1024, 2)) ->formatStateUsing(fn ($state) => number_format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), 2))
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('cpu') Tables\Columns\TextColumn::make('cpu')
->visibleFrom('sm') ->visibleFrom('sm')

6
app/Filament/Resources/ServerResource/Pages/CreateServer.php
View File

@ -488,7 +488,7 @@ class CreateServer extends CreateRecord
->dehydratedWhenHidden() ->dehydratedWhenHidden()
->hidden(fn (Forms\Get $get) => $get('unlimited_mem')) ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
->label('Memory Limit')->inlineLabel() ->label('Memory Limit')->inlineLabel()
->suffix('MiB') ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
->default(0) ->default(0)
->required() ->required()
->columnSpan(2) ->columnSpan(2)
@ -519,7 +519,7 @@ class CreateServer extends CreateRecord
->dehydratedWhenHidden() ->dehydratedWhenHidden()
->hidden(fn (Forms\Get $get) => $get('unlimited_disk')) ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
->label('Disk Space Limit')->inlineLabel() ->label('Disk Space Limit')->inlineLabel()
->suffix('MiB') ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
->default(0) ->default(0)
->required() ->required()
->columnSpan(2) ->columnSpan(2)
@ -599,7 +599,7 @@ class CreateServer extends CreateRecord
}) })
->label('Swap Memory') ->label('Swap Memory')
->default(0) ->default(0)
->suffix('MiB') ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
->minValue(-1) ->minValue(-1)
->columnSpan(2) ->columnSpan(2)
->inlineLabel() ->inlineLabel()

6
app/Filament/Resources/ServerResource/Pages/EditServer.php
View File

@ -220,7 +220,7 @@ class EditServer extends EditRecord
->dehydratedWhenHidden() ->dehydratedWhenHidden()
->hidden(fn (Forms\Get $get) => $get('unlimited_mem')) ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
->label('Memory Limit')->inlineLabel() ->label('Memory Limit')->inlineLabel()
->suffix('MiB') ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
->required() ->required()
->columnSpan(2) ->columnSpan(2)
->numeric() ->numeric()
@ -250,7 +250,7 @@ class EditServer extends EditRecord
->dehydratedWhenHidden() ->dehydratedWhenHidden()
->hidden(fn (Forms\Get $get) => $get('unlimited_disk')) ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
->label('Disk Space Limit')->inlineLabel() ->label('Disk Space Limit')->inlineLabel()
->suffix('MiB') ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
->required() ->required()
->columnSpan(2) ->columnSpan(2)
->numeric() ->numeric()
@ -331,7 +331,7 @@ class EditServer extends EditRecord
default => false, default => false,
}) })
->label('Swap Memory')->inlineLabel() ->label('Swap Memory')->inlineLabel()
->suffix('MiB') ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
->minValue(-1) ->minValue(-1)
->columnSpan(2) ->columnSpan(2)
->required() ->required()

6
app/Services/Servers/ServerConfigurationStructureService.php
View File

@ -51,12 +51,12 @@ class ServerConfigurationStructureService
'invocation' => $server->startup, 'invocation' => $server->startup,
'skip_egg_scripts' => $server->skip_scripts, 'skip_egg_scripts' => $server->skip_scripts,
'build' => [ 'build' => [
'memory_limit' => $server->memory, 'memory_limit' => config('panel.use_binary_prefix') ? $server->memory : $server->memory / 1.048576,
'swap' => $server->swap, 'swap' => config('panel.use_binary_prefix') ? $server->swap : $server->swap / 1.048576,
'io_weight' => $server->io, 'io_weight' => $server->io,
'cpu_limit' => $server->cpu, 'cpu_limit' => $server->cpu,
'threads' => $server->threads, 'threads' => $server->threads,
'disk_space' => $server->disk, 'disk_space' => config('panel.use_binary_prefix') ? $server->disk : $server->disk / 1.048576,
'oom_killer' => $server->oom_killer, 'oom_killer' => $server->oom_killer,
], ],
'container' => [ 'container' => [

2
config/panel.php
View File

@ -175,4 +175,6 @@ return [
'filament' => [ 'filament' => [
'top-navigation' => env('FILAMENT_TOP_NAVIGATION', false), 'top-navigation' => env('FILAMENT_TOP_NAVIGATION', false),
], ],
'use_binary_prefix' => env('PANEL_USE_BINARY_PREFIX', true),
]; ];