@hmcts/ccd-case-ui-toolkit 6.19.10 → 6.19.11-exui-848

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

@@ -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,10 +10113,12 @@
             // 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);
-            // // Remove unnesessary case fields which are hidden
-            this.formValueService.removeUnnecessaryFields(caseEventData.data, pageListCaseFields, true, true);
+            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);
+            }
             caseEventData.event_token = eventTrigger.event_token;
             caseEventData.ignore_warning = this.ignoreWarning;
             if (this.confirmation) {
@@ -11492,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;
@@ -26521,10 +26522,16 @@
             if (formGroup) {
                 checkConditionalShowAgainst = formGroup.parent.getRawValue().data;
                 formGroupAvailable = true;
-                if (idPrefix) {
-                    var fieldId = idPrefix.substring(0, idPrefix.indexOf('_'));
-                    if (checkConditionalShowAgainst[fieldId]) {
-                        checkConditionalShowAgainst = values;
+                if (idPrefix !== undefined) {
+                    if (idPrefix !== '') {
+                        var fieldId = idPrefix.substring(0, idPrefix.indexOf('_'));
+                        if (checkConditionalShowAgainst[fieldId]) {
+                            checkConditionalShowAgainst = values;
+                            formGroupAvailable = false;
+                        }
+                    }
+                    else {
+                        checkConditionalShowAgainst = Object.assign(checkConditionalShowAgainst, values);
                         formGroupAvailable = false;
                     }
                 }
@@ -32418,7 +32425,6 @@
             var targetTabIndex = this.tabGroup._tabs.toArray().findIndex(function (tab) { return tab.textLabel === triggerOutputEventText; });
             if (targetTabIndex > -1) {
                 this.selectedTabIndex = targetTabIndex;
-                this.tabGroup.selectedIndex = targetTabIndex;
             }
         };
         CaseFullAccessViewComponent.prototype.hasActiveCaseFlags = function () {