@hmcts/ccd-case-ui-toolkit 6.16.2-ccpay-5.2.8 → 6.18.0-restricted-case-access

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

@@ -481,7 +481,7 @@
     OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
     PERFORMANCE OF THIS SOFTWARE.
     ***************************************************************************** */
-    /* global Reflect, Promise */
+    /* global Reflect, Promise, SuppressedError, Symbol */
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -560,11 +560,11 @@
                 if (_ = accept(result.set))
                     descriptor.set = _;
                 if (_ = accept(result.init))
-                    initializers.push(_);
+                    initializers.unshift(_);
             }
             else if (_ = accept(result)) {
                 if (kind === "field")
-                    initializers.push(_);
+                    initializers.unshift(_);
                 else
                     descriptor[key] = _;
             }
@@ -851,6 +851,85 @@
             throw new TypeError("Cannot use 'in' operator on non-object");
         return typeof state === "function" ? receiver === state : state.has(receiver);
     }
+    function __addDisposableResource(env, value, async) {
+        if (value !== null && value !== void 0) {
+            if (typeof value !== "object")
+                throw new TypeError("Object expected.");
+            var dispose;
+            if (async) {
+                if (!Symbol.asyncDispose)
+                    throw new TypeError("Symbol.asyncDispose is not defined.");
+                dispose = value[Symbol.asyncDispose];
+            }
+            if (dispose === void 0) {
+                if (!Symbol.dispose)
+                    throw new TypeError("Symbol.dispose is not defined.");
+                dispose = value[Symbol.dispose];
+            }
+            if (typeof dispose !== "function")
+                throw new TypeError("Object not disposable.");
+            env.stack.push({ value: value, dispose: dispose, async: async });
+        }
+        else if (async) {
+            env.stack.push({ async: true });
+        }
+        return value;
+    }
+    var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+        var e = new Error(message);
+        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+    };
+    function __disposeResources(env) {
+        function fail(e) {
+            env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        function next() {
+            while (env.stack.length) {
+                var rec = env.stack.pop();
+                try {
+                    var result = rec.dispose && rec.dispose.call(rec.value);
+                    if (rec.async)
+                        return Promise.resolve(result).then(next, function (e) { fail(e); return next(); });
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (env.hasError)
+                throw env.error;
+        }
+        return next();
+    }
+    var tslib_es6 = {
+        __extends: __extends,
+        __assign: __assign,
+        __rest: __rest,
+        __decorate: __decorate,
+        __param: __param,
+        __metadata: __metadata,
+        __awaiter: __awaiter,
+        __generator: __generator,
+        __createBinding: __createBinding,
+        __exportStar: __exportStar,
+        __values: __values,
+        __read: __read,
+        __spread: __spread,
+        __spreadArrays: __spreadArrays,
+        __spreadArray: __spreadArray,
+        __await: __await,
+        __asyncGenerator: __asyncGenerator,
+        __asyncDelegator: __asyncDelegator,
+        __asyncValues: __asyncValues,
+        __makeTemplateObject: __makeTemplateObject,
+        __importStar: __importStar,
+        __importDefault: __importDefault,
+        __classPrivateFieldGet: __classPrivateFieldGet,
+        __classPrivateFieldSet: __classPrivateFieldSet,
+        __classPrivateFieldIn: __classPrivateFieldIn,
+        __addDisposableResource: __addDisposableResource,
+        __disposeResources: __disposeResources,
+    };
 
     var _c0$X = function (a0) { return { "govuk-input--error": a0 }; };
     function DateInputComponent_div_16_Template(rf, ctx) {
@@ -4124,18 +4203,39 @@
             }
             return this.isFlagsFieldType(caseField.field_type);
         };
+        /**
+         * @deprecated Use {@link isCaseFieldOfType} instead, passing 'FlagLauncher' as the single type in the `types` array
+         */
         FieldsUtils.isFlagLauncherCaseField = function (caseField) {
             if (!caseField) {
                 return false;
             }
             return caseField.field_type.type === 'FlagLauncher';
         };
+        /**
+         * @deprecated Use {@link isCaseFieldOfType} instead, passing 'ComponentLauncher' as the single type in the `types`
+         * array
+         */
         FieldsUtils.isComponentLauncherCaseField = function (caseField) {
             if (!caseField) {
                 return false;
             }
             return caseField.field_type.type === 'ComponentLauncher';
         };
+        /**
+         * Checks if a {@link CaseField} is of one of the given field types.
+         *
+         * @param caseField The `CaseField` to check
+         * @param types An array of one or more field types
+         * @returns `true` if the `CaseField` type is one of those in the array of types to check against; `false`
+         * otherwise or if `caseField` or `types` are falsy
+         */
+        FieldsUtils.isCaseFieldOfType = function (caseField, types) {
+            if (!caseField || !types) {
+                return false;
+            }
+            return types.some(function (type) { return type === caseField.field_type.type; });
+        };
         FieldsUtils.isLinkedCasesCaseField = function (caseField) {
             return FieldsUtils.isComponentLauncherCaseField(caseField) &&
                 caseField.id === 'LinkedCasesComponentLauncher';
@@ -6323,65 +6423,70 @@
             }
         };
         /**
-         * Remove the FlagLauncher case field, which is not intended to be persisted.
+         * Remove from the top level of the form data any case fields of a given type or types that are not intended to be
+         * persisted. This function is intended to remove "special" case field types from the data, such as FlagLauncher or
+         * ComponentLauncher fields.
          *
-         * @param data The object tree of form values on which to perform the removal
+         * @param data The object tree of form values on which to perform the removal at the top level only
          * @param caseFields The list of underlying {@link CaseField} domain model objects for each field
+         * @param types An array of one or more field types
          */
-        FormValueService.prototype.removeFlagLauncherField = function (data, caseFields) {
-            if (data && caseFields && caseFields.length > 0) {
-                var flagLauncherCaseField = caseFields.filter(function (caseField) { return FieldsUtils.isFlagLauncherCaseField(caseField); });
-                if (flagLauncherCaseField.length > 0) {
-                    // There should be only one FlagLauncher case field
-                    delete data[flagLauncherCaseField[0].id];
+        FormValueService.prototype.removeCaseFieldsOfType = function (data, caseFields, types) {
+            var e_12, _a;
+            if (data && caseFields && caseFields.length > 0 && types.length > 0) {
+                var caseFieldsToRemove = caseFields.filter(function (caseField) { return FieldsUtils.isCaseFieldOfType(caseField, types); });
+                try {
+                    for (var caseFieldsToRemove_1 = __values(caseFieldsToRemove), caseFieldsToRemove_1_1 = caseFieldsToRemove_1.next(); !caseFieldsToRemove_1_1.done; caseFieldsToRemove_1_1 = caseFieldsToRemove_1.next()) {
+                        var caseField = caseFieldsToRemove_1_1.value;
+                        delete data[caseField.id];
+                    }
+                }
+                catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                finally {
+                    try {
+                        if (caseFieldsToRemove_1_1 && !caseFieldsToRemove_1_1.done && (_a = caseFieldsToRemove_1.return)) _a.call(caseFieldsToRemove_1);
+                    }
+                    finally { if (e_12) throw e_12.error; }
                 }
             }
         };
         /**
-         * Populate the flag data for each Flags field, from the data held in its corresponding CaseField.
+         * Re-populate the form data from the values held in the case fields. This is necessary in order to pick up, for
+         * each `Flags` field, any flag details data not currently present.
+         *
+         * `Flags` fields may be contained in other `CaseField` instances, either as a sub-field of a Complex field, or
+         * fields in a collection (or sub-fields of Complex fields in a collection). Therefore, it is necessary to
+         * iterate through all `CaseField`s.
          *
          * @param data The object tree of form values on which to perform the data population
          * @param caseFields The list of underlying {@link CaseField} domain model objects for each field
          */
-        FormValueService.prototype.populateFlagDetailsFromCaseFields = function (data, caseFields) {
-            if (data && caseFields && caseFields.length > 0) {
-                // Cannot filter out anything other than to remove the FlagLauncher CaseField because Flags fields may be
-                // contained in other CaseField instances, either as a sub-field of a Complex field, or fields in a collection
-                // (or sub-fields of Complex fields in a collection)
-                caseFields.filter(function (caseField) { return !FieldsUtils.isFlagLauncherCaseField(caseField); })
+        FormValueService.prototype.repopulateFormDataFromCaseFieldValues = function (data, caseFields) {
+            if (data && caseFields && caseFields.length > 0 &&
+                caseFields.findIndex(function (caseField) { return FieldsUtils.isCaseFieldOfType(caseField, ['FlagLauncher']); }) > -1) {
+                // Ignore the FlagLauncher CaseField because it does not hold any values
+                caseFields.filter(function (caseField) { return !FieldsUtils.isCaseFieldOfType(caseField, ['FlagLauncher']); })
                     .forEach(function (caseField) {
-                    // Ensure that the data object is populated for all case field IDs it contains, even if there is currently
-                    // nothing for a given case field ID (hence the use of hasOwnProperty())
+                    // Ensure that the data object is populated for all CaseField keys it contains, even if for a given
+                    // CaseField key, the data object has a falsy value (hence the use of hasOwnProperty() for the check below)
+                    // See https://tools.hmcts.net/jira/browse/EUI-7377
                     if (data.hasOwnProperty(caseField.id) && caseField.value) {
-                        // Create new object for the case field ID within the data object, if necessary
-                        if (data[caseField.id]) {
-                            // Copy all values from the corresponding CaseField; this ensures all nested flag data (for example, a
-                            // Flags field within a Complex field or a collection of Complex fields) is copied across
-                            Object.keys(data[caseField.id]).forEach(function (key) {
-                                if (caseField.value.hasOwnProperty(key)) {
-                                    data[caseField.id][key] = caseField.value[key];
-                                }
-                            });
+                        // Create new object for the CaseField ID within the data object, if necessary (i.e. if the current value
+                        // is falsy)
+                        if (!data[caseField.id]) {
+                            data[caseField.id] = {};
                         }
+                        // Copy all values from the corresponding CaseField; this ensures all nested flag data (for example, a
+                        // Flags field within a Complex field or a collection of Complex fields) is copied across
+                        Object.keys(data[caseField.id]).forEach(function (key) {
+                            if (caseField.value.hasOwnProperty(key)) {
+                                data[caseField.id][key] = caseField.value[key];
+                            }
+                        });
                     }
                 });
             }
         };
-        /**
-         * Remove the ComponentLauncher case field, which is not intended to be persisted.
-         *
-         * @param data The object tree of form values on which to perform the removal
-         * @param caseFields The list of underlying {@link CaseField} domain model objects for each field
-         */
-        FormValueService.prototype.removeComponentLauncherField = function (data, caseFields) {
-            if (data && caseFields && caseFields.length > 0) {
-                var componentLauncherCaseField = caseFields.filter(function (caseField) { return FieldsUtils.isComponentLauncherCaseField(caseField); });
-                if (componentLauncherCaseField.length > 0) {
-                    // There should be only one ComponentLauncher case field
-                    delete data[componentLauncherCaseField[0].id];
-                }
-            }
-        };
         /**
          * Populate the linked cases from the data held in its corresponding CaseField.
          *
@@ -6390,7 +6495,7 @@
          */
         FormValueService.prototype.populateLinkedCasesDetailsFromCaseFields = function (data, caseFields) {
             if (data && caseFields && caseFields.length > 0) {
-                caseFields.filter(function (caseField) { return !FieldsUtils.isComponentLauncherCaseField(caseField); })
+                caseFields.filter(function (caseField) { return !FieldsUtils.isCaseFieldOfType(caseField, ['ComponentLauncher']); })
                     .forEach(function (caseField) {
                     if (data.hasOwnProperty('caseLinks') && caseField.value) {
                         data[caseField.id] = caseField.value;
@@ -9614,7 +9719,9 @@
                 form: this.form,
             });
             /* istanbul ignore else */
-            if (!nextPage && !this.eventTrigger.show_summary && !this.eventTrigger.show_event_notes) {
+            if (!nextPage &&
+                !(this.eventTrigger.show_summary || this.eventTrigger.show_summary === null) &&
+                !this.eventTrigger.show_event_notes) {
                 this.submitForm({
                     eventTrigger: this.eventTrigger,
                     form: this.form,
@@ -9706,16 +9813,13 @@
             // Remove collection fields that have "min" validation of greater than zero set on the FieldType but are empty;
             // these will fail validation
             this.formValueService.removeEmptyCollectionsWithMinValidation(caseEventData.data, eventTrigger.case_fields);
-            // If this is a Case Flag submission (and thus a FlagLauncher field is present in the event trigger), the flag
-            // details data needs populating for each Flags field, then the FlagLauncher field needs removing
-            if (this.isCaseFlagSubmission) {
-                this.formValueService.populateFlagDetailsFromCaseFields(caseEventData.data, eventTrigger.case_fields);
-                this.formValueService.removeFlagLauncherField(caseEventData.data, eventTrigger.case_fields);
-            }
-            if (this.isLinkedCasesSubmission) {
-                this.formValueService.populateLinkedCasesDetailsFromCaseFields(caseEventData.data, eventTrigger.case_fields);
-                this.formValueService.removeComponentLauncherField(caseEventData.data, eventTrigger.case_fields);
-            }
+            // For Case Flag submissions (where a FlagLauncher field is present in the event trigger), the flag details data
+            // needs populating for each Flags field, then the FlagLauncher field needs removing
+            this.formValueService.repopulateFormDataFromCaseFieldValues(caseEventData.data, eventTrigger.case_fields);
+            // Data population step required for Linked Cases
+            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']);
             caseEventData.event_token = eventTrigger.event_token;
             caseEventData.ignore_warning = this.ignoreWarning;
             if (this.confirmation) {
@@ -9837,8 +9941,7 @@
                 _this.sessionStorageService.removeItem('eventUrl');
                 var confirmation = _this.buildConfirmation(response);
                 if (confirmation && (confirmation.getHeader() || confirmation.getBody())) {
-                    // Add finally to fix sonar bug
-                    _this.confirm(confirmation).finally();
+                    _this.confirm(confirmation);
                 }
                 else {
                     _this.emitSubmitted(response);
@@ -10599,7 +10702,7 @@
             this.wizard = this.caseEdit.wizard;
             this.caseFields = this.getCaseFields();
             this.syncCaseEditDataService();
-            this.route.params
+            this.routeParamsSub = this.route.params
                 .subscribe(function (params) {
                 var _a, _b;
                 var pageId = params['page'];
@@ -10621,13 +10724,14 @@
                 }
             });
             CaseEditPageComponent.setFocusToTop();
-            this.caseEditDataService.caseEditForm$.subscribe({
+            this.caseEditFormSub = this.caseEditDataService.caseEditForm$.subscribe({
                 next: function (editForm) { return _this.editForm = editForm; }
             });
-            this.caseEditDataService.caseIsLinkedCasesJourneyAtFinalStep$.subscribe({
-                next: function (isLinkedCasesJourneyAtFinalStep) { return _this.isLinkedCasesJourneyAtFinalStep = isLinkedCasesJourneyAtFinalStep; }
-            });
-            this.caseEditDataService.caseTriggerSubmitEvent$.subscribe({
+            this.caseIsLinkedCasesJourneyAtFinalStepSub =
+                this.caseEditDataService.caseIsLinkedCasesJourneyAtFinalStep$.subscribe({
+                    next: function (isLinkedCasesJourneyAtFinalStep) { return _this.isLinkedCasesJourneyAtFinalStep = isLinkedCasesJourneyAtFinalStep; }
+                });
+            this.caseTriggerSubmitEventSub = this.caseEditDataService.caseTriggerSubmitEvent$.subscribe({
                 next: function (state) {
                     if (state) {
                         _this.caseEditDataService.setTriggerSubmitEvent(false);
@@ -10640,6 +10744,17 @@
         CaseEditPageComponent.prototype.ngAfterViewChecked = function () {
             this.cdRef.detectChanges();
         };
+        CaseEditPageComponent.prototype.ngOnDestroy = function () {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            (_a = this.routeParamsSub) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+            (_b = this.caseEditFormSub) === null || _b === void 0 ? void 0 : _b.unsubscribe();
+            (_c = this.caseIsLinkedCasesJourneyAtFinalStepSub) === null || _c === void 0 ? void 0 : _c.unsubscribe();
+            (_d = this.caseTriggerSubmitEventSub) === null || _d === void 0 ? void 0 : _d.unsubscribe();
+            (_e = this.validateSub) === null || _e === void 0 ? void 0 : _e.unsubscribe();
+            (_f = this.dialogRefAfterClosedSub) === null || _f === void 0 ? void 0 : _f.unsubscribe();
+            (_g = this.saveDraftSub) === null || _g === void 0 ? void 0 : _g.unsubscribe();
+            (_h = this.caseFormValidationErrorsSub) === null || _h === void 0 ? void 0 : _h.unsubscribe();
+        };
         CaseEditPageComponent.prototype.applyValuesChanged = function (valuesChanged) {
             this.formValuesChanged = valuesChanged;
         };
@@ -10714,7 +10829,7 @@
                                 _this.generateErrorMessage(casefield.field_type.collection_field_type.complex_fields, c.get('value'), id_1);
                             });
                         }
-                        else if (FieldsUtils.isFlagLauncherCaseField(casefield)) {
+                        else if (FieldsUtils.isCaseFieldOfType(casefield, ['FlagLauncher'])) {
                             // Check whether the case field DisplayContextParameter is signalling "create" mode or "update" mode
                             // (expected always to be one of the two), to set the correct error message
                             var action = '';
@@ -10769,7 +10884,7 @@
                 this.caseEdit.error = null;
                 var caseEventData = this.buildCaseEventData();
                 var loadingSpinnerToken_1 = this.loadingService.register();
-                this.caseEdit.validate(caseEventData, this.currentPage.id)
+                this.validateSub = this.caseEdit.validate(caseEventData, this.currentPage.id)
                     .pipe(operators.finalize(function () {
                     _this.loadingService.unregister(loadingSpinnerToken_1);
                 }))
@@ -10788,10 +10903,10 @@
             CaseEditPageComponent.setFocusToTop();
         };
         CaseEditPageComponent.prototype.updateFormData = function (jsonData) {
-            var e_1, _c;
+            var e_1, _j;
             try {
-                for (var _d = __values(Object.keys(jsonData.data)), _e = _d.next(); !_e.done; _e = _d.next()) {
-                    var caseFieldId = _e.value;
+                for (var _k = __values(Object.keys(jsonData.data)), _l = _k.next(); !_l.done; _l = _k.next()) {
+                    var caseFieldId = _l.value;
                     /* istanbul ignore else */
                     if (this.pageWithFieldExists(caseFieldId)) {
                         this.updateEventTriggerCaseFields(caseFieldId, jsonData, this.caseEdit.eventTrigger);
@@ -10802,7 +10917,7 @@
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
+                    if (_l && !_l.done && (_j = _k.return)) _j.call(_k);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -10831,12 +10946,12 @@
         CaseEditPageComponent.prototype.updateJsonDataObject = function (caseFieldId, jsonData, element) {
             var _this = this;
             return Object.keys(jsonData.data[caseFieldId]).reduce(function (acc, key) {
-                var _c;
+                var _j;
                 var elementValue = element.value[key];
                 var jsonDataValue = jsonData.data[caseFieldId][key];
                 var hasElementGotValueProperty = _this.isAnObject(elementValue) && elementValue.value !== undefined;
                 var jsonDataOrElementValue = (jsonDataValue === null || jsonDataValue === void 0 ? void 0 : jsonDataValue.value) !== null && (jsonDataValue === null || jsonDataValue === void 0 ? void 0 : jsonDataValue.value) !== undefined ? jsonDataValue : elementValue;
-                return Object.assign(Object.assign({}, acc), (_c = {}, _c["" + key] = hasElementGotValueProperty ? jsonDataOrElementValue : jsonDataValue, _c));
+                return Object.assign(Object.assign({}, acc), (_j = {}, _j["" + key] = hasElementGotValueProperty ? jsonDataOrElementValue : jsonDataValue, _j));
             }, {});
         };
         CaseEditPageComponent.prototype.isAnObject = function (property) {
@@ -10884,7 +10999,7 @@
             if (this.eventTrigger.can_save_draft) {
                 if (this.formValuesChanged) {
                     var dialogRef = this.dialog.open(SaveOrDiscardDialogComponent, this.dialogConfig);
-                    dialogRef.afterClosed().subscribe(function (result) {
+                    this.dialogRefAfterClosedSub = dialogRef.afterClosed().subscribe(function (result) {
                         if (result === 'Discard') {
                             _this.discard();
                         }
@@ -10971,7 +11086,7 @@
                 var draftCaseEventData = this.formValueService.sanitise(this.editForm.value);
                 draftCaseEventData.event_token = this.eventTrigger.event_token;
                 draftCaseEventData.ignore_warning = this.caseEdit.ignoreWarning;
-                this.caseEdit.saveDraft(draftCaseEventData).subscribe(function (draft) { return _this.eventTrigger.case_id = DRAFT_PREFIX + draft.id; }, function (error) { return _this.handleError(error); });
+                this.saveDraftSub = this.caseEdit.saveDraft(draftCaseEventData).subscribe(function (draft) { return _this.eventTrigger.case_id = DRAFT_PREFIX + draft.id; }, function (error) { return _this.handleError(error); });
             }
         };
         CaseEditPageComponent.prototype.getCaseFields = function () {
@@ -11039,7 +11154,7 @@
             this.caseEditDataService.setCaseEventTriggerName(this.eventTrigger.name);
             this.caseEditDataService.setCaseTitle(this.getCaseTitle());
             this.caseEditDataService.setCaseEditForm(this.editForm);
-            this.caseEditDataService.caseFormValidationErrors$.subscribe({
+            this.caseFormValidationErrorsSub = this.caseEditDataService.caseFormValidationErrors$.subscribe({
                 next: function (validationErrors) { return _this.validationErrors = validationErrors; }
             });
         };
@@ -26788,9 +26903,10 @@
             this.contextFields = this.getCaseFields();
             // Indicates if the submission is for a Case Flag, as opposed to a "regular" form submission, by the presence of
             // a FlagLauncher field in the event trigger
-            this.caseEdit.isCaseFlagSubmission = this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isFlagLauncherCaseField(caseField); });
+            this.caseEdit.isCaseFlagSubmission =
+                this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isCaseFieldOfType(caseField, ['FlagLauncher']); });
             this.caseEdit.isLinkedCasesSubmission =
-                this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isComponentLauncherCaseField(caseField); });
+                this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isCaseFieldOfType(caseField, ['ComponentLauncher']); });
             this.pageTitle = this.caseEdit.isCaseFlagSubmission ? 'Review flag details' : 'Check your answers';
         };
         CaseEditSubmitComponent.prototype.ngOnDestroy = function () {
@@ -26863,49 +26979,50 @@
         CaseEditSubmitComponent.prototype.checkYourAnswerFieldsToDisplayExists = function () {
             var e_1, _d, e_2, _e;
             /* istanbul ignore else */
-            if (!this.eventTrigger.show_summary) {
-                return false;
-            }
-            try {
-                for (var _f = __values(this.wizard.pages), _g = _f.next(); !_g.done; _g = _f.next()) {
-                    var page = _g.value;
-                    /* istanbul ignore else */
-                    if (this.isShown(page)) {
-                        try {
-                            for (var _h = (e_2 = void 0, __values(page.case_fields)), _j = _h.next(); !_j.done; _j = _h.next()) {
-                                var field = _j.value;
-                                /* istanbul ignore else */
-                                if (this.canShowFieldInCYA(field)) {
-                                    // at least one field needs showing
-                                    return true;
+            if (this.eventTrigger.show_summary || this.eventTrigger.show_summary === null) {
+                try {
+                    for (var _f = __values(this.wizard.pages), _g = _f.next(); !_g.done; _g = _f.next()) {
+                        var page = _g.value;
+                        /* istanbul ignore else */
+                        if (page.case_fields && this.isShown(page)) {
+                            try {
+                                for (var _h = (e_2 = void 0, __values(page.case_fields)), _j = _h.next(); !_j.done; _j = _h.next()) {
+                                    var field = _j.value;
+                                    /* istanbul ignore else */
+                                    if (this.canShowFieldInCYA(field)) {
+                                        // at least one field needs showing
+                                        return true;
+                                    }
                                 }
                             }
-                        }
-                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                        finally {
-                            try {
-                                if (_j && !_j.done && (_e = _h.return)) _e.call(_h);
+                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                            finally {
+                                try {
+                                    if (_j && !_j.done && (_e = _h.return)) _e.call(_h);
+                                }
+                                finally { if (e_2) throw e_2.error; }
                             }
-                            finally { if (e_2) throw e_2.error; }
                         }
                     }
                 }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_g && !_g.done && (_d = _f.return)) _d.call(_f);
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (_g && !_g.done && (_d = _f.return)) _d.call(_f);
+                    }
+                    finally { if (e_1) throw e_1.error; }
                 }
-                finally { if (e_1) throw e_1.error; }
             }
-            // found no fields to show in CYA summary page
-            return false;
+            else {
+                // found no fields to show in CYA summary page
+                return false;
+            }
         };
         CaseEditSubmitComponent.prototype.readOnlySummaryFieldsToDisplayExists = function () {
             return this.eventTrigger.case_fields.some(function (field) { return field.show_summary_content_option >= 0; });
         };
         CaseEditSubmitComponent.prototype.showEventNotes = function () {
-            return this.eventTrigger.show_event_notes === true;
+            return !!this.eventTrigger.show_event_notes;
         };
         CaseEditSubmitComponent.prototype.getLastPageShown = function () {
             var _this = this;
@@ -29906,7 +30023,7 @@
                 }
                 else {
                     return this.caseNotifier.fetchAndRefresh(cid)
-                        .pipe(operators.catchError(function (error) { return _this.checkAuthorizationError(error); }))
+                        .pipe(operators.catchError(function (error) { return _this.checkAuthorizationError(error, cid); }))
                         .toPromise();
                 }
             }
@@ -29919,20 +30036,24 @@
                 _this.caseNotifier.cachedCaseView = classTransformer.plainToClassFromExist(new CaseView(), caseView);
                 _this.caseNotifier.announceCase(_this.caseNotifier.cachedCaseView);
                 return _this.caseNotifier.cachedCaseView;
-            }), operators.catchError(function (error) { return _this.checkAuthorizationError(error); })).toPromise();
+            }), operators.catchError(function (error) { return _this.checkAuthorizationError(error, cid); })).toPromise();
         };
-        CaseResolver.prototype.checkAuthorizationError = function (error) {
+        CaseResolver.prototype.checkAuthorizationError = function (error, caseReference) {
             // TODO Should be logged to remote logging infrastructure
             if (error.status === 400) {
                 this.router.navigate(['/search/noresults']);
                 return rxjs.of(null);
             }
-            console.error(error);
             if (CaseResolver.EVENT_REGEX.test(this.previousUrl) && error.status === 404) {
                 this.router.navigate(['/list/case']);
                 return rxjs.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 rxjs.of(null);
+            }
+            if (error.status !== 401) {
                 this.router.navigate(['/error']);
             }
             this.goToDefaultPage();