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=79b7129a3feb4f804eff65a4d54b07216cac79b9;hb=d65bf33082110fbd2e0a022743ed9d0b014e5e8a;hp=bcff218cc476c03951d32c489f847eb5c24db2e8;hpb=f7c54883fabc2ffd90a32197d06b04369357219b;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 bcff218..79b7129 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
@@ -17,125 +17,114 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { MatSort } from '@angular/material/sort';
-import { animate, state, style, transition, trigger } from '@angular/animations';
-
-import { EIService } from '../services/ei/ei.service';
-import { EIJob, EIProducer } from '../interfaces/ei.jobs';
-import { EIProducerDataSource } from './ei-producer.datasource';
+import { Component, OnInit } from '@angular/core';
+import { Sort } from '@angular/material/sort';
+import { FormBuilder, FormGroup, AbstractControl } from '@angular/forms';
+import { MatTableDataSource } from '@angular/material/table';
+
+import { EIJob } from '../interfaces/ei.types';
 import { EIJobDataSource } from './ei-job.datasource';
-import { NotificationService } from '../services/ui/notification.service';
-import { BehaviorSubject, Observable } from 'rxjs';
 import { UiService } from '../services/ui/ui.service';
-
-class EIJobInfo {
-    constructor(public eiJob: EIJob) { }
-
-    isExpanded: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
-}
+import { ProducersListComponent } from './producers-list/producers-list.component';
 
 @Component({
-    selector: 'rd-ei-coordinator',
+    selector: 'nrcp-ei-coordinator',
     templateUrl: './ei-coordinator.component.html',
-    styleUrls: ['./ei-coordinator.component.scss'],
-    animations: [
-        trigger('detailExpand', [
-            state('collapsed, void', style({ height: '0px', minHeight: '0', display: 'none' })),
-            state('expanded', style({ height: '*' })),
-            transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')),
-            transition('expanded <=> void', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)'))
-        ]),
-    ],
+    styleUrls: ['./ei-coordinator.component.scss']
 })
 export class EICoordinatorComponent implements OnInit {
 
-
-    eiJobsDataSource: EIJobDataSource;
-    eiProducersDataSource: EIProducerDataSource;
-    @ViewChild(MatSort, { static: true }) sort: MatSort;
-
-    eiJobInfo = new Map<string, EIJobInfo>();
     darkMode: boolean;
+    formGroup: FormGroup;
+    jobsDataSource: MatTableDataSource<EIJob> = new MatTableDataSource<EIJob>();
+
+    readonly jobsFormControl: AbstractControl;
 
     constructor(
-        private eiSvc: EIService,
-        private dialog: MatDialog,
-        private notificationService: NotificationService,
-        private ui: UiService) { }
+        private producersList: ProducersListComponent,
+        private eiJobsDataSource: EIJobDataSource,
+        private ui: UiService,
+        private formBuilder: FormBuilder) {
+            this.formGroup = formBuilder.group({ filter: [""] });
+
+            this.jobsFormControl = formBuilder.group({
+                id: '',
+                typeId: '',
+                owner: '',
+                targetUri:''
+            });
+    }
 
     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.ui.darkModeState.subscribe((isDark) => {
-            this.darkMode = isDark;
+        this.eiJobsDataSource.loadJobs();
+
+        this.eiJobsDataSource.eiJobsSubject().subscribe((data) => {
+            this.jobsDataSource.data = data;
         });
-    }
 
-    toggleListInstances(eiJob: EIJob): void {
-        const info = this.getEIJobInfo(eiJob);
-        info.isExpanded.next(!info.isExpanded.getValue());
-    }
+        this.jobsFormControl.valueChanges.subscribe(value => {
+            const filter = {...value, id: value.id.trim().toLowerCase()} as string;
+            this.jobsDataSource.filter = filter;
+        });
 
-    getEIJobInfo(eiJob: EIJob): EIJobInfo {
-        let info: EIJobInfo = this.eiJobInfo.get(eiJob.ei_job_data);
-        if (!info) {
-            info = new EIJobInfo(eiJob);
-            this.eiJobInfo.set(eiJob.ei_job_data, info);
-        }
-        return info;
-    }
+        this.jobsDataSource.filterPredicate = ((data: EIJob, filter) => {
+            return this.isDataIncluding(data.ei_job_identity, filter.id)
+                && this.isDataIncluding(data.target_uri, filter.targetUri)
+                && this.isDataIncluding(data.owner, filter.owner)
+                && this.isDataIncluding(data.ei_type_identity, filter.typeId);
+          }) as (data: EIJob, filter: any) => boolean;
 
-    getDisplayName(eiJob: EIJob): string {
-        if (eiJob.ei_job_identity) {
-            return eiJob.ei_job_identity;
-        }
-        return '< No id >';
+        this.ui.darkModeState.subscribe((isDark) => {
+            this.darkMode = isDark;
+        });
     }
 
-    getEITypeId(eiJob: EIJob): string {
-        if (eiJob.ei_type_identity){
-            return eiJob.ei_type_identity;
-        }
-        return '< No type >';
+    sortJobs(sort: Sort){
+        const data = this.jobsDataSource.data
+        data.sort((a: EIJob, b: EIJob) => {
+            const isAsc = sort.direction === 'asc';
+            switch (sort.active) {
+              case 'id': return this.compare(a.ei_job_identity, b.ei_job_identity, isAsc);
+              case 'typeId': return this.compare(a.ei_type_identity, b.ei_type_identity, isAsc);
+              case 'owner': return this.compare(a.owner, b.owner, isAsc);
+              case 'targetUri': return this.compare(a.target_uri, b.owner, isAsc);
+              default: return 0;
+            }
+          });
+          this.jobsDataSource.data = data;
     }
 
-    getTargetUri(eiJob: EIJob): string {
-        if (eiJob.target_uri){
-            return eiJob.target_uri;
-        }
-        return '< No target URI >';
+    compare(a: any, b: any, isAsc: boolean) {
+      return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
     }
 
-    isInstancesShown(eiJob: EIJob): boolean {
-        return this.getEIJobInfo(eiJob).isExpanded.getValue();
+    stopSort(event: any){
+        event.stopPropagation();
     }
 
-    getExpandedObserver(eiJob: EIJob): Observable<boolean> {
-        return this.getEIJobInfo(eiJob).isExpanded.asObservable();
+    isDataIncluding(data: string, filter: string) : boolean {
+        return !filter || data.toLowerCase().includes(filter);
     }
 
-    getEIProducerId(eiProducer: EIProducer): string {
-        if (eiProducer.ei_producer_id){
-            return eiProducer.ei_producer_id;
+    getJobTypeId(eiJob: EIJob): string {
+        if (eiJob.ei_type_identity) {
+            return eiJob.ei_type_identity;
         }
-        return '< No id>';
+        return '< No type >';
     }
 
-    getEIProducerTypes(eiProducer: EIProducer): string[] {
-        if (eiProducer.ei_producer_types){
-            return eiProducer.ei_producer_types;
+    getJobOwner(eiJob: EIJob): string {
+        if (eiJob.owner) {
+            return eiJob.owner;
         }
-        return ['< No types >'];
+        return '< No owner >';
     }
+    refreshTables() {
+        this.eiJobsDataSource.loadJobs();
+        this.eiJobsDataSource.eiJobsSubject().subscribe((data) => {
+            this.jobsDataSource.data = data;
+        });
 
-    getEIProducerStatus(eiProducer: EIProducer): string {
-        if (eiProducer.status){
-            return eiProducer.status;
-        }
-        return '< No status >';
+        this.producersList.refresh();
     }
 }