X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fanr-xapp%2Fanr-xapp.datasource.ts;h=b31ad03ee50e74f2d0d4db023a14fe3f345c7942;hb=a4b2e71472b32a8244da846af20128504f4cbc65;hp=bca766c6545ef6680223911f9282a2212819ba2f;hpb=29ce34b03e4099786f14cd7fc5473305da8750d6;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/anr-xapp/anr-xapp.datasource.ts b/webapp-frontend/src/app/anr-xapp/anr-xapp.datasource.ts
index bca766c6..b31ad03e 100644
--- a/webapp-frontend/src/app/anr-xapp/anr-xapp.datasource.ts
+++ b/webapp-frontend/src/app/anr-xapp/anr-xapp.datasource.ts
@@ -2,14 +2,14 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,44 +18,85 @@
  * ========================LICENSE_END===================================
  */
 
-import { CollectionViewer, DataSource} from '@angular/cdk/collections';
+import { CollectionViewer, DataSource } from '@angular/cdk/collections';
+import { HttpErrorResponse } from '@angular/common/http';
+import { MatSort } from '@angular/material/sort';
 import { Observable } from 'rxjs/Observable';
-import { catchError, finalize } from 'rxjs/operators';
-import { of } from 'rxjs/observable/of';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { of } from 'rxjs/observable/of';
+import { merge } from 'rxjs';
+import { catchError, finalize, map } from 'rxjs/operators';
 import { ANRNeighborCellRelation } from '../interfaces/anr-xapp.types';
 import { ANRXappService } from '../services/anr-xapp/anr-xapp.service';
+import { NotificationService } from '../services/ui/notification.service';
 
-// https://blog.angular-university.io/angular-material-data-table/
 export class ANRXappDataSource extends DataSource<ANRNeighborCellRelation> {
 
-    private relationsSubject = new BehaviorSubject<ANRNeighborCellRelation[]>([]);
+  private relationsSubject = new BehaviorSubject<ANRNeighborCellRelation[]>([]);
 
-    private loadingSubject = new BehaviorSubject<boolean>(false);
+  private loadingSubject = new BehaviorSubject<boolean>(false);
 
-    public loading$ = this.loadingSubject.asObservable();
+  public loading$ = this.loadingSubject.asObservable();
 
-    constructor(private anrXappService: ANRXappService) {
-        super();
-    }
+  public rowCount = 1; // hide footer during intial load
 
-    loadTable(ggnodeb = '', servingCellNrcgi = '', neighborCellNrpci = '') {
-        this.loadingSubject.next(true);
-        this.anrXappService.getNcrtInfo(ggnodeb, servingCellNrcgi, neighborCellNrpci)
-            .pipe(
-                catchError(() => of([])),
-                finalize(() => this.loadingSubject.next(false))
-            )
-            .subscribe(ncrt => this.relationsSubject.next(ncrt));
-    }
+  constructor(private anrXappService: ANRXappService,
+    private sort: MatSort,
+    private notificationService: NotificationService) {
+    super();
+  }
 
-    connect(collectionViewer: CollectionViewer): Observable<ANRNeighborCellRelation[]> {
-        return this.relationsSubject.asObservable();
-    }
+  loadTable(ggnodeb: string = '', servingCellNrcgi: string = '', neighborCellNrpci: string = '') {
+    this.loadingSubject.next(true);
+    this.anrXappService.getNcrtInfo(ggnodeb, servingCellNrcgi, neighborCellNrpci)
+      .pipe(
+        catchError( (her: HttpErrorResponse) => {
+          console.log('ANRXappDataSource failed: ' + her.message);
+          this.notificationService.error('Failed to get data: ' + her.message);
+          return of([]);
+        }),
+        finalize(() => this.loadingSubject.next(false))
+      )
+      .subscribe( (ncrt: ANRNeighborCellRelation[]) => {
+        this.rowCount = ncrt.length;
+        this.relationsSubject.next(ncrt);
+      });
+  }
+
+  connect(collectionViewer: CollectionViewer): Observable<ANRNeighborCellRelation[]> {
+    const dataMutations = [
+      this.relationsSubject.asObservable(),
+      this.sort.sortChange
+    ];
+    return merge(...dataMutations).pipe(map(() => {
+      return this.getSortedData([...this.relationsSubject.getValue()]);
+    }));
+  }
 
-    disconnect(collectionViewer: CollectionViewer): void {
-        this.relationsSubject.complete();
-        this.loadingSubject.complete();
+  disconnect(collectionViewer: CollectionViewer): void {
+    this.relationsSubject.complete();
+    this.loadingSubject.complete();
+  }
+
+  private getSortedData(data: ANRNeighborCellRelation[]) {
+    if (!this.sort.active || this.sort.direction === '') {
+      return data;
     }
+    return data.sort((a: ANRNeighborCellRelation, b: ANRNeighborCellRelation) => {
+      const isAsc = this.sort.direction === 'asc';
+      switch (this.sort.active) {
+        case 'cellIdentifierNrcgi': return compare(a.servingCellNrcgi, b.servingCellNrcgi, isAsc);
+        case 'neighborCellNrpci': return compare(a.neighborCellNrpci, b.neighborCellNrpci, isAsc);
+        case 'neighborCellNrcgi': return compare(a.neighborCellNrcgi, b.neighborCellNrcgi, isAsc);
+        case 'flagNoHo': return compare(a.flagNoHo, b.flagNoHo, isAsc);
+        case 'flagNoXn': return compare(a.flagNoXn, b.flagNoXn, isAsc);
+        case 'flagNoRemove': return compare(a.flagNoRemove, b.flagNoRemove, isAsc);
+        default: return 0;
+      }
+    });
+  }
+}
 
+function compare(a: any, b: any, isAsc: boolean) {
+  return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
 }