Merge pull request #41 from REAN-Foundation/user-search-issue

Fixed user search issue.

Author: nisha-inflectionzone

src/routes/api/server/priorities/+server.ts

@@ -19,7 +19,7 @@ export const DELETE = async (event: RequestEvent) => {
 			);
 	}
 	throw redirect(
-		successMessage('Priorite deleted successfully!'),
+		successMessage('Priority deleted successfully!'),
 		event
 		);	
 };

src/routes/api/server/users/search/+server.ts

@@ -25,16 +25,19 @@ export const GET = async (event: RequestEvent) => {
 			firstName,
 			phone,
 			email,
-            roleIds,
+      roleIds,
 			orderBy: sortBy,
 			order: sortOrder,
 			itemsPerPage,
 			pageIndex
 		};
 		const response = await searchUsers(sessionId, searchParams);
+    
 		const users = response.Data.Users;
-    users.Items = await addPermissionMatrix(users.Items, userRole, userId, tenantId, userRoleId);
-		return new Response(JSON.stringify(users));
+    // console.log("---",  users);
+    users.Items = await addPermissionMatrix(sessionId, users.Items, userRole, userId, tenantId, userRoleId);
+		// console.log("***",  users);
+    return new Response(JSON.stringify(users));
 	} catch (err) {
 		console.error(`Error retriving users: ${err.message}`);
 		return new Response(err.message);

src/routes/api/services/reancare/user.ts

@@ -264,5 +264,6 @@ export const addPermissionMatrix = async (sessionId: string, userRoleList: any[]
       }
     })
   }
+  // console.log('Permission Matrix', permissionMatrix)
   return permissionMatrix.length > 0  ? permissionMatrix : userRoleList;
 }

src/routes/users/[userId]/health-systems/+page.svelte

@@ -219,7 +219,7 @@
                                     />
                                 </button>
                                 <span slot="title"> Delete </span>
-                                <span slot="description"> Are you sure you want to delete a health system? </span>
+                                <span slot="description"> Are you sure you want to delete a health system? Hospitals associated with it will also get deleted. </span>
                             </Confirm>
                         </td>
                     </tr>

src/routes/users/[userId]/users/+page.server.ts

@@ -45,7 +45,8 @@ export const load: PageServerLoad = async (event: ServerLoadEvent) => {
 	return {
 		users,
 		sessionId,
-		message: response.Message
+		message: response.Message,
+    selectedRoles
 	};
 
 };

src/routes/users/[userId]/users/+page.svelte

@@ -37,7 +37,7 @@
 	let isSortingEmail = false;
 	let isSortingPhone = false;
 	let items = 10;
-    let selectedRoles = [];
+    let selectedRoles = data.selectedRoles;
 
 	let paginationSettings = {
 		page: 0,
@@ -52,15 +52,15 @@
         }
     }
 
-    const tmp = LocalStorageUtils.getItem('personRoles');
-    const personRoles = JSON.parse(tmp);
-    personRoles?.map((x) => {
-        if (x.RoleName === "System admin" || 
-            x.RoleName === "System user"  ||
-            x.RoleName === "Tenant admin" ||
-            x.RoleName === "Tenant user") {
-                selectedRoles.push(x.id);
-            }});
+    // const tmp = LocalStorageUtils.getItem('personRoles');
+    // const personRoles = JSON.parse(tmp);
+    // personRoles?.map((x) => {
+    //     if (x.RoleName === "System admin" || 
+    //         x.RoleName === "System user"  ||
+    //         x.RoleName === "Tenant admin" ||
+    //         x.RoleName === "Tenant user") {
+    //             selectedRoles.push(x.id);
+    //         }});
    
     $: console.log("selectedRole", selectedRoles);
     async function searchUser(model) {
@@ -81,6 +81,7 @@
         headers: { 'content-type': 'application/json' }
       });
       const searchResult = await res.json();
+      console.log('URL  : ' + url)
       console.log('Response: ' + JSON.stringify(searchResult));
       totalUsersCount = searchResult.TotalCount;
       users = searchResult.Items.map((item, index) => ({ ...item, index: index + 1 }));