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

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

@@ -9885,13 +9885,20 @@
     })();
 
     var ValidPageListCaseFieldsService = /** @class */ (function () {
-        function ValidPageListCaseFieldsService() {
+        function ValidPageListCaseFieldsService(fieldsUtils) {
+            this.fieldsUtils = fieldsUtils;
         }
-        ValidPageListCaseFieldsService.prototype.deleteNonValidatedFields = function (validPageList, data, notFromEventSubmit, fromPreviousPage) {
+        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 (notFromEventSubmit || ShowCondition.getInstance(page.show_condition).match(data)) {
+                if (_this.isShown(page, eventTriggerFields, data)) {
                     page.case_fields.forEach(function (field) { return validPageListCaseFields.push(field); });
                 }
             });
@@ -9899,19 +9906,18 @@
                 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)(); };
+    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
-            }], null, null);
+            }], function () { return [{ type: FieldsUtils }]; }, null);
     })();
 
     var CaseEditComponent = /** @class */ (function () {
@@ -10103,7 +10109,7 @@
             // 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) {
@@ -11478,7 +11484,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, 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;
@@ -31012,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;
@@ -31091,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);
             }
@@ -31123,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 () {