X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fei-coordinator%2Fei-producer.datasource.ts;h=cb4809cb82af35a37bfbc8250f43fae4d1c8a181;hb=b3f060ed6175d6dab20e16f51cb96a8ed02a6fc2;hp=bd7f276b6e6e5114b60dc2f13bad9df59595d1ab;hpb=92f286c193d0b5090129614c76601dcf02ca22b5;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
index bd7f276..cb4809c 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
@@ -18,81 +18,67 @@
  * ========================LICENSE_END===================================
  */
 
-import { HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { MatTableDataSource } from '@angular/material';
 
-import { Observable } from 'rxjs/Observable';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { of } from 'rxjs/observable/of';
-import { catchError, finalize, tap } from 'rxjs/operators';
+import { mergeMap, finalize } from 'rxjs/operators';
+import { Observable, forkJoin, of } from 'rxjs';
 
 import { EIProducer } from '../interfaces/ei.types';
 import { EIService } from '../services/ei/ei.service';
-import { NotificationService } from '../services/ui/notification.service';
 
 @Injectable({
     providedIn: 'root'
 })
 
-export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
+export class EIProducerDataSource {
 
-    producerSubject = new BehaviorSubject<EIProducer[]>([]);
+    private producers: Array<EIProducer> = [];
+
+    public eiProducers(): EIProducer[] {
+        return this.producers;
+    }
+
+    public eiProducersSubject(): Observable<EIProducer[]> {
+        return this.producersSubject.asObservable() as Observable<EIProducer[]>;
+    }
 
     private loadingSubject = new BehaviorSubject<boolean>(false);
+    private producersSubject = new BehaviorSubject<EIProducer[]>([]);
 
     public loading$ = this.loadingSubject.asObservable();
 
     public rowCount = 1; // hide footer during intial load
 
     constructor(
-        private eiSvc: EIService,
-        private notificationService: NotificationService) {
-        super();
+        private eiSvc: EIService) {
     }
 
-    loadProducers(): Observable<EIProducer[]> {
+    loadProducers() {
         this.loadingSubject.next(true);
-        let producers: Array<EIProducer> = [];
-        this.eiSvc.getProducerIds()
-            .pipe(
-                catchError((her: HttpErrorResponse) => {
-                    this.notificationService.error('Failed to get producers: ' + her.error);
-                    return of([]);
-                }),
-                finalize(() => this.loadingSubject.next(false))
-            )
-            .subscribe((prodIds: string[]) => {
-                console.log("ProducerIds: " + prodIds);
-                prodIds.forEach(id => {
-                    let eiProducer = <EIProducer>{};
-                    eiProducer.ei_producer_id = id;
-                    this.eiSvc.getProducer(id).subscribe(producer => {
-                        eiProducer.ei_producer_types = producer.supported_ei_types;
-                    });
-                    this.eiSvc.getProducerStatus(id).subscribe(prodStatus => {
-                        eiProducer.status = prodStatus.opState.toString();
-                    });
-                    this.addProducerToSubject(eiProducer);
-                    producers.push(eiProducer);
-                });
-                this.rowCount = this.producerSubject.value.length;
-            });
-        return of(producers);
-    }
+        this.producers = [];
 
-    private addProducerToSubject(producer: EIProducer) {
-        const currentValue = this.producerSubject.value;
-        const updatedValue = [...currentValue, producer];
-        this.producerSubject.next(updatedValue);
-    }
-
-    connect(): BehaviorSubject<EIProducer[]> {
-        return this.producerSubject;
-    }
-
-    disconnect(): void {
-        this.producerSubject.complete();
-        this.loadingSubject.complete();
+        this.eiSvc.getProducerIds().pipe(
+            mergeMap(prodIds =>
+                forkJoin(prodIds.map(id => {
+                    return forkJoin([
+                        of(id),
+                        this.eiSvc.getProducer(id),
+                        this.eiSvc.getProducerStatus(id)
+                    ])
+                })
+                )),
+            finalize(() => this.loadingSubject.next(false))
+        ).subscribe(result => {
+            this.producers = result.map(producer => {
+                let eiProducer = <EIProducer>{};
+                eiProducer.ei_producer_id = producer[0];
+                eiProducer.ei_producer_types = producer[1].supported_ei_types;
+                eiProducer.status = producer[2].operational_state.toString();
+                return eiProducer;
+            });
+            this.producersSubject.next(this.producers);
+        });
+        this.rowCount = this.producers.length;
     }
-}
+}
\ No newline at end of file