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

package/bundles/hmcts-ccd-case-ui-toolkit.umd.js

@@ -4113,7 +4113,7 @@
                         // 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));
@@ -6083,9 +6083,6 @@
             // Clear out any MultiSelect labels.
             FormValueService.removeMultiSelectLabels(data);
         };
-        /**
-         * Remove any empty or invalid array with only id
-         */
         FormValueService.prototype.removeInvalidCollectionData = function (data, field) {
             var e_10, _a;
             if (data[field.id] && data[field.id].length > 0) {
@@ -6166,13 +6163,17 @@
                     // 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(function (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(function (key) { return data[caseField.id][key] = caseField.value[key]; });
                     }
+                    ;
                 });
             }
         };
@@ -7963,6 +7964,9 @@
             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;
             }
@@ -7987,6 +7991,9 @@
                 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;
@@ -8047,6 +8054,9 @@
     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';
 
     var WizardPageFieldToCaseFieldMapper = /** @class */ (function () {
         function WizardPageFieldToCaseFieldMapper() {
@@ -8467,7 +8477,7 @@
                 .set('Content-Type', 'application/json');
             return this.http
                 .post(url, eventData, { headers: headers, observe: 'body' })
-                .pipe(operators.map(function (body) { return _this.processResponseBody(body, eventData); }), operators.catchError(function (error) {
+                .pipe(operators.catchError(function (error) {
                 _this.errorService.setError(error);
                 return rxjs.throwError(error);
             }));
@@ -8502,7 +8512,7 @@
                 .set('Content-Type', 'application/json');
             return this.http
                 .post(url, eventData, { headers: headers, observe: 'body' })
-                .pipe(operators.map(function (body) { return _this.processResponseBody(body, eventData); }), operators.catchError(function (error) {
+                .pipe(operators.catchError(function (error) {
                 _this.errorService.setError(error);
                 return rxjs.throwError(error);
             }));
@@ -8542,10 +8552,6 @@
             }
             return url;
         };
-        CasesService.prototype.processResponseBody = function (body, eventData) {
-            this.processTasksOnSuccess(body, eventData.event);
-            return body;
-        };
         CasesService.prototype.initialiseEventTrigger = function (eventTrigger) {
             var _this = this;
             if (!eventTrigger.wizard_pages) {
@@ -8556,22 +8562,6 @@
                 wizardPage.case_fields = _this.orderService.sort(_this.wizardPageFieldToCaseFieldMapper.mapAll(wizardPage.wizard_page_fields, eventTrigger.case_fields));
             });
         };
-        CasesService.prototype.processTasksOnSuccess = function (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(function () {
-                        // Success. Do nothing.
-                    }, function (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
         */
@@ -8594,7 +8584,7 @@
             if (userInfoStr) {
                 userInfo = JSON.parse(userInfoStr);
             }
-            var roleCategory = camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
+            var roleCategory = userInfo.roleCategory || camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
             var roleName = camUtils.getAMRoleName('challenged', roleCategory);
             var beginTime = new Date();
             var endTime = new Date(new Date().setUTCHours(23, 59, 59, 999));
@@ -8611,7 +8601,7 @@
             if (userInfoStr) {
                 userInfo = JSON.parse(userInfoStr);
             }
-            var roleCategory = camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
+            var roleCategory = userInfo.roleCategory || camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
             var roleName = camUtils.getAMRoleName('specific', roleCategory);
             var id = userInfo.id ? userInfo.id : userInfo.uid;
             var payload = camUtils.getAMPayload(null, id, roleName, roleCategory, 'SPECIFIC', caseId, sar, null, null, true);