fix(rxjs): add rxjs-compat and use throwError instead of Observable.t…

…hrowError

package.json

@@ -199,6 +199,7 @@
     "rimraf": "2.6.2",
     "run-sequence": "2.2.0",
     "rxjs": "6.0.0",
+    "rxjs-compat": "^6.3.3",
     "script-ext-html-webpack-plugin": "1.8.7",
     "semantic-release": "8.2.0",
     "style-loader": "0.19.0",

src/app/effects/infotip.effects.spec.ts

@@ -3,7 +3,7 @@ import { provideMockActions } from '@ngrx/effects/testing';
 import { cold, hot } from 'jasmine-marbles';
 
 import { Notifications } from 'ngx-base';
-import { Observable, of } from 'rxjs';
+import { Observable, of, throwError } from 'rxjs';
 import { Action } from 'rxjs/scheduler/Action';
 import * as Actions from '../actions/infotip.actions';
 import { InfotipService } from '../services/infotip.service';
@@ -59,7 +59,7 @@ describe('InfotipEffects', () => {
     const action = new Actions.Get();
     const error = new Actions.GetError();
 
-    infotipService.getInfotips.and.returnValue(Observable.throw(new Error()));
+    infotipService.getInfotips.and.returnValue(throwError(new Error()));
 
     actions = hot('--a-', { a: action });
     const expected = cold('--b', { b: error });

src/app/services/area.service.ts

@@ -1,4 +1,4 @@
-import { Observable, of as ObservableOf } from 'rxjs';
+import { Observable, of as ObservableOf, throwError } from 'rxjs';
 import { catchError, first, map } from 'rxjs/operators';
 
 import { Injectable } from '@angular/core';
@@ -57,7 +57,7 @@ export class AreaService {
         return ObservableOf<AreaModel[]>([] as AreaModel[]);
       }
     } else {
-      return Observable.throw('nospace');
+      return throwError('nospace');
     }
   }
 
@@ -116,7 +116,7 @@ export class AreaService {
         }
       }),
       catchError(err => {
-        return Observable.throw(new Error(err.message));
+        return throwError(new Error(err.message));
       })
     );
   }

src/app/services/custom-query.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, throwError } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 import { CustomQueryModel } from '../models/custom-query.model';
 import { HttpClientService } from '../shared/http-module/http.service';
@@ -66,7 +66,7 @@ export class CustomQueryService {
       } else {
         console.log(str, error.message);
       }
-      return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+      return throwError(new Error(error.message));
     }
 
 }

src/app/services/filter.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable, Subject } from 'rxjs';
+import { Observable, Subject, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { FilterModel } from '../models/filter.model';
 import { HttpClientService } from '../shared/http-module/http.service';
@@ -142,7 +142,7 @@ export class FilterService {
         map(response => response.data as FilterModel[]),
         catchError((error: Error | any) => {
           console.log('API returned error: ', error.message);
-          return Observable.throw('Error  - [FilterService - getFilters]' + error.message); // TODO ng6: use throwError from rxjs 6
+          return throwError('Error  - [FilterService - getFilters]' + error.message);
         })
       );
   }

src/app/services/work-item.service.spec.ts

@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { Logger } from 'ngx-base';
 import { Spaces, WIT_API_URL } from 'ngx-fabric8-wit';
 import { UserService } from 'ngx-login-client';
-import { Observable, of } from 'rxjs';
+import { Observable, of, throwError } from 'rxjs';
 
 import { delay } from 'rxjs/operators';
 import {
@@ -134,7 +134,7 @@ describe('Unit Test :: WorkItemService', () => {
     const wiService = TestBed.get(WorkItemService);
     wiService['baseApiUrl'] = 'link/to/spaces/';
     wiService.httpClientService.get.and.returnValue(
-      Observable.throw(new Error('Internal service error')).pipe(delay(100))
+      throwError(new Error('Internal service error')).pipe(delay(100))
     );
     spyOn(wiService, 'notifyError');
     wiService.getWorkItems('', {}).subscribe(
@@ -165,7 +165,7 @@ describe('Unit Test :: WorkItemService', () => {
   it('getMoreWorkItems :: Should call notifyError if error response comes', done => {
     const wiService = TestBed.get(WorkItemService);
     wiService.httpClientService.get.and.returnValue(
-      Observable.throw(new Error('Internal service error')).pipe(delay(100))
+      throwError(new Error('Internal service error')).pipe(delay(100))
     );
     spyOn(wiService, 'notifyError');
     wiService.getMoreWorkItems('some/url').subscribe(
@@ -231,7 +231,7 @@ describe('Unit Test :: WorkItemService', () => {
     const wiService = TestBed.get(WorkItemService);
     wiService['baseApiUrl'] = 'link/to/';
     wiService.httpClientService.get.and.returnValue(
-      Observable.throw(new Error('Internal service error')).pipe(delay(100))
+      throwError(new Error('Internal service error')).pipe(delay(100))
     );
     spyOn(wiService, 'notifyError');
     // We are providing the space name as empty to the function
@@ -269,7 +269,7 @@ describe('Unit Test :: WorkItemService', () => {
     const wiService = TestBed.get(WorkItemService);
     wiService['baseApiUrl'] = 'link/to/';
     wiService.httpBackendClient.get.and.returnValue(
-      Observable.throw(new Error('Internal service error')).pipe(delay(100))
+      throwError(new Error('Internal service error')).pipe(delay(100))
     );
     spyOn(wiService, 'notifyError');
     // We are providing the space name as empty to the function
@@ -344,7 +344,7 @@ describe('Unit Test :: WorkItemService', () => {
   it('getWorkItemTypes :: Should call notifyError on error', done => {
     const wiService = TestBed.get(WorkItemService);
     wiService.httpClientService.get.and.returnValue(
-      Observable.throw(new Error('Internal server error')).pipe(delay(100))
+      throwError(new Error('Internal server error')).pipe(delay(100))
     );
     spyOn(wiService, 'notifyError');
     wiService.getWorkItemTypes('link/to/types').subscribe(

src/app/services/work-item.service.ts

@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@angular/core';
 
-import { Observable, of as ObservableOf } from 'rxjs';
+import { Observable, of as ObservableOf, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
 import { Logger } from 'ngx-base';
@@ -53,7 +53,7 @@ export class WorkItemService {
 
   private handleError(error: Error | any, msg: string) {
     this.notifyError(msg, error);
-    return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+    return throwError(new Error(error.message));
   }
 
   /**
@@ -106,7 +106,7 @@ export class WorkItemService {
         }),
         catchError((error: Error | any) => {
           this.notifyError('Getting work items failed.', error);
-          return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+          return throwError(new Error(error.message));
         })
       );
   }
@@ -138,11 +138,11 @@ export class WorkItemService {
           }),
           catchError((error: Error | any) => {
             this.notifyError('Getting more work items failed.', error);
-            return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+            return throwError(new Error(error.message));
           })
         );
     } else {
-      return Observable.throw('No more item found'); // TODO ng6: use throwError from rxjs 6
+      return throwError('No more item found');
     }
   }
 
@@ -166,7 +166,7 @@ export class WorkItemService {
         map(item => item.data),
         catchError((error: Error | any) => {
           this.notifyError('Getting work item data failed.', error);
-          return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+          return throwError(new Error(error.message));
         })
       );
     } else {
@@ -175,7 +175,7 @@ export class WorkItemService {
           map(i => i.data),
           catchError((error: Error | any) => {
             this.notifyError('Getting work item data failed.', error);
-            return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+            return throwError(new Error(error.message));
           })
         );
     }
@@ -227,7 +227,7 @@ export class WorkItemService {
         map(response => [response.data as Link[], response.included]),
         catchError((error: Error | any) => {
           this.notifyError('Getting linked items data failed.', error);
-          return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+          return throwError(new Error(error.message));
         })
       );
   }
@@ -250,7 +250,7 @@ export class WorkItemService {
         }),
         catchError((error: Error | any) => {
           this.notifyError('Getting work item type information failed.', error);
-          return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+          return throwError(new Error(error.message));
         })
       );
   }
@@ -298,7 +298,7 @@ export class WorkItemService {
         }),
         catchError((error: Error | any) => {
           this.notifyError('Updating work item failed.', error);
-          return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+          return throwError(new Error(error.message));
         })
       );
   }
@@ -318,7 +318,7 @@ export class WorkItemService {
         }),
         catchError((error: Error | any) => {
           this.notifyError('Creating comment failed.', error);
-          return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+          return throwError(new Error(error.message));
         })
       );
   }
@@ -341,7 +341,7 @@ export class WorkItemService {
         }),
         catchError((error: Error | any) => {
           this.notifyError('Updating comment failed.', error);
-          return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+          return throwError(new Error(error.message));
         })
       );
   }
@@ -356,7 +356,7 @@ export class WorkItemService {
       .pipe(
         catchError((error: Error | any) => {
           this.notifyError('Deleting comment failed.', error);
-          return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+          return throwError(new Error(error.message));
         })
       );
   }
@@ -373,7 +373,7 @@ export class WorkItemService {
         map(d => d.data),
         catchError((error: Error | any) => {
           this.notifyError('Getting link meta info failed (forward).', error);
-          return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+          return throwError(new Error(error.message));
         })
       );
   }
@@ -524,7 +524,7 @@ export class WorkItemService {
             }),
             catchError((error: Error | any) => {
               this.notifyError('Getting work item type info failed.', error);
-              return Observable.throw(new Error(error.message)); // TODO ng6: use throwError from rxjs 6
+              return throwError(new Error(error.message));
             })
           );
       }

src/app/shared/http-module/http.service.ts

@@ -1,6 +1,6 @@
 import { HttpBackend, HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Observable, timer } from 'rxjs';
+import { Observable, throwError, timer } from 'rxjs';
 import { flatMap, retryWhen } from 'rxjs/operators';
 
 @Injectable()
@@ -35,9 +35,9 @@ export class HttpClientService {
           console.log('########### Now offline #############', error);
           return timer(++count * 1000); // TODO ng6: use timer from rxjs 6
         } else if (error.status == 500 || error.status == 401) { // Server error :: Try 3 times then throw error
-          return ++count >= 3 ? Observable.throw(error) : timer(1000); // TODO ng6: use throwError, timer from rxjs 6
+          return ++count >= 3 ? throwError(error) : timer(1000);
         } else {
-          return Observable.throw(error); // TODO ng6: use throwError from rxjs 6
+          return throwError(error);
         }
       })
     );