From c052a73f50e7f55212c56192842e8a881561ec47 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 27 Aug 2021 20:49:07 +0300 Subject: [PATCH] one more error service update --- src/lib/error/error.service.ts | 13 ++----------- .../full-page-error/full-page-error.component.html | 4 ++-- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/lib/error/error.service.ts b/src/lib/error/error.service.ts index 7b33179..f23ab9d 100644 --- a/src/lib/error/error.service.ts +++ b/src/lib/error/error.service.ts @@ -2,31 +2,22 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; import { LoadingService } from '../loading'; -import { map } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) export class ErrorService { - readonly hasError$: Observable; + readonly error$: Observable; private readonly _errorEvent$ = new BehaviorSubject(undefined); constructor(private readonly _loadingService: LoadingService) { - this.hasError$ = this._errorEvent$.asObservable().pipe(map(e => !!e)); - } - - private _error?: HttpErrorResponse; - - get error(): HttpErrorResponse | undefined { - return this._error; + this.error$ = this._errorEvent$.asObservable(); } set(error: HttpErrorResponse): void { this._loadingService.stop(); - this._error = error; this._errorEvent$.next(error); } clear(): void { this._errorEvent$.next(undefined); - this._error = undefined; } } diff --git a/src/lib/error/full-page-error/full-page-error.component.html b/src/lib/error/full-page-error/full-page-error.component.html index 23dfe03..b96e2cb 100644 --- a/src/lib/error/full-page-error/full-page-error.component.html +++ b/src/lib/error/full-page-error/full-page-error.component.html @@ -1,9 +1,9 @@ - +
-

{{ errorService.error.message }}

+

{{ error.message }}