@hmcts/ccd-case-ui-toolkit 6.19.6-restricted-case-access-v2 → 6.19.6-restricted-case-access-v4

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

@@ -9884,8 +9884,44 @@
             }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: HttpErrorService }, { type: AlertService }, { type: SessionStorageService }]; }, null);
     })();
 
+    var ValidPageListCaseFieldsService = /** @class */ (function () {
+        function ValidPageListCaseFieldsService(fieldsUtils) {
+            this.fieldsUtils = fieldsUtils;
+        }
+        ValidPageListCaseFieldsService.prototype.isShown = function (page, eventTriggerFields, data) {
+            var fields = this.fieldsUtils
+                .mergeCaseFieldsAndFormFields(eventTriggerFields, data);
+            return page.parsedShowCondition.match(fields);
+        };
+        ValidPageListCaseFieldsService.prototype.deleteNonValidatedFields = function (validPageList, data, eventTriggerFields, fromPreviousPage) {
+            var _this = this;
+            if (fromPreviousPage === void 0) { fromPreviousPage = false; }
+            var validPageListCaseFields = [];
+            validPageList.forEach(function (page) {
+                if (_this.isShown(page, eventTriggerFields, data)) {
+                    page.case_fields.forEach(function (field) { return validPageListCaseFields.push(field); });
+                }
+            });
+            if (!fromPreviousPage && validPageListCaseFields.length > 0) {
+                Object.keys(data).forEach(function (key) {
+                    if (validPageListCaseFields.findIndex(function (element) { return element.id === key; }) < 0) {
+                        delete data[key];
+                    }
+                });
+            }
+        };
+        return ValidPageListCaseFieldsService;
+    }());
+    ValidPageListCaseFieldsService.ɵfac = function ValidPageListCaseFieldsService_Factory(t) { return new (t || ValidPageListCaseFieldsService)(i0__namespace.ɵɵinject(FieldsUtils)); };
+    ValidPageListCaseFieldsService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: ValidPageListCaseFieldsService, factory: ValidPageListCaseFieldsService.ɵfac });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ValidPageListCaseFieldsService, [{
+                type: i0.Injectable
+            }], function () { return [{ type: FieldsUtils }]; }, null);
+    })();
+
     var CaseEditComponent = /** @class */ (function () {
-        function CaseEditComponent(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService) {
+        function CaseEditComponent(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService) {
             this.fb = fb;
             this.caseNotifier = caseNotifier;
             this.router = router;
@@ -9899,6 +9935,7 @@
             this.formValueService = formValueService;
             this.formErrorService = formErrorService;
             this.loadingService = loadingService;
+            this.validPageListCaseFieldsService = validPageListCaseFieldsService;
             this.cancelled = new i0.EventEmitter();
             this.submitted = new i0.EventEmitter();
             this.isEventCompletionChecksRequired = false;
@@ -9906,6 +9943,7 @@
             this.ignoreWarning = false;
             this.isLinkedCasesSubmission = false;
             this.callbackErrorsSubject = new rxjs.Subject();
+            this.validPageList = [];
         }
         CaseEditComponent.prototype.ngOnInit = function () {
             var _this = this;
@@ -10070,6 +10108,8 @@
             this.formValueService.populateLinkedCasesDetailsFromCaseFields(caseEventData.data, eventTrigger.case_fields);
             // 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);
             caseEventData.event_token = eventTrigger.event_token;
             caseEventData.ignore_warning = this.ignoreWarning;
             if (this.confirmation) {
@@ -10171,7 +10211,9 @@
                             rawFormValueData[key] = parentField.formatted_value[caseField.id];
                         }
                         else {
-                            rawFormValueData[key] = caseField.formatted_value;
+                            if (!(caseField.hidden && caseField.retain_hidden_value)) {
+                                rawFormValueData[key] = caseField.formatted_value;
+                            }
                         }
                     }
                 }
@@ -10237,7 +10279,7 @@
     }());
     CaseEditComponent.ORIGIN_QUERY_PARAM = 'origin';
     CaseEditComponent.ALERT_MESSAGE = 'Page is being refreshed so you will be redirected to the first page of this event.';
-    CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0__namespace.ɵɵdirectiveInject(i2__namespace$1.FormBuilder), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(FieldsPurger), i0__namespace.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0__namespace.ɵɵdirectiveInject(WizardFactoryService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(WindowService), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(LoadingService)); };
+    CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0__namespace.ɵɵdirectiveInject(i2__namespace$1.FormBuilder), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(FieldsPurger), i0__namespace.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0__namespace.ɵɵdirectiveInject(WizardFactoryService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(WindowService), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(LoadingService), i0__namespace.ɵɵdirectiveInject(ValidPageListCaseFieldsService)); };
     CaseEditComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditComponent, selectors: [["ccd-case-edit"]], inputs: { eventTrigger: "eventTrigger", submit: "submit", validate: "validate", saveDraft: "saveDraft", caseDetails: "caseDetails" }, outputs: { cancelled: "cancelled", submitted: "submitted" }, features: [i0__namespace.ɵɵProvidersFeature([GreyBarService])], decls: 1, vars: 0, template: function CaseEditComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelement(0, "router-outlet");
@@ -10252,7 +10294,7 @@
                         styleUrls: ['../case-edit.scss'],
                         providers: [GreyBarService]
                     }]
-            }], function () { return [{ type: i2__namespace$1.FormBuilder }, { type: CaseNotifier }, { type: i1__namespace$1.Router }, { type: i1__namespace$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }]; }, { eventTrigger: [{
+            }], function () { return [{ type: i2__namespace$1.FormBuilder }, { type: CaseNotifier }, { type: i1__namespace$1.Router }, { type: i1__namespace$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }]; }, { eventTrigger: [{
                     type: i0.Input
                 }], submit: [{
                     type: i0.Input
@@ -10948,7 +10990,7 @@
         }
     }
     var CaseEditPageComponent = /** @class */ (function () {
-        function CaseEditPageComponent(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService) {
+        function CaseEditPageComponent(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService, validPageListCaseFieldsService) {
             this.caseEdit = caseEdit;
             this.route = route;
             this.formValueService = formValueService;
@@ -10959,6 +11001,7 @@
             this.caseFieldService = caseFieldService;
             this.caseEditDataService = caseEditDataService;
             this.loadingService = loadingService;
+            this.validPageListCaseFieldsService = validPageListCaseFieldsService;
             this.triggerTextStart = CaseEditPageComponent.TRIGGER_TEXT_START;
             this.triggerTextIgnoreWarnings = CaseEditPageComponent.TRIGGER_TEXT_CONTINUE;
             this.formValuesChanged = false;
@@ -11169,6 +11212,9 @@
                 }
             }
             if (!this.caseEdit.isSubmitting && !this.currentPageIsNotValid()) {
+                if (this.caseEdit.validPageList.findIndex(function (page) { return page.id === _this.currentPage.id; }) === -1) {
+                    this.caseEdit.validPageList.push(this.currentPage);
+                }
                 this.caseEdit.isSubmitting = true;
                 this.caseEdit.error = null;
                 var caseEventData = this.buildCaseEventData();
@@ -11437,6 +11483,8 @@
             this.formValueService.sanitiseDynamicLists(caseFields, formFields);
             // 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);
             // Tidy it up before we return it.
             this.formValueService.removeUnnecessaryFields(caseEventData.data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, this.currentPage.case_fields);
             return caseEventData;
@@ -11479,7 +11527,7 @@
     CaseEditPageComponent.TRIGGER_TEXT_START = 'Continue';
     CaseEditPageComponent.TRIGGER_TEXT_SAVE = 'Save and continue';
     CaseEditPageComponent.TRIGGER_TEXT_CONTINUE = 'Ignore Warning and Continue';
-    CaseEditPageComponent.ɵfac = function CaseEditPageComponent_Factory(t) { return new (t || CaseEditPageComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(PageValidationService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(CaseEditDataService), i0__namespace.ɵɵdirectiveInject(LoadingService)); };
+    CaseEditPageComponent.ɵfac = function CaseEditPageComponent_Factory(t) { return new (t || CaseEditPageComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(PageValidationService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(CaseEditDataService), i0__namespace.ɵɵdirectiveInject(LoadingService), i0__namespace.ɵɵdirectiveInject(ValidPageListCaseFieldsService)); };
     CaseEditPageComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditPageComponent, selectors: [["ccd-case-edit-page"]], decls: 12, vars: 11, consts: [[4, "ngIf"], [4, "ngIf", "ngIfThen", "ngIfElse"], ["titleBlock", ""], ["idBlock", ""], ["class", "govuk-error-summary", "aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 4, "ngIf"], [3, "error"], [3, "triggerTextContinue", "triggerTextIgnore", "callbackErrorsSubject", "callbackErrorsContext"], [1, "width-50"], ["class", "form", 3, "formGroup", "submit", 4, "ngIf"], [3, "eventCompletionParams", "eventCanBeCompleted", 4, "ngIf"], ["class", "govuk-heading-l", 4, "ngIf"], [1, "govuk-heading-l"], [1, "govuk-caption-l"], [3, "content"], ["class", "heading-h2", 4, "ngIf"], [1, "heading-h2"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], ["class", "govuk-error-summary__body", 4, "ngFor", "ngForOf"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [1, "validation-error", 3, "click"], [1, "form", 3, "formGroup", "submit"], ["id", "fieldset-case-data"], [2, "display", "none"], ["id", "caseEditForm", 3, "fields", "formGroup", "caseFields", "pageChangeSubject", "valuesChanged", 4, "ngIf"], ["class", "grid-row", 4, "ngIf"], [1, "form-group", "form-group-related"], ["type", "button", 1, "button", "button-secondary", 3, "disabled", "click"], ["type", "submit", 1, "button", 3, "disabled"], [1, "cancel"], ["href", "javascript:void(0)", 3, "click"], ["id", "caseEditForm", 3, "fields", "formGroup", "caseFields", "pageChangeSubject", "valuesChanged"], [1, "grid-row"], [1, "column-two-thirds", "rightBorderSeparator"], ["id", "caseEditForm1", 3, "fields", "formGroup", "caseFields"], [1, "column-one-third"], ["id", "caseEditForm2", 3, "fields", "formGroup", "caseFields"], [3, "eventCompletionParams", "eventCanBeCompleted"]], template: function CaseEditPageComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, CaseEditPageComponent_ng_container_0_Template, 3, 2, "ng-container", 0);
@@ -11522,7 +11570,7 @@
                         templateUrl: 'case-edit-page.html',
                         styleUrls: ['./case-edit-page.scss']
                     }]
-            }], function () { return [{ type: CaseEditComponent }, { type: i1__namespace$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0__namespace.ChangeDetectorRef }, { type: PageValidationService }, { type: i1__namespace$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }]; }, null);
+            }], function () { return [{ type: CaseEditComponent }, { type: i1__namespace$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0__namespace.ChangeDetectorRef }, { type: PageValidationService }, { type: i1__namespace$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }]; }, null);
     })();
 
     var CallbackErrorsContext = /** @class */ (function () {
@@ -28614,7 +28662,8 @@
             JudicialworkerService,
             CaseworkerService,
             SessionStorageService,
-            EventCompletionStateMachineService
+            EventCompletionStateMachineService,
+            ValidPageListCaseFieldsService
         ], imports: [[
                 i2.CommonModule,
                 i1$1.RouterModule,
@@ -28730,7 +28779,8 @@
                             JudicialworkerService,
                             CaseworkerService,
                             SessionStorageService,
-                            EventCompletionStateMachineService
+                            EventCompletionStateMachineService,
+                            ValidPageListCaseFieldsService
                         ]
                     }]
             }], null, null);
@@ -30968,13 +31018,14 @@
     i0__namespace.ɵɵsetComponentScope(CaseTimelineComponent, [i2__namespace.NgIf, i2__namespace.NgSwitch, i2__namespace.NgSwitchCase, EventLogComponent, CaseHistoryComponent], [i1__namespace.RpxTranslatePipe]);
 
     var CaseResolver = /** @class */ (function () {
-        function CaseResolver(caseNotifier, draftService, navigationNotifierService, router, sessionStorage) {
+        function CaseResolver(caseNotifier, draftService, navigationNotifierService, router, sessionStorage, appConfig) {
             var _this = this;
             this.caseNotifier = caseNotifier;
             this.draftService = draftService;
             this.navigationNotifierService = navigationNotifierService;
             this.router = router;
             this.sessionStorage = sessionStorage;
+            this.appConfig = appConfig;
             router.events.pipe(operators.filter(function (event) { return event instanceof i1$1.NavigationEnd; }))
                 .subscribe(function (event) {
                 _this.previousUrl = event.url;
@@ -31047,8 +31098,8 @@
                 this.router.navigate(['/list/case']);
                 return rxjs.of(null);
             }
-            // Error 403, navigate to restricted case access page
-            if (error.status === 403) {
+            // Error 403 and enable-restricted-case-access Launch Darkly flag is enabled, navigate to restricted case access page
+            if (error.status === 403 && this.appConfig.getEnableRestrictedCaseAccessConfig()) {
                 this.router.navigate(["/cases/restricted-case-access/" + caseReference]);
                 return rxjs.of(null);
             }
@@ -31079,12 +31130,12 @@
     CaseResolver.CASE_CREATED_MSG = 'The case has been created successfully';
     CaseResolver.defaultWAPage = '/work/my-work/list';
     CaseResolver.defaultPage = '/cases';
-    CaseResolver.ɵfac = function CaseResolver_Factory(t) { return new (t || CaseResolver)(i0__namespace.ɵɵinject(CaseNotifier), i0__namespace.ɵɵinject(DraftService), i0__namespace.ɵɵinject(NavigationNotifierService), i0__namespace.ɵɵinject(i1__namespace$1.Router), i0__namespace.ɵɵinject(SessionStorageService)); };
+    CaseResolver.ɵfac = function CaseResolver_Factory(t) { return new (t || CaseResolver)(i0__namespace.ɵɵinject(CaseNotifier), i0__namespace.ɵɵinject(DraftService), i0__namespace.ɵɵinject(NavigationNotifierService), i0__namespace.ɵɵinject(i1__namespace$1.Router), i0__namespace.ɵɵinject(SessionStorageService), i0__namespace.ɵɵinject(AbstractAppConfig)); };
     CaseResolver.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: CaseResolver, factory: CaseResolver.ɵfac });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CaseResolver, [{
                 type: i0.Injectable
-            }], function () { return [{ type: CaseNotifier }, { type: DraftService }, { type: NavigationNotifierService }, { type: i1__namespace$1.Router }, { type: SessionStorageService }]; }, null);
+            }], function () { return [{ type: CaseNotifier }, { type: DraftService }, { type: NavigationNotifierService }, { type: i1__namespace$1.Router }, { type: SessionStorageService }, { type: AbstractAppConfig }]; }, null);
     })();
 
     var EventTriggerResolver = /** @class */ (function () {