@hmcts/ccd-case-ui-toolkit 6.19.15 → 6.19.16-exui-1152-rc1

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

@@ -1985,6 +1985,13 @@
                     error[key] = response.error.hasOwnProperty(key) && response.error[key] ? response.error[key] : error[key];
                 });
             }
+            // Error object in HttpErrorResponse will be empty for 403 errors
+            // Set the error properties of HttpError accordingly
+            if ((response === null || response === void 0 ? void 0 : response.status) === 403) {
+                error.error = response.statusText;
+                error.status = response.status;
+                error.message = response.message;
+            }
             return error;
         };
         return HttpError;
@@ -2083,14 +2090,13 @@
             this.authService = authService;
         }
         HttpErrorService.convertToHttpError = function (error) {
+            var _a;
             if (error instanceof HttpError) {
                 return error;
             }
             var httpError = new HttpError();
             if (error instanceof i1$2.HttpErrorResponse) {
-                if (error.headers
-                    && error.headers.get(HttpErrorService.CONTENT_TYPE)
-                    && error.headers.get(HttpErrorService.CONTENT_TYPE).indexOf(HttpErrorService.JSON) !== -1) {
+                if (((_a = error.headers) === null || _a === void 0 ? void 0 : _a.get(HttpErrorService.CONTENT_TYPE).indexOf(HttpErrorService.JSON)) !== -1) {
                     try {
                         httpError = HttpError.from(error);
                     }
@@ -2125,7 +2131,7 @@
             console.error('Handling error in http error service.');
             console.error(error);
             var httpError = HttpErrorService.convertToHttpError(error);
-            if (redirectIfNotAuthorised && (httpError.status === 401 || httpError.status === 403)) {
+            if (redirectIfNotAuthorised && httpError.status === 401) {
                 this.authService.signIn();
             }
             return rxjs.throwError(httpError);
@@ -4107,6 +4113,11 @@
     var FieldsUtils = /** @class */ (function () {
         function FieldsUtils() {
         }
+        FieldsUtils.isValidDisplayContext = function (ctx) {
+            return (ctx === 'MANDATORY' || ctx === 'READONLY'
+                || ctx === 'OPTIONAL' || ctx === 'HIDDEN'
+                || ctx === 'COMPLEX');
+        };
         FieldsUtils.convertToCaseField = function (obj) {
             if (!(obj instanceof CaseField)) {
                 return classTransformer.plainToClassFromExist(new CaseField(), obj);
@@ -6387,12 +6398,13 @@
          * @param clearEmpty Whether or not we should clear out empty, optional, complex objects.
          * @param clearNonCase Whether or not we should clear out non-case fields at the top level.
          */
-        FormValueService.prototype.removeUnnecessaryFields = function (data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, currentPageCaseFields) {
+        FormValueService.prototype.removeUnnecessaryFields = function (data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, currentPageCaseFields, isCalledFromSubmit) {
             var e_8, _a;
             if (clearEmpty === void 0) { clearEmpty = false; }
             if (clearNonCase === void 0) { clearNonCase = false; }
             if (fromPreviousPage === void 0) { fromPreviousPage = false; }
             if (currentPageCaseFields === void 0) { currentPageCaseFields = []; }
+            if (isCalledFromSubmit === void 0) { isCalledFromSubmit = false; }
             if (data && caseFields && caseFields.length > 0) {
                 // check if there is any data at the top level of the form that's not in the caseFields
                 if (clearNonCase) {
@@ -6403,10 +6415,16 @@
                     if (!FormValueService.isLabel(field) && FormValueService.isReadOnly(field)) {
                         return "continue";
                     }
-                    if (field.hidden === true && field.display_context !== 'HIDDEN' && field.id !== 'caseLinks' && !field.retain_hidden_value) {
+                    if (field.hidden === true && field.display_context !== 'HIDDEN' && field.display_context !== 'HIDDEN_TEMP' && field.id !== 'caseLinks') {
                         // Delete anything that is hidden (that is NOT readonly), and that
                         // hasn't had its display_context overridden to make it hidden.
-                        delete data[field.id];
+                        // in event submission check for field's retain_hidden_value defore deletion
+                        if (isCalledFromSubmit && !field.retain_hidden_value) {
+                            delete data[field.id];
+                        }
+                        else {
+                            delete data[field.id];
+                        }
                     }
                     else if (field.field_type) {
                         switch (field.field_type.type) {
@@ -6420,7 +6438,7 @@
                                 }
                                 break;
                             case 'Complex':
-                                this_1.removeUnnecessaryFields(data[field.id], field.field_type.complex_fields, clearEmpty);
+                                this_1.removeUnnecessaryFields(data[field.id], field.field_type.complex_fields, clearEmpty, false, false, [], isCalledFromSubmit);
                                 // Also remove any optional complex objects that are completely empty.
                                 // EUI-4244: Ritesh's fix, passing true instead of clearEmpty.
                                 if (FormValueService.clearOptionalEmpty(true, data[field.id], field)) {
@@ -6445,8 +6463,8 @@
                                             // Iterate through the elements and remove any unnecessary fields within.
                                             for (var collection_3 = (e_9 = void 0, __values(collection)), collection_3_1 = collection_3.next(); !collection_3_1.done; collection_3_1 = collection_3.next()) {
                                                 var item = collection_3_1.value;
-                                                this_1.removeUnnecessaryFields(item, field.field_type.collection_field_type.complex_fields, clearEmpty);
-                                                this_1.removeUnnecessaryFields(item.value, field.field_type.collection_field_type.complex_fields, false);
+                                                this_1.removeUnnecessaryFields(item, field.field_type.collection_field_type.complex_fields, clearEmpty, false, false, [], isCalledFromSubmit);
+                                                this_1.removeUnnecessaryFields(item.value, field.field_type.collection_field_type.complex_fields, false, false, false, [], isCalledFromSubmit);
                                             }
                                         }
                                         catch (e_9_1) { e_9 = { error: e_9_1 }; }
@@ -8095,7 +8113,6 @@
             this.artificialDelayOn = true;
             this.selectedDelay = this.selectActualDelayTime();
         }
-        ;
         ArtificialDelayContext.prototype.switchArtificialDelays = function (status) {
             this.artificialDelayOn = status;
             this.selectedDelay = this.selectActualDelayTime();
@@ -8700,7 +8717,8 @@
             childrenCaseFields.forEach(function (e) { return _this.hideParentIfAllChildrenHidden(e); });
             if (childrenCaseFields.length > 0 && this.allCaseFieldsHidden(childrenCaseFields)) {
                 caseField.hidden = true;
-                caseField.display_context = 'HIDDEN';
+                // marking display_context as special hidden so field not being deleted in event submission
+                caseField.display_context = 'HIDDEN_TEMP';
             }
         };
         WizardPageFieldToCaseFieldMapper.prototype.getCaseFieldChildren = function (caseField) {
@@ -8714,7 +8732,7 @@
             return childrenCaseFields;
         };
         WizardPageFieldToCaseFieldMapper.prototype.allCaseFieldsHidden = function (children) {
-            return !children.some(function (e) { return e.hidden !== true; });
+            return children.every(function (e) { return e.display_context === 'HIDDEN' || e.display_context === 'HIDDEN_TEMP'; });
         };
         return WizardPageFieldToCaseFieldMapper;
     }());
@@ -10117,7 +10135,7 @@
             var pageListCaseFields = this.validPageListCaseFieldsService.validPageListCaseFields(this.validPageList, eventTrigger.case_fields, form.controls['data'].value);
             // Remove unnecessary case fields which are hidden, only if the submission is *not* for Case Flags
             if (!this.isCaseFlagSubmission) {
-                this.formValueService.removeUnnecessaryFields(caseEventData.data, pageListCaseFields, true, true);
+                this.formValueService.removeUnnecessaryFields(caseEventData.data, pageListCaseFields, true, true, false, [], true);
             }
             caseEventData.event_token = eventTrigger.event_token;
             caseEventData.ignore_warning = this.ignoreWarning;
@@ -14164,7 +14182,9 @@
                 .filter(function (f) { return keepEmpty || FieldsFilterPipe.keepField(f); })
                 .map(function (f) {
                 if (!f.display_context) {
-                    f.display_context = complexField.display_context;
+                    if (FieldsUtils.isValidDisplayContext(complexField.display_context)) {
+                        f.display_context = complexField.display_context;
+                    }
                 }
                 return f;
             });
@@ -26581,7 +26601,9 @@
             })
                 .map(function (f) {
                 if (!f.display_context) {
-                    f.display_context = complexField.display_context;
+                    if (FieldsUtils.isValidDisplayContext(complexField.display_context)) {
+                        f.display_context = complexField.display_context;
+                    }
                 }
                 if (setupHidden) {
                     ReadFieldsFilterPipe.evaluateConditionalShow(f, checkConditionalShowAgainst, path, formGroupAvailable, complexField.id);
@@ -31081,13 +31103,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;
@@ -31133,7 +31156,7 @@
                 else {
                     console.info('getAndCacheCaseView - Path B.');
                     return this.caseNotifier.fetchAndRefresh(cid)
-                        .pipe(operators.catchError(function (error) { return _this.processErrorInCaseFetch(error); }))
+                        .pipe(operators.catchError(function (error) { return _this.processErrorInCaseFetch(error, cid); }))
                         .toPromise();
                 }
             }
@@ -31146,9 +31169,9 @@
                 _this.caseNotifier.cachedCaseView = classTransformer.plainToClassFromExist(new CaseView(), caseView);
                 _this.caseNotifier.announceCase(_this.caseNotifier.cachedCaseView);
                 return _this.caseNotifier.cachedCaseView;
-            }), operators.catchError(function (error) { return _this.processErrorInCaseFetch(error); })).toPromise();
+            }), operators.catchError(function (error) { return _this.processErrorInCaseFetch(error, cid); })).toPromise();
         };
-        CaseResolver.prototype.processErrorInCaseFetch = function (error) {
+        CaseResolver.prototype.processErrorInCaseFetch = function (error, caseReference) {
             console.error('!!! processErrorInCaseFetch !!!');
             console.error(error);
             // TODO Should be logged to remote logging infrastructure
@@ -31156,12 +31179,16 @@
                 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 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);
+            }
+            if (error.status !== 401) {
                 this.router.navigate(['/error']);
             }
             this.goToDefaultPage();
@@ -31188,12 +31215,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 () {