fix roles filter

tomatophp · Apr 25, 2024 · a25f8f9 · a25f8f9
1 parent cb6c8f5
commit a25f8f9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/resources/views/roles/index.blade.php b/resources/views/roles/index.blade.php
@@ -2,6 +2,9 @@
     <x-slot:header>
         {{trans('tomato-roles::global.roles.index')}}
     </x-slot:header>
+    <x-slot:icon>
+        bx bxs-lock
+    </x-slot:icon>
     <x-slot:buttons>
         <x-tomato-admin-button :href="route('admin.roles.create')" type="link">
             {{trans('tomato-admin::global.crud.create-new')}} {{trans('tomato-roles::global.roles.single')}}

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
@@ -2,6 +2,9 @@
     <x-slot:header>
         {{ trans('tomato-roles::global.users.index') }}
     </x-slot:header>
+    <x-slot:icon>
+        bx bxs-user
+    </x-slot:icon>
     <x-slot:buttons>
         <x-tomato-admin-button :modal="true" :href="route('admin.users.create')" type="link">
             {{trans('tomato-admin::global.crud.create-new')}} {{ trans('tomato-roles::global.users.index') }}

diff --git a/src/Http/Controllers/UserController.php b/src/Http/Controllers/UserController.php
@@ -22,11 +22,19 @@ class UserController extends Controller
      */
     public function index(Request $request): View
     {
+        $query = User::query();
+        if(isset($request->get('filter')['role_id']) && !empty($request->get('filter')['role_id'])){
+            $query->whereHas('roles', function($q) use ($request){
+                $q->where('id', (int)$request->get('filter')['role_id']);
+            });
+        }
+
         return Tomato::index(
             request: $request,
             model: User::class,
             view: 'tomato-roles::users.index',
             table: \TomatoPHP\TomatoRoles\Tables\UserTable::class,
+            query: $query
         );
     }
 

diff --git a/src/Tables/UserTable.php b/src/Tables/UserTable.php
@@ -15,9 +15,11 @@ class UserTable extends AbstractTable
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(public mixed $query)
     {
-        //
+        if(!$query){
+            $this->query = \App\Models\User::query();
+        }
     }
 
     /**
@@ -37,7 +39,7 @@ public function authorize(Request $request)
      */
     public function for()
     {
-        return \App\Models\User::query();
+        return $this->query;
     }
 
     /**
@@ -52,11 +54,12 @@ public function configure(SpladeTable $table)
 
         $table
             ->selectFilter(
-                key: 'roles.id',
+                key: 'role_id',
                 options: $roles->pluck('name', 'id')->toArray(),
                 label: trans('tomato-roles::global.users.roles'),
                 noFilterOption: true,
-                noFilterOptionLabel: trans('tomato-roles::global.users.filters.roles')
+                noFilterOptionLabel: trans('tomato-roles::global.users.filters.roles'),
+                applyQuery: false
             )
             ->withGlobalSearch(label: trans('tomato-admin::global.search'),columns: ['id','name','email',])
             ->bulkAction(