refactor: upgrade to f4

* feat: migrate to f4

* chore: fixes

* chore: more fixes

* chore: remove filament upgrade

* chore: format

* chore: update seeder

* chore: fix attempt

* Revert "chore: fix attempt"

This reverts commit 6dd9633.

* chore: fix seeder

* chore: further fixes

* chore: permissions f4 syntax & minor other fixes

* chore: make panel nullable prop for tests

* style: fix code style

* chore: add custom permissions handling

* chore: update test runner

* chore: update comment

* chore: test & shield fixes

* style: fix code style

* chore: trigger-rerun of tests

* Revert "chore: trigger-rerun of tests"

This reverts commit df6df1c.

---------

Co-authored-by: Kilian Trunk <[email protected]>
Co-authored-by: KilianTrunk <[email protected]>

Author: SlimDeluxe

.github/workflows/test-runner.yml

@@ -1,15 +1,13 @@
 name: Tests
 
 on:
-  # Run testing on all push and pull requests for the main branch that have committed changes in PHP files
+  # Run testing on all push and pull requests that have committed changes in PHP files
   push:
-    branches: [ "main" ]
     paths:
-      - '**.php'
+      - '**/*.php'
   pull_request:
-    branches: [ "main" ]
     paths:
-      - '**.php'
+      - '**/*.php'
   # Make it possible to run the workflow manually
   workflow_dispatch:
 

composer.json

@@ -42,35 +42,33 @@
     },
     "require": {
         "php": "^8.3",
-        "bezhansalleh/filament-language-switch": "^3.1",
-        "bezhansalleh/filament-panel-switch": "^1.1",
-        "bezhansalleh/filament-shield": "^3.3",
+        "bezhansalleh/filament-language-switch": "^4.0",
+        "bezhansalleh/filament-panel-switch": "^2.0",
+        "bezhansalleh/filament-shield": "^4.0",
         "datalinx/php-utils": "^2.5",
-        "dutchcodingcompany/filament-developer-logins": "^1.6",
+        "dutchcodingcompany/filament-developer-logins": "^2.0",
         "eclipsephp/common": "dev-main",
         "eclipsephp/world-plugin": "dev-main",
-        "filament/filament": "^3.3",
-        "filament/spatie-laravel-media-library-plugin": "^3.2",
-        "filament/spatie-laravel-translatable-plugin": "^3.2",
-        "hasnayeen/themes": "^3.0",
+        "filament/filament": "^4.0",
+        "filament/spatie-laravel-media-library-plugin": "^4.0",
+        "lara-zeus/spatie-translatable": "^1.0",
         "laravel/framework": "^12.0",
         "laravel/horizon": "^5.31",
         "laravel/telescope": "^5.5",
         "laravel/tinker": "^2.10",
+        "nben/filament-record-nav": "^1.0",
         "opcodesio/log-viewer": "^3.17",
-        "pxlrbt/filament-environment-indicator": "^2.1",
-        "pxlrbt/filament-excel": "^2.4",
-        "pxlrbt/filament-spotlight": "^1.3",
-        "shuvroroy/filament-spatie-laravel-health": "^2.3",
+        "pxlrbt/filament-environment-indicator": "^3.0",
+        "pxlrbt/filament-excel": "^3.0",
+        "pxlrbt/filament-spotlight": "^2.0",
+        "shuvroroy/filament-spatie-laravel-health": "^3.0",
         "spatie/laravel-package-tools": "^1.18",
         "spatie/laravel-translatable": "^6.11",
         "spatie/security-advisories-health-check": "^1.2",
-        "stechstudio/filament-impersonate": "^3.16",
+        "stechstudio/filament-impersonate": "^4.0",
         "symfony/http-client": "^7.3",
         "symfony/mailgun-mailer": "^7.3",
-        "tangodev-it/filament-emoji-picker": "^1.0",
-        "typesense/typesense-php": "^5.0",
-        "nben/filament-record-nav": "^1.0"
+        "typesense/typesense-php": "^5.0"
     },
     "require-dev": {
         "laravel/pint": "^1.21",

config/filament-shield.php

@@ -1,81 +1,88 @@
 <?php
 
+use Filament\Pages\Dashboard;
+use Filament\Widgets\AccountWidget;
+use Filament\Widgets\FilamentInfoWidget;
+
 return [
     'shield_resource' => [
-        'should_register_navigation' => true,
         'slug' => 'shield/roles',
-        'navigation_sort' => -1,
-        'navigation_badge' => true,
-        'navigation_group' => true,
-        'is_globally_searchable' => false,
         'show_model_path' => true,
-        'is_scoped_to_tenant' => false,
         'cluster' => null,
+        'tabs' => [
+            'pages' => true,
+            'widgets' => true,
+            'resources' => true,
+            'custom_permissions' => true,
+        ],
     ],
 
     'tenant_model' => \Eclipse\Core\Models\Site::class,
 
-    'auth_provider_model' => [
-        'fqcn' => \Eclipse\Core\Models\User::class,
-    ],
+    'auth_provider_model' => \Eclipse\Core\Models\User::class,
 
     'super_admin' => [
         'enabled' => true,
         'name' => 'super_admin',
         'define_via_gate' => false,
-        'intercept_gate' => 'before', // after
+        'intercept_gate' => 'before',
     ],
 
     'panel_user' => [
         'enabled' => true,
         'name' => 'panel_user',
     ],
 
-    'permission_prefixes' => [
-        'resource' => [
-            'view_any',
-            'view',
-            'create',
-            'update',
-            'restore',
-            'restore_any',
-            'replicate',
-            'reorder',
-            'delete',
-            'delete_any',
-            'force_delete',
-            'force_delete_any',
-        ],
-
-        'page' => 'page',
-        'widget' => 'widget',
+    'permissions' => [
+        'separator' => '_',
+        'case' => 'lower_snake',
+        'generate' => true,
     ],
 
-    'entities' => [
-        'pages' => true,
-        'widgets' => true,
-        'resources' => true,
-        'custom_permissions' => false,
+    'policies' => [
+        'path' => app_path('Policies'),
+        'merge' => false,
+        'generate' => true,
+        'methods' => [
+            'viewAny', 'view', 'create', 'update', 'restore', 'restoreAny',
+            'replicate', 'reorder', 'delete', 'deleteAny', 'forceDelete', 'forceDeleteAny',
+        ],
+        'single_parameter_methods' => [
+            'viewAny', 'create', 'deleteAny', 'forceDeleteAny', 'restoreAny', 'reorder',
+        ],
     ],
 
-    'generator' => [
-        'option' => 'policies_and_permissions',
-        'policy_directory' => 'Policies',
-        'policy_namespace' => 'Policies',
+    'localization' => [
+        'enabled' => false,
+        'key' => 'filament-shield::filament-shield',
     ],
 
-    'exclude' => [
-        'enabled' => true,
+    'resources' => [
+        'subject' => 'model',
+        'manage' => [],
+        'exclude' => [],
+    ],
 
-        'pages' => [
-            'Dashboard',
+    'pages' => [
+        'subject' => 'class',
+        'prefix' => 'view',
+        'exclude' => [
+            Dashboard::class,
         ],
+    ],
 
-        'widgets' => [
-            'AccountWidget', 'FilamentInfoWidget',
+    'widgets' => [
+        'subject' => 'class',
+        'prefix' => 'view',
+        'exclude' => [
+            AccountWidget::class,
+            FilamentInfoWidget::class,
         ],
+    ],
 
-        'resources' => [],
+    'custom_permissions' => [
+        'impersonate_user',
+        'send_email_user',
     ],
 
     'discovery' => [
@@ -84,8 +91,5 @@
         'discover_all_pages' => false,
     ],
 
-    'register_role_policy' => [
-        'enabled' => true,
-    ],
-
+    'register_role_policy' => true,
 ];

config/themes.php

@@ -2,6 +2,9 @@
 
 namespace Eclipse\Core\Database\Seeders;
 
+use Eclipse\Core\Models\Site;
+use Eclipse\Core\Models\User\Permission;
+use Eclipse\Core\Models\User\Role;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Artisan;
 
@@ -16,7 +19,6 @@ public function run(): void
             '--all' => null,
             '--panel' => 'admin',
             '--option' => 'permissions',
-            '--minimal' => null,
         ]);
 
         // Seed additional roles
@@ -25,7 +27,37 @@ public function run(): void
         // Sites
         $this->call(SiteSeeder::class);
 
+        // Assign permissions to roles
+        $this->assignPermissionsToRoles();
+
         // Users
         $this->call(UserSeeder::class);
     }
+
+    private function assignPermissionsToRoles(): void
+    {
+        $allPermissions = Permission::all();
+
+        foreach (Site::all() as $site) {
+            foreach (['super_admin', 'admin'] as $roleName) {
+                $role = Role::firstOrCreate([
+                    'name' => $roleName,
+                    'guard_name' => 'web',
+                    'site_id' => $site->id,
+                ]);
+
+                $role->syncPermissions($allPermissions);
+            }
+        }
+
+        $this->assignCustomPermissionsToRoles();
+    }
+
+    private function assignCustomPermissionsToRoles(): void
+    {
+        app(\Spatie\Permission\PermissionRegistrar::class)->forgetCachedPermissions();
+        $guard = config('auth.defaults.guard', 'web');
+        Permission::findOrCreate('impersonate_user', $guard);
+        Permission::findOrCreate('send_email_user', $guard);
+    }
 }

database/migrations/2025_05_27_071139_add_themes_settings_to_users_table.php

@@ -14,7 +14,11 @@ public function run(): void
     {
         if (is_array(config('eclipse.seed.roles.presets'))) {
             foreach (config('eclipse.seed.roles.presets') as $preset) {
-                Role::create($preset['data']);
+                $data = $preset['data'];
+                Role::firstOrCreate([
+                    'name' => $data['name'],
+                    'guard_name' => $data['guard_name'] ?? 'web',
+                ], $data);
             }
         }
 

database/seeders/CoreSeeder.php

@@ -9,8 +9,9 @@
 @endphp
 
 <div class="fi-dropdown-list p-1">
-    <a @if ($hasSpaMode) wire:navigate @endif href="{{ ManageUserSettings::getUrl() }}"
-        class="fi-dropdown-list-item flex w-full items-center gap-2 whitespace-nowrap rounded-md p-2 text-sm transition-colors duration-75 outline-none disabled:pointer-events-none disabled:opacity-70 hover:bg-gray-50 focus-visible:bg-gray-50 dark:hover:bg-white/5 dark:focus-visible:bg-white/5 fi-dropdown-list-item-color-gray fi-color-gray">
+    <a @if ($hasSpaMode) wire:navigate @endif
+       href="{{ ManageUserSettings::getUrl(['tenant' => Filament::getTenant() ?? \Eclipse\Core\Models\Site::firstWhere('domain', request()->getHost())]) }}"
+       class="fi-dropdown-list-item flex w-full items-center gap-2 whitespace-nowrap rounded-md p-2 text-sm transition-colors duration-75 outline-none disabled:pointer-events-none disabled:opacity-70 hover:bg-gray-50 focus-visible:bg-gray-50 dark:hover:bg-white/5 dark:focus-visible:bg-white/5 fi-dropdown-list-item-color-gray fi-color-gray">
         <x-filament::icon class="fi-dropdown-list-item-icon h-5 w-5 text-gray-400 dark:text-gray-500" icon="{{ $navigationIcon }}" />
         {{ __($navigationLabel) }}
     </a>

database/seeders/RoleSeeder.php

@@ -31,7 +31,6 @@ public function handle(): void
         // ------------------
         $this->call('vendor:publish', ['--tag' => 'laravel-assets', '--force' => true]);
         $this->call('log-viewer:publish');
-        $this->call('themes:upgrade');
 
         // ------------------