banquise/pelican-panel-banquise
7
0
Fork 0
forked from banquise/pelican-panel-mirror
Code Pull Requests Activity

Merge branch 'main' of github.com:pelican-dev/panel

Browse Source
This commit is contained in:
Lance Pioch 2024-04-21 16:18:37 -04:00
commit 0b950832c2
4 changed files with 72 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/Node/MakeNodeCommand.php
View File

@ -60,7 +60,7 @@ class MakeNodeCommand extends Command
$data['upload_size'] = $this->option('uploadSize') ?? $this->ask('Enter the maximum filesize upload', '100'); $data['upload_size'] = $this->option('uploadSize') ?? $this->ask('Enter the maximum filesize upload', '100');
$data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask('Enter the daemon listening port', '8080'); $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask('Enter the daemon listening port', '8080');
$data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask('Enter the daemon SFTP listening port', '2022'); $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask('Enter the daemon SFTP listening port', '2022');
$data['daemon_base'] = $this->option('daemonBase') ?? $this->ask('Enter the base folder', '/var/lib/panel/volumes'); $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask('Enter the base folder', '/var/lib/pelican/volumes');
$node = $this->creationService->handle($data); $node = $this->creationService->handle($data);
$this->line('Successfully created a new node with the name ' . $data['name'] . ' and has an id of ' . $node->id . '.'); $this->line('Successfully created a new node with the name ' . $data['name'] . ' and has an id of ' . $node->id . '.');

6
app/Filament/Resources/NodeResource.php
View File

@ -43,17 +43,17 @@ class NodeResource extends Resource
->required() ->required()
->integer() ->integer()
->default(100), ->default(100),
Forms\Components\TextInput::make('daemonListen') Forms\Components\TextInput::make('daemon_listen')
->required() ->required()
->integer() ->integer()
->label('Daemon Port') ->label('Daemon Port')
->default(8080), ->default(8080),
Forms\Components\TextInput::make('daemonSFTP') Forms\Components\TextInput::make('daemon_sftp')
->required() ->required()
->integer() ->integer()
->label('Daemon SFTP Port') ->label('Daemon SFTP Port')
->default(2022), ->default(2022),
Forms\Components\TextInput::make('daemonBase') Forms\Components\TextInput::make('daemon_base')
->required() ->required()
->maxLength(191) ->maxLength(191)
->default('/home/daemon-files'), ->default('/home/daemon-files'),

2
app/Filament/Resources/NodeResource/Pages/CreateNode.php
View File

@ -113,7 +113,7 @@ class CreateNode extends CreateRecord
'lg' => 1, 'lg' => 1,
]), ]),
Forms\Components\TextInput::make('daemonListen') Forms\Components\TextInput::make('daemon_listen')
->columnSpan([ ->columnSpan([
'default' => 1, 'default' => 1,
'sm' => 1, 'sm' => 1,

73
app/Filament/Resources/NodeResource/Pages/EditNode.php
View File

@ -3,12 +3,12 @@
namespace App\Filament\Resources\NodeResource\Pages; namespace App\Filament\Resources\NodeResource\Pages;
use App\Filament\Resources\NodeResource; use App\Filament\Resources\NodeResource;
use App\Models\Allocation;
use App\Models\Node; use App\Models\Node;
use Filament\Actions; use Filament\Actions;
use Filament\Forms; use Filament\Forms;
use Filament\Forms\Components\Tabs; use Filament\Forms\Components\Tabs;
use Filament\Resources\Pages\EditRecord; use Filament\Resources\Pages\EditRecord;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\HtmlString; use Illuminate\Support\HtmlString;
use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction; use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
@ -91,6 +91,52 @@ class EditNode extends EditRecord
'md' => 1, 'md' => 1,
'lg' => 1, 'lg' => 1,
]) ])
->live()
->afterStateUpdated(function ($state, Forms\Set $set) {
$ports = collect();
$update = false;
foreach ($state as $portEntry) {
if (!str_contains($portEntry, '-')) {
if (is_numeric($portEntry)) {
$ports->push((int) $portEntry);
continue;
}
// Do not add non numerical ports
$update = true;
continue;
}
$update = true;
[$start, $end] = explode('-', $portEntry);
if (!is_numeric($start) || !is_numeric($end)) {
continue;
}
$start = max((int) $start, 0);
$end = min((int) $end, 2 ** 16 - 1);
for ($i = $start; $i <= $end; $i++) {
$ports->push($i);
}
}
$uniquePorts = $ports->unique()->values();
if ($ports->count() > $uniquePorts->count()) {
$update = true;
$ports = $uniquePorts;
}
$sortedPorts = $ports->sort()->values();
if ($sortedPorts->all() !== $ports->all()) {
$update = true;
$ports = $sortedPorts;
}
if ($update) {
$set('port', $ports->all());
}
})
->placeholder('25565') ->placeholder('25565')
->helperText('Individual ports or port ranges here separated by spaces') ->helperText('Individual ports or port ranges here separated by spaces')
->splitKeys(['Tab', ' ']), ->splitKeys(['Tab', ' ']),
@ -108,6 +154,15 @@ class EditNode extends EditRecord
Forms\Components\Repeater::make('allocations') Forms\Components\Repeater::make('allocations')
->orderColumn('server_id') ->orderColumn('server_id')
->columnSpan(4) ->columnSpan(4)
->collapsible()->collapsed()
->itemLabel(function (array $state) {
$host = $state['ip'] . ':' . $state['port'];
if ($state['ip_alias']) {
return $state['ip_alias'] ." ($host)";
}
return $host;
})
->columns([ ->columns([
'default' => 1, 'default' => 1,
'sm' => 3, 'sm' => 3,
@ -133,7 +188,7 @@ class EditNode extends EditRecord
'default' => 1, 'default' => 1,
'sm' => 1, 'sm' => 1,
'md' => 1, 'md' => 1,
'lg' => 1, 'lg' => 2,
]) ])
->minValue(0) ->minValue(0)
->maxValue(65535) ->maxValue(65535)
@ -147,15 +202,21 @@ class EditNode extends EditRecord
'lg' => 3, 'lg' => 3,
]) ])
->label('Alias'), ->label('Alias'),
Forms\Components\TextInput::make('server') Forms\Components\Select::make('server')
->columnSpan([ ->columnSpan([
'default' => 1, 'default' => 1,
'sm' => 1, 'sm' => 1,
'md' => 2, 'md' => 2,
'lg' => 3, 'lg' => 2,
]) ])
->formatStateUsing(fn (Allocation $allocation) => $allocation->server?->name) ->searchable()
->activeUrl(true) ->preload()
->relationship(
'server',
'name',
fn (Builder $query, Forms\Get $get) => $query
->where('node_id', $get('node_id')),
)
->placeholder('Not assigned'), ->placeholder('Not assigned'),
]), ]),
]), ]),