Fix variables on CreateServer page (#558)

pelican-dev · Aug 20, 2024 · 20b06b7 · 20b06b7
1 parent c2b1a98
commit 20b06b7
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/app/Filament/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Resources/ServerResource/Pages/CreateServer.php
@@ -6,7 +6,6 @@
 use App\Models\Allocation;
 use App\Models\Egg;
 use App\Models\Node;
-use App\Models\ServerVariable;
 use App\Models\User;
 use App\Services\Allocations\AssignmentService;
 use App\Services\Servers\RandomWordService;
@@ -444,7 +443,7 @@ public function form(Form $form): Form
 
                                             $text = Forms\Components\TextInput::make('variable_value')
                                                 ->hidden($this->shouldHideComponent(...))
-                                                ->required(fn (ServerVariable $serverVariable) => $serverVariable->variable->getRequiredAttribute())
+                                                ->required(fn (Forms\Get $get) => in_array('required', $get('rules')))
                                                 ->rules(
                                                     fn (Forms\Get $get): Closure => function (string $attribute, $value, Closure $fail) use ($get) {
                                                         $validator = Validator::make(['validatorkey' => $value], [
@@ -471,7 +470,7 @@ public function form(Form $form): Form
                                                     ->live(onBlur: true)
                                                     ->hintIcon('tabler-code')
                                                     ->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') . '}}')
                                                     ->helperText(fn (Forms\Get $get) => empty($get('description')) ? '—' : $get('description'))
                                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
@@ -806,9 +805,11 @@ protected function handleRecordCreation(array $data): Model
         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) {
             return $containsRuleIn;
@@ -821,9 +822,11 @@ private function shouldHideComponent(ServerVariable $serverVariable, Forms\Compo
         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)
             ->after('in:')