mirror of
https://github.com/pelican-dev/panel.git
synced 2025-05-29 14:24:46 +02:00
Merge branch 'feature/filament' of github.com:pelican-dev/panel into feature/filament
# Conflicts: # app/Filament/Resources/ServerResource.php
This commit is contained in:
commit
058371ba7d
@ -5,6 +5,7 @@ namespace App\Filament\Resources;
|
||||
use App\Filament\Resources\DatabaseHostResource\Pages;
|
||||
use App\Models\DatabaseHost;
|
||||
use Filament\Forms;
|
||||
use Filament\Forms\Components\Section;
|
||||
use Filament\Forms\Form;
|
||||
use Filament\Resources\Resource;
|
||||
use Filament\Tables;
|
||||
@ -22,6 +23,7 @@ class DatabaseHostResource extends Resource
|
||||
{
|
||||
return $form
|
||||
->schema([
|
||||
Section::make()->schema([
|
||||
Forms\Components\TextInput::make('host')
|
||||
->helperText('The IP address or Domain name that should be used when attempting to connect to this MySQL host from this Panel to create new databases.')
|
||||
->required()
|
||||
@ -56,6 +58,10 @@ class DatabaseHostResource extends Resource
|
||||
->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
|
||||
->label('Linked Node')
|
||||
->relationship('node', 'name'),
|
||||
])->columns([
|
||||
'default' => 1,
|
||||
'lg' => 2,
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
|
@ -7,7 +7,6 @@ use App\Models\Allocation;
|
||||
use App\Models\Egg;
|
||||
use App\Models\Node;
|
||||
use App\Models\Server;
|
||||
use App\Repositories\Daemon\DaemonServerRepository;
|
||||
use App\Services\Allocations\AssignmentService;
|
||||
use Closure;
|
||||
use Filament\Forms;
|
||||
@ -176,7 +175,9 @@ class ServerResource extends Resource
|
||||
'ip',
|
||||
fn (Builder $query, Forms\Get $get, Forms\Components\Select $component, $state) => $query
|
||||
->where('node_id', $get('../../node_id'))
|
||||
->whereNotIn('id', collect(($repeater = $component->getParentRepeater())->getState())
|
||||
->whereNotIn(
|
||||
'id',
|
||||
collect(($repeater = $component->getParentRepeater())->getState())
|
||||
->pluck(
|
||||
(string) str($component->getStatePath())
|
||||
->after("{$repeater->getStatePath()}.")
|
||||
@ -441,66 +442,6 @@ class ServerResource extends Resource
|
||||
])
|
||||
->required(),
|
||||
]),
|
||||
|
||||
Forms\Components\Textarea::make('startup')
|
||||
->hintIcon('tabler-code')
|
||||
->label('Startup Command')
|
||||
->required()
|
||||
->live()
|
||||
->rows(function ($state) {
|
||||
return str($state)->explode("\n")->reduce(
|
||||
fn (int $carry, $line) => $carry + floor(strlen($line) / 125),
|
||||
0
|
||||
);
|
||||
})
|
||||
->columnSpanFull(),
|
||||
|
||||
Forms\Components\Hidden::make('environment')
|
||||
->default([])
|
||||
->columnSpanFull(),
|
||||
|
||||
Forms\Components\Section::make('Egg Variables')
|
||||
->icon('tabler-eggs')
|
||||
->iconColor('primary')
|
||||
->collapsible()
|
||||
->collapsed()
|
||||
->schema([
|
||||
Forms\Components\Placeholder::make('Select an egg first to show its variables!')
|
||||
->hidden(fn (Forms\Get $get) => !empty($get('server_variables'))),
|
||||
|
||||
Forms\Components\Repeater::make('server_variables')
|
||||
->relationship('serverVariables')
|
||||
->grid(2)
|
||||
->reorderable(false)
|
||||
->addable(false)
|
||||
->deletable(false)
|
||||
->default([])
|
||||
->hidden(fn ($state) => empty($state))
|
||||
->schema([
|
||||
Forms\Components\TextInput::make('variable_value')
|
||||
->rules([
|
||||
fn (Forms\Get $get): Closure => function (string $attribute, $value, Closure $fail) use ($get) {
|
||||
$validator = Validator::make(['validatorkey' => $value], [
|
||||
'validatorkey' => $get('rules'),
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
$message = str($validator->errors()->first())->replace('validatorkey', $get('name'));
|
||||
|
||||
$fail($message);
|
||||
}
|
||||
},
|
||||
])
|
||||
->label(fn (Forms\Get $get) => $get('name'))
|
||||
->hint(fn (Forms\Get $get) => $get('rules'))
|
||||
->prefix(fn (Forms\Get $get) => '{{' . $get('env_variable') . '}}')
|
||||
->helperText(fn (Forms\Get $get) => empty($get('description')) ? '—' : $get('description'))
|
||||
->maxLength(191),
|
||||
|
||||
Forms\Components\Hidden::make('variable_id')->default(0),
|
||||
])
|
||||
->columnSpanFull(),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user