use role contract

Signed-off-by: Lloric Mayuga Garcia <[email protected]>
lloricode · Aug 11, 2024 · d51b585 · d51b585
1 parent 4fed2e8
commit d51b585
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 90 deletions.
diff --git a/src/Models/EloquentBuilder/RoleEloquentBuilder.php b/src/Models/EloquentBuilder/RoleEloquentBuilder.php
diff --git a/src/Models/Role.php b/src/Models/Role.php
diff --git a/src/Resources/RoleResource/Pages/EditRole.php b/src/Resources/RoleResource/Pages/EditRole.php
@@ -9,11 +9,11 @@
 use Illuminate\Database\Eloquent\Model;
 use Lloricode\FilamentSpatieLaravelPermissionPlugin\Actions\EditRoleAction;
 use Lloricode\FilamentSpatieLaravelPermissionPlugin\Data\RoleData;
-use Lloricode\FilamentSpatieLaravelPermissionPlugin\Models\Role;
 use Lloricode\FilamentSpatieLaravelPermissionPlugin\Resources\RoleResource;
+use Spatie\Permission\Contracts\Role as RoleContract;
 
 /**
- * @property-read Role $record
+ * @property-read RoleContract&Model $record
  */
 class EditRole extends EditRecord
 {
@@ -30,7 +30,7 @@ protected function getHeaderActions(): array
     #[\Override]
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
-        /** @var Role $record */
+        /** @var RoleContract&Model $record */
         return app(EditRoleAction::class)
             ->execute($record, new RoleData(...$data));
     }

diff --git a/src/Resources/RoleResource/Schema/PermissionSchema.php b/src/Resources/RoleResource/Schema/PermissionSchema.php
@@ -9,9 +9,9 @@
 use Filament\Forms\Set;
 use Illuminate\Support\Collection as CollectionSupport;
 use Illuminate\Support\Str;
-use Lloricode\FilamentSpatieLaravelPermissionPlugin\Models\Role;
 use Lloricode\FilamentSpatieLaravelPermissionPlugin\Resources\RoleResource\Support\PermissionData;
 use Spatie\Permission\Contracts\Permission as PermissionContract;
+use Spatie\Permission\Contracts\Role as RoleContract;
 use Spatie\Permission\PermissionRegistrar;
 
 final class PermissionSchema
@@ -38,7 +38,7 @@ public static function schema(?string $guardName): array
         return [
 
             Forms\Components\Hidden::make('permissions')
-                ->afterStateHydrated(function (Forms\Components\Hidden $component, ?Role $record): void {
+                ->afterStateHydrated(function (Forms\Components\Hidden $component, ?RoleContract $record): void {
                     $component->state($record ? $record->permissions->pluck('name') : []);
                 })
                 ->dehydrateStateUsing(
@@ -72,7 +72,7 @@ function (
                 ->afterStateUpdated(function (Get $get, Set $set, bool $state): void {
                     self::updatedToggleSelectAllState(get: $get, set: $set, state: $state);
                 })
-                ->afterStateHydrated(function (Forms\Components\Toggle $component, ?Role $record): void {
+                ->afterStateHydrated(function (Forms\Components\Toggle $component, ?RoleContract $record): void {
 
                     if ($record === null) {
                         $component->state(false);
@@ -84,7 +84,7 @@ function (
 
                     foreach (self::permissions() as $permissionData) {
 
-                        if (! $record->hasPermissionTo($permissionData->name)) {
+                        if (! $record->hasPermissionTo($permissionData->name, self::$guardName)) {
                             $all = false;
 
                             break;
@@ -109,15 +109,15 @@ function (
                                         ->offIcon('heroicon-s-lock-closed')
                                         ->reactive()
                                         ->afterStateHydrated(
-                                            function (Forms\Components\Toggle $component, ?Role $record) use (
+                                            function (Forms\Components\Toggle $component, ?RoleContract $record) use (
                                                 $parentPermission
                                             ): void {
                                                 if ($record === null) {
                                                     $component->state(false);
 
                                                     return;
                                                 }
-                                                $component->state($record->hasPermissionTo($parentPermission));
+                                                $component->state($record->hasPermissionTo($parentPermission, self::$guardName));
                                             }
                                         )
                                         ->afterStateUpdated(
@@ -152,7 +152,7 @@ function (Set $set, Get $get, bool $state) use (
                                                 ->columns(2)
                                                 ->reactive()
                                                 ->afterStateHydrated(
-                                                    function (Forms\Components\CheckboxList $component, ?Role $record) use (
+                                                    function (Forms\Components\CheckboxList $component, ?RoleContract $record) use (
                                                         $permissionsDatas,
                                                         $parentPermission
                                                     ): void {
@@ -163,7 +163,7 @@ function (Forms\Components\CheckboxList $component, ?Role $record) use (
                                                             return;
                                                         }
 
-                                                        if ($record->hasPermissionTo($parentPermission)) {
+                                                        if ($record->hasPermissionTo($parentPermission, self::$guardName)) {
                                                             $component->state($permissionsDatas->pluck('name')->toArray());
 
                                                             return;
@@ -173,7 +173,7 @@ function (Forms\Components\CheckboxList $component, ?Role $record) use (
 
                                                         foreach ($permissionsDatas as $permissionData) {
 
-                                                            if ($record->hasPermissionTo($permissionData->name)) {
+                                                            if ($record->hasPermissionTo($permissionData->name, self::$guardName)) {
                                                                 $names[] = $permissionData->name;
                                                             }
                                                         }