@hmcts/ccd-case-ui-toolkit 7.0.3-error-message-fix → 7.0.3-exui-1123

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

@@ -3237,6 +3237,11 @@ class WorkbasketInput {
 
 // @dynamic
 class FieldsUtils {
+    static isValidDisplayContext(ctx) {
+        return (ctx === 'MANDATORY' || ctx === 'READONLY'
+            || ctx === 'OPTIONAL' || ctx === 'HIDDEN'
+            || ctx === 'COMPLEX');
+    }
     static convertToCaseField(obj) {
         if (!(obj instanceof CaseField)) {
             return plainToClassFromExist(new CaseField(), obj);
@@ -4385,12 +4390,17 @@ class AbstractFormFieldComponent {
         return this.idPrefix + this.caseField.id;
     }
     registerControl(control, replace = false) {
+        var _a;
         const container = this.parent || this.formGroup;
         if (!container) {
             return control;
         }
         const existing = container.controls[this.caseField.id];
+        // update the field value which has been set in mid-event call back
         if (existing) {
+            if (existing.value === null && ((_a = this.caseField) === null || _a === void 0 ? void 0 : _a.value)) {
+                existing.value = this.caseField.value;
+            }
             if (replace) {
                 // Set the validators on the replacement with what already exists.
                 control.setValidators(existing.validator);
@@ -5446,7 +5456,7 @@ class FormValueService {
                     // Retain anything that is readonly and not a label.
                     continue;
                 }
-                if (field.hidden === true && field.display_context !== 'HIDDEN' && field.id !== 'caseLinks' && !field.retain_hidden_value) {
+                if (field.hidden === true && field.display_context !== 'HIDDEN' && field.display_context !== 'HIDDEN_TEMP' && field.id !== 'caseLinks' && !field.retain_hidden_value) {
                     // Delete anything that is hidden (that is NOT readonly), and that
                     // hasn't had its display_context overridden to make it hidden.
                     delete data[field.id];
@@ -7554,7 +7564,8 @@ class WizardPageFieldToCaseFieldMapper {
         childrenCaseFields.forEach(e => this.hideParentIfAllChildrenHidden(e));
         if (childrenCaseFields.length > 0 && this.allCaseFieldsHidden(childrenCaseFields)) {
             caseField.hidden = true;
-            caseField.display_context = 'HIDDEN';
+            // marking display_context as special hidden so field not being deleted in event submission
+            caseField.display_context = 'HIDDEN_TEMP';
         }
     }
     getCaseFieldChildren(caseField) {
@@ -7568,7 +7579,7 @@ class WizardPageFieldToCaseFieldMapper {
         return childrenCaseFields;
     }
     allCaseFieldsHidden(children) {
-        return !children.some(e => e.hidden !== true);
+        return children.every(e => e.display_context === 'HIDDEN' || e.display_context === 'HIDDEN_TEMP');
     }
 }
 WizardPageFieldToCaseFieldMapper.ɵfac = function WizardPageFieldToCaseFieldMapper_Factory(t) { return new (t || WizardPageFieldToCaseFieldMapper)(); };
@@ -12686,7 +12697,9 @@ class FieldsFilterPipe {
             .filter(f => keepEmpty || FieldsFilterPipe.keepField(f))
             .map(f => {
             if (!f.display_context) {
-                f.display_context = complexField.display_context;
+                if (FieldsUtils.isValidDisplayContext(complexField.display_context)) {
+                    f.display_context = complexField.display_context;
+                }
             }
             return f;
         });
@@ -13347,19 +13360,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         if (0 === error.status || 502 === error.status) {
             return WriteDocumentFieldComponent.UPLOAD_ERROR_NOT_AVAILABLE;
         }
-        let errorMsg = 'Error uploading file';
-        if (error && (error === null || error === void 0 ? void 0 : error.error)) {
-            const fullError = error.error;
-            const start = fullError.indexOf('{');
-            if (start >= 0) {
-                const json = fullError.substring(start, fullError.length - 1).split('<EOL>').join('');
-                const obj = JSON.parse(json);
-                if (obj && (obj === null || obj === void 0 ? void 0 : obj.error)) {
-                    errorMsg = obj.error;
-                }
-            }
-        }
-        return errorMsg;
+        return error.error;
     }
     buildDocumentUploadData(selectedFile) {
         const documentUpload = new FormData();
@@ -23735,7 +23736,9 @@ class ReadFieldsFilterPipe {
         })
             .map(f => {
             if (!f.display_context) {
-                f.display_context = complexField.display_context;
+                if (FieldsUtils.isValidDisplayContext(complexField.display_context)) {
+                    f.display_context = complexField.display_context;
+                }
             }
             if (setupHidden) {
                 ReadFieldsFilterPipe.evaluateConditionalShow(f, checkConditionalShowAgainst, path, formGroupAvailable, complexField.id);