shukivaknin/jabali-panel
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix updates list and align admin navigation

Browse Source
This commit is contained in:
root
2026-01-29 07:00:58 +02:00
parent a412c9d2c9
commit be0ec33ecd
10 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -5,7 +5,7 @@
A modern web hosting control panel for WordPress and general PHP hosting. Built with Laravel 12, Filament v5, Livewire 4, and Tailwind CSS v4. A modern web hosting control panel for WordPress and general PHP hosting. Built with Laravel 12, Filament v5, Livewire 4, and Tailwind CSS v4.
Version: 0.9-rc31 (release candidate) Version: 0.9-rc32 (release candidate)
This is a release candidate. Expect rapid iteration and breaking changes until 1.0. This is a release candidate. Expect rapid iteration and breaking changes until 1.0.
@@ -156,6 +156,7 @@ php artisan test --compact
## Initial Release ## Initial Release
- 0.9-rc32: Server Updates list loads reliably; admin sidebar order aligned; apt update parsing expanded.
- 0.9-rc31: File manager navigation uses Livewire actions; parent row excluded from bulk select. - 0.9-rc31: File manager navigation uses Livewire actions; parent row excluded from bulk select.
- 0.9-rc30: Avoid IncludeOptional in ModSecurity CRS includes. - 0.9-rc30: Avoid IncludeOptional in ModSecurity CRS includes.
- 0.9-rc29: Ensure ModSecurity unicode mapping is installed automatically. - 0.9-rc29: Ensure ModSecurity unicode mapping is installed automatically.

2
VERSION
View File

@@ -1 +1 @@
VERSION=0.9-rc31 VERSION=0.9-rc32

2
app/Filament/Admin/Pages/AutomationApi.php
View File

@@ -27,7 +27,7 @@ class AutomationApi extends Page implements HasActions, HasTable
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedKey; protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedKey;
protected static ?int $navigationSort = 17; protected static ?int $navigationSort = 16;
protected static ?string $slug = 'automation-api'; protected static ?string $slug = 'automation-api';

2
app/Filament/Admin/Pages/DatabaseTuning.php
View File

@@ -26,7 +26,7 @@ class DatabaseTuning extends Page implements HasActions, HasTable
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCircleStack; protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCircleStack;
protected static ?int $navigationSort = 19; protected static ?int $navigationSort = 18;
protected static ?string $slug = 'database-tuning'; protected static ?string $slug = 'database-tuning';

2
app/Filament/Admin/Pages/EmailQueue.php
View File

@@ -25,7 +25,7 @@ class EmailQueue extends Page implements HasActions, HasTable
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedQueueList; protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedQueueList;
protected static ?int $navigationSort = 15; protected static ?int $navigationSort = 14;
protected static ?string $slug = 'email-queue'; protected static ?string $slug = 'email-queue';

33
app/Filament/Admin/Pages/ServerUpdates.php
View File

@@ -25,7 +25,7 @@ class ServerUpdates extends Page implements HasActions, HasTable
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedArrowPathRoundedSquare; protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedArrowPathRoundedSquare;
protected static ?int $navigationSort = 16; protected static ?int $navigationSort = 15;
protected static ?string $slug = 'server-updates'; protected static ?string $slug = 'server-updates';
@@ -35,6 +35,8 @@ class ServerUpdates extends Page implements HasActions, HasTable
protected ?AgentClient $agent = null; protected ?AgentClient $agent = null;
protected bool $updatesLoaded = false;
public function getTitle(): string|Htmlable public function getTitle(): string|Htmlable
{ {
return __('Server Updates'); return __('Server Updates');
@@ -47,7 +49,7 @@ class ServerUpdates extends Page implements HasActions, HasTable
public function mount(): void public function mount(): void
{ {
$this->loadUpdates(); $this->loadUpdates(false);
} }
protected function getAgent(): AgentClient protected function getAgent(): AgentClient
@@ -55,13 +57,15 @@ class ServerUpdates extends Page implements HasActions, HasTable
return $this->agent ??= new AgentClient; return $this->agent ??= new AgentClient;
} }
public function loadUpdates(): void public function loadUpdates(bool $refreshTable = true): void
{ {
try { try {
$result = $this->getAgent()->updatesList(); $result = $this->getAgent()->updatesList();
$this->packages = $result['packages'] ?? []; $this->packages = $result['packages'] ?? [];
$this->updatesLoaded = true;
} catch (\Exception $e) { } catch (\Exception $e) {
$this->packages = []; $this->packages = [];
$this->updatesLoaded = true;
Notification::make() Notification::make()
->title(__('Failed to load updates')) ->title(__('Failed to load updates'))
->body($e->getMessage()) ->body($e->getMessage())
@@ -69,7 +73,9 @@ class ServerUpdates extends Page implements HasActions, HasTable
->send(); ->send();
} }
$this->resetTable(); if ($refreshTable) {
$this->resetTable();
}
} }
public function runUpdates(): void public function runUpdates(): void
@@ -94,7 +100,24 @@ class ServerUpdates extends Page implements HasActions, HasTable
public function table(Table $table): Table public function table(Table $table): Table
{ {
return $table return $table
->records(fn () => $this->packages) ->records(function () {
if (! $this->updatesLoaded) {
$this->loadUpdates(false);
}
return collect($this->packages)
->mapWithKeys(function (array $package, int $index): array {
$keyParts = [
$package['name'] ?? (string) $index,
$package['current_version'] ?? '',
$package['new_version'] ?? '',
];
$key = implode('|', array_filter($keyParts, fn (string $part): bool => $part !== ''));
return [$key !== '' ? $key : (string) $index => $package];
})
->all();
})
->columns([ ->columns([
TextColumn::make('name') TextColumn::make('name')
->label(__('Package')) ->label(__('Package'))

2
app/Filament/Admin/Pages/Waf.php
View File

@@ -24,7 +24,7 @@ class Waf extends Page implements HasForms
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedShieldCheck; protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedShieldCheck;
protected static ?int $navigationSort = 20; protected static ?int $navigationSort = 19;
protected static ?string $slug = 'waf'; protected static ?string $slug = 'waf';

2
app/Filament/Admin/Resources/GeoBlockRules/GeoBlockRuleResource.php
View File

@@ -22,7 +22,7 @@ class GeoBlockRuleResource extends Resource
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedGlobeAlt; protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedGlobeAlt;
protected static ?int $navigationSort = 22; protected static ?int $navigationSort = 20;
public static function getNavigationLabel(): string public static function getNavigationLabel(): string
{ {

2
app/Filament/Admin/Resources/WebhookEndpoints/WebhookEndpointResource.php
View File

@@ -22,7 +22,7 @@ class WebhookEndpointResource extends Resource
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedBellAlert; protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedBellAlert;
protected static ?int $navigationSort = 18; protected static ?int $navigationSort = 17;
public static function getNavigationLabel(): string public static function getNavigationLabel(): string
{ {

2
bin/jabali-agent
View File

@@ -24692,7 +24692,7 @@ function updatesList(array $params): array
continue; continue;
} }
if (preg_match('/^([^\/]+)\/[^\s]+\s+([^\s]+)\s+[^\s]+\s+[^\s]+\s+\[upgradable from: ([^\]]+)\]/', $line, $matches)) { if (preg_match('/^([^\/]+)\/\S+\s+(\S+)\s+\S+(?:\s+\S+)?\s+\[upgradable from: ([^\]]+)\]/', $line, $matches)) {
$packages[] = [ $packages[] = [
'name' => $matches[1], 'name' => $matches[1],
'new_version' => $matches[2], 'new_version' => $matches[2],