X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fran-control%2Fran-control.datasource.ts;h=b23a3cd200bf83c0c3b1ec0ec10f6fb10e90a59f;hb=a4b2e71472b32a8244da846af20128504f4cbc65;hp=c84ab1ea26e691495642a20c4ed4708927aea970;hpb=5b686151904e2582ea9ce9d2f1c6abb7a400afa5;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/ran-control/ran-control.datasource.ts b/webapp-frontend/src/app/ran-control/ran-control.datasource.ts
index c84ab1ea..b23a3cd2 100644
--- a/webapp-frontend/src/app/ran-control/ran-control.datasource.ts
+++ b/webapp-frontend/src/app/ran-control/ran-control.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,12 +19,14 @@
  */
 
 import { CollectionViewer, DataSource } from '@angular/cdk/collections';
+import { HttpErrorResponse } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
-import { catchError, finalize } from 'rxjs/operators';
-import { of } from 'rxjs/observable/of';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { E2RanDetails, E2SetupRequest } from '../interfaces/e2-mgr.types';
+import { of } from 'rxjs/observable/of';
+import { catchError, finalize } from 'rxjs/operators';
+import { E2RanDetails } from '../interfaces/e2-mgr.types';
 import { E2ManagerService } from '../services/e2-mgr/e2-mgr.service';
+import { NotificationService } from '../services/ui/notification.service';
 
 export class RANControlDataSource extends DataSource<E2RanDetails> {
 
@@ -34,7 +36,10 @@ export class RANControlDataSource extends DataSource<E2RanDetails> {
 
   public loading$ = this.loadingSubject.asObservable();
 
-  constructor(private e2MgrSvcservice: E2ManagerService) {
+  public rowCount = 1; // hide footer during intial load
+
+  constructor(private e2MgrSvcservice: E2ManagerService,
+    private notificationService: NotificationService) {
     super();
   }
 
@@ -42,10 +47,17 @@ export class RANControlDataSource extends DataSource<E2RanDetails> {
     this.loadingSubject.next(true);
     this.e2MgrSvcservice.getRan()
       .pipe(
-        catchError(() => of([])),
-        finalize(() => this.loadingSubject.next(false))
+        catchError( (her: HttpErrorResponse) => {
+          console.log('RANControlDataSource failed: ' + her.message);
+          this.notificationService.error('Failed to get RAN details: ' + her.message);
+          return of([]);
+        }),
+        finalize( () =>  this.loadingSubject.next(false) )
       )
-      .subscribe((ranControl: E2RanDetails[]) => this.ranControlSubject.next(ranControl));
+      .subscribe( (ranControl: E2RanDetails[] ) => {
+        this.rowCount = ranControl.length;
+        this.ranControlSubject.next(ranControl);
+      });
   }
 
   connect(collectionViewer: CollectionViewer): Observable<E2RanDetails[]> {