X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fei-coordinator%2Fei-coordinator.component.ts;h=278911471395f0693f1349245369ae8e78764523;hb=64b35796309259667d0dac6f9cdc2ad00bca53ee;hp=7c4979e25d40cb70e86fbbae12ba6762d5c3e966;hpb=cde4ceece9e916ef9387e78982df21b13dc58837;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
index 7c4979e..2789114 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
@@ -17,20 +17,18 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, OnInit, ViewChild, Version } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { MatSort } from '@angular/material/sort';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { MatTableDataSource } from '@angular/material';
 
-import { EIService } from '../services/ei/ei.service';
-import { EIJob, EIProducer } from '../interfaces/ei.jobs';
-import { EIProducerDataSource } from './ei-producer.datasource';
-import { EIJobDataSource } from './ei-job.datasource';
-import { NotificationService } from '../services/ui/notification.service';
 import { defer, BehaviorSubject, Observable } from 'rxjs';
-import { map, withLatestFrom, startWith, tap } from 'rxjs/operators';
+import { map, withLatestFrom, startWith } from 'rxjs/operators';
+
+import { EIJob, EIProducer } from '../interfaces/ei.types';
+import { EIJobDataSource } from './ei-job.datasource';
+import { EIProducerDataSource } from './ei-producer.datasource';
 import { UiService } from '../services/ui/ui.service';
 
 class EIJobInfo {
@@ -40,7 +38,7 @@ class EIJobInfo {
 }
 
 @Component({
-    selector: 'rd-ei-coordinator',
+    selector: 'nrcp-ei-coordinator',
     templateUrl: './ei-coordinator.component.html',
     styleUrls: ['./ei-coordinator.component.scss'],
     animations: [
@@ -54,8 +52,6 @@ class EIJobInfo {
 })
 export class EICoordinatorComponent implements OnInit {
 
-    eiJobsDataSource: EIJobDataSource;
-    eiProducersDataSource: EIProducerDataSource;
     producers$: Observable<EIProducer[]>;
     filteredProducers$: Observable<EIProducer[]>;
     @ViewChild(MatSort, { static: true }) sort: MatSort;
@@ -66,23 +62,18 @@ export class EICoordinatorComponent implements OnInit {
     formGroup: FormGroup;
     eiProducersData: MatTableDataSource<EIProducerDataSource>;
 
-
     constructor(
-        private eiSvc: EIService,
-        private dialog: MatDialog,
-        private notificationService: NotificationService,
+        private eiJobsDataSource: EIJobDataSource,
+        private eiProducersDataSource: EIProducerDataSource,
         private ui: UiService,
         private formBuilder: FormBuilder) {
             this.formGroup = formBuilder.group({ filter: [""] });
         }
 
     ngOnInit() {
-        this.eiJobsDataSource = new EIJobDataSource(this.eiSvc, this.sort, this.notificationService);
-        this.eiProducersDataSource = new EIProducerDataSource(this.eiSvc, this.sort, this.notificationService);
-        this.eiJobsDataSource.loadTable();
-        //this.eiProducersDataSource.loadTable();
+        this.eiJobsDataSource.getJobs();
 
-        this.producers$= this.eiProducersDataSource.getProducers();
+        this.producers$= this.eiProducersDataSource.loadProducers();
         this.filteredProducers$ = defer(() => this.formGroup.get("filter")
         .valueChanges.pipe(
             startWith(""),
@@ -97,12 +88,6 @@ export class EICoordinatorComponent implements OnInit {
         });
     }
 
-    ngAfterViewInit() {
-        this.eiJobsDataSource.sort = this.sort;
-        this.eiProducersDataSource.sort = this.sort;
-
-      }
-
     getEIJobInfo(eiJob: EIJob): EIJobInfo {
         let info: EIJobInfo = this.eiJobInfo.get(eiJob.ei_job_data);
         if (!info) {
@@ -163,7 +148,7 @@ export class EICoordinatorComponent implements OnInit {
     }
 
     refreshTables() {
-        this.eiJobsDataSource.loadTable();
-        this.eiProducersDataSource.loadTable();
+        this.eiJobsDataSource.getJobs();
+        this.eiProducersDataSource.loadProducers();
     }
 }