@abp/ng.theme.shared 7.4.0-rc.1 → 7.4.0-rc.3

package/fesm2022/abp-ng.theme.shared.mjs

@@ -1,8 +1,8 @@
 import { animation, style, animate, keyframes, trigger, state, transition, useAnimation, query } from '@angular/animations';
 import * as i0 from '@angular/core';
-import { Component, Input, ChangeDetectionStrategy, EventEmitter, Output, ViewChild, InjectionToken, Inject, ViewEncapsulation, Injectable, Optional, ContentChild, Directive, HostListener, forwardRef, HostBinding, NgModule, inject, RendererFactory2, ComponentFactoryResolver, Injector, ApplicationRef, APP_INITIALIZER, LOCALE_ID } from '@angular/core';
+import { Component, Input, ChangeDetectionStrategy, EventEmitter, Output, ViewChild, InjectionToken, Inject, inject, ViewEncapsulation, Injectable, Optional, ContentChild, Directive, HostListener, forwardRef, HostBinding, NgModule, RendererFactory2, ComponentFactoryResolver, Injector, ApplicationRef, APP_INITIALIZER, LOCALE_ID } from '@angular/core';
 import * as i1 from '@angular/common';
-import { CommonModule, NgIf, DOCUMENT, formatDate, DatePipe } from '@angular/common';
+import { DOCUMENT, CommonModule, NgIf, formatDate, DatePipe } from '@angular/common';
 import * as i1$1 from '@angular/router';
 import { ResolveEnd } from '@angular/router';
 import * as i2 from '@abp/ng.core';
@@ -361,6 +361,8 @@ class HttpErrorWrapperComponent {
     }
     constructor(subscription) {
         this.subscription = subscription;
+        this.document = inject(DOCUMENT);
+        this.window = this.document.defaultView;
         this.status = 0;
         this.title = 'Oops!';
         this.details = 'Sorry, an error has occured.';
@@ -370,7 +372,7 @@ class HttpErrorWrapperComponent {
     }
     ngOnInit() {
         this.backgroundColor =
-            window.getComputedStyle(document.body)?.getPropertyValue('background-color') || '#fff';
+            this.window.getComputedStyle(this.document.body)?.getPropertyValue('background-color') || '#fff';
     }
     ngAfterViewInit() {
         if (this.customComponent) {
@@ -385,7 +387,7 @@ class HttpErrorWrapperComponent {
             }
             customComponentRef.changeDetectorRef.detectChanges();
         }
-        const keyup$ = fromEvent(document, 'keyup').pipe(debounceTime(150), filter((key) => key && key.key === 'Escape'));
+        const keyup$ = fromEvent(this.document, 'keyup').pipe(debounceTime(150), filter((key) => key && key.key === 'Escape'));
         this.subscription.addOne(keyup$, () => this.destroy());
     }
     ngOnDestroy() {
@@ -2235,15 +2237,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.6", ngImpor
         }] });
 
 class CreateErrorComponentService {
-    getErrorHostElement() {
-        return document.body;
-    }
-    canCreateCustomError(status) {
-        return !!(this.httpErrorConfig?.errorScreen?.component &&
-            this.httpErrorConfig?.errorScreen?.forWhichErrors &&
-            this.httpErrorConfig?.errorScreen?.forWhichErrors.indexOf(status) > -1);
-    }
     constructor() {
+        this.document = inject(DOCUMENT);
         this.rendererFactory = inject(RendererFactory2);
         this.cfRes = inject(ComponentFactoryResolver);
         this.routerEvents = inject(RouterEvents);
@@ -2261,8 +2256,18 @@ class CreateErrorComponentService {
             this.componentRef = null;
         });
     }
+    getErrorHostElement() {
+        return this.document.body;
+    }
     isCloseIconHidden() {
-        return !!this.httpErrorConfig.errorScreen?.hideCloseIcon;
+        return !!this.httpErrorConfig?.errorScreen?.hideCloseIcon;
+    }
+    canCreateCustomError(status) {
+        const { component, forWhichErrors } = this.httpErrorConfig?.errorScreen || {};
+        if (!component || !forWhichErrors) {
+            return false;
+        }
+        return forWhichErrors.indexOf(status) > -1;
     }
     execute(instance) {
         const renderer = this.rendererFactory.createRenderer(null, null);
@@ -2393,11 +2398,39 @@ class StatusCodeErrorHandlerService {
         this.confirmationService = inject(ConfirmationService);
         this.createErrorComponentService = inject(CreateErrorComponentService);
         this.authService = inject(AuthService);
-        this.priority = CUSTOM_HTTP_ERROR_HANDLER_PRIORITY.normal;
         this.handledStatusCodes = [401, 403, 404, 500];
+        this.priority = CUSTOM_HTTP_ERROR_HANDLER_PRIORITY.normal;
+    }
+    navigateToLogin() {
+        this.authService.navigateToLogin();
+    }
+    showConfirmation(message, title) {
+        return this.confirmationService.error(message, title, {
+            hideCancelBtn: true,
+            yesText: 'AbpAccount::Close',
+        });
+    }
+    showPage() {
+        const key = `defaultError${this.status}`;
+        const shouldRemoveDetail = [401, 404].indexOf(this.status) > -1;
+        const instance = {
+            title: {
+                key: DEFAULT_ERROR_LOCALIZATIONS[key]?.title,
+                defaultValue: DEFAULT_ERROR_MESSAGES[key]?.title,
+            },
+            details: {
+                key: DEFAULT_ERROR_LOCALIZATIONS[key]?.details,
+                defaultValue: DEFAULT_ERROR_MESSAGES[key]?.details,
+            },
+            status: this.status,
+        };
+        if (shouldRemoveDetail) {
+            delete instance.details;
+        }
+        this.createErrorComponentService.execute(instance);
     }
     canHandle({ status }) {
-        this.status = status;
+        this.status = status || 0;
         return this.handledStatusCodes.indexOf(status) > -1;
     }
     execute() {
@@ -2418,11 +2451,11 @@ class StatusCodeErrorHandlerService {
                     this.showPage();
                     break;
                 }
-                this.showConfirmation(title, message).subscribe(() => {
-                    if (this.status === 401) {
-                        this.navigateToLogin();
-                    }
-                });
+                if (this.status === 401) {
+                    this.authService.navigateToLogin();
+                    break;
+                }
+                this.showConfirmation(title, message).subscribe();
                 break;
             case 403:
             case 500:
@@ -2430,34 +2463,6 @@ class StatusCodeErrorHandlerService {
                 break;
         }
     }
-    navigateToLogin() {
-        this.authService.navigateToLogin();
-    }
-    showConfirmation(message, title) {
-        return this.confirmationService.error(message, title, {
-            hideCancelBtn: true,
-            yesText: 'AbpAccount::Close',
-        });
-    }
-    showPage() {
-        const key = `defaultError${this.status}`;
-        const instance = {
-            title: {
-                key: DEFAULT_ERROR_LOCALIZATIONS[key]?.title,
-                defaultValue: DEFAULT_ERROR_MESSAGES[key]?.title,
-            },
-            details: {
-                key: DEFAULT_ERROR_LOCALIZATIONS[key]?.details,
-                defaultValue: DEFAULT_ERROR_MESSAGES[key]?.details,
-            },
-            status: this.status,
-        };
-        const shouldRemoveDetail = [401, 404].indexOf(this.status) > -1;
-        if (shouldRemoveDetail) {
-            delete instance.details;
-        }
-        this.createErrorComponentService.execute(instance);
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.6", ngImport: i0, type: StatusCodeErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.6", ngImport: i0, type: StatusCodeErrorHandlerService, providedIn: 'root' }); }
 }
@@ -2504,8 +2509,10 @@ class RouterErrorHandlerService {
         this.httpErrorConfig = inject(HTTP_ERROR_CONFIG);
         this.createErrorComponentService = inject(CreateErrorComponentService);
         this.filterRouteErrors = (navigationError) => {
+            if (!this.httpErrorConfig?.skipHandledErrorCodes) {
+                return true;
+            }
             return (navigationError.error?.message?.indexOf('Cannot match') > -1 &&
-                !!this.httpErrorConfig.skipHandledErrorCodes &&
                 this.httpErrorConfig.skipHandledErrorCodes.findIndex(code => code === 404) < 0);
         };
     }
@@ -2546,8 +2553,7 @@ class ErrorHandler {
         this.executeErrorHandler = (error) => {
             const errHandler = this.httpErrorHandler(this.injector, error);
             const isObservable = errHandler instanceof Observable;
-            const response = isObservable ? errHandler : of(null);
-            return response.pipe(catchError(err => {
+            return (isObservable ? errHandler : of(null)).pipe(catchError(err => {
                 this.handleError(err);
                 return of(null);
             }));
@@ -2555,8 +2561,10 @@ class ErrorHandler {
         this.filterRestErrors = ({ status }) => {
             if (typeof status !== 'number')
                 return false;
-            return (!!this.httpErrorConfig.skipHandledErrorCodes &&
-                this.httpErrorConfig.skipHandledErrorCodes.findIndex(code => code === status) < 0);
+            if (!this.httpErrorConfig || !this.httpErrorConfig.skipHandledErrorCodes) {
+                return true;
+            }
+            return this.httpErrorConfig.skipHandledErrorCodes?.findIndex(code => code === status) < 0;
         };
         this.listenToRestError();
         this.listenToRouterError();
@@ -2567,9 +2575,7 @@ class ErrorHandler {
     listenToRestError() {
         this.httpErrorReporter.reporter$
             .pipe(filter(this.filterRestErrors), switchMap(this.executeErrorHandler))
-            .subscribe(err => {
-            this.handleError(err);
-        });
+            .subscribe(err => this.handleError(err));
     }
     sortHttpErrorHandlers(a, b) {
         return (b.priority || 0) - (a.priority || 0);