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=bd7f276b6e6e5114b60dc2f13bad9df59595d1ab;hb=a3e0f85eff3e8203612c547045e11f8d83639df1;hp=44af50a50a1a6f1f163a22c12cd80d74042a849e;hpb=f34ec0823b56ceaf7a6073be6fc530b0d432b37d;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 44af50a..bd7f276 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
@@ -18,21 +18,26 @@
  * ========================LICENSE_END===================================
  */
 
-import { CollectionViewer, DataSource } from '@angular/cdk/collections';
 import { HttpErrorResponse } from '@angular/common/http';
-import { MatSort } from '@angular/material';
+import { Injectable } from '@angular/core';
+import { MatTableDataSource } from '@angular/material';
+
 import { Observable } from 'rxjs/Observable';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { merge } from 'rxjs';
 import { of } from 'rxjs/observable/of';
-import { catchError, finalize, map, tap } from 'rxjs/operators';
-import { EIProducer } from '../interfaces/ei.jobs';
+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';
 
-export class EIProducerDataSource extends DataSource<EIProducer> {
+@Injectable({
+    providedIn: 'root'
+})
+
+export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
 
-    private producerSubject = new BehaviorSubject<EIProducer[]>([]);
+    producerSubject = new BehaviorSubject<EIProducer[]>([]);
 
     private loadingSubject = new BehaviorSubject<boolean>(false);
 
@@ -42,14 +47,14 @@ export class EIProducerDataSource extends DataSource<EIProducer> {
 
     constructor(
         private eiSvc: EIService,
-        public sort: MatSort,
         private notificationService: NotificationService) {
         super();
     }
 
-    loadTable() {
+    loadProducers(): Observable<EIProducer[]> {
         this.loadingSubject.next(true);
-        this.eiSvc.getEIProducers()
+        let producers: Array<EIProducer> = [];
+        this.eiSvc.getProducerIds()
             .pipe(
                 catchError((her: HttpErrorResponse) => {
                     this.notificationService.error('Failed to get producers: ' + her.error);
@@ -57,51 +62,37 @@ export class EIProducerDataSource extends DataSource<EIProducer> {
                 }),
                 finalize(() => this.loadingSubject.next(false))
             )
-            .subscribe((prods: EIProducer[]) => {
-                console.log("Producers: " + prods);
-                this.rowCount = prods.length;
-                this.producerSubject.next(prods);
+            .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);
     }
 
-    connect(): Observable<EIProducer[]> {
-        const dataMutations = [
-            this.producerSubject.asObservable(),
-            this.sort.sortChange
-        ];
-        return merge(...dataMutations).pipe(map(() => {
-            return this.getSortedData([...this.producerSubject.getValue()]);
-        }));
+    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();
     }
-
-    private getSortedData(data: EIProducer[]) {
-        if (!this.sort || !this.sort.active || this.sort.direction === '') {
-            return data;
-        }
-
-        return data.sort((a, b) => {
-            const isAsc = this.sort.direction === 'asc';
-            switch (this.sort.active) {
-                case 'id': return compare(a.ei_producer_id, b.ei_producer_id, isAsc);
-                case 'type': return compare(a.ei_producer_types[0], b.ei_producer_types[0], isAsc);
-                case 'status': return compare(a.status, b.status, isAsc);
-                default: return 0;
-            }
-        });
-    }
-
-    getProducers(): Observable<EIProducer[]> {
-        return this.eiSvc.getEIProducers()
-        .pipe(tap(console.log));
-    }
-}
-
-function compare(a: string, b: string, isAsc: boolean) {
-    return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
 }