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=2b12021cabbf7bb8b587dbcb28276a1b904ff768;hb=refs%2Fchanges%2F87%2F5587%2F1;hp=866d785740c6dadaddbb998adf9b1d401c899d19;hpb=f7c54883fabc2ffd90a32197d06b04369357219b;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 866d785..2b12021 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
@@ -18,19 +18,24 @@
  * ========================LICENSE_END===================================
  */
 
-import { 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 } 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[]>([]);
 
@@ -42,7 +47,6 @@ export class EIProducerDataSource extends DataSource<EIProducer> {
 
     constructor(
         private eiSvc: EIService,
-        public sort: MatSort,
         private notificationService: NotificationService) {
         super();
     }
@@ -62,16 +66,11 @@ export class EIProducerDataSource extends DataSource<EIProducer> {
                 this.rowCount = prods.length;
                 this.producerSubject.next(prods);
             });
+            this.connect();
     }
 
-    connect(): Observable<EIProducer[]> {
-        const dataMutations = [
-            this.producerSubject.asObservable(),
-            this.sort.sortChange
-        ];
-        return merge(...dataMutations).pipe(map(() => {
-            return this.getSortedData([...this.producerSubject.getValue()]);
-        }));
+    connect(): BehaviorSubject<EIProducer[]> {
+        return this.producerSubject;
     }
 
     disconnect(): void {
@@ -79,21 +78,8 @@ export class EIProducerDataSource extends DataSource<EIProducer> {
         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 'ei_producer_id': return compare(a.ei_producer_id, b.ei_producer_id, 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);
-}