@hmcts/ccd-case-ui-toolkit 6.19.15 → 6.19.16-hearing-requirements-event-fix

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);
@@ -5822,13 +5828,23 @@
          * @returns A new array with the mapped values
          */
         FieldsPurger.prototype.mapArrayValuesToNull = function (array) {
-            return array.map(function (element) {
-                return typeof element === 'object'
-                    ? Object.assign.apply(Object, __spread([{}], Object.keys(element).map(function (k) {
-                        var _a;
-                        return (_a = {}, _a[k] = null, _a);
-                    }))) : null;
-            });
+            if (array && array.length > 0) {
+                return array.map(function (element) {
+                    if (element !== undefined && element !== null) {
+                        return typeof element === 'object'
+                            ? Object.assign.apply(Object, __spread([{}], Object.keys(element).map(function (k) {
+                                var _a;
+                                return (_a = {}, _a[k] = null, _a);
+                            }))) : null;
+                    }
+                    else {
+                        return {};
+                    }
+                });
+            }
+            else {
+                return array;
+            }
         };
         return FieldsPurger;
     }());
@@ -31081,13 +31097,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 +31150,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 +31163,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 +31173,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 +31209,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 () {