@hmcts/ccd-case-ui-toolkit 6.19.16-hearing-requirements-event-fix → 6.19.16-rc2

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

@@ -5828,23 +5828,13 @@
          * @returns A new array with the mapped values
          */
         FieldsPurger.prototype.mapArrayValuesToNull = function (array) {
-            if (array && array.length > 0) {
-                return array.map(function (element) {
-                    if (element !== undefined && element !== null) {
-                        return typeof element === 'object'
-                            ? Object.assign.apply(Object, __spread([{}], Object.keys(element).map(function (k) {
-                                var _a;
-                                return (_a = {}, _a[k] = null, _a);
-                            }))) : null;
-                    }
-                    else {
-                        return {};
-                    }
-                });
-            }
-            else {
-                return array;
-            }
+            return array.map(function (element) {
+                return typeof element === 'object'
+                    ? Object.assign.apply(Object, __spread([{}], Object.keys(element).map(function (k) {
+                        var _a;
+                        return (_a = {}, _a[k] = null, _a);
+                    }))) : null;
+            });
         };
         return FieldsPurger;
     }());
@@ -6419,7 +6409,7 @@
                     if (!FormValueService.isLabel(field) && FormValueService.isReadOnly(field)) {
                         return "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];
@@ -8716,7 +8706,8 @@
             childrenCaseFields.forEach(function (e) { return _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';
             }
         };
         WizardPageFieldToCaseFieldMapper.prototype.getCaseFieldChildren = function (caseField) {
@@ -8730,7 +8721,7 @@
             return childrenCaseFields;
         };
         WizardPageFieldToCaseFieldMapper.prototype.allCaseFieldsHidden = function (children) {
-            return !children.some(function (e) { return e.hidden !== true; });
+            return children.every(function (e) { return e.display_context === 'HIDDEN' || e.display_context === 'HIDDEN_TEMP'; });
         };
         return WizardPageFieldToCaseFieldMapper;
     }());
@@ -14180,7 +14171,10 @@
                 .filter(function (f) { return keepEmpty || FieldsFilterPipe.keepField(f); })
                 .map(function (f) {
                 if (!f.display_context) {
-                    f.display_context = complexField.display_context;
+                    if (complexField.display_context === 'MANDATORY' || complexField.display_context === 'READONLY'
+                        || complexField.display_context === 'OPTIONAL' || complexField.display_context === 'HIDDEN') {
+                        f.display_context = complexField.display_context;
+                    }
                 }
                 return f;
             });
@@ -26597,7 +26591,10 @@
             })
                 .map(function (f) {
                 if (!f.display_context) {
-                    f.display_context = complexField.display_context;
+                    if (complexField.display_context === 'MANDATORY' || complexField.display_context === 'READONLY'
+                        || complexField.display_context === 'OPTIONAL' || complexField.display_context === 'HIDDEN') {
+                        f.display_context = complexField.display_context;
+                    }
                 }
                 if (setupHidden) {
                     ReadFieldsFilterPipe.evaluateConditionalShow(f, checkConditionalShowAgainst, path, formGroupAvailable, complexField.id);