Small updates

This commit is contained in:
Lance Pioch 2024-04-13 15:52:54 -04:00
parent f25bd33f06
commit f69d0823f4
3 changed files with 39 additions and 12 deletions

View File

@ -70,9 +70,11 @@ class ServerResource extends Resource
->relationship('node', 'name') ->relationship('node', 'name')
->searchable() ->searchable()
->preload() ->preload()
->afterStateUpdated(fn (Forms\Set $set) => $set('allocation_id', null))
->required(), ->required(),
Forms\Components\Select::make('allocation_id') Forms\Components\Select::make('allocation_id')
->preload()
->prefixIcon('tabler-network') ->prefixIcon('tabler-network')
->label('Primary Allocation') ->label('Primary Allocation')
->columnSpan(3) ->columnSpan(3)
@ -93,7 +95,9 @@ class ServerResource extends Resource
->relationship( ->relationship(
'allocation', 'allocation',
'ip', 'ip',
fn (Builder $query, Forms\Get $get) => $query->where('node_id', $get('node_id')), fn (Builder $query, Forms\Get $get) => $query
->where('node_id', $get('node_id'))
->whereNull('server_id'),
) )
->createOptionForm(fn (Forms\Get $get) => [ ->createOptionForm(fn (Forms\Get $get) => [
Forms\Components\TextInput::make('allocation_ip') Forms\Components\TextInput::make('allocation_ip')
@ -153,23 +157,25 @@ class ServerResource extends Resource
->searchable() ->searchable()
->preload() ->preload()
->live() ->live()
->afterStateUpdated(function ($state, Forms\Set $set) { ->afterStateUpdated(function ($state, Forms\Set $set, Forms\Get $get) {
$egg = Egg::find($state); $egg = Egg::find($state);
$set('startup', $egg->startup); $set('startup', $egg->startup);
$set('image', array_flip($egg->docker_images ?? []));
$variables = $egg->variables ?? []; $variables = $egg->variables ?? [];
$serverVariables = collect(); $serverVariables = collect();
foreach ($variables as $variable) { foreach ($variables as $variable) {
$serverVariables->add($variable->toArray()); $serverVariables->add($variable->toArray());
} }
$variables = [];
$set($path = 'server_variables', $serverVariables->all()); $set($path = 'server_variables', $serverVariables->all());
for ($i = 0; $i < $serverVariables->count(); $i++) { for ($i = 0; $i < $serverVariables->count(); $i++) {
$set("$path.$i.variable_value", $serverVariables[$i]['default_value']); $set("$path.$i.variable_value", $serverVariables[$i]['default_value']);
$set("$path.$i.variable_id", $serverVariables[$i]['id']); $set("$path.$i.variable_id", $serverVariables[$i]['id']);
$variables[$serverVariables[$i]['env_variable']] = $serverVariables[$i]['default_value'];
} }
$set('environment', $variables);
}) })
->required(), ->required(),
@ -196,7 +202,14 @@ class ServerResource extends Resource
->disabled(fn (Forms\Get $get) => $get('custom_image')) ->disabled(fn (Forms\Get $get) => $get('custom_image'))
->label('Docker Image') ->label('Docker Image')
->prefixIcon('tabler-brand-docker') ->prefixIcon('tabler-brand-docker')
->options(fn (Forms\Get $get) => array_flip(Egg::find($get('egg_id'))->docker_images ?? [])) ->options(function (Forms\Get $get, Forms\Set $set) {
$images = Egg::find($get('egg_id'))->docker_images ?? [];
$set('image', collect($images)->first());
return $images;
})
->disabled(fn (Forms\Components\Select $component) => empty($component->getOptions()))
->selectablePlaceholder(false) ->selectablePlaceholder(false)
->columnSpan(2) ->columnSpan(2)
->required(), ->required(),
@ -332,6 +345,9 @@ class ServerResource extends Resource
}) })
->columnSpanFull(), ->columnSpanFull(),
Forms\Components\KeyValue::make('environment')
->default([]),
Forms\Components\Section::make('Egg Variables') Forms\Components\Section::make('Egg Variables')
->icon('tabler-eggs') ->icon('tabler-eggs')
->iconColor('primary') ->iconColor('primary')
@ -349,10 +365,6 @@ class ServerResource extends Resource
->deletable(false) ->deletable(false)
->default([]) ->default([])
->hidden(fn ($state) => empty($state)) ->hidden(fn ($state) => empty($state))
->afterStateUpdated(function () {
})
->schema([ ->schema([
Forms\Components\TextInput::make('variable_value') Forms\Components\TextInput::make('variable_value')
->rules([ ->rules([
@ -368,11 +380,9 @@ class ServerResource extends Resource
} }
}, },
]) ])
->label(fn (Forms\Get $get) => $get('name')) ->label(fn (Forms\Get $get) => $get('name'))
->hint(fn (Forms\Get $get) => $get('rules')) ->hint(fn (Forms\Get $get) => $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'))
->maxLength(191), ->maxLength(191),

View File

@ -3,11 +3,28 @@
namespace App\Filament\Resources\ServerResource\Pages; namespace App\Filament\Resources\ServerResource\Pages;
use App\Filament\Resources\ServerResource; use App\Filament\Resources\ServerResource;
use App\Services\Servers\ServerCreationService;
use Filament\Actions; use Filament\Actions;
use Filament\Resources\Pages\CreateRecord; use Filament\Resources\Pages\CreateRecord;
use Illuminate\Database\Eloquent\Model;
class CreateServer extends CreateRecord class CreateServer extends CreateRecord
{ {
protected static string $resource = ServerResource::class; protected static string $resource = ServerResource::class;
protected static bool $canCreateAnother = false; protected static bool $canCreateAnother = false;
protected function handleRecordCreation(array $data): Model
{
/** @var ServerCreationService $service */
$service = resolve(ServerCreationService::class);
$server = $service->handle($data);
return $server;
}
// protected function getRedirectUrl(): string
// {
// return $this->getResource()::getUrl('edit');
// }
} }

View File

@ -101,7 +101,7 @@ class AssignmentService
]; ];
} }
$ids = Allocation::query()->insertOrIgnore($insertData); $ids[] = Allocation::query()->insertOrIgnore($insertData);
} }
} }