tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
ivan-sim
2024-07-08 09:46:12 +07:00
parent 29180eee15
commit e3609a69b8
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/Internal/Http/Controllers/Api/UserManagementController.php
View File

@@ -22,6 +22,11 @@ class UserManagementController extends Controller
$search = $request->get('search'); $search = $request->get('search');
$query->where('name', 'like', "%{$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); $userRole = $query->paginate(10);
return Helper::paginateResources($userRole); return Helper::paginateResources($userRole);
} }
@@ -133,6 +138,13 @@ class UserManagementController extends Controller
$search = $request->get('search'); $search = $request->get('search');
$userAccess->where('name', 'like', "%{$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); $userAccess = $userAccess->paginate(10);
return Helper::paginateResources($userAccess); return Helper::paginateResources($userAccess);
} }

2
frontend/client-portal/src/pages/UserManagement/UserAccess/List.tsx
View File

@@ -354,7 +354,7 @@ export default function List() {
const loadDataTableData = async (appliedFilter : any | null = null) => { const loadDataTableData = async (appliedFilter : any | null = null) => {
setDataTableLoading(true); setDataTableLoading(true);
const filter = appliedFilter ? appliedFilter : Object.fromEntries([...searchParams.entries()]); 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); console.log(response.data);
setDataTableLoading(false); setDataTableLoading(false);

2
frontend/client-portal/src/pages/UserManagement/UserRole/List.tsx
View File

@@ -351,7 +351,7 @@ export default function List() {
const loadDataTableData = async (appliedFilter : any | null = null) => { const loadDataTableData = async (appliedFilter : any | null = null) => {
setDataTableLoading(true); setDataTableLoading(true);
const filter = appliedFilter ? appliedFilter : Object.fromEntries([...searchParams.entries()]); 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); console.log(response.data);
setDataTableLoading(false); setDataTableLoading(false);