From 160ea1ed50231db4719f604d46904b0c4ddfcd14 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 3 Jul 2024 10:27:57 -0400 Subject: [PATCH] Enable Update URL Since importing an egg via url was added, we can enable this. --- app/Filament/Resources/EggResource/Pages/CreateEgg.php | 7 ++++--- app/Filament/Resources/EggResource/Pages/EditEgg.php | 9 ++++++--- .../Resources/ServerResource/Pages/CreateServer.php | 2 +- app/Models/Egg.php | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/Filament/Resources/EggResource/Pages/CreateEgg.php b/app/Filament/Resources/EggResource/Pages/CreateEgg.php index e97bc2af2..16f94be53 100644 --- a/app/Filament/Resources/EggResource/Pages/CreateEgg.php +++ b/app/Filament/Resources/EggResource/Pages/CreateEgg.php @@ -74,9 +74,10 @@ class CreateEgg extends CreateRecord ->helperText('') ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]), TextInput::make('update_url') - ->disabled() - ->helperText('Not implemented.') - ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]), + ->hintIcon('tabler-question-mark') + ->hintToolTip('URLs must point directly to the raw .json file.') + ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]) + ->url(), KeyValue::make('docker_images') ->live() ->columnSpanFull() diff --git a/app/Filament/Resources/EggResource/Pages/EditEgg.php b/app/Filament/Resources/EggResource/Pages/EditEgg.php index 3ced26164..c2282ea80 100644 --- a/app/Filament/Resources/EggResource/Pages/EditEgg.php +++ b/app/Filament/Resources/EggResource/Pages/EditEgg.php @@ -91,8 +91,10 @@ class EditEgg extends EditRecord ->helperText('') ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]), TextInput::make('update_url') - ->disabled() - ->helperText('Not implemented.') + ->label('Update URL') + ->url() + ->hintIcon('tabler-question-mark') + ->hintIconTooltip('URLs must point directly to the raw .json file.') ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]), KeyValue::make('docker_images') ->live() @@ -247,8 +249,9 @@ class EditEgg extends EditRecord Tab::make('From URL') ->icon('tabler-world-upload') ->schema([ - TextInput::make('url') + TextInput::make('update_url') ->label('URL') + ->formatStateUsing(fn (Egg $egg): string => $egg->update_url) ->hint('Link to the egg file (eg. minecraft.json)') ->url(), ]), diff --git a/app/Filament/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Resources/ServerResource/Pages/CreateServer.php index 604ecf33a..572499aa0 100644 --- a/app/Filament/Resources/ServerResource/Pages/CreateServer.php +++ b/app/Filament/Resources/ServerResource/Pages/CreateServer.php @@ -233,7 +233,7 @@ class CreateServer extends CreateRecord $end = min((int) $end, 2 ** 16 - 1); $range = $start <= $end ? range($start, $end) : range($end, $start); foreach ($range as $i) { - if($i > 1024 && $i <= 65535) { + if ($i > 1024 && $i <= 65535) { $ports->push($i); } } diff --git a/app/Models/Egg.php b/app/Models/Egg.php index 5586b4c1f..40e20d22a 100644 --- a/app/Models/Egg.php +++ b/app/Models/Egg.php @@ -95,6 +95,7 @@ class Egg extends Model 'config_stop', 'config_from', 'startup', + 'update_url', 'script_is_privileged', 'script_install', 'script_entry',