Added rolefilter to role assignments

FINTLabs · Jan 17, 2025 · 9330a8f · 9330a8f
1 parent e109b54
commit 9330a8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/app/data/fetch-assignments.ts b/app/data/fetch-assignments.ts
@@ -61,8 +61,8 @@ export const fetchAssignmentsForUser = async (request: Request, id: string | und
 
 }
 
-export const fetchAssignedRoles = async (request: Request, id: string | undefined, size: string, page: string, search: string, orgUnits: string[]) => {
-    const response = await fetch(`${ASSIGNMENT_API_URL}${BASE_PATH}/api/assignments/resource/${id}/roles?size=${size}&page=${page}&search=${search}&${orgUnits.length > 0 ? 'orgUnits=' + orgUnits : ""}`, {
+export const fetchAssignedRoles = async (request: Request, id: string | undefined, size: string, page: string, search: string, orgUnits: string[], roleFilter?: string) => {
+    const response = await fetch(`${ASSIGNMENT_API_URL}${BASE_PATH}/api/assignments/resource/${id}/roles?size=${size}&page=${page}&search=${search}&${orgUnits.length > 0 ? 'orgUnits=' + orgUnits : ""}${roleFilter}`, {
         headers: request.headers
     });
 

diff --git a/app/routes/ressurs.$id.ny-tildeling.grupper.tsx b/app/routes/ressurs.$id.ny-tildeling.grupper.tsx
@@ -29,12 +29,18 @@ export async function loader({params, request}: LoaderFunctionArgs): Promise<Typ
     const resourceResponse = await fetchResourceById(request, params.id)
     const resource = await resourceResponse.json()
 
-    const [responseRoles, responseAssignments, userTypesKodeverk] = await Promise.all([
-        fetchRoles(request, size, page, search, orgUnits, resource.validForRoles),
-        fetchAssignedRoles(request, params.id, "1000", "0", "", orgUnits),
+    const responseRoles = await fetchRoles(request, size, page, search, orgUnits, resource.validForRoles)
+    const roleList: IRoleList = await responseRoles.json()
+
+    let filter = ""
+    roleList.roles.forEach(value => {
+        filter += `&rolefilter=${value.id}`
+    })
+
+    const [responseAssignments, userTypesKodeverk] = await Promise.all([
+        fetchAssignedRoles(request, params.id, size, "0", "", orgUnits, filter),
         fetchUserTypes(request)
     ]);
-    const roleList: IRoleList = await responseRoles.json()
     const assignedRolesList: IAssignedRoles = await responseAssignments.json()
 
     const assignedRolesMap: Map<number, IRole> = new Map(assignedRolesList.roles.map(role => [role.id, role]))