From 19c7b4d044706703bf9d592db2903df916858039 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Wed, 26 Jun 2024 21:44:06 -0400 Subject: [PATCH] Clean up --- .../ServerResource/Pages/EditServer.php | 18 +++--------------- .../ServerResource/Pages/ListServers.php | 3 --- app/Models/Server.php | 2 +- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/app/Filament/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Resources/ServerResource/Pages/EditServer.php index d9881cebd..347b98b24 100644 --- a/app/Filament/Resources/ServerResource/Pages/EditServer.php +++ b/app/Filament/Resources/ServerResource/Pages/EditServer.php @@ -525,17 +525,15 @@ class EditServer extends EditRecord foreach ($this->portOptions($server->egg) as $key => $port) { $set("assignments.$key", ['port' => $portIndex = array_search($port, array_values($ports))]); } - }) - , - + }), + Forms\Components\Textarea::make('startup') ->label('Startup Command') ->required() ->hintAction(Forms\Components\Actions\Action::make('startup-restore') ->label('Restore Default') ->icon('tabler-restore') - ->action(fn (Forms\Get $get, Forms\Set $set) => - $set('startup', Egg::find($get('egg_id'))?->startup ?? '') + ->action(fn (Forms\Get $get, Forms\Set $set) => $set('startup', Egg::find($get('egg_id'))?->startup ?? '') ) ) ->columnSpan([ @@ -894,8 +892,6 @@ class EditServer extends EditRecord } $set('environment', $variables); - - // dump($variables, $this->ports, $this->eggDefaultPorts, $get('assignments')); } public function portOptions(Egg $egg, string $startup = null): array @@ -914,22 +910,14 @@ class EditServer extends EditRecord $options['SERVER_PORT'] = null; } - // startup SERVER_PORT - // ... - // ... - foreach ($egg->variables as $variable) { if (!in_array('port', explode('|', $variable->rules))) { continue; } - // dump($variable); - $options[$variable->env_variable] = $variable->default_value; } -// dump($options); - return $options; } } diff --git a/app/Filament/Resources/ServerResource/Pages/ListServers.php b/app/Filament/Resources/ServerResource/Pages/ListServers.php index 4919c6e0c..55869c9e7 100644 --- a/app/Filament/Resources/ServerResource/Pages/ListServers.php +++ b/app/Filament/Resources/ServerResource/Pages/ListServers.php @@ -3,10 +3,7 @@ namespace App\Filament\Resources\ServerResource\Pages; use App\Filament\Resources\ServerResource; -use App\Models\Egg; -use App\Models\Node; use App\Models\Server; -use App\Models\User; use Filament\Actions; use Filament\Resources\Pages\ListRecords; use Filament\Tables\Actions\CreateAction; diff --git a/app/Models/Server.php b/app/Models/Server.php index c1f6d127e..93c46c76a 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -447,7 +447,7 @@ class Server extends Model $portEggVariable = $this->variables->firstWhere('env_variable', 'SERVER_PORT'); if ($portEggVariable) { $portServerVariable = $this->serverVariables->firstWhere('variable_id', $portEggVariable->id); - if (! $portServerVariable) { + if (!$portServerVariable) { return null; }