@hmcts/ccd-case-ui-toolkit 7.3.35 → 7.3.36-pofcc-78

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -6050,8 +6050,8 @@ class FormValueService {
     constructor(fieldTypeSanitiser) {
         this.fieldTypeSanitiser = fieldTypeSanitiser;
     }
-    sanitise(rawValue) {
-        return this.sanitiseObject(rawValue);
+    sanitise(rawValue, isCaseFlagJourney = false) {
+        return this.sanitiseObject(rawValue, isCaseFlagJourney);
     }
     sanitiseCaseReference(reference) {
         // strip non digits
@@ -6073,7 +6073,7 @@ class FormValueService {
     sanitiseDynamicLists(caseFields, editForm) {
         return this.fieldTypeSanitiser.sanitiseLists(caseFields, editForm.data);
     }
-    sanitiseObject(rawObject) {
+    sanitiseObject(rawObject, isCaseFlagJourney = false) {
         if (!rawObject) {
             return rawObject;
         }
@@ -6087,14 +6087,17 @@ class FormValueService {
                 break;
             }
             else if ('CaseReference' === key) {
-                sanitisedObject[key] = this.sanitiseValue(this.sanitiseCaseReference(String(rawObject[key])));
+                sanitisedObject[key] = this.sanitiseValue(this.sanitiseCaseReference(String(rawObject[key])), isCaseFlagJourney);
             }
             else {
-                sanitisedObject[key] = this.sanitiseValue(rawObject[key]);
+                sanitisedObject[key] = this.sanitiseValue(rawObject[key], isCaseFlagJourney);
                 if (Array.isArray(sanitisedObject[key])) {
                     // If the 'sanitised' array is empty, whereas the original array had 1 or more items
                     // delete the property from the sanatised object
-                    if (sanitisedObject[key].length === 0 && rawObject[key].length > 0) {
+                    const shouldDeleteField = sanitisedObject[key].length === 0
+                        && rawObject[key].length > 0
+                        && !isCaseFlagJourney;
+                    if (shouldDeleteField) {
                         delete sanitisedObject[key];
                     }
                 }
@@ -6102,13 +6105,13 @@ class FormValueService {
         }
         return sanitisedObject;
     }
-    sanitiseArray(rawArray) {
+    sanitiseArray(rawArray, isCaseFlagJourney = false) {
         if (!rawArray) {
             return rawArray;
         }
         rawArray.forEach(item => {
             if (item && item.hasOwnProperty('value')) {
-                item.value = this.sanitiseValue(item.value);
+                item.value = this.sanitiseValue(item.value, isCaseFlagJourney);
             }
         });
         // Filter the array to ensure only truthy values are returned; double-bang operator returns the boolean true/false
@@ -6118,13 +6121,13 @@ class FormValueService {
             .filter(item => !!item)
             .filter(item => item.hasOwnProperty('value') ? FieldsUtils.containsNonEmptyValues(item.value) : true);
     }
-    sanitiseValue(rawValue) {
+    sanitiseValue(rawValue, isCaseFlagJourney = false) {
         if (Array.isArray(rawValue)) {
-            return this.sanitiseArray(rawValue);
+            return this.sanitiseArray(rawValue, isCaseFlagJourney);
         }
         switch (typeof rawValue) {
             case 'object':
-                return this.sanitiseObject(rawValue);
+                return this.sanitiseObject(rawValue, isCaseFlagJourney);
             case 'string':
                 return rawValue.trim();
             case 'number':
@@ -9630,7 +9633,7 @@ class CaseEditComponent {
     }
     generateCaseEventData({ eventTrigger, form }) {
         const caseEventData = {
-            data: this.replaceEmptyComplexFieldValues(this.formValueService.sanitise(this.replaceHiddenFormValuesWithOriginalCaseData(form.get('data'), eventTrigger.case_fields))),
+            data: this.replaceEmptyComplexFieldValues(this.formValueService.sanitise(this.replaceHiddenFormValuesWithOriginalCaseData(form.get('data'), eventTrigger.case_fields), this.isCaseFlagSubmission)),
             event: form.value.event
         };
         this.formValueService.clearNonCaseFields(caseEventData.data, eventTrigger.case_fields);
@@ -15011,9 +15014,20 @@ class WriteCollectionFieldComponent extends AbstractFieldWriteComponent {
         }
     }
     focusLastItem() {
-        const item = this.items.last.nativeElement.querySelector('.form-control');
-        if (item) {
-            item.focus();
+        const root = this.items.last?.nativeElement;
+        if (!root) {
+            return;
+        }
+        const controls = Array.from(root.querySelectorAll('.form-control'));
+        const focusTarget = controls.find(control => {
+            if (!(control instanceof HTMLInputElement)) {
+                return true;
+            }
+            const type = (control.type || '').toLowerCase();
+            return type !== 'radio';
+        });
+        if (focusTarget) {
+            focusTarget.focus();
         }
     }
     removeItem(index) {