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

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

@@ -8511,10 +8511,18 @@ WorkAllocationService.ɵprov = i0.ɵɵdefineInjectable({ token: WorkAllocationSe
     }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: HttpErrorService }, { type: AlertService }, { type: SessionStorageService }]; }, null); })();
 
 class ValidPageListCaseFieldsService {
-    deleteNonValidatedFields(validPageList, data, notFromEventSubmit, fromPreviousPage = false) {
+    constructor(fieldsUtils) {
+        this.fieldsUtils = fieldsUtils;
+    }
+    isShown(page, eventTriggerFields, data) {
+        const fields = this.fieldsUtils
+            .mergeCaseFieldsAndFormFields(eventTriggerFields, data);
+        return page.parsedShowCondition.match(fields);
+    }
+    deleteNonValidatedFields(validPageList, data, eventTriggerFields, fromPreviousPage = false) {
         const validPageListCaseFields = [];
         validPageList.forEach(page => {
-            if (notFromEventSubmit || ShowCondition.getInstance(page.show_condition).match(data)) {
+            if (this.isShown(page, eventTriggerFields, data)) {
                 page.case_fields.forEach(field => validPageListCaseFields.push(field));
             }
         });
@@ -8522,17 +8530,16 @@ class ValidPageListCaseFieldsService {
             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.ɵfac = function ValidPageListCaseFieldsService_Factory(t) { return new (t || ValidPageListCaseFieldsService)(i0.ɵɵinject(FieldsUtils)); };
 ValidPageListCaseFieldsService.ɵprov = i0.ɵɵdefineInjectable({ token: ValidPageListCaseFieldsService, factory: ValidPageListCaseFieldsService.ɵfac });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ValidPageListCaseFieldsService, [{
         type: Injectable
-    }], null, null); })();
+    }], function () { return [{ type: FieldsUtils }]; }, null); })();
 
 class CaseEditComponent {
     constructor(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService) {
@@ -8719,7 +8726,7 @@ 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, false);
+        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) {
@@ -9966,7 +9973,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, true, fromPreviousPage);
+        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;
@@ -27059,12 +27066,13 @@ CaseTimelineModule.ɵinj = i0.ɵɵdefineInjector({ imports: [[
 i0.ɵɵsetComponentScope(CaseTimelineComponent, [i2.NgIf, i2.NgSwitch, i2.NgSwitchCase, EventLogComponent, CaseHistoryComponent], [i1.RpxTranslatePipe]);
 
 class CaseResolver {
-    constructor(caseNotifier, draftService, navigationNotifierService, router, sessionStorage) {
+    constructor(caseNotifier, draftService, navigationNotifierService, router, sessionStorage, appConfig) {
         this.caseNotifier = caseNotifier;
         this.draftService = draftService;
         this.navigationNotifierService = navigationNotifierService;
         this.router = router;
         this.sessionStorage = sessionStorage;
+        this.appConfig = appConfig;
         router.events.pipe(filter(event => event instanceof NavigationEnd))
             .subscribe((event) => {
             this.previousUrl = event.url;
@@ -27135,8 +27143,8 @@ class CaseResolver {
             this.router.navigate(['/list/case']);
             return 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 of(null);
         }
@@ -27166,11 +27174,11 @@ CaseResolver.PARAM_CASE_ID = 'cid';
 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.ɵɵinject(CaseNotifier), i0.ɵɵinject(DraftService), i0.ɵɵinject(NavigationNotifierService), i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(SessionStorageService)); };
+CaseResolver.ɵfac = function CaseResolver_Factory(t) { return new (t || CaseResolver)(i0.ɵɵinject(CaseNotifier), i0.ɵɵinject(DraftService), i0.ɵɵinject(NavigationNotifierService), i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(SessionStorageService), i0.ɵɵinject(AbstractAppConfig)); };
 CaseResolver.ɵprov = i0.ɵɵdefineInjectable({ token: CaseResolver, factory: CaseResolver.ɵfac });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseResolver, [{
         type: Injectable
-    }], function () { return [{ type: CaseNotifier }, { type: DraftService }, { type: NavigationNotifierService }, { type: i1$1.Router }, { type: SessionStorageService }]; }, null); })();
+    }], function () { return [{ type: CaseNotifier }, { type: DraftService }, { type: NavigationNotifierService }, { type: i1$1.Router }, { type: SessionStorageService }, { type: AbstractAppConfig }]; }, null); })();
 
 class EventTriggerResolver {
     constructor(casesService, alertService, profileService, profileNotifier) {