From e3609a69b82fd02b4a856ca2ac8e5631736ec265 Mon Sep 17 00:00:00 2001
From: ivan-sim <ivan@sismedika.com>
Date: Mon, 8 Jul 2024 09:46:12 +0700
Subject: [PATCH] Update

---
 .../Controllers/Api/UserManagementController.php     | 12 ++++++++++++
 .../src/pages/UserManagement/UserAccess/List.tsx     |  2 +-
 .../src/pages/UserManagement/UserRole/List.tsx       |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Modules/Internal/Http/Controllers/Api/UserManagementController.php b/Modules/Internal/Http/Controllers/Api/UserManagementController.php
index 98c3a97d..e2448a3e 100644
--- a/Modules/Internal/Http/Controllers/Api/UserManagementController.php
+++ b/Modules/Internal/Http/Controllers/Api/UserManagementController.php
@@ -22,6 +22,11 @@ class UserManagementController extends Controller
             $search = $request->get('search');
             $query->where('name', 'like', "%{$search}%");
         }
+        if($request->has('guard_name'))
+        {
+            $guard_name = $request->get('guard_name');
+            $query->where('guard_name', '=', $guard_name);
+        }
         $userRole = $query->paginate(10);
         return Helper::paginateResources($userRole);
     }
@@ -133,6 +138,13 @@ class UserManagementController extends Controller
             $search = $request->get('search');
             $userAccess->where('name', 'like', "%{$search}%");
         }
+        if($request->has('guard_name'))
+        {
+            $guard_name = $request->get('guard_name');
+            $userAccess->whereHas('role', function ($query) use ($guard_name) {
+                $query->where('guard_name', $guard_name);
+            });
+        }
         $userAccess = $userAccess->paginate(10);
         return Helper::paginateResources($userAccess);
     }
diff --git a/frontend/client-portal/src/pages/UserManagement/UserAccess/List.tsx b/frontend/client-portal/src/pages/UserManagement/UserAccess/List.tsx
index 3391c365..c4b5d66a 100644
--- a/frontend/client-portal/src/pages/UserManagement/UserAccess/List.tsx
+++ b/frontend/client-portal/src/pages/UserManagement/UserAccess/List.tsx
@@ -354,7 +354,7 @@ export default function List() {
   const loadDataTableData = async (appliedFilter : any | null = null) => {
     setDataTableLoading(true);
     const filter = appliedFilter ? appliedFilter : Object.fromEntries([...searchParams.entries()]);
-    const response = await axios.get('/user/access', { params: filter });
+    const response = await axios.get('/user/access?guard_name=client-portal&', { params: filter });
     console.log(response.data);
     setDataTableLoading(false);
 
diff --git a/frontend/client-portal/src/pages/UserManagement/UserRole/List.tsx b/frontend/client-portal/src/pages/UserManagement/UserRole/List.tsx
index ffba0805..c3a577fd 100644
--- a/frontend/client-portal/src/pages/UserManagement/UserRole/List.tsx
+++ b/frontend/client-portal/src/pages/UserManagement/UserRole/List.tsx
@@ -351,7 +351,7 @@ export default function List() {
   const loadDataTableData = async (appliedFilter : any | null = null) => {
     setDataTableLoading(true);
     const filter = appliedFilter ? appliedFilter : Object.fromEntries([...searchParams.entries()]);
-    const response = await axios.get('/user/role', { params: filter });
+    const response = await axios.get('/user/role?guard_name=client-portal&', { params: filter });
     console.log(response.data);
     setDataTableLoading(false);