From ccb2f009dbb1e9458a30809f22efd70bf3e567fe Mon Sep 17 00:00:00 2001 From: Abhay Chawla Date: Sat, 21 Jul 2018 21:57:10 +0530 Subject: [PATCH] fix(progress-bar): stop loading in case of error (#142) Stop progress bar loading indicator in case of an HTTP Error Response. Fixes #141 --- src/app/core/progress.interceptor.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/core/progress.interceptor.ts b/src/app/core/progress.interceptor.ts index 19fea0c3c..3c5130627 100644 --- a/src/app/core/progress.interceptor.ts +++ b/src/app/core/progress.interceptor.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse} from '@angular/common/http'; import { Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { tap, catchError } from 'rxjs/operators'; import { ProgressBarService } from './progress-bar.service'; @@ -13,13 +13,19 @@ export class ProgressInterceptor implements HttpInterceptor { intercept(request: HttpRequest, next: HttpHandler): Observable> { this.progressBarService.increase(); - return next - .handle(request).pipe( + return next.handle(request) + .pipe( tap(event => { if (event instanceof HttpResponse) { this.progressBarService.decrease(); } }) + ) + .pipe( + catchError(error => { + this.progressBarService.decrease(); + throw error; + }) ); }