merge from ecomp a88f0072 - Modern UI

Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 14 insertions, 13 deletions

diff --git a/vid-webpack-master/src/app/shared/utils/httpInterceptor/httpInterceptor.service.ts b/vid-webpack-master/src/app/shared/utils/httpInterceptor/httpInterceptor.service.ts
index be9ade080..daa31a33f 100644
--- a/vid-webpack-master/src/app/shared/utils/httpInterceptor/httpInterceptor.service.ts
+++ b/vid-webpack-master/src/app/shared/utils/httpInterceptor/httpInterceptor.service.ts
@@ -1,19 +1,19 @@
-import { Injectable } from '@angular/core';
-import {
-  HttpInterceptor,
-  HttpRequest,
-  HttpHandler,
-  HttpEvent, HttpErrorResponse
-} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http';
 
-import { Observable } from 'rxjs/Observable';
-import { ErrorMessage, ErrorService } from '../../components/error/error.component.service';
-import { SpinnerComponent } from '../../components/spinner/spinner.component';
+import {Observable} from 'rxjs';
+import {ErrorMessage, ErrorService} from '../../components/error/error.component.service';
+import {SpinnerComponent, SpinnerInfo} from '../../components/spinner/spinner.component';
+import {of} from "rxjs";
 
 @Injectable()
 export class HttpInterceptorService implements HttpInterceptor {
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    SpinnerComponent.showSpinner.next(true);
+    if (request.headers.get('x-show-spinner') !== false.toString()) {
+      let spinnerInfo : SpinnerInfo = new SpinnerInfo(true, request.url, request.responseType);
+      SpinnerComponent.showSpinner.next(spinnerInfo);
+    }
+
     return next.handle(request)
       .catch((err: HttpErrorResponse) => {
         if (err.status === 500) {
@@ -21,11 +21,12 @@ export class HttpInterceptorService implements HttpInterceptor {
             'It appears that one of the backend servers is not responding.\n Please try later.',
             500);
           ErrorService.showErrorWithMessage(errorMessage);
-          return Observable.of(null);
+          return of(null);
         }
         return Observable.throw(err);
       }).finally(() => {
-        SpinnerComponent.showSpinner.next(false);
+        let spinnerInfo : SpinnerInfo = new SpinnerInfo(false, request.url, request.responseType);
+        SpinnerComponent.showSpinner.next(spinnerInfo);
       });
   }
 }