X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.datasource.ts;h=f5f6e986377102a46654375ecea6ffeaef1e37f7;hb=refs%2Fchanges%2F97%2F1197%2F3;hp=f6ae32d486b46fd8e63b3a600d4a05f601aa0d10;hpb=19570d54903b181469ee2806043d562dadc1d804;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/catalog/catalog.datasource.ts b/webapp-frontend/src/app/catalog/catalog.datasource.ts
index f6ae32d4..f5f6e986 100644
--- a/webapp-frontend/src/app/catalog/catalog.datasource.ts
+++ b/webapp-frontend/src/app/catalog/catalog.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.
@@ -19,70 +19,81 @@
  */
 
 import { CollectionViewer, DataSource } from '@angular/cdk/collections';
-import { MatSort } from '@angular/material';
-import { merge } from 'rxjs';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { HttpErrorResponse } from '@angular/common/http';
+import { MatSort } from '@angular/material/sort';
 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 { XMXapp } from '../interfaces/xapp-mgr.types';
-import { XappMgrService } from '../services/xapp-mgr/xapp-mgr.service';
+import { AppMgrService } from '../services/app-mgr/app-mgr.service';
+import { XMDeployableApp } from '../interfaces/app-mgr.types';
+import { NotificationService } from '../services/ui/notification.service';
 
-export class CatalogDataSource extends DataSource<XMXapp> {
+export class CatalogDataSource extends DataSource<XMDeployableApp> {
 
-  private xAppsSubject = new BehaviorSubject<XMXapp[]>([]);
+  private catalogSubject = new BehaviorSubject<XMDeployableApp[]>([]);
 
   private loadingSubject = new BehaviorSubject<boolean>(false);
 
   public loading$ = this.loadingSubject.asObservable();
 
-  constructor(private xappMgrSvc: XappMgrService, private sort: MatSort ) {
+  public rowCount = 1; // hide footer during intial load
+
+  constructor(private appMgrSvc: AppMgrService,
+    private sort: MatSort,
+    private notificationService: NotificationService) {
     super();
-  };
+  }
 
   loadTable() {
     this.loadingSubject.next(true);
-    this.xappMgrSvc.getAll()
+    this.appMgrSvc.getDeployable()
       .pipe(
-        catchError(() => of([])),
+        catchError( (her: HttpErrorResponse) => {
+          console.log('CatalogDataSource failed: ' + her.message);
+          this.notificationService.error('Failed to get applications: ' + her.message);
+          return of([]);
+        }),
         finalize(() => this.loadingSubject.next(false))
       )
-      .subscribe(xApps => this.xAppsSubject.next(xApps) )
+      .subscribe( (xApps: XMDeployableApp[]) => {
+        this.rowCount = xApps.length;
+        this.catalogSubject.next(xApps);
+      });
   }
 
-  connect(collectionViewer: CollectionViewer): Observable<XMXapp[]> {
+  connect(collectionViewer: CollectionViewer): Observable<XMDeployableApp[]> {
     const dataMutations = [
-      this.xAppsSubject.asObservable(),
+      this.catalogSubject.asObservable(),
       this.sort.sortChange
     ];
     return merge(...dataMutations).pipe(map(() => {
-      return this.getSortedData([...this.xAppsSubject.getValue()]);
+      return this.getSortedData([...this.catalogSubject.getValue()]);
     }));
   }
 
   disconnect(collectionViewer: CollectionViewer): void {
-    this.xAppsSubject.complete();
+    this.catalogSubject.complete();
     this.loadingSubject.complete();
   }
 
-  private getSortedData(data: XMXapp[]) {
+  private getSortedData(data: XMDeployableApp[]) {
     if (!this.sort.active || this.sort.direction === '') {
       return data;
     }
-
-    return data.sort((a, b) => {
+    return data.sort((a: XMDeployableApp, b: XMDeployableApp) => {
       const isAsc = this.sort.direction === 'asc';
       switch (this.sort.active) {
-        case 'name': return compare(a.name, b.name, isAsc);
-        case 'version': return compare(a.version, b.version, isAsc);
-        case 'status': return compare(a.status, b.status, isAsc);
+        case 'name': return this.compare(a.name, b.name, isAsc);
+        case 'version': return this.compare(a.version, b.version, isAsc);
         default: return 0;
       }
     });
   }
-}
 
-function compare(a, b, isAsc) {
-  return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
-}
+  private compare(a: any, b: any, isAsc: boolean) {
+    return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
+  }
 
+}