@hmcts/rpx-xui-common-lib 2.0.18 → 2.0.19

package/fesm2020/hmcts-rpx-xui-common-lib.mjs

@@ -2129,28 +2129,6 @@ function getValues(options, values) {
     }, []);
 }
 
-const getAllCaseworkersFromServices = (caseworkersByService) => {
-    let allCaseworkers = [];
-    caseworkersByService.forEach(caseworkerListByService => {
-        allCaseworkers = allCaseworkers.concat(caseworkerListByService.caseworkers);
-    });
-    return allCaseworkers;
-};
-const getSessionStorageKeyForServiceId = (serviceId) => {
-    return `${serviceId}-caseworkers`;
-};
-const getCaseworkers = (serviceId, sessionStorageService) => {
-    const sessionKey = getSessionStorageKeyForServiceId(serviceId);
-    const value = sessionStorageService.getItem(sessionKey);
-    if (value) {
-        return JSON.parse(value);
-    }
-};
-const setCaseworkers = (serviceId, caseworkers, sessionStorageService) => {
-    const sessionKey = getSessionStorageKeyForServiceId(serviceId);
-    sessionStorageService.setItem(sessionKey, JSON.stringify(caseworkers));
-};
-
 class SessionStorageService {
     /**
      * Get an item from the session storage.
@@ -2216,35 +2194,8 @@ class FindAPersonService {
         }
         this.assignedUser = searchOptions.assignedUser ? searchOptions.assignedUser : null;
         const fullServices = searchOptions.services;
-        const storedServices = [];
-        const newServices = [];
-        const storedCaseworkersByService = [];
-        fullServices.forEach(serviceId => {
-            const serviceKey = getSessionStorageKeyForServiceId(serviceId);
-            if (this.sessionStorageService.getItem(serviceKey)) {
-                storedServices.push(serviceId);
-                storedCaseworkersByService.push({ service: serviceId, caseworkers: JSON.parse(this.sessionStorageService.getItem(serviceKey)) });
-            }
-            else {
-                newServices.push(serviceId);
-            }
-        });
-        // if all services are stored then return the stored caseworkers by service
-        if (storedServices.length === fullServices.length) {
-            const storedCaseworkers = getAllCaseworkersFromServices(storedCaseworkersByService);
-            return of$1(this.searchInCaseworkers(storedCaseworkers, searchOptions));
-        }
-        // all serviceIds passed in as node layer getting used anyway and caseworkers also stored there
-        return this.http.post('/workallocation/retrieveCaseWorkersForServices', { fullServices }).pipe(tap(caseworkersByService => {
-            caseworkersByService.forEach(caseworkerListByService => {
-                // for any new service, ensure that they are then stored in the session
-                if (newServices.includes(caseworkerListByService.service)) {
-                    setCaseworkers(caseworkerListByService.service, caseworkerListByService.caseworkers, this.sessionStorageService);
-                }
-            });
-        }), map(caseworkersByService => {
-            const givenCaseworkers = getAllCaseworkersFromServices(caseworkersByService);
-            return this.searchInCaseworkers(givenCaseworkers, searchOptions);
+        return this.http.post('/workallocation/caseworker/getUsersByServiceName', { services: fullServices, term: searchOptions.searchTerm }).pipe(map(caseworkers => {
+            return this.searchInCaseworkers(caseworkers, searchOptions);
         }));
     }
     mapCaseworkers(caseworkers, roleCategory) {
@@ -2276,11 +2227,9 @@ class FindAPersonService {
                 roleCategory = RoleCategory.CTSC;
             }
         }
-        const searchTerm = searchOptions && searchOptions.searchTerm ? searchOptions.searchTerm.toLowerCase() : '';
         const people = caseworkers ? this.mapCaseworkers(caseworkers, roleCategory) : [];
-        const finalPeopleList = people.filter(person => person && person.name && person.name.toLowerCase().includes(searchTerm));
-        return searchOptions.userIncluded ? finalPeopleList.filter(person => person && person.id !== this.assignedUser)
-            : finalPeopleList.filter(person => person?.id !== this.assignedUser);
+        return searchOptions.userIncluded ? people.filter(person => person && person.id !== this.assignedUser)
+            : people.filter(person => person && person.id !== this.userId && person.id !== this.assignedUser);
     }
     searchJudicial(value, serviceId) {
         return this.http.post('api/prd/judicial/getJudicialUsersSearch', { searchString: value, serviceCode: serviceId });