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

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

@@ -8510,32 +8510,8 @@ WorkAllocationService.ɵprov = i0.ɵɵdefineInjectable({ token: WorkAllocationSe
         type: Injectable
     }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: HttpErrorService }, { type: AlertService }, { type: SessionStorageService }]; }, null); })();
 
-class ValidPageListCaseFieldsService {
-    deleteNonValidatedFields(validPageList, data, notFromEventSubmit, fromPreviousPage = false) {
-        const validPageListCaseFields = [];
-        validPageList.forEach(page => {
-            if (notFromEventSubmit || ShowCondition.getInstance(page.show_condition).match(data)) {
-                page.case_fields.forEach(field => validPageListCaseFields.push(field));
-            }
-        });
-        if (!fromPreviousPage && validPageListCaseFields.length > 0) {
-            Object.keys(data).forEach(key => {
-                if (validPageListCaseFields.findIndex((element) => element.id === key) < 0) {
-                    delete data[key];
-                    ;
-                }
-            });
-        }
-    }
-}
-ValidPageListCaseFieldsService.ɵfac = function ValidPageListCaseFieldsService_Factory(t) { return new (t || ValidPageListCaseFieldsService)(); };
-ValidPageListCaseFieldsService.ɵprov = i0.ɵɵdefineInjectable({ token: ValidPageListCaseFieldsService, factory: ValidPageListCaseFieldsService.ɵfac });
-(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ValidPageListCaseFieldsService, [{
-        type: Injectable
-    }], null, null); })();
-
 class CaseEditComponent {
-    constructor(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService) {
+    constructor(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService) {
         this.fb = fb;
         this.caseNotifier = caseNotifier;
         this.router = router;
@@ -8549,7 +8525,6 @@ class CaseEditComponent {
         this.formValueService = formValueService;
         this.formErrorService = formErrorService;
         this.loadingService = loadingService;
-        this.validPageListCaseFieldsService = validPageListCaseFieldsService;
         this.cancelled = new EventEmitter();
         this.submitted = new EventEmitter();
         this.isEventCompletionChecksRequired = false;
@@ -8557,7 +8532,6 @@ class CaseEditComponent {
         this.ignoreWarning = false;
         this.isLinkedCasesSubmission = false;
         this.callbackErrorsSubject = new Subject();
-        this.validPageList = [];
     }
     ngOnInit() {
         this.wizard = this.wizardFactory.create(this.eventTrigger);
@@ -8718,8 +8692,6 @@ class CaseEditComponent {
         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, false);
         caseEventData.event_token = eventTrigger.event_token;
         caseEventData.ignore_warning = this.ignoreWarning;
         if (this.confirmation) {
@@ -8820,9 +8792,7 @@ class CaseEditComponent {
                         rawFormValueData[key] = parentField.formatted_value[caseField.id];
                     }
                     else {
-                        if (!(caseField.hidden && caseField.retain_hidden_value)) {
-                            rawFormValueData[key] = caseField.formatted_value;
-                        }
+                        rawFormValueData[key] = caseField.formatted_value;
                     }
                 }
             }
@@ -8884,7 +8854,7 @@ class CaseEditComponent {
 }
 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.ɵɵdirectiveInject(i2$1.FormBuilder), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FieldsUtils), i0.ɵɵdirectiveInject(FieldsPurger), i0.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0.ɵɵdirectiveInject(WizardFactoryService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(WindowService), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(ValidPageListCaseFieldsService)); };
+CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0.ɵɵdirectiveInject(i2$1.FormBuilder), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FieldsUtils), i0.ɵɵdirectiveInject(FieldsPurger), i0.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0.ɵɵdirectiveInject(WizardFactoryService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(WindowService), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(LoadingService)); };
 CaseEditComponent.ɵcmp = i0.ɵɵ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.ɵɵProvidersFeature([GreyBarService])], decls: 1, vars: 0, template: function CaseEditComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelement(0, "router-outlet");
     } }, directives: [i1$1.RouterOutlet], styles: ["#fieldset-case-data[_ngcontent-%COMP%]{margin-bottom:30px}#fieldset-case-data[_ngcontent-%COMP%]   th[_ngcontent-%COMP%]{width:1%;white-space:nowrap;vertical-align:top}.compound-field[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{padding:0}#confirmation-header[_ngcontent-%COMP%]{width:630px;background-color:#17958b;border:1px solid #979797;color:#fff;text-align:center}#confirmation-body[_ngcontent-%COMP%]{width:630px;background-color:#fff}.valign-top[_ngcontent-%COMP%]{vertical-align:top}.summary-fields[_ngcontent-%COMP%]{margin-bottom:30px}.summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   td[_ngcontent-%COMP%], .summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   th[_ngcontent-%COMP%]{border-bottom:0}a.disabled[_ngcontent-%COMP%]{pointer-events:none;cursor:default}.case-field-label[_ngcontent-%COMP%]{width:45%}.case-field-content[_ngcontent-%COMP%]{width:50%}.case-field-change[_ngcontent-%COMP%]{width:5%}"] });
@@ -8896,7 +8866,7 @@ CaseEditComponent.ɵcmp = i0.ɵɵdefineComponent({ type: CaseEditComponent, sele
                 styleUrls: ['../case-edit.scss'],
                 providers: [GreyBarService]
             }]
-    }], function () { return [{ type: i2$1.FormBuilder }, { type: CaseNotifier }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }]; }, { eventTrigger: [{
+    }], function () { return [{ type: i2$1.FormBuilder }, { type: CaseNotifier }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }]; }, { eventTrigger: [{
             type: Input
         }], submit: [{
             type: Input
@@ -9495,7 +9465,7 @@ function CaseEditPageComponent_ccd_case_event_completion_11_Template(rf, ctx) {
     i0.ɵɵproperty("eventCompletionParams", ctx_r8.caseEdit.eventCompletionParams);
 } }
 class CaseEditPageComponent {
-    constructor(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService, validPageListCaseFieldsService) {
+    constructor(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService) {
         this.caseEdit = caseEdit;
         this.route = route;
         this.formValueService = formValueService;
@@ -9506,7 +9476,6 @@ class CaseEditPageComponent {
         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;
@@ -9714,9 +9683,6 @@ class CaseEditPageComponent {
             }
         }
         if (!this.caseEdit.isSubmitting && !this.currentPageIsNotValid()) {
-            if (this.caseEdit.validPageList.findIndex(page => page.id === this.currentPage.id) === -1) {
-                this.caseEdit.validPageList.push(this.currentPage);
-            }
             this.caseEdit.isSubmitting = true;
             this.caseEdit.error = null;
             const caseEventData = this.buildCaseEventData();
@@ -9965,8 +9931,6 @@ class CaseEditPageComponent {
         this.formValueService.sanitiseDynamicLists(caseFields, formFields);
         // 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, true, fromPreviousPage);
         // Tidy it up before we return it.
         this.formValueService.removeUnnecessaryFields(caseEventData.data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, this.currentPage.case_fields);
         return caseEventData;
@@ -10007,7 +9971,7 @@ CaseEditPageComponent.RESUMED_FORM_SAVE = 'RESUMED_FORM_SAVE';
 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.ɵɵdirectiveInject(CaseEditComponent), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(PageValidationService), i0.ɵɵdirectiveInject(i1$3.MatDialog), i0.ɵɵdirectiveInject(CaseFieldService), i0.ɵɵdirectiveInject(CaseEditDataService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(ValidPageListCaseFieldsService)); };
+CaseEditPageComponent.ɵfac = function CaseEditPageComponent_Factory(t) { return new (t || CaseEditPageComponent)(i0.ɵɵdirectiveInject(CaseEditComponent), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(PageValidationService), i0.ɵɵdirectiveInject(i1$3.MatDialog), i0.ɵɵdirectiveInject(CaseFieldService), i0.ɵɵdirectiveInject(CaseEditDataService), i0.ɵɵdirectiveInject(LoadingService)); };
 CaseEditPageComponent.ɵcmp = i0.ɵɵ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.ɵɵtemplate(0, CaseEditPageComponent_ng_container_0_Template, 3, 2, "ng-container", 0);
         i0.ɵɵtemplate(1, CaseEditPageComponent_div_1_Template, 1, 0, "div", 1);
@@ -10046,7 +10010,7 @@ CaseEditPageComponent.ɵcmp = i0.ɵɵdefineComponent({ type: CaseEditPageCompone
                 templateUrl: 'case-edit-page.html',
                 styleUrls: ['./case-edit-page.scss']
             }]
-    }], function () { return [{ type: CaseEditComponent }, { type: i1$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0.ChangeDetectorRef }, { type: PageValidationService }, { type: i1$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }]; }, null); })();
+    }], function () { return [{ type: CaseEditComponent }, { type: i1$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0.ChangeDetectorRef }, { type: PageValidationService }, { type: i1$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }]; }, null); })();
 
 class CallbackErrorsContext {
 }
@@ -24970,8 +24934,7 @@ CaseEditorModule.ɵinj = i0.ɵɵdefineInjector({ providers: [
         JudicialworkerService,
         CaseworkerService,
         SessionStorageService,
-        EventCompletionStateMachineService,
-        ValidPageListCaseFieldsService
+        EventCompletionStateMachineService
     ], imports: [[
             CommonModule,
             RouterModule,
@@ -25084,8 +25047,7 @@ CaseEditorModule.ɵinj = i0.ɵɵdefineInjector({ providers: [
                     JudicialworkerService,
                     CaseworkerService,
                     SessionStorageService,
-                    EventCompletionStateMachineService,
-                    ValidPageListCaseFieldsService
+                    EventCompletionStateMachineService
                 ]
             }]
     }], null, null); })();
@@ -27109,7 +27071,7 @@ class CaseResolver {
             else {
                 console.info('getAndCacheCaseView - Path B.');
                 return this.caseNotifier.fetchAndRefresh(cid)
-                    .pipe(catchError(error => this.processErrorInCaseFetch(error)))
+                    .pipe(catchError(error => this.processErrorInCaseFetch(error, cid)))
                     .toPromise();
             }
         }
@@ -27121,9 +27083,9 @@ class CaseResolver {
             this.caseNotifier.cachedCaseView = plainToClassFromExist(new CaseView(), caseView);
             this.caseNotifier.announceCase(this.caseNotifier.cachedCaseView);
             return this.caseNotifier.cachedCaseView;
-        }), catchError(error => this.processErrorInCaseFetch(error))).toPromise();
+        }), catchError(error => this.processErrorInCaseFetch(error, cid))).toPromise();
     }
-    processErrorInCaseFetch(error) {
+    processErrorInCaseFetch(error, caseReference) {
         console.error('!!! processErrorInCaseFetch !!!');
         console.error(error);
         // TODO Should be logged to remote logging infrastructure
@@ -27131,12 +27093,16 @@ class CaseResolver {
             this.router.navigate(['/search/noresults']);
             return of(null);
         }
-        console.error(error);
         if (CaseResolver.EVENT_REGEX.test(this.previousUrl) && error.status === 404) {
             this.router.navigate(['/list/case']);
             return of(null);
         }
-        if (error.status !== 401 && error.status !== 403) {
+        // Error 403, navigate to restricted case access page
+        if (error.status === 403) {
+            this.router.navigate([`/cases/restricted-case-access/${caseReference}`]);
+            return of(null);
+        }
+        if (error.status !== 401) {
             this.router.navigate(['/error']);
         }
         this.goToDefaultPage();