fix: set page resources to use config value for resource

zvive · Apr 22, 2022 · f239ca9 · f239ca9
1 parent 0f66037
commit f239ca9
Show file tree

Hide file tree

Showing 14 changed files with 159 additions and 33 deletions.
diff --git a/src/Resources/PermissionResource/Pages/CreatePermission.php b/src/Resources/PermissionResource/Pages/CreatePermission.php
@@ -2,10 +2,24 @@
 
 namespace Phpsa\FilamentAuthentication\Resources\PermissionResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\PermissionResource;
+use Illuminate\Support\Facades\Config;
 use Filament\Resources\Pages\CreateRecord;
+use Spatie\Permission\PermissionRegistrar;
+use Spatie\Permission\Contracts\Permission;
 
 class CreatePermission extends CreateRecord
 {
-    protected static string $resource = PermissionResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.PermissionResource');
+    }
+
+    public function afterSave(): void
+    {
+        if (! $this->record instanceof Permission) {
+            return;
+        }
+
+        app(PermissionRegistrar::class)->forgetCachedPermissions();
+    }
 }
diff --git a/src/Resources/PermissionResource/Pages/EditPermission.php b/src/Resources/PermissionResource/Pages/EditPermission.php
@@ -2,10 +2,23 @@
 
 namespace Phpsa\FilamentAuthentication\Resources\PermissionResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\PermissionResource;
+use Illuminate\Support\Facades\Config;
 use Filament\Resources\Pages\EditRecord;
+use Spatie\Permission\Contracts\Permission;
 
 class EditPermission extends EditRecord
 {
-    protected static string $resource = PermissionResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.PermissionResource');
+    }
+
+    public function afterSave(): void
+    {
+        if (! $this->record instanceof Permission) {
+            return;
+        }
+
+        app(PermissionRegistrar::class)->forgetCachedPermissions();
+    }
 }
diff --git a/src/Resources/PermissionResource/Pages/ListPermissions.php b/src/Resources/PermissionResource/Pages/ListPermissions.php
@@ -2,18 +2,20 @@
 
 namespace Phpsa\FilamentAuthentication\Resources\PermissionResource\Pages;
 
-// use Phpsa\FilamentAuthentication\Resource\PermissionResource;
-
-use Phpsa\FilamentAuthentication\Resources\PermissionResource;
+use Spatie\Permission\Models\Role;
 use Filament\Forms\Components\Select;
-use Filament\Resources\Pages\ListRecords;
+use Illuminate\Support\Facades\Config;
 use Filament\Tables\Actions\BulkAction;
+use Filament\Resources\Pages\ListRecords;
 use Illuminate\Database\Eloquent\Collection;
-use Spatie\Permission\Models\Role;
 
 class ListPermissions extends ListRecords
 {
-    protected static string $resource = PermissionResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.PermissionResource');
+    }
+
 
     protected function getTableBulkActions(): array
     {
@@ -28,7 +30,7 @@ protected function getTableBulkActions(): array
             })
             ->form([
                 Select::make('role')
-                    ->label(__('filament-spatie-roles-permissions::filament-spatie.field.role'))
+                    ->label(__('filament-authentication::filament-authentication.field.role'))
                     ->options(Role::query()->pluck('name', 'id'))
                     ->required(),
             ])->deselectRecordsAfterCompletion()

diff --git a/src/Resources/PermissionResource/Pages/ViewPermission.php b/src/Resources/PermissionResource/Pages/ViewPermission.php
@@ -2,10 +2,13 @@
 
 namespace Phpsa\FilamentAuthentication\Resources\PermissionResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\PermissionResource;
+use Illuminate\Support\Facades\Config;
 use Filament\Resources\Pages\ViewRecord;
 
 class ViewPermission extends ViewRecord
 {
-    protected static string $resource = PermissionResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.PermissionResource');
+    }
 }
diff --git a/src/Resources/RoleResource/Pages/CreateRole.php b/src/Resources/RoleResource/Pages/CreateRole.php
@@ -2,10 +2,24 @@
 
 namespace Phpsa\FilamentAuthentication\Resources\RoleResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\RoleResource;
+use Spatie\Permission\Contracts\Role;
+use Illuminate\Support\Facades\Config;
 use Filament\Resources\Pages\CreateRecord;
+use Spatie\Permission\PermissionRegistrar;
 
 class CreateRole extends CreateRecord
 {
-    protected static string $resource = RoleResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.RoleResource');
+    }
+
+    public function afterSave(): void
+    {
+        if (! $this->record instanceof Role) {
+            return;
+        }
+
+        app(PermissionRegistrar::class)->forgetCachedPermissions();
+    }
 }
diff --git a/src/Resources/RoleResource/Pages/EditRole.php b/src/Resources/RoleResource/Pages/EditRole.php
@@ -2,10 +2,24 @@
 
 namespace Phpsa\FilamentAuthentication\Resources\RoleResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\RoleResource;
+use Spatie\Permission\Contracts\Role;
+use Illuminate\Support\Facades\Config;
 use Filament\Resources\Pages\EditRecord;
+use Spatie\Permission\PermissionRegistrar;
 
 class EditRole extends EditRecord
 {
-    protected static string $resource = RoleResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.RoleResource');
+    }
+
+    public function afterSave(): void
+    {
+        if (! $this->record instanceof Role) {
+            return;
+        }
+
+        app(PermissionRegistrar::class)->forgetCachedPermissions();
+    }
 }
diff --git a/src/Resources/RoleResource/Pages/ListRoles.php b/src/Resources/RoleResource/Pages/ListRoles.php
@@ -2,10 +2,13 @@
 
 namespace Phpsa\FilamentAuthentication\Resources\RoleResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\RoleResource;
+use Illuminate\Support\Facades\Config;
 use Filament\Resources\Pages\ListRecords;
 
 class ListRoles extends ListRecords
 {
-    protected static string $resource = RoleResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.RoleResource');
+    }
 }
diff --git a/src/Resources/RoleResource/Pages/ViewRole.php b/src/Resources/RoleResource/Pages/ViewRole.php
@@ -2,10 +2,13 @@
 
 namespace Phpsa\FilamentAuthentication\Resources\RoleResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\RoleResource;
+use Illuminate\Support\Facades\Config;
 use Filament\Resources\Pages\ViewRecord;
 
 class ViewRole extends ViewRecord
 {
-    protected static string $resource = RoleResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.RoleResource');
+    }
 }
diff --git a/src/Resources/UserResource.php b/src/Resources/UserResource.php
@@ -78,8 +78,6 @@ public static function form(Form $form): Form
     public static function table(Table $table): Table
     {
 
-        $userTimeZone = config('request.user.timezone', config('filament-authentication.user_timezone', config('app.timezone')));
-
         return $table
             ->columns([
                 TextColumn::make('id')
@@ -111,7 +109,7 @@ public static function table(Table $table): Table
                 TagsColumn::make('roles.name')
                     ->label(__('filament-authentication::filament-authentication.field.user.roles')),
                 TextColumn::make('created_at')
-                    ->dateTime("Y-m-d H:i:s", $userTimeZone)
+                    ->dateTime("Y-m-d H:i:s", static::getUserTimezone())
                     ->label(__('filament-authentication::filament-authentication.field.user.created_at'))
             ])
             ->filters([
@@ -137,12 +135,17 @@ public static function getPages(): array
             'index'  => ListUsers::route('/'),
             'create' => CreateUser::route('/create'),
             'edit'   => EditUser::route('/{record}/edit'),
-         //   'view'   => ViewUser::route('/{record}')
+            'view'   => ViewUser::route('/{record}')
         ];
     }
 
     public static function getEloquentQuery(): Builder
     {
         return parent::getEloquentQuery()->with('roles');
     }
+
+    public static function getUserTimezone(): string
+    {
+        return config('request.user.timezone', config('filament-authentication.user_timezone', config('app.timezone', 'UTC')));
+    }
 }
diff --git a/src/Resources/UserResource/Pages/CreateUser.php b/src/Resources/UserResource/Pages/CreateUser.php
@@ -2,10 +2,13 @@
 
 namespace  Phpsa\FilamentAuthentication\Resources\UserResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\UserResource;
 use Filament\Resources\Pages\CreateRecord;
+use Illuminate\Support\Facades\Config;
 
 class CreateUser extends CreateRecord
 {
-    protected static string $resource = UserResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.UserResource');
+    }
 }
diff --git a/src/Resources/UserResource/Pages/EditUser.php b/src/Resources/UserResource/Pages/EditUser.php
@@ -2,12 +2,15 @@
 
 namespace  Phpsa\FilamentAuthentication\Resources\UserResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\UserResource;
+use Illuminate\Support\Facades\Config;
 use Filament\Resources\Pages\EditRecord;
 
 class EditUser extends EditRecord
 {
-    protected static string $resource = UserResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.UserResource');
+    }
 
     protected function mutateFormDataBeforeSave(array $data): array
     {

diff --git a/src/Resources/UserResource/Pages/ListUsers.php b/src/Resources/UserResource/Pages/ListUsers.php
@@ -2,10 +2,13 @@
 
 namespace Phpsa\FilamentAuthentication\Resources\UserResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\UserResource;
+use Illuminate\Support\Facades\Config;
 use Filament\Resources\Pages\ListRecords;
 
 class ListUsers extends ListRecords
 {
-    protected static string $resource = UserResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.UserResource');
+    }
 }
diff --git a/src/Resources/UserResource/Pages/ViewUser.php b/src/Resources/UserResource/Pages/ViewUser.php
@@ -2,10 +2,14 @@
 
 namespace Phpsa\FilamentAuthentication\Resources\UserResource\Pages;
 
-use Phpsa\FilamentAuthentication\Resources\UserResource;
+use Illuminate\Support\Facades\Config;
 use Filament\Resources\Pages\ViewRecord;
+use Phpsa\FilamentAuthentication\Resources\UserResource\RelationManager\RoleRelationManager;
 
 class ViewUser extends ViewRecord
 {
-    protected static string $resource = UserResource::class;
+    public static function getResource(): string
+    {
+        return Config::get('filament-authentication.resources.UserResource');
+    }
 }
diff --git a/src/Resources/UserResource/RelationManager/RoleRelationManager.php b/src/Resources/UserResource/RelationManager/RoleRelationManager.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Phpsa\FilamentAuthentication\Resources\UserResource\RelationManager;
+
+use Filament\Forms\Components\TextInput;
+use Filament\Resources\Form;
+use Filament\Resources\RelationManagers\BelongsToManyRelationManager;
+use Filament\Resources\Table;
+use Filament\Tables\Columns\TextColumn;
+
+class RoleRelationManager extends BelongsToManyRelationManager
+{
+    protected static string $relationship = 'roles';
+
+    protected static ?string $recordTitleAttribute = 'name';
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                TextInput::make('name')
+                    ->label(__('filament-authentication::filament-authentication.field.name')),
+                TextInput::make('guard_name')
+                    ->label(__('filament-authentication::filament-authentication.field.guard_name'))
+                     ->default(config('auth.defaults.guard')),
+
+            ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                TextColumn::make('name')
+                    ->label(__('filament-authentication::filament-authentication.field.name'))->searchable(),
+                TextColumn::make('guard_name')
+                    ->label(__('filament-authentication::filament-authentication.field.guard_name')),
+
+            ])
+            ->filters([
+                //
+            ]);
+    }
+}