@hmcts/ccd-case-ui-toolkit 6.19.16-rc1 → 6.19.16-rc2

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

@@ -6409,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];
@@ -8642,7 +8642,7 @@
             var caseFieldLeaf;
             var children = this.getCaseFieldChildren(caseField);
             if (children.length > 0) {
-                var _b = __read(caseFieldIds), _ = _b[0], tail = _b.slice(1);
+                var _a = __read(caseFieldIds), _ = _a[0], tail = _a.slice(1);
                 caseFieldLeaf = this.getCaseFieldLeaf(tail, children);
             }
             else {
@@ -8680,7 +8680,7 @@
             return pathPrefix.length === 0 ? caseField : pathPrefix + "." + caseField;
         };
         WizardPageFieldToCaseFieldMapper.prototype.getCaseFieldLeaf = function (caseFieldId, caseFields) {
-            var _b = __read(caseFieldId), head = _b[0], tail = _b.slice(1);
+            var _a = __read(caseFieldId), head = _a[0], tail = _a.slice(1);
             if (caseFieldId.length === 1) {
                 var caseLeaf = caseFields.find(function (e) { return e.id === head; });
                 if (!caseLeaf) {
@@ -8702,15 +8702,12 @@
         };
         WizardPageFieldToCaseFieldMapper.prototype.hideParentIfAllChildrenHidden = function (caseField) {
             var _this = this;
-            var _a;
             var childrenCaseFields = this.getCaseFieldChildren(caseField);
             childrenCaseFields.forEach(function (e) { return _this.hideParentIfAllChildrenHidden(e); });
-            // filter out judicialuser field to avoid issue with the field to be hide/unhide based on the selection
             if (childrenCaseFields.length > 0 && this.allCaseFieldsHidden(childrenCaseFields)) {
                 caseField.hidden = true;
-                if (caseField.field_type.id !== 'JudicialUser' && ((_a = caseField.field_type.collection_field_type) === null || _a === void 0 ? void 0 : _a.id) !== 'JudicialUser') {
-                    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) {
@@ -8724,7 +8721,7 @@
             return childrenCaseFields;
         };
         WizardPageFieldToCaseFieldMapper.prototype.allCaseFieldsHidden = function (children) {
-            return children.every(function (e) { return e.display_context === 'HIDDEN'; });
+            return children.every(function (e) { return e.display_context === 'HIDDEN' || e.display_context === 'HIDDEN_TEMP'; });
         };
         return WizardPageFieldToCaseFieldMapper;
     }());
@@ -14174,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;
             });
@@ -26591,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);