@hmcts/ccd-case-ui-toolkit 5.0.54-rollback-case-link → 5.0.55-rollback-case-link

package/fesm2015/hmcts-ccd-case-ui-toolkit.js

@@ -3499,7 +3499,7 @@ class FieldsUtils {
                     // If the Flags CaseField has a value, it is a root-level Complex field; if it does not, it is a Flags
                     // CaseField that is a sub-field within another Complex field, so use the currentValue value (if any)
                     // instead. The exception to this is the "caseFlags" Flags CaseField, which will have an empty object value
-                    // initially or could be null or undefined, because no party name is required
+                    // initially, because no party name is required
                     if (caseField.value && FieldsUtils.isNonEmptyObject(caseField.value) ||
                         caseField.id === this.caseLevelCaseFlagsFieldId) {
                         flags.push(this.mapCaseFieldToFlagsWithFormGroupPathObject(caseField, pathToFlagsFormGroup));
@@ -5251,9 +5251,6 @@ class FormValueService {
         // Clear out any MultiSelect labels.
         FormValueService.removeMultiSelectLabels(data);
     }
-    /**
-     * Remove any empty or invalid array with only id
-     */
     removeInvalidCollectionData(data, field) {
         if (data[field.id] && data[field.id].length > 0) {
             for (const objCollection of data[field.id]) {
@@ -5312,13 +5309,17 @@ class FormValueService {
                 // nothing for a given case field ID (hence the use of hasOwnProperty())
                 if (data.hasOwnProperty(caseField.id) && caseField.value) {
                     // Create new object for the case field ID within the data object, if necessary
-                    if (!data[caseField.id]) {
-                        data[caseField.id] = {};
+                    if (data[caseField.id]) {
+                        // Copy all values from the corresponding CaseField; this ensures all nested flag data (for example, a
+                        // Flags field within a Complex field or a collection of Complex fields) is copied across
+                        Object.keys(data[caseField.id]).forEach(key => {
+                            if (caseField.value.hasOwnProperty(key)) {
+                                data[caseField.id][key] = caseField.value[key];
+                            }
+                        });
                     }
-                    // Copy all values from the corresponding CaseField; this ensures all nested flag data (for example, a
-                    // Flags field within a Complex field or a collection of Complex fields) is copied across
-                    Object.keys(caseField.value).forEach(key => data[caseField.id][key] = caseField.value[key]);
                 }
+                ;
             });
         }
     }
@@ -6728,6 +6729,9 @@ class CaseAccessUtils {
         else if (this.roleOrCategoryExists(CaseAccessUtils.ADMIN_ROLE, CaseAccessUtils.ADMIN_ROLE_CATEGORY, roleKeywords, roleCategories)) {
             return CaseAccessUtils.ADMIN_ROLE_CATEGORY;
         }
+        else if (this.roleOrCategoryExists(CaseAccessUtils.CTSC_ROLE, CaseAccessUtils.CTSC_ROLE_CATEGORY, roleKeywords, roleCategories)) {
+            return CaseAccessUtils.CTSC_ROLE_CATEGORY;
+        }
         else {
             return CaseAccessUtils.LEGAL_OPERATIONS_ROLE_CATEGORY;
         }
@@ -6752,6 +6756,9 @@ class CaseAccessUtils {
             case CaseAccessUtils.ADMIN_ROLE_CATEGORY:
                 roleName = `${accessType}-access-${CaseAccessUtils.ADMIN_ROLE_NAME}`;
                 break;
+            case CaseAccessUtils.CTSC_ROLE_CATEGORY:
+                roleName = `${accessType}-access-${CaseAccessUtils.CTSC_ROLE_NAME}`;
+                break;
             default:
                 roleName = `${accessType}-access-${CaseAccessUtils.LEGAL_OPERATIONS_ROLE_NAME}`;
                 break;
@@ -6808,6 +6815,9 @@ CaseAccessUtils.LEGAL_OPERATIONS_ROLE_NAME = 'legal-ops';
 CaseAccessUtils.CITIZEN_ROLE = 'citizen';
 CaseAccessUtils.CITIZEN_ROLE_CATEGORY = 'CITIZEN';
 CaseAccessUtils.CITIZEN_ROLE_NAME = 'citizen';
+CaseAccessUtils.CTSC_ROLE = 'ctsc';
+CaseAccessUtils.CTSC_ROLE_CATEGORY = 'CTSC';
+CaseAccessUtils.CTSC_ROLE_NAME = 'ctsc';
 
 class WizardPageFieldToCaseFieldMapper {
     mapAll(wizardPageFields, caseFields) {
@@ -7207,7 +7217,7 @@ class CasesService {
             .set('Content-Type', 'application/json');
         return this.http
             .post(url, eventData, { headers, observe: 'body' })
-            .pipe(map(body => this.processResponseBody(body, eventData)), catchError(error => {
+            .pipe(catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
         }));
@@ -7240,7 +7250,7 @@ class CasesService {
             .set('Content-Type', 'application/json');
         return this.http
             .post(url, eventData, { headers, observe: 'body' })
-            .pipe(map(body => this.processResponseBody(body, eventData)), catchError(error => {
+            .pipe(catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
         }));
@@ -7279,10 +7289,6 @@ class CasesService {
         }
         return url;
     }
-    processResponseBody(body, eventData) {
-        this.processTasksOnSuccess(body, eventData.event);
-        return body;
-    }
     initialiseEventTrigger(eventTrigger) {
         if (!eventTrigger.wizard_pages) {
             eventTrigger.wizard_pages = [];
@@ -7292,22 +7298,6 @@ class CasesService {
             wizardPage.case_fields = this.orderService.sort(this.wizardPageFieldToCaseFieldMapper.mapAll(wizardPage.wizard_page_fields, eventTrigger.case_fields));
         });
     }
-    processTasksOnSuccess(caseData, eventData) {
-        // The following code is work allocation 1 related
-        if (this.appConfig.getWorkAllocationApiUrl().toLowerCase() === 'workallocation') {
-            // This is used a feature toggle to
-            // control the work allocation
-            if (!this.isPuiCaseManager()) {
-                this.workAllocationService.completeAppropriateTask(caseData.id, eventData.id, caseData.jurisdiction, caseData.case_type)
-                    .subscribe(() => {
-                    // Success. Do nothing.
-                }, error => {
-                    // Show an appropriate warning about something that went wrong.
-                    console.warn('Could not process tasks for this case event', error);
-                });
-            }
-        }
-    }
     /*
     Checks if the user has role of pui-case-manager and returns true or false
     */
@@ -7330,7 +7320,7 @@ class CasesService {
         if (userInfoStr) {
             userInfo = JSON.parse(userInfoStr);
         }
-        const roleCategory = camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
+        const roleCategory = userInfo.roleCategory || camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
         const roleName = camUtils.getAMRoleName('challenged', roleCategory);
         const beginTime = new Date();
         const endTime = new Date(new Date().setUTCHours(23, 59, 59, 999));
@@ -7347,7 +7337,7 @@ class CasesService {
         if (userInfoStr) {
             userInfo = JSON.parse(userInfoStr);
         }
-        const roleCategory = camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
+        const roleCategory = userInfo.roleCategory || camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
         const roleName = camUtils.getAMRoleName('specific', roleCategory);
         const id = userInfo.id ? userInfo.id : userInfo.uid;
         const payload = camUtils.getAMPayload(null, id, roleName, roleCategory, 'SPECIFIC', caseId, sar, null, null, true);