1st Phase Team Support (#34)

* Add role nagivation group customisation * Add permission nagivation group customisation * Add nagivation_section_group config option * Remove default setting on Guard Remove default setting on Guard because it causes an issue with the datalist being array if it's not selected / typed. * Remove default setting on Guard Remove default setting on Guard because it causes an issue with the datalist being array if it's not selected / typed. * Add team support to RolesResource * Add english language strings for team support * Added Team Model Class linkage
Althinect · Mar 2, 2023 · 40cb1c7 · 40cb1c7
1 parent 9be5424
commit 40cb1c7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/config/filament-spatie-roles-permissions.php b/config/filament-spatie-roles-permissions.php
@@ -7,6 +7,8 @@
     'preload_permissions' => false,
 
     'navigation_section_group' => 'filament-spatie-roles-permissions::filament-spatie.section.roles_and_permissions', // Default uses language constant
+
+    'team_model' => \App\Models\Team::class,
 
     'generator' => [
 

diff --git a/resources/lang/en/filament-spatie.php b/resources/lang/en/filament-spatie.php
@@ -23,4 +23,7 @@
     'section.role' => 'Role',
     'section.roles' => 'Roles',
     'section.roles_and_permissions' => 'Roles and Permissions',
+    'team' => 'Team',
+    'select-team' => 'Select a Team',
+    'select-team-hint' => 'Leave blank for a global role'
 ];
diff --git a/src/Resources/PermissionResource.php b/src/Resources/PermissionResource.php
@@ -55,11 +55,7 @@ public static function form(Form $form): Form
                                 ->label(__('filament-spatie-roles-permissions::filament-spatie.field.name')),
                             TextInput::make('guard_name')
                                 ->label(__('filament-spatie-roles-permissions::filament-spatie.field.guard_name'))
-                                ->datalist(config('filament-spatie-roles-permissions.generator.guard_names'))
-                                ->default(
-                                    count(config('filament-spatie-roles-permissions.generator.guard_names')) === 1 ?
-                                    config('filament-spatie-roles-permissions.generator.guard_names') : ''
-                                ),
+                                ->datalist(config('filament-spatie-roles-permissions.generator.guard_names')),
                             Select::make('roles')
                                 ->multiple()
                                 ->label(__('filament-spatie-roles-permissions::filament-spatie.field.roles'))

diff --git a/src/Resources/RoleResource.php b/src/Resources/RoleResource.php
@@ -54,16 +54,19 @@ public static function form(Form $form): Form
                                     ->label(__('filament-spatie-roles-permissions::filament-spatie.field.name')),
                                 TextInput::make('guard_name')
                                     ->label(__('filament-spatie-roles-permissions::filament-spatie.field.guard_name'))
-                                    ->datalist(config('filament-spatie-roles-permissions.generator.guard_names'))
-                                    ->default(
-                                        count(config('filament-spatie-roles-permissions.generator.guard_names')) === 1 ?
-                                            config('filament-spatie-roles-permissions.generator.guard_names') : ''
-                                    ),
+                                    ->datalist(config('filament-spatie-roles-permissions.generator.guard_names')),
                                 Select::make('permissions')
                                     ->multiple()
                                     ->label(__('filament-spatie-roles-permissions::filament-spatie.field.permissions'))
                                     ->relationship('permissions', 'name')
-                                    ->preload(config('filament-spatie-roles-permissions.preload_permissions'))
+                                    ->preload(config('filament-spatie-roles-permissions.preload_permissions')),
+                                Select::make(config('permission.team_foreign_key', 'team_id'))->label(__('filament-spatie-roles-permissions::team'))
+                                    ->hidden(!config('permission.teams', false))
+                                    ->options(
+                                        fn() => config('filament-spatie-roles-permissions.team_model', App\Models\Team::class)::pluck('name', 'id')
+                                    )
+                                    ->placeholder(__('filament-spatie-roles-permissions::select-team'))
+                                    ->hint(__('filament-spatie-roles-permissions::select-team-hint')),
                             ])
                     ])
             ]);