X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fei-coordinator%2Fei-job.datasource.ts;h=64c948c158eafe3302c68055d01d7a51342d7496;hb=c57eea20731c196a5de55faef024c6c07f7689fe;hp=2e0e0c87a42be20057935237026008362152b7d3;hpb=87ffca501cf3dca8dfb050b56f5c3bf9b742b651;p=portal%2Fnonrtric-controlpanel.git diff --git a/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts b/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts index 2e0e0c8..64c948c 100644 --- a/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts +++ b/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts @@ -18,17 +18,13 @@ * ========================LICENSE_END=================================== */ -import { HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { MatTableDataSource } from '@angular/material'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { of } from 'rxjs/observable/of'; -import { catchError, finalize, map } from 'rxjs/operators'; import { EIJob } from '../interfaces/ei.types'; import { EIService } from '../services/ei/ei.service'; -import { NotificationService } from '../services/ui/notification.service'; @Injectable({ providedIn: 'root' @@ -45,29 +41,21 @@ export class EIJobDataSource extends MatTableDataSource { public rowCount = 1; // hide footer during intial load constructor( - private eiSvc: EIService, - private notificationService: NotificationService) { + private eiSvc: EIService) { super(); } getJobs() { this.loadingSubject.next(true); this.eiSvc.getProducerIds() - .pipe( - catchError((her: HttpErrorResponse) => { - this.notificationService.error('Failed to get EI jobs: ' + her.error); - return of([]); - }), - finalize(() => this.loadingSubject.next(false)) - ) - .subscribe((producerIds: String[]) => { + .subscribe((producerIds: string[]) => { producerIds.forEach(id => { this.getJobsForProducer(id); }); }); } - private getJobsForProducer(id: String) { + private getJobsForProducer(id: string) { console.log('Getting jobs for producer ID: ', id); this.eiSvc.getJobsForProducer(id).subscribe(jobs => { this.addJobsToSubject(jobs);