Merge "BugFix - Enable Controlpanel to start even when gateway is Unavailable"

[portal/nonrtric-controlpanel.git] / webapp-frontend / src / app / ei-coordinator / ei-producer.datasource.ts

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 bd7f276..8dac859 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
@@ -18,26 +18,24 @@
  * ========================LICENSE_END===================================
  */
 
-import { HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { MatTableDataSource } from '@angular/material';
 
-import { Observable } from 'rxjs/Observable';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { of } from 'rxjs/observable/of';
-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';
 
 @Injectable({
     providedIn: 'root'
 })
 
-export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
+export class EIProducerDataSource {
 
-    producerSubject = new BehaviorSubject<EIProducer[]>([]);
+    private producers: Array<EIProducer> = [];
+
+    public eiProducers(): EIProducer[] {
+        return this.producers;
+    }
 
     private loadingSubject = new BehaviorSubject<boolean>(false);
 
@@ -46,22 +44,13 @@ export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
     public rowCount = 1; // hide footer during intial load
 
     constructor(
-        private eiSvc: EIService,
-        private notificationService: NotificationService) {
-        super();
+        private eiSvc: EIService) {
     }
 
-    loadProducers(): Observable<EIProducer[]> {
+    loadProducers() {
         this.loadingSubject.next(true);
-        let producers: Array<EIProducer> = [];
+        this.producers = [];
         this.eiSvc.getProducerIds()
-            .pipe(
-                catchError((her: HttpErrorResponse) => {
-                    this.notificationService.error('Failed to get producers: ' + her.error);
-                    return of([]);
-                }),
-                finalize(() => this.loadingSubject.next(false))
-            )
             .subscribe((prodIds: string[]) => {
                 console.log("ProducerIds: " + prodIds);
                 prodIds.forEach(id => {
@@ -73,26 +62,9 @@ export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
                     this.eiSvc.getProducerStatus(id).subscribe(prodStatus => {
                         eiProducer.status = prodStatus.opState.toString();
                     });
-                    this.addProducerToSubject(eiProducer);
-                    producers.push(eiProducer);
+                    this.producers.push(eiProducer);
                 });
-                this.rowCount = this.producerSubject.value.length;
+                this.rowCount = this.producers.length;
             });
-        return of(producers);
-    }
-
-    private addProducerToSubject(producer: EIProducer) {
-        const currentValue = this.producerSubject.value;
-        const updatedValue = [...currentValue, producer];
-        this.producerSubject.next(updatedValue);
-    }
-
-    connect(): BehaviorSubject<EIProducer[]> {
-        return this.producerSubject;
-    }
-
-    disconnect(): void {
-        this.producerSubject.complete();
-        this.loadingSubject.complete();
     }
-}
+}
\ No newline at end of file