From 4f1e98c09e27e6428bf50cacd42b38fcbcbd2e1b Mon Sep 17 00:00:00 2001
From: Boy132 <mail@boy132.de>
Date: Mon, 3 Nov 2025 15:52:16 +0100
Subject: [PATCH] change order of operations when registering panel

this makes sure plugins always register after our default configuration
---
 app/Providers/Filament/AdminPanelProvider.php  | 11 +++++++----
 app/Providers/Filament/AppPanelProvider.php    | 11 +++++++----
 app/Providers/Filament/PanelProvider.php       |  7 +------
 app/Providers/Filament/ServerPanelProvider.php | 11 +++++++----
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
index 225c109ef..9c838eb02 100644
--- a/app/Providers/Filament/AdminPanelProvider.php
+++ b/app/Providers/Filament/AdminPanelProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers\Filament;
 
 use AchyutN\FilamentLogViewer\FilamentLogViewer;
+use App\Facades\Plugins;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
 use Filament\Navigation\NavigationGroup;
@@ -12,12 +13,10 @@ class AdminPanelProvider extends PanelProvider
 {
     public function panel(Panel $panel): Panel
     {
-        $panel
+        $panel = parent::panel($panel)
             ->id('admin')
             ->path('admin')
-            ->homeUrl('/');
-
-        return parent::panel($panel)
+            ->homeUrl('/')
             ->breadcrumbs(false)
             ->sidebarCollapsibleOnDesktop(fn () => !$panel->hasTopNavigation())
             ->userMenuItems([
@@ -42,5 +41,9 @@ class AdminPanelProvider extends PanelProvider
                     ->navigationGroup(fn () => trans('admin/dashboard.advanced'))
                     ->navigationIcon('tabler-file-info'),
             ]);
+
+        Plugins::loadPanelPlugins($panel);
+
+        return $panel;
     }
 }
diff --git a/app/Providers/Filament/AppPanelProvider.php b/app/Providers/Filament/AppPanelProvider.php
index 2c489ab11..15c582877 100644
--- a/app/Providers/Filament/AppPanelProvider.php
+++ b/app/Providers/Filament/AppPanelProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers\Filament;
 
 use AchyutN\FilamentLogViewer\FilamentLogViewer;
+use App\Facades\Plugins;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
 use Filament\Panel;
@@ -11,11 +12,9 @@ class AppPanelProvider extends PanelProvider
 {
     public function panel(Panel $panel): Panel
     {
-        $panel
+        $panel = parent::panel($panel)
             ->id('app')
-            ->default();
-
-        return parent::panel($panel)
+            ->default()
             ->breadcrumbs(false)
             ->navigation(false)
             ->topbar(true)
@@ -31,5 +30,9 @@ class AppPanelProvider extends PanelProvider
                 FilamentLogViewer::make()
                     ->authorize(false),
             ]);
+
+        Plugins::loadPanelPlugins($panel);
+
+        return $panel;
     }
 }
diff --git a/app/Providers/Filament/PanelProvider.php b/app/Providers/Filament/PanelProvider.php
index ac8e9436a..cdb0dde42 100644
--- a/app/Providers/Filament/PanelProvider.php
+++ b/app/Providers/Filament/PanelProvider.php
@@ -3,7 +3,6 @@
 namespace App\Providers\Filament;
 
 use App\Enums\CustomizationKey;
-use App\Facades\Plugins;
 use App\Filament\Pages\Auth\EditProfile;
 use App\Filament\Pages\Auth\Login;
 use App\Http\Middleware\LanguageMiddleware;
@@ -28,7 +27,7 @@ abstract class PanelProvider extends BasePanelProvider
 {
     public function panel(Panel $panel): Panel
     {
-        $panel
+        return $panel
             ->spa()
             ->databaseNotifications()
             ->brandName(config('app.name', 'Pelican'))
@@ -95,9 +94,5 @@ abstract class PanelProvider extends BasePanelProvider
             ->authMiddleware([
                 Authenticate::class,
             ]);
-
-        Plugins::loadPanelPlugins($panel);
-
-        return $panel;
     }
 }
diff --git a/app/Providers/Filament/ServerPanelProvider.php b/app/Providers/Filament/ServerPanelProvider.php
index 7361d45f9..63e1fd5f5 100644
--- a/app/Providers/Filament/ServerPanelProvider.php
+++ b/app/Providers/Filament/ServerPanelProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers\Filament;
 
+use App\Facades\Plugins;
 use App\Filament\Admin\Resources\Servers\Pages\EditServer;
 use App\Filament\App\Resources\Servers\Pages\ListServers;
 use App\Http\Middleware\Activity\ServerSubject;
@@ -15,12 +16,10 @@ class ServerPanelProvider extends PanelProvider
 {
     public function panel(Panel $panel): Panel
     {
-        $panel
+        $panel = parent::panel($panel)
             ->id('server')
             ->path('server')
-            ->homeUrl(fn () => Filament::getPanel('app')->getUrl());
-
-        return parent::panel($panel)
+            ->homeUrl(fn () => Filament::getPanel('app')->getUrl())
             ->tenant(Server::class, 'uuid_short')
             ->userMenuItems([
                 Action::make('to_serverList')
@@ -46,5 +45,9 @@ class ServerPanelProvider extends PanelProvider
             ->tenantMiddleware([
                 ServerSubject::class,
             ]);
+
+        Plugins::loadPanelPlugins($panel);
+
+        return $panel;
     }
 }