Bug-Fix Last instance does not disappear when deleted

[portal/nonrtric-controlpanel.git] / webapp-frontend / src / app / ei-coordinator / jobs-list / jobs-list.component.ts

diff --git a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts
index 43b3ad8..ce6c9a7 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts
@@ -22,9 +22,9 @@ import { FormControl, FormGroup } from "@angular/forms";
 import { MatPaginator } from "@angular/material/paginator";
 import { Sort } from "@angular/material/sort";
 import { MatTableDataSource } from "@angular/material/table";
-import { EMPTY, forkJoin, of, Subscription, timer } from "rxjs";
+import { EMPTY, forkJoin, of, pipe, Subscription, concat, Observable } from "rxjs";
 import { BehaviorSubject } from "rxjs/BehaviorSubject";
-import { mergeMap, finalize, map, tap, switchMap } from "rxjs/operators";
+import { mergeMap, finalize, map, tap, concatMap, delay, skip, catchError } from "rxjs/operators";
 import { ConsumerService } from "@services/ei/consumer.service";
 import { UiService } from "@services/ui/ui.service";
 
@@ -55,6 +55,7 @@ export class JobsListComponent implements OnInit {
   subscription: Subscription;
   checked: boolean = false;
   firstTime: boolean = true;
+  jobList: Job[] = [];
 
   constructor(private consumerService: ConsumerService, private ui: UiService) {
     this.jobForm = new FormGroup({
@@ -96,33 +97,50 @@ export class JobsListComponent implements OnInit {
 
   dataSubscription(): Subscription {
     const jobsInfo$ = this.consumerService.getJobIds().pipe(
+      tap((_) => {
+        this.jobList = [] as Job[];
+      }),
       mergeMap((jobIds) =>
         forkJoin(jobIds.map((jobId) => {
           return forkJoin([
             of(jobId),
-            this.consumerService.getJobInfo(jobId),
-            this.consumerService.getConsumerStatus(jobId)
+            this.consumerService.getJobInfo(jobId).pipe(
+              catchError(err => {
+                return of([-1]);
+              })),
+            this.consumerService.getConsumerStatus(jobId).pipe(
+              catchError(err => {
+                return of([-1]);
+              })),
           ])
         }))
       ),
-      finalize(() => this.loadingSubject$.next(false))
+      finalize(() => {
+        this.loadingSubject$.next(false);
+        this.jobsSubject$.next(this.jobList);
+      })
+
+    );
+
+    const whenToRefresh$ = of('').pipe(
+      delay(10000),
+      tap((_) => this.refresh$.next('')),
+      skip(1),
     );
 
+    const poll$ = concat(jobsInfo$, whenToRefresh$);
+
     const refreshedJobs$ = this.refresh$.pipe(
-      switchMap((_) =>
-        timer(0, 10000).pipe(
-          tap((_) => {
-            this.loadingSubject$.next(true);
-          }),
-          switchMap((_) => jobsInfo$),
-          map((response) => this.extractJobs(response))
-        )
-      )
+      tap((_) => {
+        this.loadingSubject$.next(true);
+      }),
+      concatMap((_) => this.checked ? poll$ : jobsInfo$),
+      map((response) => this.extractJobs(response))
     );
 
     return this.polling$
       .pipe(
-        switchMap((value) => {
+        concatMap((value) => {
           let pollCondition = value == 0 || this.checked;
           return pollCondition ? refreshedJobs$ : EMPTY;
         })
@@ -167,6 +185,7 @@ export class JobsListComponent implements OnInit {
   stopPolling(checked) {
     this.checked = checked;
     this.polling$.next(this.jobs().length);
+    this.refreshDataClick();
   }
 
   compare(a: any, b: any, isAsc: boolean) {
@@ -183,7 +202,7 @@ export class JobsListComponent implements OnInit {
   }
 
   isArrayIncluding(data: string[], filter: string): boolean {
-    if(!data)
+    if (!data)
       return true;
     for (let i = 0; i < data.length; i++) {
       return this.isDataIncluding(data[i], filter);
@@ -210,26 +229,31 @@ export class JobsListComponent implements OnInit {
 
   private extractJobs(res: any) {
     this.clearFilter();
-    let jobList = [];
     res.forEach(element => {
-      let jobObj = <Job>{};
-      jobObj.jobId = element[0];
-      jobObj.owner = element[1].job_owner;
-      jobObj.targetUri = element[1].job_result_uri;
-      jobObj.typeId = element[1].info_type_id;
-      jobObj.prodIds = (element[2].producers) ? element[2].producers : ["No Producers"];      
-      jobList = jobList.concat(jobObj);
-    });  
-   
-    this.jobsSubject$.next(jobList);
-    if (this.firstTime && jobList.length > 0) {
-      this.polling$.next(jobList.length);
+      if(element[1] != -1 && element[2] != -1){
+        let jobObj = <Job>{};
+        jobObj.jobId = element[0];
+        jobObj.owner = element[1].job_owner;
+        jobObj.targetUri = element[1].job_result_uri;
+        jobObj.typeId = element[1].info_type_id;
+        jobObj.prodIds = (element[2].producers) ? element[2].producers : ["No Producers"];
+        this.jobList = this.jobList.concat(jobObj);
+      }
+    });
+
+    if (this.firstTime && this.jobList.length > 0) {
+      this.polling$.next(this.jobList.length);
       this.firstTime = false;
     }
-    return jobList;
+    return this.jobList;
   }
 
   refreshDataClick() {
     this.refresh$.next("");
   }
+
+  hasJobs(): boolean {
+    return this.jobs().length > 0;
+  }
+
 }