@hmcts/ccd-case-ui-toolkit 7.3.53-pofcc-10 → 7.3.53-pofcc-78

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

@@ -11487,7 +11487,7 @@ class CaseEditPageComponent {
         CaseEditPageComponent.setFocusToTop();
     }
     // Adding validation message to show it as Error Summary
-    generateErrorMessage(fields, container, path, sourceFromComplexField) {
+    generateErrorMessage(fields, container, path) {
         const group = container || this.editForm.controls['data'];
         let validErrorFieldFound = false;
         let validationErrorAmount = this.validationErrors.length;
@@ -11504,7 +11504,7 @@ class CaseEditPageComponent {
             if (fieldElement) {
                 const label = casefield.label || 'Field';
                 let id = casefield.id;
-                if (fieldElement['component'] && (fieldElement['component'].parent || sourceFromComplexField)) {
+                if (fieldElement['component'] && fieldElement['component'].parent) {
                     if (fieldElement['component'].idPrefix.indexOf(`_${id}_`) === -1) {
                         id = `${fieldElement['component'].idPrefix}${id}`;
                     }
@@ -11516,7 +11516,7 @@ class CaseEditPageComponent {
                     if (casefield.id === 'AddressLine1') {
                         // EUI-1067 - Display more relevant error message to user and correctly navigate to the field
                         this.addressService.setMandatoryError(true);
-                        this.caseEditDataService.addFormValidationError({ id, message: `An address is required` });
+                        this.caseEditDataService.addFormValidationError({ id: `${path}_${path}`, message: `An address is required` });
                     }
                     else {
                         this.caseEditDataService.addFormValidationError({ id, message: `%FIELDLABEL% is required`, label });
@@ -11542,7 +11542,7 @@ class CaseEditPageComponent {
                 }
                 else if (fieldElement.invalid) {
                     if (casefield.isComplex()) {
-                        errorPresent = this.generateErrorMessage(casefield.field_type.complex_fields, fieldElement, id, true);
+                        errorPresent = this.generateErrorMessage(casefield.field_type.complex_fields, fieldElement, id);
                     }
                     else if (casefield.isCollection() && casefield.field_type.collection_field_type.type === 'Complex') {
                         const fieldArray = fieldElement;
@@ -15306,9 +15306,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) {