Skip to content

Commit cb55b45

Browse files
authored
Drop user created server's resource entry minimum limit to 0 (#86)
* fix: drop user resource limit to 0 The rest of the code is already set up to treat 0 as "unlimited", as far as I can tell, but the UI elements were limiting the minimum to 1. This change allows users to specify unlimited resources for a specific server if the user is unlimited in that resource. * fix: only allow unlimited resources for servers if the user doesn't have a global limit in that resource
1 parent 5332a38 commit cb55b45

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

user-creatable-servers/src/Filament/Components/Actions/CreateServerAction.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,21 @@ protected function setUp(): void
5959
->label(trans('user-creatable-servers::strings.cpu'))
6060
->required()
6161
->numeric()
62-
->minValue(1)
62+
->minValue($userResourceLimits->cpu > 0 ? 1 : 0)
6363
->maxValue($userResourceLimits->getCpuLeft())
6464
->suffix('%'),
6565
TextInput::make('memory')
6666
->label(trans('user-creatable-servers::strings.memory'))
6767
->required()
6868
->numeric()
69-
->minValue(1)
69+
->minValue($userResourceLimits->memory > 0 ? 1 : 0)
7070
->maxValue($userResourceLimits->getMemoryLeft())
7171
->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
7272
TextInput::make('disk')
7373
->label(trans('user-creatable-servers::strings.disk'))
7474
->required()
7575
->numeric()
76-
->minValue(1)
76+
->minValue($userResourceLimits->disk > 0 ? 1 : 0)
7777
->maxValue($userResourceLimits->getDiskLeft())
7878
->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
7979
];

user-creatable-servers/src/Filament/Server/Pages/ServerResourcePage.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function form(Schema $schema): Schema
6969
->hint(fn ($state) => $userResourceLimits->cpu > 0 ? ($maxCpu - $state . '% ' . trans('user-creatable-servers::strings.left')) : trans('user-creatable-servers::strings.unlimited'))
7070
->hintColor(fn ($state) => $userResourceLimits->cpu > 0 && $maxCpu - $state < 0 ? 'danger' : null)
7171
->numeric()
72-
->minValue(1)
72+
->minValue($userResourceLimits->cpu > 0 ? 1 : 0)
7373
->maxValue($userResourceLimits->cpu > 0 ? $maxCpu : null)
7474
->suffix('%'),
7575
TextInput::make('memory')
@@ -79,7 +79,7 @@ public function form(Schema $schema): Schema
7979
->hint(fn ($state) => $userResourceLimits->memory > 0 ? ($maxMemory - $state . $suffix . ' ' . trans('user-creatable-servers::strings.left')) : trans('user-creatable-servers::strings.unlimited'))
8080
->hintColor(fn ($state) => $userResourceLimits->memory > 0 && $maxMemory - $state < 0 ? 'danger' : null)
8181
->numeric()
82-
->minValue(1)
82+
->minValue($userResourceLimits->memory > 0 ? 1 : 0)
8383
->maxValue($userResourceLimits->memory > 0 ? $maxMemory : null)
8484
->suffix($suffix),
8585
TextInput::make('disk')
@@ -89,7 +89,7 @@ public function form(Schema $schema): Schema
8989
->hint(fn ($state) => $userResourceLimits->disk > 0 ? ($maxDisk - $state . $suffix . ' ' . trans('user-creatable-servers::strings.left')) : trans('user-creatable-servers::strings.unlimited'))
9090
->hintColor(fn ($state) => $userResourceLimits->disk > 0 && $maxDisk - $state < 0 ? 'danger' : null)
9191
->numeric()
92-
->minValue(1)
92+
->minValue($userResourceLimits->disk > 0 ? 1 : 0)
9393
->maxValue($userResourceLimits->disk > 0 ? $maxDisk : null)
9494
->suffix($suffix),
9595
]);

0 commit comments

Comments
 (0)