@abp/ng.theme.shared 7.4.0-rc.2 → 7.4.0-rc.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/components/http-error-wrapper/http-error-wrapper.component.mjs +8 -5
- package/esm2022/lib/handlers/error.handler.mjs +8 -11
- package/esm2022/lib/models/common.mjs +1 -1
- package/esm2022/lib/services/create-error-component.service.mjs +15 -11
- package/esm2022/lib/services/router-error-handler.service.mjs +2 -2
- package/esm2022/lib/services/status-code-error-handler.service.mjs +36 -36
- package/fesm2022/abp-ng.theme.shared.mjs +58 -56
- package/fesm2022/abp-ng.theme.shared.mjs.map +1 -1
- package/lib/components/http-error-wrapper/http-error-wrapper.component.d.ts +7 -4
- package/lib/handlers/error.handler.d.ts +13 -10
- package/lib/models/common.d.ts +2 -2
- package/lib/services/create-error-component.service.d.ts +11 -9
- package/lib/services/router-error-handler.service.d.ts +6 -4
- package/lib/services/status-code-error-handler.service.d.ts +11 -9
- package/package.json +3 -3
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { Component, inject, ElementRef, ViewChild, } from '@angular/core';
|
|
2
|
+
import { DOCUMENT } from '@angular/common';
|
|
3
3
|
import { fromEvent } from 'rxjs';
|
|
4
4
|
import { debounceTime, filter } from 'rxjs/operators';
|
|
5
|
+
import { SubscriptionService } from '@abp/ng.core';
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
6
7
|
import * as i1 from "@abp/ng.core";
|
|
7
8
|
import * as i2 from "@angular/common";
|
|
@@ -12,6 +13,8 @@ class HttpErrorWrapperComponent {
|
|
|
12
13
|
}
|
|
13
14
|
constructor(subscription) {
|
|
14
15
|
this.subscription = subscription;
|
|
16
|
+
this.document = inject(DOCUMENT);
|
|
17
|
+
this.window = this.document.defaultView;
|
|
15
18
|
this.status = 0;
|
|
16
19
|
this.title = 'Oops!';
|
|
17
20
|
this.details = 'Sorry, an error has occured.';
|
|
@@ -21,7 +24,7 @@ class HttpErrorWrapperComponent {
|
|
|
21
24
|
}
|
|
22
25
|
ngOnInit() {
|
|
23
26
|
this.backgroundColor =
|
|
24
|
-
window.getComputedStyle(document.body)?.getPropertyValue('background-color') || '#fff';
|
|
27
|
+
this.window.getComputedStyle(this.document.body)?.getPropertyValue('background-color') || '#fff';
|
|
25
28
|
}
|
|
26
29
|
ngAfterViewInit() {
|
|
27
30
|
if (this.customComponent) {
|
|
@@ -36,7 +39,7 @@ class HttpErrorWrapperComponent {
|
|
|
36
39
|
}
|
|
37
40
|
customComponentRef.changeDetectorRef.detectChanges();
|
|
38
41
|
}
|
|
39
|
-
const keyup$ = fromEvent(document, 'keyup').pipe(debounceTime(150), filter((key) => key && key.key === 'Escape'));
|
|
42
|
+
const keyup$ = fromEvent(this.document, 'keyup').pipe(debounceTime(150), filter((key) => key && key.key === 'Escape'));
|
|
40
43
|
this.subscription.addOne(keyup$, () => this.destroy());
|
|
41
44
|
}
|
|
42
45
|
ngOnDestroy() {
|
|
@@ -57,4 +60,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.6", ngImpor
|
|
|
57
60
|
type: ViewChild,
|
|
58
61
|
args: ['container', { static: false }]
|
|
59
62
|
}] } });
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-error-wrapper.component.js","sourceRoot":"","sources":["../../../../../../../packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts","../../../../../../../packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.html"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAET,MAAM,EAGN,UAAU,EAGV,SAAS,GAGV,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAW,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAqB,mBAAmB,EAAE,MAAM,cAAc,CAAC;;;;;AAGtE,MAMa,yBAAyB;IA6BpC,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/C,CAAC;IAED,YAAoB,YAAiC;QAAjC,iBAAY,GAAZ,YAAY,CAAqB;QAhClC,aAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC5B,WAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;QAQtD,WAAM,GAA0B,CAAC,CAAC;QAElC,UAAK,GAAsB,OAAO,CAAC;QAEnC,YAAO,GAAsB,8BAA8B,CAAC;QAE5D,oBAAe,GAA0B,SAAS,CAAC;QAInD,kBAAa,GAAG,KAAK,CAAC;QAItB,eAAU,GAAG,IAAI,CAAC;IASsC,CAAC;IAEzD,QAAQ;QACN,IAAI,CAAC,eAAe;YAClB,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,IAAI,MAAM,CAAC;IACrG,CAAC;IAED,eAAe;QACb,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK;iBAClC,uBAAuB,CAAC,IAAI,CAAC,eAAe,CAAC;iBAC7C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzB,kBAAkB,CAAC,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;YACtD,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YACrD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACpD,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,WAAW,CACxC,kBAAkB,CAAC,QAAiC,CAAC,SAAS,CAAC,CAAC,CAAC,CACnE,CAAC;aACH;YACD,kBAAkB,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC;SACtD;QAED,MAAM,MAAM,GAAG,SAAS,CAAgB,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAClE,YAAY,CAAC,GAAG,CAAC,EACjB,MAAM,CAAC,CAAC,GAAkB,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,KAAK,QAAQ,CAAC,CAC5D,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,WAAW;QACT,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;8GAtEU,yBAAyB;kGAAzB,yBAAyB,iDAFzB,CAAC,mBAAmB,CAAC,qICxBlC,mjCAmCA;;SDTa,yBAAyB;2FAAzB,yBAAyB;kBANrC,SAAS;+BACE,wBAAwB,aAGvB,CAAC,mBAAmB,CAAC;0GA6BhC,YAAY;sBADX,SAAS;uBAAC,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE","sourcesContent":["import {\r\n  ApplicationRef,\r\n  Component,\r\n  Injector,\r\n  inject,\r\n  OnInit,\r\n  ComponentFactoryResolver,\r\n  ElementRef,\r\n  EmbeddedViewRef,\r\n  Type,\r\n  ViewChild,\r\n  AfterViewInit,\r\n  OnDestroy,\r\n} from '@angular/core';\r\nimport { DOCUMENT } from '@angular/common';\r\nimport { fromEvent, Subject } from 'rxjs';\r\nimport { debounceTime, filter } from 'rxjs/operators';\r\nimport { LocalizationParam, SubscriptionService } from '@abp/ng.core';\r\nimport { ErrorScreenErrorCodes } from '../../models';\r\n\r\n@Component({\r\n  selector: 'abp-http-error-wrapper',\r\n  templateUrl: './http-error-wrapper.component.html',\r\n  styleUrls: ['http-error-wrapper.component.scss'],\r\n  providers: [SubscriptionService],\r\n})\r\nexport class HttpErrorWrapperComponent implements OnInit, AfterViewInit, OnDestroy {\r\n  protected readonly document = inject(DOCUMENT);\r\n  protected readonly window = this.document.defaultView;\r\n\r\n  appRef!: ApplicationRef;\r\n\r\n  cfRes!: ComponentFactoryResolver;\r\n\r\n  injector!: Injector;\r\n\r\n  status: ErrorScreenErrorCodes = 0;\r\n\r\n  title: LocalizationParam = 'Oops!';\r\n\r\n  details: LocalizationParam = 'Sorry, an error has occured.';\r\n\r\n  customComponent: Type<any> | undefined = undefined;\r\n\r\n  destroy$!: Subject<void>;\r\n\r\n  hideCloseIcon = false;\r\n\r\n  backgroundColor!: string;\r\n\r\n  isHomeShow = true;\r\n\r\n  @ViewChild('container', { static: false })\r\n  containerRef?: ElementRef<HTMLDivElement>;\r\n\r\n  get statusText(): string {\r\n    return this.status ? `[${this.status}]` : '';\r\n  }\r\n\r\n  constructor(private subscription: SubscriptionService) {}\r\n\r\n  ngOnInit(): void {\r\n    this.backgroundColor =\r\n      this.window.getComputedStyle(this.document.body)?.getPropertyValue('background-color') || '#fff';\r\n  }\r\n\r\n  ngAfterViewInit(): void {\r\n    if (this.customComponent) {\r\n      const customComponentRef = this.cfRes\r\n        .resolveComponentFactory(this.customComponent)\r\n        .create(this.injector);\r\n      customComponentRef.instance.errorStatus = this.status;\r\n      customComponentRef.instance.destroy$ = this.destroy$;\r\n      this.appRef.attachView(customComponentRef.hostView);\r\n      if (this.containerRef) {\r\n        this.containerRef.nativeElement.appendChild(\r\n          (customComponentRef.hostView as EmbeddedViewRef<any>).rootNodes[0],\r\n        );\r\n      }\r\n      customComponentRef.changeDetectorRef.detectChanges();\r\n    }\r\n\r\n    const keyup$ = fromEvent<KeyboardEvent>(this.document, 'keyup').pipe(\r\n      debounceTime(150),\r\n      filter((key: KeyboardEvent) => key && key.key === 'Escape'),\r\n    );\r\n    this.subscription.addOne(keyup$, () => this.destroy());\r\n  }\r\n\r\n  ngOnDestroy(): void {\r\n    this.destroy();\r\n  }\r\n\r\n  destroy(): void {\r\n    this.destroy$.next();\r\n    this.destroy$.complete();\r\n  }\r\n}\r\n","<div\r\n  #container\r\n  id=\"abp-http-error-container\"\r\n  class=\"error\"\r\n  [style.backgroundColor]=\"backgroundColor\"\r\n>\r\n  <button\r\n    *ngIf=\"!hideCloseIcon\"\r\n    id=\"abp-close-button\"\r\n    type=\"button\"\r\n    class=\"btn-close me-2\"\r\n    (click)=\"destroy()\"\r\n  ></button>\r\n\r\n  <div *ngIf=\"!customComponent\" class=\"row centered\">\r\n    <div class=\"col-md-12\">\r\n      <div class=\"error-template\">\r\n        <h1>{{ statusText }} {{ title | abpLocalization }}</h1>\r\n        <div class=\"error-details\">\r\n          {{ details | abpLocalization }}\r\n        </div>\r\n        <div class=\"error-actions\">\r\n          <a\r\n            *ngIf=\"isHomeShow\"\r\n            (click)=\"destroy()\"\r\n            routerLink=\"/\"\r\n            class=\"btn btn-primary btn-md mt-2\"\r\n            ><span class=\"glyphicon glyphicon-home\"></span>\r\n            {{ { key: '::Menu:Home', defaultValue: 'Home' } | abpLocalization }}\r\n          </a>\r\n        </div>\r\n      </div>\r\n    </div>\r\n  </div>\r\n</div>\r\n"]}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { HttpErrorReporterService } from '@abp/ng.core';
|
|
2
1
|
import { inject, Injectable, Injector } from '@angular/core';
|
|
3
2
|
import { Observable, of, throwError } from 'rxjs';
|
|
4
3
|
import { catchError, filter, switchMap } from 'rxjs/operators';
|
|
5
|
-
import {
|
|
4
|
+
import { HttpErrorReporterService } from '@abp/ng.core';
|
|
6
5
|
import { CUSTOM_ERROR_HANDLERS, HTTP_ERROR_HANDLER } from '../tokens/http-error.token';
|
|
6
|
+
import { HTTP_ERROR_CONFIG } from '../tokens/http-error.token';
|
|
7
7
|
import { DEFAULT_ERROR_LOCALIZATIONS, DEFAULT_ERROR_MESSAGES } from '../constants/default-errors';
|
|
8
|
+
import { ConfirmationService } from '../services/confirmation.service';
|
|
8
9
|
import { RouterErrorHandlerService } from '../services/router-error-handler.service';
|
|
9
|
-
import { HTTP_ERROR_CONFIG } from '../tokens/http-error.token';
|
|
10
10
|
import * as i0 from "@angular/core";
|
|
11
11
|
class ErrorHandler {
|
|
12
12
|
constructor(injector) {
|
|
@@ -21,8 +21,7 @@ class ErrorHandler {
|
|
|
21
21
|
this.executeErrorHandler = (error) => {
|
|
22
22
|
const errHandler = this.httpErrorHandler(this.injector, error);
|
|
23
23
|
const isObservable = errHandler instanceof Observable;
|
|
24
|
-
|
|
25
|
-
return response.pipe(catchError(err => {
|
|
24
|
+
return (isObservable ? errHandler : of(null)).pipe(catchError(err => {
|
|
26
25
|
this.handleError(err);
|
|
27
26
|
return of(null);
|
|
28
27
|
}));
|
|
@@ -30,10 +29,10 @@ class ErrorHandler {
|
|
|
30
29
|
this.filterRestErrors = ({ status }) => {
|
|
31
30
|
if (typeof status !== 'number')
|
|
32
31
|
return false;
|
|
33
|
-
if (!this.httpErrorConfig.skipHandledErrorCodes) {
|
|
32
|
+
if (!this.httpErrorConfig || !this.httpErrorConfig.skipHandledErrorCodes) {
|
|
34
33
|
return true;
|
|
35
34
|
}
|
|
36
|
-
return this.httpErrorConfig.skipHandledErrorCodes
|
|
35
|
+
return this.httpErrorConfig.skipHandledErrorCodes?.findIndex(code => code === status) < 0;
|
|
37
36
|
};
|
|
38
37
|
this.listenToRestError();
|
|
39
38
|
this.listenToRouterError();
|
|
@@ -44,9 +43,7 @@ class ErrorHandler {
|
|
|
44
43
|
listenToRestError() {
|
|
45
44
|
this.httpErrorReporter.reporter$
|
|
46
45
|
.pipe(filter(this.filterRestErrors), switchMap(this.executeErrorHandler))
|
|
47
|
-
.subscribe(err =>
|
|
48
|
-
this.handleError(err);
|
|
49
|
-
});
|
|
46
|
+
.subscribe(err => this.handleError(err));
|
|
50
47
|
}
|
|
51
48
|
sortHttpErrorHandlers(a, b) {
|
|
52
49
|
return (b.priority || 0) - (a.priority || 0);
|
|
@@ -85,4 +82,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.6", ngImpor
|
|
|
85
82
|
type: Injectable,
|
|
86
83
|
args: [{ providedIn: 'root' }]
|
|
87
84
|
}], ctorParameters: function () { return [{ type: i0.Injector }]; } });
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"error.handler.js","sourceRoot":"","sources":["../../../../../../packages/theme-shared/src/lib/handlers/error.handler.ts"],"names":[],"mappings":"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","sourcesContent":["import { inject, Injectable, Injector } from '@angular/core';\r\nimport { HttpErrorResponse } from '@angular/common/http';\r\nimport { Observable, of, throwError } from 'rxjs';\r\nimport { catchError, filter, switchMap } from 'rxjs/operators';\r\n\r\nimport { HttpErrorReporterService } from '@abp/ng.core';\r\n\r\nimport { CustomHttpErrorHandlerService } from '../models/common';\r\nimport { Confirmation } from '../models/confirmation';\r\n\r\nimport { CUSTOM_ERROR_HANDLERS, HTTP_ERROR_HANDLER } from '../tokens/http-error.token';\r\nimport { HTTP_ERROR_CONFIG } from '../tokens/http-error.token';\r\nimport { DEFAULT_ERROR_LOCALIZATIONS, DEFAULT_ERROR_MESSAGES } from '../constants/default-errors';\r\n\r\nimport { ConfirmationService } from '../services/confirmation.service';\r\nimport { RouterErrorHandlerService } from '../services/router-error-handler.service';\r\n\r\n@Injectable({ providedIn: 'root' })\r\nexport class ErrorHandler {\r\n  protected readonly httpErrorReporter = inject(HttpErrorReporterService);\r\n  protected readonly confirmationService = inject(ConfirmationService);\r\n  protected readonly routerErrorHandlerService = inject(RouterErrorHandlerService);\r\n  protected readonly httpErrorConfig = inject(HTTP_ERROR_CONFIG);\r\n  protected readonly customErrorHandlers = inject(CUSTOM_ERROR_HANDLERS);\r\n  protected readonly defaultHttpErrorHandler = (_, err: HttpErrorResponse) => throwError(() => err);\r\n  protected readonly httpErrorHandler =\r\n    inject(HTTP_ERROR_HANDLER, { optional: true }) || this.defaultHttpErrorHandler;\r\n\r\n  constructor(protected injector: Injector) {\r\n    this.listenToRestError();\r\n    this.listenToRouterError();\r\n  }\r\n\r\n  protected listenToRouterError() {\r\n    this.routerErrorHandlerService.listen();\r\n  }\r\n\r\n  protected listenToRestError() {\r\n    this.httpErrorReporter.reporter$\r\n      .pipe(filter(this.filterRestErrors), switchMap(this.executeErrorHandler))\r\n      .subscribe(err => this.handleError(err));\r\n  }\r\n\r\n  protected executeErrorHandler = (error: HttpErrorResponse) => {\r\n    const errHandler = this.httpErrorHandler(this.injector, error);\r\n    const isObservable = errHandler instanceof Observable;\r\n\r\n    return (isObservable ? errHandler : of(null)).pipe(\r\n      catchError(err => {\r\n        this.handleError(err);\r\n        return of(null);\r\n      }),\r\n    );\r\n  };\r\n\r\n  protected sortHttpErrorHandlers(\r\n    a: CustomHttpErrorHandlerService,\r\n    b: CustomHttpErrorHandlerService,\r\n  ) {\r\n    return (b.priority || 0) - (a.priority || 0);\r\n  }\r\n\r\n  protected handleError(err: unknown) {\r\n    if (this.customErrorHandlers && this.customErrorHandlers.length) {\r\n      const canHandleService = this.customErrorHandlers\r\n        .sort(this.sortHttpErrorHandlers)\r\n        .find(service => service.canHandle(err));\r\n\r\n      if (canHandleService) {\r\n        canHandleService.execute();\r\n        return;\r\n      }\r\n    }\r\n\r\n    this.showError().subscribe();\r\n  }\r\n\r\n  protected showError(): Observable<Confirmation.Status> {\r\n    const title = {\r\n      key: DEFAULT_ERROR_LOCALIZATIONS.defaultError.title,\r\n      defaultValue: DEFAULT_ERROR_MESSAGES.defaultError.title,\r\n    };\r\n    const message = {\r\n      key: DEFAULT_ERROR_LOCALIZATIONS.defaultError.details,\r\n      defaultValue: DEFAULT_ERROR_MESSAGES.defaultError.details,\r\n    };\r\n    return this.confirmationService.error(message, title, {\r\n      hideCancelBtn: true,\r\n      yesText: 'AbpAccount::Close',\r\n    });\r\n  }\r\n\r\n  protected filterRestErrors = ({ status }: HttpErrorResponse): boolean => {\r\n    if (typeof status !== 'number') return false;\r\n\r\n    if (!this.httpErrorConfig || !this.httpErrorConfig.skipHandledErrorCodes) {\r\n      return true;\r\n    }\r\n\r\n    return this.httpErrorConfig.skipHandledErrorCodes?.findIndex(code => code === status) < 0;\r\n  };\r\n}\r\n"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvdGhlbWUtc2hhcmVkL3NyYy9saWIvbW9kZWxzL2NvbW1vbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cEVycm9yUmVzcG9uc2UgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XHJcbmltcG9ydCB7IFR5cGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgVmFsaWRhdGlvbiB9IGZyb20gJ0BuZ3gtdmFsaWRhdGUvY29yZSc7XHJcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcclxuaW1wb3J0IHsgQ29uZmlybWF0aW9uSWNvbnMgfSBmcm9tICcuLi90b2tlbnMvY29uZmlybWF0aW9uLWljb25zLnRva2VuJztcclxuXHJcbmV4cG9ydCBpbnRlcmZhY2UgUm9vdFBhcmFtcyB7XHJcbiAgaHR0cEVycm9yQ29uZmlnPzogSHR0cEVycm9yQ29uZmlnO1xyXG4gIHZhbGlkYXRpb24/OiBQYXJ0aWFsPFZhbGlkYXRpb24uQ29uZmlnPjtcclxuICBjb25maXJtYXRpb25JY29ucz86IFBhcnRpYWw8Q29uZmlybWF0aW9uSWNvbnM+O1xyXG59XHJcblxyXG5leHBvcnQgdHlwZSBFcnJvclNjcmVlbkVycm9yQ29kZXMgPSAwIHwgNDAxIHwgNDAzIHwgNDA0IHwgNTAwO1xyXG5cclxuZXhwb3J0IGludGVyZmFjZSBIdHRwRXJyb3JDb25maWcge1xyXG4gIHNraXBIYW5kbGVkRXJyb3JDb2Rlcz86IEVycm9yU2NyZWVuRXJyb3JDb2Rlc1tdIHwgbnVtYmVyW107XHJcbiAgZXJyb3JTY3JlZW4/OiB7XHJcbiAgICBjb21wb25lbnQ6IFR5cGU8YW55PjtcclxuICAgIGZvcldoaWNoRXJyb3JzPzogRXJyb3JTY3JlZW5FcnJvckNvZGVzW107XHJcbiAgICBoaWRlQ2xvc2VJY29uPzogYm9vbGVhbjtcclxuICB9O1xyXG59XHJcbmV4cG9ydCB0eXBlIEh0dHBFcnJvckhhbmRsZXI8VCA9IGFueT4gPSAoaHR0cEVycm9yOiBIdHRwRXJyb3JSZXNwb25zZSkgPT4gT2JzZXJ2YWJsZTxUPjtcclxuZXhwb3J0IHR5cGUgTG9jYWxlRGlyZWN0aW9uID0gJ2x0cicgfCAncnRsJztcclxuXHJcbmV4cG9ydCBpbnRlcmZhY2UgQ3VzdG9tSHR0cEVycm9ySGFuZGxlclNlcnZpY2Uge1xyXG4gIHJlYWRvbmx5IHByaW9yaXR5OiBudW1iZXI7XHJcbiAgY2FuSGFuZGxlKGVycm9yOiB1bmtub3duKTogYm9vbGVhbjtcclxuICBleGVjdXRlKCk6IHZvaWQ7XHJcbn1cclxuIl19
|
|
@@ -1,21 +1,15 @@
|
|
|
1
1
|
import { ApplicationRef, ComponentFactoryResolver, inject, Injectable, Injector, RendererFactory2, } from '@angular/core';
|
|
2
|
-
import {
|
|
2
|
+
import { DOCUMENT } from '@angular/common';
|
|
3
3
|
import { ResolveEnd } from '@angular/router';
|
|
4
|
+
import { Subject } from 'rxjs';
|
|
4
5
|
import { filter } from 'rxjs/operators';
|
|
5
6
|
import { RouterEvents } from '@abp/ng.core';
|
|
6
7
|
import { HTTP_ERROR_CONFIG } from '../tokens/http-error.token';
|
|
7
8
|
import { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http-error-wrapper.component';
|
|
8
9
|
import * as i0 from "@angular/core";
|
|
9
10
|
class CreateErrorComponentService {
|
|
10
|
-
getErrorHostElement() {
|
|
11
|
-
return document.body;
|
|
12
|
-
}
|
|
13
|
-
canCreateCustomError(status) {
|
|
14
|
-
return !!(this.httpErrorConfig?.errorScreen?.component &&
|
|
15
|
-
this.httpErrorConfig?.errorScreen?.forWhichErrors &&
|
|
16
|
-
this.httpErrorConfig?.errorScreen?.forWhichErrors.indexOf(status) > -1);
|
|
17
|
-
}
|
|
18
11
|
constructor() {
|
|
12
|
+
this.document = inject(DOCUMENT);
|
|
19
13
|
this.rendererFactory = inject(RendererFactory2);
|
|
20
14
|
this.cfRes = inject(ComponentFactoryResolver);
|
|
21
15
|
this.routerEvents = inject(RouterEvents);
|
|
@@ -33,8 +27,18 @@ class CreateErrorComponentService {
|
|
|
33
27
|
this.componentRef = null;
|
|
34
28
|
});
|
|
35
29
|
}
|
|
30
|
+
getErrorHostElement() {
|
|
31
|
+
return this.document.body;
|
|
32
|
+
}
|
|
36
33
|
isCloseIconHidden() {
|
|
37
|
-
return !!this.httpErrorConfig
|
|
34
|
+
return !!this.httpErrorConfig?.errorScreen?.hideCloseIcon;
|
|
35
|
+
}
|
|
36
|
+
canCreateCustomError(status) {
|
|
37
|
+
const { component, forWhichErrors } = this.httpErrorConfig?.errorScreen || {};
|
|
38
|
+
if (!component || !forWhichErrors) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
return forWhichErrors.indexOf(status) > -1;
|
|
38
42
|
}
|
|
39
43
|
execute(instance) {
|
|
40
44
|
const renderer = this.rendererFactory.createRenderer(null, null);
|
|
@@ -74,4 +78,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.6", ngImpor
|
|
|
74
78
|
type: Injectable,
|
|
75
79
|
args: [{ providedIn: 'root' }]
|
|
76
80
|
}], ctorParameters: function () { return []; } });
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-error-component.service.js","sourceRoot":"","sources":["../../../../../../packages/theme-shared/src/lib/services/create-error-component.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n  ApplicationRef,\r\n  ComponentFactoryResolver,\r\n  ComponentRef,\r\n  EmbeddedViewRef,\r\n  inject,\r\n  Injectable,\r\n  Injector,\r\n  RendererFactory2,\r\n} from '@angular/core';\r\nimport { DOCUMENT } from '@angular/common';\r\nimport { ResolveEnd } from '@angular/router';\r\nimport { Subject } from 'rxjs';\r\nimport { filter } from 'rxjs/operators';\r\nimport { RouterEvents } from '@abp/ng.core';\r\nimport { HTTP_ERROR_CONFIG } from '../tokens/http-error.token';\r\nimport { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http-error-wrapper.component';\r\nimport { ErrorScreenErrorCodes } from '../models/common';\r\n\r\n@Injectable({ providedIn: 'root' })\r\nexport class CreateErrorComponentService {\r\n  protected readonly document = inject(DOCUMENT);\r\n  protected readonly rendererFactory = inject(RendererFactory2);\r\n  protected readonly cfRes = inject(ComponentFactoryResolver);\r\n  protected readonly routerEvents = inject(RouterEvents);\r\n  protected readonly injector = inject(Injector);\r\n  protected readonly httpErrorConfig = inject(HTTP_ERROR_CONFIG);\r\n\r\n  componentRef: ComponentRef<HttpErrorWrapperComponent> | null = null;\r\n\r\n  constructor() {\r\n    this.listenToRouterDataResolved();\r\n  }\r\n\r\n  protected listenToRouterDataResolved(): void {\r\n    this.routerEvents\r\n      .getEvents(ResolveEnd)\r\n      .pipe(filter(() => !!this.componentRef))\r\n      .subscribe(() => {\r\n        this.componentRef?.destroy();\r\n        this.componentRef = null;\r\n      });\r\n  }\r\n\r\n  protected getErrorHostElement(): HTMLElement {\r\n    return this.document.body;\r\n  }\r\n\r\n  protected isCloseIconHidden(): boolean {\r\n    return !!this.httpErrorConfig?.errorScreen?.hideCloseIcon;\r\n  }\r\n\r\n  canCreateCustomError(status: ErrorScreenErrorCodes) {\r\n    const { component, forWhichErrors } = this.httpErrorConfig?.errorScreen || {};\r\n\r\n    if (!component || !forWhichErrors) {\r\n      return false;\r\n    }\r\n\r\n    return forWhichErrors.indexOf(status) > -1;\r\n  }\r\n\r\n  execute(instance: Partial<HttpErrorWrapperComponent>): void {\r\n    const renderer = this.rendererFactory.createRenderer(null, null);\r\n    const hostElement = this.getErrorHostElement();\r\n    const host = renderer.selectRootElement(hostElement, true);\r\n\r\n    this.componentRef = this.cfRes\r\n      .resolveComponentFactory(HttpErrorWrapperComponent)\r\n      .create(this.injector);\r\n\r\n    for (const key in instance) {\r\n      /* istanbul ignore else */\r\n      if (Object.prototype.hasOwnProperty.call(this.componentRef.instance, key)) {\r\n        (this.componentRef.instance as any)[key] = (instance as any)[key];\r\n      }\r\n    }\r\n\r\n    this.componentRef.instance.hideCloseIcon = this.isCloseIconHidden();\r\n    const appRef = this.injector.get(ApplicationRef);\r\n\r\n    if (this.canCreateCustomError(instance.status as ErrorScreenErrorCodes)) {\r\n      this.componentRef.instance.cfRes = this.cfRes;\r\n      this.componentRef.instance.appRef = appRef;\r\n      this.componentRef.instance.injector = this.injector;\r\n      this.componentRef.instance.customComponent = this.httpErrorConfig.errorScreen?.component;\r\n    }\r\n\r\n    appRef.attachView(this.componentRef.hostView);\r\n    renderer.appendChild(host, (this.componentRef.hostView as EmbeddedViewRef<any>).rootNodes[0]);\r\n\r\n    const destroy$ = new Subject<void>();\r\n    this.componentRef.instance.destroy$ = destroy$;\r\n    destroy$.subscribe(() => {\r\n      this.componentRef?.destroy();\r\n      this.componentRef = null;\r\n    });\r\n  }\r\n}\r\n"]}
|
|
@@ -11,7 +11,7 @@ class RouterErrorHandlerService {
|
|
|
11
11
|
this.httpErrorConfig = inject(HTTP_ERROR_CONFIG);
|
|
12
12
|
this.createErrorComponentService = inject(CreateErrorComponentService);
|
|
13
13
|
this.filterRouteErrors = (navigationError) => {
|
|
14
|
-
if (!this.httpErrorConfig
|
|
14
|
+
if (!this.httpErrorConfig?.skipHandledErrorCodes) {
|
|
15
15
|
return true;
|
|
16
16
|
}
|
|
17
17
|
return (navigationError.error?.message?.indexOf('Cannot match') > -1 &&
|
|
@@ -42,4 +42,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.6", ngImpor
|
|
|
42
42
|
type: Injectable,
|
|
43
43
|
args: [{ providedIn: 'root' }]
|
|
44
44
|
}] });
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLWVycm9yLWhhbmRsZXIuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3RoZW1lLXNoYXJlZC9zcmMvbGliL3NlcnZpY2VzL3JvdXRlci1lcnJvci1oYW5kbGVyLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDNUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQy9DLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUMxRCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQzs7QUFHbEcsTUFDYSx5QkFBeUI7SUFEdEM7UUFFcUIsaUJBQVksR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDcEMsb0JBQWUsR0FBRyxNQUFNLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUM1QyxnQ0FBMkIsR0FBRyxNQUFNLENBQUMsMkJBQTJCLENBQUMsQ0FBQztRQUUzRSxzQkFBaUIsR0FBRyxDQUFDLGVBQWdDLEVBQVcsRUFBRTtZQUMxRSxJQUFJLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxxQkFBcUIsRUFBRTtnQkFDaEQsT0FBTyxJQUFJLENBQUM7YUFDYjtZQUVELE9BQU8sQ0FDTCxlQUFlLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUM1RCxJQUFJLENBQUMsZUFBZSxDQUFDLHFCQUFxQixDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQy9FLENBQUM7UUFDSixDQUFDLENBQUM7S0FvQkg7SUFsQkMsTUFBTTtRQUNKLElBQUksQ0FBQyxZQUFZO2FBQ2QsbUJBQW1CLENBQUMsT0FBTyxDQUFDO2FBQzVCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7YUFDcEMsU0FBUyxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxXQUFXO1FBQ1QsTUFBTSxRQUFRLEdBQUc7WUFDZixLQUFLLEVBQUU7Z0JBQ0wsR0FBRyxFQUFFLDJCQUEyQixDQUFDLGVBQWUsQ0FBQyxLQUFLO2dCQUN0RCxZQUFZLEVBQUUsc0JBQXNCLENBQUMsZUFBZSxDQUFDLEtBQUs7YUFDM0Q7WUFDRCxNQUFNLEVBQXlCLEdBQUc7U0FDbkMsQ0FBQztRQUVGLElBQUksQ0FBQywyQkFBMkIsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDckQsQ0FBQzs4R0FqQ1UseUJBQXlCO2tIQUF6Qix5QkFBeUIsY0FEWixNQUFNOztTQUNuQix5QkFBeUI7MkZBQXpCLHlCQUF5QjtrQkFEckMsVUFBVTttQkFBQyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBpbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgTmF2aWdhdGlvbkVycm9yIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuaW1wb3J0IHsgZmlsdGVyIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xyXG5pbXBvcnQgeyBSb3V0ZXJFdmVudHMgfSBmcm9tICdAYWJwL25nLmNvcmUnO1xyXG5pbXBvcnQgeyBIVFRQX0VSUk9SX0NPTkZJRyB9IGZyb20gJy4uL3Rva2Vucy8nO1xyXG5pbXBvcnQgeyBDcmVhdGVFcnJvckNvbXBvbmVudFNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcyc7XHJcbmltcG9ydCB7IERFRkFVTFRfRVJST1JfTE9DQUxJWkFUSU9OUywgREVGQVVMVF9FUlJPUl9NRVNTQUdFUyB9IGZyb20gJy4uL2NvbnN0YW50cy9kZWZhdWx0LWVycm9ycyc7XHJcbmltcG9ydCB7IEVycm9yU2NyZWVuRXJyb3JDb2RlcyB9IGZyb20gJy4uL21vZGVscyc7XHJcblxyXG5ASW5qZWN0YWJsZSh7IHByb3ZpZGVkSW46ICdyb290JyB9KVxyXG5leHBvcnQgY2xhc3MgUm91dGVyRXJyb3JIYW5kbGVyU2VydmljZSB7XHJcbiAgcHJvdGVjdGVkIHJlYWRvbmx5IHJvdXRlckV2ZW50cyA9IGluamVjdChSb3V0ZXJFdmVudHMpO1xyXG4gIHByb3RlY3RlZCByZWFkb25seSBodHRwRXJyb3JDb25maWcgPSBpbmplY3QoSFRUUF9FUlJPUl9DT05GSUcpO1xyXG4gIHByb3RlY3RlZCByZWFkb25seSBjcmVhdGVFcnJvckNvbXBvbmVudFNlcnZpY2UgPSBpbmplY3QoQ3JlYXRlRXJyb3JDb21wb25lbnRTZXJ2aWNlKTtcclxuXHJcbiAgcHJvdGVjdGVkIGZpbHRlclJvdXRlRXJyb3JzID0gKG5hdmlnYXRpb25FcnJvcjogTmF2aWdhdGlvbkVycm9yKTogYm9vbGVhbiA9PiB7XHJcbiAgICBpZiAoIXRoaXMuaHR0cEVycm9yQ29uZmlnPy5za2lwSGFuZGxlZEVycm9yQ29kZXMpIHtcclxuICAgICAgcmV0dXJuIHRydWU7XHJcbiAgICB9XHJcblxyXG4gICAgcmV0dXJuIChcclxuICAgICAgbmF2aWdhdGlvbkVycm9yLmVycm9yPy5tZXNzYWdlPy5pbmRleE9mKCdDYW5ub3QgbWF0Y2gnKSA+IC0xICYmXHJcbiAgICAgIHRoaXMuaHR0cEVycm9yQ29uZmlnLnNraXBIYW5kbGVkRXJyb3JDb2Rlcy5maW5kSW5kZXgoY29kZSA9PiBjb2RlID09PSA0MDQpIDwgMFxyXG4gICAgKTtcclxuICB9O1xyXG5cclxuICBsaXN0ZW4oKSB7XHJcbiAgICB0aGlzLnJvdXRlckV2ZW50c1xyXG4gICAgICAuZ2V0TmF2aWdhdGlvbkV2ZW50cygnRXJyb3InKVxyXG4gICAgICAucGlwZShmaWx0ZXIodGhpcy5maWx0ZXJSb3V0ZUVycm9ycykpXHJcbiAgICAgIC5zdWJzY3JpYmUoKCkgPT4gdGhpcy5zaG93NDA0UGFnZSgpKTtcclxuICB9XHJcblxyXG4gIHNob3c0MDRQYWdlKCkge1xyXG4gICAgY29uc3QgaW5zdGFuY2UgPSB7XHJcbiAgICAgIHRpdGxlOiB7XHJcbiAgICAgICAga2V5OiBERUZBVUxUX0VSUk9SX0xPQ0FMSVpBVElPTlMuZGVmYXVsdEVycm9yNDA0LnRpdGxlLFxyXG4gICAgICAgIGRlZmF1bHRWYWx1ZTogREVGQVVMVF9FUlJPUl9NRVNTQUdFUy5kZWZhdWx0RXJyb3I0MDQudGl0bGUsXHJcbiAgICAgIH0sXHJcbiAgICAgIHN0YXR1czogPEVycm9yU2NyZWVuRXJyb3JDb2Rlcz40MDQsXHJcbiAgICB9O1xyXG5cclxuICAgIHRoaXMuY3JlYXRlRXJyb3JDb21wb25lbnRTZXJ2aWNlLmV4ZWN1dGUoaW5zdGFuY2UpO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -9,11 +9,39 @@ class StatusCodeErrorHandlerService {
|
|
|
9
9
|
this.confirmationService = inject(ConfirmationService);
|
|
10
10
|
this.createErrorComponentService = inject(CreateErrorComponentService);
|
|
11
11
|
this.authService = inject(AuthService);
|
|
12
|
-
this.priority = CUSTOM_HTTP_ERROR_HANDLER_PRIORITY.normal;
|
|
13
12
|
this.handledStatusCodes = [401, 403, 404, 500];
|
|
13
|
+
this.priority = CUSTOM_HTTP_ERROR_HANDLER_PRIORITY.normal;
|
|
14
|
+
}
|
|
15
|
+
navigateToLogin() {
|
|
16
|
+
this.authService.navigateToLogin();
|
|
17
|
+
}
|
|
18
|
+
showConfirmation(message, title) {
|
|
19
|
+
return this.confirmationService.error(message, title, {
|
|
20
|
+
hideCancelBtn: true,
|
|
21
|
+
yesText: 'AbpAccount::Close',
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
showPage() {
|
|
25
|
+
const key = `defaultError${this.status}`;
|
|
26
|
+
const shouldRemoveDetail = [401, 404].indexOf(this.status) > -1;
|
|
27
|
+
const instance = {
|
|
28
|
+
title: {
|
|
29
|
+
key: DEFAULT_ERROR_LOCALIZATIONS[key]?.title,
|
|
30
|
+
defaultValue: DEFAULT_ERROR_MESSAGES[key]?.title,
|
|
31
|
+
},
|
|
32
|
+
details: {
|
|
33
|
+
key: DEFAULT_ERROR_LOCALIZATIONS[key]?.details,
|
|
34
|
+
defaultValue: DEFAULT_ERROR_MESSAGES[key]?.details,
|
|
35
|
+
},
|
|
36
|
+
status: this.status,
|
|
37
|
+
};
|
|
38
|
+
if (shouldRemoveDetail) {
|
|
39
|
+
delete instance.details;
|
|
40
|
+
}
|
|
41
|
+
this.createErrorComponentService.execute(instance);
|
|
14
42
|
}
|
|
15
43
|
canHandle({ status }) {
|
|
16
|
-
this.status = status;
|
|
44
|
+
this.status = status || 0;
|
|
17
45
|
return this.handledStatusCodes.indexOf(status) > -1;
|
|
18
46
|
}
|
|
19
47
|
execute() {
|
|
@@ -34,11 +62,11 @@ class StatusCodeErrorHandlerService {
|
|
|
34
62
|
this.showPage();
|
|
35
63
|
break;
|
|
36
64
|
}
|
|
37
|
-
this.
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
65
|
+
if (this.status === 401) {
|
|
66
|
+
this.authService.navigateToLogin();
|
|
67
|
+
break;
|
|
68
|
+
}
|
|
69
|
+
this.showConfirmation(title, message).subscribe();
|
|
42
70
|
break;
|
|
43
71
|
case 403:
|
|
44
72
|
case 500:
|
|
@@ -46,34 +74,6 @@ class StatusCodeErrorHandlerService {
|
|
|
46
74
|
break;
|
|
47
75
|
}
|
|
48
76
|
}
|
|
49
|
-
navigateToLogin() {
|
|
50
|
-
this.authService.navigateToLogin();
|
|
51
|
-
}
|
|
52
|
-
showConfirmation(message, title) {
|
|
53
|
-
return this.confirmationService.error(message, title, {
|
|
54
|
-
hideCancelBtn: true,
|
|
55
|
-
yesText: 'AbpAccount::Close',
|
|
56
|
-
});
|
|
57
|
-
}
|
|
58
|
-
showPage() {
|
|
59
|
-
const key = `defaultError${this.status}`;
|
|
60
|
-
const instance = {
|
|
61
|
-
title: {
|
|
62
|
-
key: DEFAULT_ERROR_LOCALIZATIONS[key]?.title,
|
|
63
|
-
defaultValue: DEFAULT_ERROR_MESSAGES[key]?.title,
|
|
64
|
-
},
|
|
65
|
-
details: {
|
|
66
|
-
key: DEFAULT_ERROR_LOCALIZATIONS[key]?.details,
|
|
67
|
-
defaultValue: DEFAULT_ERROR_MESSAGES[key]?.details,
|
|
68
|
-
},
|
|
69
|
-
status: this.status,
|
|
70
|
-
};
|
|
71
|
-
const shouldRemoveDetail = [401, 404].indexOf(this.status) > -1;
|
|
72
|
-
if (shouldRemoveDetail) {
|
|
73
|
-
delete instance.details;
|
|
74
|
-
}
|
|
75
|
-
this.createErrorComponentService.execute(instance);
|
|
76
|
-
}
|
|
77
77
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.6", ngImport: i0, type: StatusCodeErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
78
78
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.6", ngImport: i0, type: StatusCodeErrorHandlerService, providedIn: 'root' }); }
|
|
79
79
|
}
|
|
@@ -82,4 +82,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.6", ngImpor
|
|
|
82
82
|
type: Injectable,
|
|
83
83
|
args: [{ providedIn: 'root' }]
|
|
84
84
|
}] });
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHVzLWNvZGUtZXJyb3ItaGFuZGxlci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvdGhlbWUtc2hhcmVkL3NyYy9saWIvc2VydmljZXMvc3RhdHVzLWNvZGUtZXJyb3ItaGFuZGxlci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFDTCxrQ0FBa0MsRUFDbEMsMkJBQTJCLEVBQzNCLHNCQUFzQixHQUN2QixNQUFNLDZCQUE2QixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxXQUFXLEVBQXFCLE1BQU0sY0FBYyxDQUFDO0FBRTlELE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzdELE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDOztBQUUvRSxNQUNhLDZCQUE2QjtJQUQxQztRQUVxQix3QkFBbUIsR0FBRyxNQUFNLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUNsRCxnQ0FBMkIsR0FBRyxNQUFNLENBQUMsMkJBQTJCLENBQUMsQ0FBQztRQUNsRSxnQkFBVyxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUVsQyx1QkFBa0IsR0FBRyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBVSxDQUFDO1FBRzdELGFBQVEsR0FBRyxrQ0FBa0MsQ0FBQyxNQUFNLENBQUM7S0E4RS9EO0lBNUVXLGVBQWU7UUFDdkIsSUFBSSxDQUFDLFdBQVcsQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0lBRVMsZ0JBQWdCLENBQ3hCLE9BQTBCLEVBQzFCLEtBQXdCO1FBRXhCLE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsS0FBSyxFQUFFO1lBQ3BELGFBQWEsRUFBRSxJQUFJO1lBQ25CLE9BQU8sRUFBRSxtQkFBbUI7U0FDN0IsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVTLFFBQVE7UUFDaEIsTUFBTSxHQUFHLEdBQUcsZUFBZSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDekMsTUFBTSxrQkFBa0IsR0FBRyxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ2hFLE1BQU0sUUFBUSxHQUFHO1lBQ2YsS0FBSyxFQUFFO2dCQUNMLEdBQUcsRUFBRSwyQkFBMkIsQ0FBQyxHQUFHLENBQUMsRUFBRSxLQUFLO2dCQUM1QyxZQUFZLEVBQUUsc0JBQXNCLENBQUMsR0FBRyxDQUFDLEVBQUUsS0FBSzthQUNqRDtZQUNELE9BQU8sRUFBRTtnQkFDUCxHQUFHLEVBQUUsMkJBQTJCLENBQUMsR0FBRyxDQUFDLEVBQUUsT0FBTztnQkFDOUMsWUFBWSxFQUFFLHNCQUFzQixDQUFDLEdBQUcsQ0FBQyxFQUFFLE9BQU87YUFDbkQ7WUFDRCxNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07U0FDcEIsQ0FBQztRQUVGLElBQUksa0JBQWtCLEVBQUU7WUFDdEIsT0FBTyxRQUFRLENBQUMsT0FBTyxDQUFDO1NBQ3pCO1FBRUQsSUFBSSxDQUFDLDJCQUEyQixDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBRUQsU0FBUyxDQUFDLEVBQUUsTUFBTSxFQUFFO1FBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsQ0FBQztRQUMxQixPQUFPLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVELE9BQU87UUFDTCxNQUFNLEdBQUcsR0FBRyxlQUFlLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUN6QyxNQUFNLEtBQUssR0FBRztZQUNaLEdBQUcsRUFBRSwyQkFBMkIsQ0FBQyxHQUFHLENBQUMsRUFBRSxLQUFLO1lBQzVDLFlBQVksRUFBRSxzQkFBc0IsQ0FBQyxHQUFHLENBQUMsRUFBRSxLQUFLO1NBQ2pELENBQUM7UUFDRixNQUFNLE9BQU8sR0FBRztZQUNkLEdBQUcsRUFBRSwyQkFBMkIsQ0FBQyxHQUFHLENBQUMsRUFBRSxPQUFPO1lBQzlDLFlBQVksRUFBRSxzQkFBc0IsQ0FBQyxHQUFHLENBQUMsRUFBRSxPQUFPO1NBQ25ELENBQUM7UUFFRixNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQywyQkFBMkIsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFaEcsUUFBUSxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ25CLEtBQUssR0FBRyxDQUFDO1lBQ1QsS0FBSyxHQUFHO2dCQUNOLElBQUksb0JBQW9CLEVBQUU7b0JBQ3hCLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztvQkFDaEIsTUFBTTtpQkFDUDtnQkFFRCxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssR0FBRyxFQUFFO29CQUN2QixJQUFJLENBQUMsV0FBVyxDQUFDLGVBQWUsRUFBRSxDQUFDO29CQUNuQyxNQUFNO2lCQUNQO2dCQUVELElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUM7Z0JBQ2xELE1BQU07WUFFUixLQUFLLEdBQUcsQ0FBQztZQUNULEtBQUssR0FBRztnQkFDTixJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7Z0JBQ2hCLE1BQU07U0FDVDtJQUNILENBQUM7OEdBckZVLDZCQUE2QjtrSEFBN0IsNkJBQTZCLGNBRGhCLE1BQU07O1NBQ25CLDZCQUE2QjsyRkFBN0IsNkJBQTZCO2tCQUR6QyxVQUFVO21CQUFDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbmZpcm1hdGlvbiwgQ3VzdG9tSHR0cEVycm9ySGFuZGxlclNlcnZpY2UgfSBmcm9tICcuLi9tb2RlbHMnO1xyXG5pbXBvcnQge1xyXG4gIENVU1RPTV9IVFRQX0VSUk9SX0hBTkRMRVJfUFJJT1JJVFksXHJcbiAgREVGQVVMVF9FUlJPUl9MT0NBTElaQVRJT05TLFxyXG4gIERFRkFVTFRfRVJST1JfTUVTU0FHRVMsXHJcbn0gZnJvbSAnLi4vY29uc3RhbnRzL2RlZmF1bHQtZXJyb3JzJztcclxuaW1wb3J0IHsgQXV0aFNlcnZpY2UsIExvY2FsaXphdGlvblBhcmFtIH0gZnJvbSAnQGFicC9uZy5jb3JlJztcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xyXG5pbXBvcnQgeyBpbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgQ29uZmlybWF0aW9uU2VydmljZSB9IGZyb20gJy4vY29uZmlybWF0aW9uLnNlcnZpY2UnO1xyXG5pbXBvcnQgeyBDcmVhdGVFcnJvckNvbXBvbmVudFNlcnZpY2UgfSBmcm9tICcuL2NyZWF0ZS1lcnJvci1jb21wb25lbnQuc2VydmljZSc7XHJcblxyXG5ASW5qZWN0YWJsZSh7IHByb3ZpZGVkSW46ICdyb290JyB9KVxyXG5leHBvcnQgY2xhc3MgU3RhdHVzQ29kZUVycm9ySGFuZGxlclNlcnZpY2UgaW1wbGVtZW50cyBDdXN0b21IdHRwRXJyb3JIYW5kbGVyU2VydmljZSB7XHJcbiAgcHJvdGVjdGVkIHJlYWRvbmx5IGNvbmZpcm1hdGlvblNlcnZpY2UgPSBpbmplY3QoQ29uZmlybWF0aW9uU2VydmljZSk7XHJcbiAgcHJvdGVjdGVkIHJlYWRvbmx5IGNyZWF0ZUVycm9yQ29tcG9uZW50U2VydmljZSA9IGluamVjdChDcmVhdGVFcnJvckNvbXBvbmVudFNlcnZpY2UpO1xyXG4gIHByb3RlY3RlZCByZWFkb25seSBhdXRoU2VydmljZSA9IGluamVjdChBdXRoU2VydmljZSk7XHJcblxyXG4gIHByb3RlY3RlZCByZWFkb25seSBoYW5kbGVkU3RhdHVzQ29kZXMgPSBbNDAxLCA0MDMsIDQwNCwgNTAwXSBhcyBjb25zdDtcclxuICBwcm90ZWN0ZWQgc3RhdHVzOiB0eXBlb2YgdGhpcy5oYW5kbGVkU3RhdHVzQ29kZXNbbnVtYmVyXTtcclxuXHJcbiAgcmVhZG9ubHkgcHJpb3JpdHkgPSBDVVNUT01fSFRUUF9FUlJPUl9IQU5ETEVSX1BSSU9SSVRZLm5vcm1hbDtcclxuXHJcbiAgcHJvdGVjdGVkIG5hdmlnYXRlVG9Mb2dpbigpOiB2b2lkIHtcclxuICAgIHRoaXMuYXV0aFNlcnZpY2UubmF2aWdhdGVUb0xvZ2luKCk7XHJcbiAgfVxyXG5cclxuICBwcm90ZWN0ZWQgc2hvd0NvbmZpcm1hdGlvbihcclxuICAgIG1lc3NhZ2U6IExvY2FsaXphdGlvblBhcmFtLFxyXG4gICAgdGl0bGU6IExvY2FsaXphdGlvblBhcmFtLFxyXG4gICk6IE9ic2VydmFibGU8Q29uZmlybWF0aW9uLlN0YXR1cz4ge1xyXG4gICAgcmV0dXJuIHRoaXMuY29uZmlybWF0aW9uU2VydmljZS5lcnJvcihtZXNzYWdlLCB0aXRsZSwge1xyXG4gICAgICBoaWRlQ2FuY2VsQnRuOiB0cnVlLFxyXG4gICAgICB5ZXNUZXh0OiAnQWJwQWNjb3VudDo6Q2xvc2UnLFxyXG4gICAgfSk7XHJcbiAgfVxyXG5cclxuICBwcm90ZWN0ZWQgc2hvd1BhZ2UoKTogdm9pZCB7XHJcbiAgICBjb25zdCBrZXkgPSBgZGVmYXVsdEVycm9yJHt0aGlzLnN0YXR1c31gO1xyXG4gICAgY29uc3Qgc2hvdWxkUmVtb3ZlRGV0YWlsID0gWzQwMSwgNDA0XS5pbmRleE9mKHRoaXMuc3RhdHVzKSA+IC0xO1xyXG4gICAgY29uc3QgaW5zdGFuY2UgPSB7XHJcbiAgICAgIHRpdGxlOiB7XHJcbiAgICAgICAga2V5OiBERUZBVUxUX0VSUk9SX0xPQ0FMSVpBVElPTlNba2V5XT8udGl0bGUsXHJcbiAgICAgICAgZGVmYXVsdFZhbHVlOiBERUZBVUxUX0VSUk9SX01FU1NBR0VTW2tleV0/LnRpdGxlLFxyXG4gICAgICB9LFxyXG4gICAgICBkZXRhaWxzOiB7XHJcbiAgICAgICAga2V5OiBERUZBVUxUX0VSUk9SX0xPQ0FMSVpBVElPTlNba2V5XT8uZGV0YWlscyxcclxuICAgICAgICBkZWZhdWx0VmFsdWU6IERFRkFVTFRfRVJST1JfTUVTU0FHRVNba2V5XT8uZGV0YWlscyxcclxuICAgICAgfSxcclxuICAgICAgc3RhdHVzOiB0aGlzLnN0YXR1cyxcclxuICAgIH07XHJcblxyXG4gICAgaWYgKHNob3VsZFJlbW92ZURldGFpbCkge1xyXG4gICAgICBkZWxldGUgaW5zdGFuY2UuZGV0YWlscztcclxuICAgIH1cclxuXHJcbiAgICB0aGlzLmNyZWF0ZUVycm9yQ29tcG9uZW50U2VydmljZS5leGVjdXRlKGluc3RhbmNlKTtcclxuICB9XHJcblxyXG4gIGNhbkhhbmRsZSh7IHN0YXR1cyB9KTogYm9vbGVhbiB7XHJcbiAgICB0aGlzLnN0YXR1cyA9IHN0YXR1cyB8fCAwO1xyXG4gICAgcmV0dXJuIHRoaXMuaGFuZGxlZFN0YXR1c0NvZGVzLmluZGV4T2Yoc3RhdHVzKSA+IC0xO1xyXG4gIH1cclxuXHJcbiAgZXhlY3V0ZSgpOiB2b2lkIHtcclxuICAgIGNvbnN0IGtleSA9IGBkZWZhdWx0RXJyb3Ike3RoaXMuc3RhdHVzfWA7XHJcbiAgICBjb25zdCB0aXRsZSA9IHtcclxuICAgICAga2V5OiBERUZBVUxUX0VSUk9SX0xPQ0FMSVpBVElPTlNba2V5XT8udGl0bGUsXHJcbiAgICAgIGRlZmF1bHRWYWx1ZTogREVGQVVMVF9FUlJPUl9NRVNTQUdFU1trZXldPy50aXRsZSxcclxuICAgIH07XHJcbiAgICBjb25zdCBtZXNzYWdlID0ge1xyXG4gICAgICBrZXk6IERFRkFVTFRfRVJST1JfTE9DQUxJWkFUSU9OU1trZXldPy5kZXRhaWxzLFxyXG4gICAgICBkZWZhdWx0VmFsdWU6IERFRkFVTFRfRVJST1JfTUVTU0FHRVNba2V5XT8uZGV0YWlscyxcclxuICAgIH07XHJcblxyXG4gICAgY29uc3QgY2FuQ3JlYXRlQ3VzdG9tRXJyb3IgPSB0aGlzLmNyZWF0ZUVycm9yQ29tcG9uZW50U2VydmljZS5jYW5DcmVhdGVDdXN0b21FcnJvcih0aGlzLnN0YXR1cyk7XHJcblxyXG4gICAgc3dpdGNoICh0aGlzLnN0YXR1cykge1xyXG4gICAgICBjYXNlIDQwMTpcclxuICAgICAgY2FzZSA0MDQ6XHJcbiAgICAgICAgaWYgKGNhbkNyZWF0ZUN1c3RvbUVycm9yKSB7XHJcbiAgICAgICAgICB0aGlzLnNob3dQYWdlKCk7XHJcbiAgICAgICAgICBicmVhaztcclxuICAgICAgICB9XHJcblxyXG4gICAgICAgIGlmICh0aGlzLnN0YXR1cyA9PT0gNDAxKSB7XHJcbiAgICAgICAgICB0aGlzLmF1dGhTZXJ2aWNlLm5hdmlnYXRlVG9Mb2dpbigpO1xyXG4gICAgICAgICAgYnJlYWs7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICB0aGlzLnNob3dDb25maXJtYXRpb24odGl0bGUsIG1lc3NhZ2UpLnN1YnNjcmliZSgpO1xyXG4gICAgICAgIGJyZWFrO1xyXG5cclxuICAgICAgY2FzZSA0MDM6XHJcbiAgICAgIGNhc2UgNTAwOlxyXG4gICAgICAgIHRoaXMuc2hvd1BhZ2UoKTtcclxuICAgICAgICBicmVhaztcclxuICAgIH1cclxuICB9XHJcbn1cclxuIl19
|