X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcontrol%2Fcontrol.datasource.ts;h=41d7ba41c762d795a46cd8866b43351815a68c7e;hb=80f26bbeef6caea8f9946e8a0e1a5e0319dacc38;hp=833a4f0606cdc43db93b20654858955946f3f245;hpb=8cfd065c881e3004ad2596591176d36ae155b701;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/control/control.datasource.ts b/webapp-frontend/src/app/control/control.datasource.ts
index 833a4f06..41d7ba41 100644
--- a/webapp-frontend/src/app/control/control.datasource.ts
+++ b/webapp-frontend/src/app/control/control.datasource.ts
@@ -19,12 +19,14 @@
  */
 
 import { CollectionViewer, DataSource } from '@angular/cdk/collections';
+import { MatSort } from '@angular/material';
+import { merge } from 'rxjs';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { Observable } from 'rxjs/Observable';
-import { catchError, finalize } from 'rxjs/operators';
 import { of } from 'rxjs/observable/of';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { XappMgrService } from '../services/xapp-mgr/xapp-mgr.service';
-import { XMXapp, XappControlRow } from '../interfaces/xapp-mgr.types';
+import { catchError, finalize, map } from 'rxjs/operators';
+import { XappControlRow, XMDeployedApp, XMXappInstance } from '../interfaces/app-mgr.types';
+import { AppMgrService } from '../services/app-mgr/app-mgr.service';
 
 export class ControlDataSource extends DataSource<XappControlRow> {
 
@@ -34,22 +36,37 @@ export class ControlDataSource extends DataSource<XappControlRow> {
 
   public loading$ = this.loadingSubject.asObservable();
 
-  constructor(private xappMgrSvc: XappMgrService) {
+  emptyInstances: XMXappInstance =
+    { ip: null,
+      name: null,
+      port: null,
+      status: null,
+      rxMessages: [],
+      txMessages: [],
+    };
+
+  constructor(private appMgrSvc: AppMgrService, private sort: MatSort) {
     super();
-  };
+  }
 
   loadTable() {
     this.loadingSubject.next(true);
-    this.xappMgrSvc.getAll()
+    this.appMgrSvc.getDeployed()
       .pipe(
         catchError(() => of([])),
         finalize(() => this.loadingSubject.next(false))
       )
-      .subscribe(xApps => this.xAppInstancesSubject.next(this.getInstance(xApps)) )
+      .subscribe(xApps => this.xAppInstancesSubject.next(this.flatten(xApps)));
   }
 
   connect(collectionViewer: CollectionViewer): Observable<XappControlRow[]> {
-    return this.xAppInstancesSubject.asObservable();
+    const dataMutations = [
+      this.xAppInstancesSubject.asObservable(),
+      this.sort.sortChange
+    ];
+    return merge(...dataMutations).pipe(map(() => {
+      return this.getSortedData([...this.xAppInstancesSubject.getValue()]);
+    }));
   }
 
   disconnect(collectionViewer: CollectionViewer): void {
@@ -57,18 +74,47 @@ export class ControlDataSource extends DataSource<XappControlRow> {
     this.loadingSubject.complete();
   }
 
-  getInstance(allxappdata: XMXapp[]) {
-    const xAppInstances: XappControlRow[]= [];
-    for (const xappindex in allxappdata) {
-      const instancelist = allxappdata[xappindex].instances;
-      for (const instanceindex in instancelist) {
-        var instance: XappControlRow = {
-          xapp: allxappdata[xappindex].name,
-          instance: instancelist[instanceindex]
+  private flatten(allxappdata: XMDeployedApp[]) {
+    const xAppInstances: XappControlRow[] = [];
+    for (const xapp of allxappdata) {
+      if (!xapp.instances) {
+        const row: XappControlRow = {
+          xapp: xapp.name,
+          instance: this.emptyInstances
+        };
+        xAppInstances.push(row);
+      } else {
+        for (const ins of xapp.instances) {
+          const row: XappControlRow = {
+            xapp: xapp.name,
+            instance: ins
+          };
+          xAppInstances.push(row);
         }
-        xAppInstances.push(instance);
       }
     }
     return xAppInstances;
   }
+
+  private getSortedData(data: XappControlRow[]) {
+    if (!this.sort.active || this.sort.direction === '') {
+      return data;
+    }
+
+    return data.sort((a, b) => {
+      const isAsc = this.sort.direction === 'asc';
+      switch (this.sort.active) {
+        case 'xapp': return compare(a.xapp, b.xapp, isAsc);
+        case 'name': return compare(a.instance.name, b.instance.name, isAsc);
+        case 'status': return compare(a.instance.status, b.instance.status, isAsc);
+        case 'ip': return compare(a.instance.ip, b.instance.ip, isAsc);
+        case 'port': return compare(a.instance.port, b.instance.port, isAsc);
+        default: return 0;
+      }
+    });
+  }
+}
+
+function compare(a, b, isAsc) {
+  return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
 }