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

Fix variables on CreateServer page (#558)

Browse Source
This commit is contained in:
Boy132 2024-08-20 22:45:41 +02:00 committed by GitHub
parent c2b1a98d29
commit 20b06b7b39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ use App\Filament\Resources\ServerResource;
use App\Models\Allocation; use App\Models\Allocation;
use App\Models\Egg; use App\Models\Egg;
use App\Models\Node; use App\Models\Node;
use App\Models\ServerVariable;
use App\Models\User; use App\Models\User;
use App\Services\Allocations\AssignmentService; use App\Services\Allocations\AssignmentService;
use App\Services\Servers\RandomWordService; use App\Services\Servers\RandomWordService;
@ -444,7 +443,7 @@ class CreateServer extends CreateRecord
$text = Forms\Components\TextInput::make('variable_value') $text = Forms\Components\TextInput::make('variable_value')
->hidden($this->shouldHideComponent(...)) ->hidden($this->shouldHideComponent(...))
->required(fn (ServerVariable $serverVariable) => $serverVariable->variable->getRequiredAttribute()) ->required(fn (Forms\Get $get) => in_array('required', $get('rules')))
->rules( ->rules(
fn (Forms\Get $get): Closure => function (string $attribute, $value, Closure $fail) use ($get) { fn (Forms\Get $get): Closure => function (string $attribute, $value, Closure $fail) use ($get) {
$validator = Validator::make(['validatorkey' => $value], [ $validator = Validator::make(['validatorkey' => $value], [
@ -471,7 +470,7 @@ class CreateServer extends CreateRecord
->live(onBlur: true) ->live(onBlur: true)
->hintIcon('tabler-code') ->hintIcon('tabler-code')
->label(fn (Forms\Get $get) => $get('name')) ->label(fn (Forms\Get $get) => $get('name'))
->hintIconTooltip(fn (Forms\Get $get) => $get('rules')) ->hintIconTooltip(fn (Forms\Get $get) => implode('|', $get('rules')))
->prefix(fn (Forms\Get $get) => '{{' . $get('env_variable') . '}}') ->prefix(fn (Forms\Get $get) => '{{' . $get('env_variable') . '}}')
->helperText(fn (Forms\Get $get) => empty($get('description')) ? '—' : $get('description')) ->helperText(fn (Forms\Get $get) => empty($get('description')) ? '—' : $get('description'))
->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) { ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
@ -806,9 +805,11 @@ class CreateServer extends CreateRecord
return $service->handle($data); return $service->handle($data);
} }
private function shouldHideComponent(ServerVariable $serverVariable, Forms\Components\Component $component): bool private function shouldHideComponent(Forms\Get $get, Forms\Components\Component $component): bool
{ {
$containsRuleIn = array_first($serverVariable->variable->rules, fn ($value) => str($value)->startsWith('in:'), false); $containsRuleIn = collect($get('rules'))->reduce(
fn ($result, $value) => $result === true && !str($value)->startsWith('in:'), true
);
if ($component instanceof Forms\Components\Select) { if ($component instanceof Forms\Components\Select) {
return $containsRuleIn; return $containsRuleIn;
@ -821,9 +822,11 @@ class CreateServer extends CreateRecord
throw new \Exception('Component type not supported: ' . $component::class); throw new \Exception('Component type not supported: ' . $component::class);
} }
private function getSelectOptionsFromRules(ServerVariable $serverVariable): array private function getSelectOptionsFromRules(Forms\Get $get): array
{ {
$inRule = array_first($serverVariable->variable->rules, fn ($value) => str($value)->startsWith('in:')); $inRule = collect($get('rules'))->reduce(
fn ($result, $value) => str($value)->startsWith('in:') ? $value : $result, ''
);
return str($inRule) return str($inRule)
->after('in:') ->after('in:')