Improvements (#48)

* Added option to filter permissions by models Option to select guard names * Added configurable filter key * style fix --------- Co-authored-by: Tharinda Rodrigo <[email protected]>
Althinect · Jun 17, 2023 · 46eb4fe · 46eb4fe
1 parent 6895734
commit 46eb4fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/config/filament-spatie-roles-permissions.php b/config/filament-spatie-roles-permissions.php
@@ -25,6 +25,9 @@
 
     'default_guard_name' => null,
 
+
+    'model_filter_key' => 'return \'%\'.$key;', // Eg: 'return \'%\'.$key.'\%\';'
+
     'generator' => [
 
         'guard_names' => [

diff --git a/src/Resources/PermissionResource.php b/src/Resources/PermissionResource.php
@@ -74,12 +74,6 @@ public static function form(Form $form): Form
 
     public static function table(Table $table): Table
     {
-        $commands = new \Althinect\FilamentSpatieRolesPermissions\Commands\Permission();
-        $models = $commands->getAllModels();
-        $checkBoxes =  array_map(function (\ReflectionClass $model) {
-            return Checkbox::make($model->getShortName());
-        }, $models);
-
         return $table
             ->columns([
                 TextColumn::make('id')
@@ -94,13 +88,18 @@ public static function table(Table $table): Table
             ])
             ->filters([
                 Filter::make('models')
-                    ->form($checkBoxes)
+                    ->form(function() {
+                        $commands = new \Althinect\FilamentSpatieRolesPermissions\Commands\Permission();
+                        $models = $commands->getAllModels();
+                        return  array_map(function (\ReflectionClass $model) {
+                            return Checkbox::make($model->getShortName());
+                        }, $models);
+                    })
                     ->query(function (Builder $query, array $data) {
-
                        return $query->where(function (Builder $query) use ($data) {
                             foreach ($data as $key => $value) {
                                 if ($value) {
-                                    $query->orWhere('name', 'like', '%'.$key.'%');
+                                    $query->orWhere('name', 'like', eval(config('filament-spatie-roles-permissions.model_filter_key')));
                                 }
                             }
                         });