@hmcts/ccd-case-ui-toolkit 6.19.13 → 6.19.14-rc1

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

@@ -6403,7 +6403,7 @@
                     if (!FormValueService.isLabel(field) && FormValueService.isReadOnly(field)) {
                         return "continue";
                     }
-                    if (field.hidden === true && field.display_context !== 'HIDDEN' && field.id !== 'caseLinks') {
+                    if (field.hidden === true && field.display_context !== 'HIDDEN' && 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];
@@ -9889,14 +9889,13 @@
         function ValidPageListCaseFieldsService(fieldsUtils) {
             this.fieldsUtils = fieldsUtils;
         }
-        ValidPageListCaseFieldsService.prototype.isShown = function (page, eventTriggerFields, data) {
+        ValidPageListCaseFieldsService.prototype.isShown = function (page, eventTriggerFields, formFields) {
             var fields = this.fieldsUtils
-                .mergeCaseFieldsAndFormFields(eventTriggerFields, data);
+                .mergeCaseFieldsAndFormFields(eventTriggerFields, formFields);
             return page.parsedShowCondition.match(fields);
         };
-        ValidPageListCaseFieldsService.prototype.deleteNonValidatedFields = function (validPageList, caseEventDatadata, eventTriggerFields, fromPreviousPage) {
-            if (fromPreviousPage === void 0) { fromPreviousPage = false; }
-            var pageListCaseFields = this.validPageListCaseFields(validPageList, caseEventDatadata, eventTriggerFields);
+        ValidPageListCaseFieldsService.prototype.deleteNonValidatedFields = function (validPageList, caseEventDatadata, eventTriggerFields, fromPreviousPage, formFields) {
+            var pageListCaseFields = this.validPageListCaseFields(validPageList, eventTriggerFields, formFields);
             if (!fromPreviousPage && pageListCaseFields.length > 0) {
                 Object.keys(caseEventDatadata).forEach(function (key) {
                     if (pageListCaseFields.findIndex(function (element) { return element.id === key; }) < 0) {
@@ -9905,11 +9904,11 @@
                 });
             }
         };
-        ValidPageListCaseFieldsService.prototype.validPageListCaseFields = function (validPageList, data, eventTriggerFields) {
+        ValidPageListCaseFieldsService.prototype.validPageListCaseFields = function (validPageList, eventTriggerFields, formFields) {
             var _this = this;
             var validPageListCaseFields = [];
             validPageList.forEach(function (page) {
-                if (_this.isShown(page, eventTriggerFields, data)) {
+                if (_this.isShown(page, eventTriggerFields, formFields)) {
                     page.case_fields.forEach(function (field) { return validPageListCaseFields.push(field); });
                 }
             });
@@ -10114,8 +10113,8 @@
             // Remove "Launcher"-type fields (these have no values and are not intended to be persisted)
             this.formValueService.removeCaseFieldsOfType(caseEventData.data, eventTrigger.case_fields, ['FlagLauncher', 'ComponentLauncher']);
             // delete fields which are not part of the case event journey wizard pages case fields
-            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, eventTrigger.case_fields, false);
-            var pageListCaseFields = this.validPageListCaseFieldsService.validPageListCaseFields(this.validPageList, caseEventData.data, eventTrigger.case_fields);
+            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, eventTrigger.case_fields, false, form.controls['data'].value);
+            var pageListCaseFields = this.validPageListCaseFieldsService.validPageListCaseFields(this.validPageList, eventTrigger.case_fields, form.controls['data'].value);
             // Remove unnecessary case fields which are hidden, only if the submission is *not* for Case Flags
             if (!this.isCaseFlagSubmission) {
                 this.formValueService.removeUnnecessaryFields(caseEventData.data, pageListCaseFields, true, true);
@@ -11494,7 +11493,7 @@
             // Get hold of the CaseEventData.
             var caseEventData = this.formValueService.sanitise(formFields);
             // delete fields which are not part of the case event journey wizard pages case fields
-            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, this.eventTrigger.case_fields, fromPreviousPage);
+            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, this.eventTrigger.case_fields, fromPreviousPage, this.editForm.controls['data'].value);
             // Tidy it up before we return it.
             this.formValueService.removeUnnecessaryFields(caseEventData.data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, this.currentPage.case_fields);
             return caseEventData;
@@ -26555,7 +26554,7 @@
             var checkConditionalShowAgainst = values;
             var formGroupAvailable = false;
             if (formGroup) {
-                checkConditionalShowAgainst = formGroup.parent.getRawValue().data;
+                checkConditionalShowAgainst = formGroup.value ? formGroup.parent.getRawValue().data : formGroup;
                 formGroupAvailable = true;
                 if (idPrefix !== undefined) {
                     if (idPrefix !== '') {
@@ -27573,7 +27572,7 @@
             var page_r13 = i0__namespace.ɵɵnextContext().$implicit;
             var ctx_r14 = i0__namespace.ɵɵnextContext(3);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction2(12, _c0$f, i0__namespace.ɵɵpipeBind2(4, 9, page_r13, ctx_r14.editForm), ctx_r14.editForm.controls["data"]))));
+            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction2(12, _c0$f, i0__namespace.ɵɵpipeBind2(4, 9, page_r13, ctx_r14.editForm), ctx_r14.allFieldsValues))));
         }
     }
     function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_Template(rf, ctx) {
@@ -27826,6 +27825,7 @@
         });
         CaseEditSubmitComponent.prototype.ngOnInit = function () {
             var _this = this;
+            var _a, _b, _c;
             this.profileSubscription = this.profileNotifier.profile.subscribe(function (_) { return _this.profile = _; });
             this.eventTrigger = this.caseEdit.eventTrigger;
             this.triggerText = this.eventTrigger.end_button_label || CallbackErrorsComponent.TRIGGER_TEXT_SUBMIT;
@@ -27834,6 +27834,11 @@
             this.showSummaryFields = this.sortFieldsByShowSummaryContent(this.eventTrigger.case_fields);
             this.caseEdit.isSubmitting = false;
             this.contextFields = this.getCaseFields();
+            this.metadataFieldsObject = (_c = (_b = (_a = this.caseEdit) === null || _a === void 0 ? void 0 : _a.caseDetails) === null || _b === void 0 ? void 0 : _b.metadataFields) === null || _c === void 0 ? void 0 : _c.reduce(function (o, key) {
+                var _d;
+                return Object.assign(o, (_d = {}, _d[key.id] = key.value, _d));
+            }, {});
+            this.allFieldsValues = Object.assign(this.metadataFieldsObject ? this.metadataFieldsObject : {}, this.editForm.getRawValue().data);
             // Indicates if the submission is for a Case Flag, as opposed to a "regular" form submission, by the presence of
             // a FlagLauncher field in the event trigger
             this.caseEdit.isCaseFlagSubmission =