@hmcts/ccd-case-ui-toolkit 6.19.14 → 6.19.15-prerelease-datetime-picker-fix-new

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

@@ -5570,7 +5570,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.id !== 'caseLinks') {
                     // 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];
@@ -8515,13 +8515,13 @@ class ValidPageListCaseFieldsService {
     constructor(fieldsUtils) {
         this.fieldsUtils = fieldsUtils;
     }
-    isShown(page, eventTriggerFields, formFields) {
+    isShown(page, eventTriggerFields, data) {
         const fields = this.fieldsUtils
-            .mergeCaseFieldsAndFormFields(eventTriggerFields, formFields);
+            .mergeCaseFieldsAndFormFields(eventTriggerFields, data);
         return page.parsedShowCondition.match(fields);
     }
-    deleteNonValidatedFields(validPageList, caseEventDatadata, eventTriggerFields, fromPreviousPage, formFields) {
-        const pageListCaseFields = this.validPageListCaseFields(validPageList, eventTriggerFields, formFields);
+    deleteNonValidatedFields(validPageList, caseEventDatadata, eventTriggerFields, fromPreviousPage = false) {
+        const pageListCaseFields = this.validPageListCaseFields(validPageList, caseEventDatadata, eventTriggerFields);
         if (!fromPreviousPage && pageListCaseFields.length > 0) {
             Object.keys(caseEventDatadata).forEach(key => {
                 if (pageListCaseFields.findIndex((element) => element.id === key) < 0) {
@@ -8530,10 +8530,10 @@ class ValidPageListCaseFieldsService {
             });
         }
     }
-    validPageListCaseFields(validPageList, eventTriggerFields, formFields) {
+    validPageListCaseFields(validPageList, data, eventTriggerFields) {
         const validPageListCaseFields = [];
         validPageList.forEach(page => {
-            if (this.isShown(page, eventTriggerFields, formFields)) {
+            if (this.isShown(page, eventTriggerFields, data)) {
                 page.case_fields.forEach(field => validPageListCaseFields.push(field));
             }
         });
@@ -8731,8 +8731,8 @@ class CaseEditComponent {
         // 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, form.controls['data'].value);
-        const pageListCaseFields = this.validPageListCaseFieldsService.validPageListCaseFields(this.validPageList, eventTrigger.case_fields, form.controls['data'].value);
+        this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, eventTrigger.case_fields, false);
+        const pageListCaseFields = this.validPageListCaseFieldsService.validPageListCaseFields(this.validPageList, caseEventData.data, eventTrigger.case_fields);
         // 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);
@@ -9983,7 +9983,7 @@ class CaseEditPageComponent {
         // Get hold of the CaseEventData.
         const 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.editForm.controls['data'].value);
+        this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, this.eventTrigger.case_fields, fromPreviousPage);
         // Tidy it up before we return it.
         this.formValueService.removeUnnecessaryFields(caseEventData.data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, this.currentPage.case_fields);
         return caseEventData;
@@ -21734,10 +21734,10 @@ const ɵWriteDateFieldComponent_BaseFactory = /*@__PURE__*/ i0.ɵɵgetInheritedF
 
 const CUSTOM_MOMENT_FORMATS = {
     parse: {
-        dateInput: 'YYYY MM DD HH:mm:ss'
+        dateInput: 'DD-MM-YYYY HH:mm:ss'
     },
     display: {
-        dateInput: 'YYYY MM DD HH:mm:ss',
+        dateInput: 'DD-MM-YYYY HH:mm:ss',
         monthYearLabel: 'MMMM YYYY',
         dateA11yLabel: 'EEE/MMM/YYYY',
         monthYearA11yLabel: 'MMMM YYYY',
@@ -23085,7 +23085,7 @@ class ReadFieldsFilterPipe {
         let checkConditionalShowAgainst = values;
         let formGroupAvailable = false;
         if (formGroup) {
-            checkConditionalShowAgainst = formGroup.value ? formGroup.parent.getRawValue().data : formGroup;
+            checkConditionalShowAgainst = formGroup.parent.getRawValue().data;
             formGroupAvailable = true;
             if (idPrefix !== undefined) {
                 if (idPrefix !== '') {
@@ -24031,7 +24031,7 @@ function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_contain
     const page_r13 = i0.ɵɵnextContext().$implicit;
     const ctx_r14 = i0.ɵɵnextContext(3);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngForOf", i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBindV(3, 3, i0.ɵɵpureFunction2(12, _c0$f, i0.ɵɵpipeBind2(4, 9, page_r13, ctx_r14.editForm), ctx_r14.allFieldsValues))));
+    i0.ɵɵproperty("ngForOf", i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBindV(3, 3, i0.ɵɵpureFunction2(12, _c0$f, i0.ɵɵpipeBind2(4, 9, page_r13, ctx_r14.editForm), ctx_r14.editForm.controls["data"]))));
 } }
 function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementContainerStart(0);
@@ -24249,7 +24249,6 @@ class CaseEditSubmitComponent {
         return this.caseEdit.isSubmitting || this.hasErrors;
     }
     ngOnInit() {
-        var _a, _b, _c;
         this.profileSubscription = this.profileNotifier.profile.subscribe(_ => this.profile = _);
         this.eventTrigger = this.caseEdit.eventTrigger;
         this.triggerText = this.eventTrigger.end_button_label || CallbackErrorsComponent.TRIGGER_TEXT_SUBMIT;
@@ -24258,8 +24257,6 @@ class CaseEditSubmitComponent {
         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((o, key) => Object.assign(o, { [key.id]: key.value }), {});
-        this.allFieldsValues = Object.assign(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 =