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=78ddd4e0fac25cacb3a8424e03e5d61d7e13d46c;hb=7083fe17ce58e2ef8719b78164f41a459a40f5ef;hp=2b12021cabbf7bb8b587dbcb28276a1b904ff768;hpb=94225563a68aecb49e713eb8508fb278682cec08;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 2b12021..78ddd4e 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
@@ -18,18 +18,15 @@
  * ========================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 { EIProducer } from '../interfaces/ei.types';
 import { EIService } from '../services/ei/ei.service';
-import { NotificationService } from '../services/ui/notification.service';
 
 @Injectable({
     providedIn: 'root'
@@ -37,7 +34,7 @@ import { NotificationService } from '../services/ui/notification.service';
 
 export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
 
-    private producerSubject = new BehaviorSubject<EIProducer[]>([]);
+    producerSubject = new BehaviorSubject<EIProducer[]>([]);
 
     private loadingSubject = new BehaviorSubject<boolean>(false);
 
@@ -46,27 +43,37 @@ export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
     public rowCount = 1; // hide footer during intial load
 
     constructor(
-        private eiSvc: EIService,
-        private notificationService: NotificationService) {
+        private eiSvc: EIService) {
         super();
     }
 
-    loadTable() {
+    loadProducers(): Observable<EIProducer[]> {
         this.loadingSubject.next(true);
-        this.eiSvc.getEIProducers()
-            .pipe(
-                catchError((her: HttpErrorResponse) => {
-                    this.notificationService.error('Failed to get producers: ' + her.error);
-                    return of([]);
-                }),
-                finalize(() => this.loadingSubject.next(false))
-            )
-            .subscribe((prods: EIProducer[]) => {
-                console.log("Producers: " + prods);
-                this.rowCount = prods.length;
-                this.producerSubject.next(prods);
+        let producers: Array<EIProducer> = [];
+        this.eiSvc.getProducerIds()
+            .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;
             });
-            this.connect();
+        return of(producers);
+    }
+
+    private addProducerToSubject(producer: EIProducer) {
+        const currentValue = this.producerSubject.value;
+        const updatedValue = [...currentValue, producer];
+        this.producerSubject.next(updatedValue);
     }
 
     connect(): BehaviorSubject<EIProducer[]> {
@@ -77,9 +84,4 @@ export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
         this.producerSubject.complete();
         this.loadingSubject.complete();
     }
-
-    getProducers(): Observable<EIProducer[]> {
-        return this.eiSvc.getEIProducers()
-        .pipe(tap(console.log));
-    }
 }