* limitations under the License.
* ========================LICENSE_END===================================
*/
-import { Component, OnInit, ViewChild } from '@angular/core';
-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 { forkJoin } from 'rxjs';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { mergeMap, finalize, tap } from 'rxjs/operators';
-import { EIJob } from '@interfaces/ei.types';
-import { EIService } from '@services/ei/ei.service';
-import { UiService } from '@services/ui/ui.service';
+import { Component, OnInit, ViewChild } from "@angular/core";
+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 { BehaviorSubject } from "rxjs/BehaviorSubject";
+import { mergeMap, finalize, map, tap, switchMap } from "rxjs/operators";
+import { ConsumerService } from "@services/ei/consumer.service";
+import { UiService } from "@services/ui/ui.service";
export interface Job {
jobId: string;
- jobData: any;
typeId: string;
targetUri: string;
owner: string;
- prodId: string;
+ prodIds: string[];
}
@Component({
- selector: 'nrcp-jobs-list',
- templateUrl: './jobs-list.component.html',
- styleUrls: ['./jobs-list.component.scss']
+ selector: "nrcp-jobs-list",
+ templateUrl: "./jobs-list.component.html",
+ styleUrls: ["./jobs-list.component.scss"],
})
export class JobsListComponent implements OnInit {
-
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
-
- darkMode: boolean;
jobsDataSource: MatTableDataSource<Job>;
jobForm: FormGroup;
- private loadingSubject = new BehaviorSubject<boolean>(false);
- private jobsSubject = new BehaviorSubject<Job[]>([]);
- public loading$ = this.loadingSubject.asObservable();
-
- constructor(
- private eiSvc: EIService,
- private ui: UiService
- ) {
+ darkMode: boolean;
+
+ private jobsSubject$ = new BehaviorSubject<Job[]>([]);
+ private refresh$ = new BehaviorSubject("");
+ private loadingSubject$ = new BehaviorSubject<boolean>(false);
+ private polling$ = new BehaviorSubject(0);
+ public loading$ = this.loadingSubject$.asObservable();
+ subscription: Subscription;
+ checked: boolean = false;
+ firstTime: boolean = true;
+
+ constructor(private consumerService: ConsumerService, private ui: UiService) {
this.jobForm = new FormGroup({
- jobId: new FormControl(''),
- typeId: new FormControl(''),
- owner: new FormControl(''),
- targetUri: new FormControl(''),
- prodId: new FormControl('')
+ jobId: new FormControl(""),
+ typeId: new FormControl(""),
+ owner: new FormControl(""),
+ targetUri: new FormControl(""),
+ prodIds: new FormControl(""),
});
}
ngOnInit(): void {
- this.loadJobs();
- this.jobsSubject.subscribe((data) => {
+ this.subscription = this.dataSubscription();
+
+ this.jobsSubject$.subscribe((data) => {
this.jobsDataSource = new MatTableDataSource<Job>(data);
this.jobsDataSource.paginator = this.paginator;
this.jobsDataSource.filterPredicate = ((data: Job, filter) => {
let searchTerms = JSON.parse(filter);
- return this.isDataIncluding(data.targetUri, searchTerms.targetUri)
- && this.isDataIncluding(data.jobId, searchTerms.jobId)
- && this.isDataIncluding(data.owner, searchTerms.owner)
- && this.isDataIncluding(data.typeId, searchTerms.typeId)
- && this.isDataIncluding(data.prodId, searchTerms.prodId);
+ return (
+ this.isDataIncluding(data.targetUri, searchTerms.targetUri) &&
+ this.isDataIncluding(data.jobId, searchTerms.jobId) &&
+ this.isDataIncluding(data.owner, searchTerms.owner) &&
+ this.isDataIncluding(data.typeId, searchTerms.typeId) &&
+ this.isArrayIncluding(data.prodIds, searchTerms.prodIds)
+ );
}) as (data: Job, filter: any) => boolean;
});
- this.jobForm.valueChanges.subscribe(value => {
+ this.jobForm.valueChanges.subscribe((value) => {
this.jobsDataSource.filter = JSON.stringify(value);
});
});
}
+ dataSubscription(): Subscription {
+ const jobsInfo$ = this.consumerService.getJobIds().pipe(
+ mergeMap((jobIds) =>
+ forkJoin(jobIds.map((jobId) => {
+ return forkJoin([
+ of(jobId),
+ this.consumerService.getJobInfo(jobId),
+ this.consumerService.getConsumerStatus(jobId)
+ ])
+ }))
+ ),
+ finalize(() => this.loadingSubject$.next(false))
+ );
+
+ const refreshedJobs$ = this.refresh$.pipe(
+ switchMap((_) =>
+ timer(0, 10000).pipe(
+ tap((_) => {
+ this.loadingSubject$.next(true);
+ }),
+ switchMap((_) => jobsInfo$),
+ map((response) => this.extractJobs(response))
+ )
+ )
+ );
+
+ return this.polling$
+ .pipe(
+ switchMap((value) => {
+ let pollCondition = value == 0 || this.checked;
+ return pollCondition ? refreshedJobs$ : EMPTY;
+ })
+ )
+ .subscribe();
+ }
+
ngOnDestroy() {
- if (!this.jobsSubject) this.jobsSubject.unsubscribe();
- if (!this.loadingSubject) this.loadingSubject.unsubscribe();
- if (!this.ui.darkModeState) this.ui.darkModeState.unsubscribe();
+ this.subscription.unsubscribe();
}
clearFilter() {
- this.jobForm.get('jobId').setValue('');
- this.jobForm.get('typeId').setValue('');
- this.jobForm.get('owner').setValue('');
- this.jobForm.get('targetUri').setValue('');
- this.jobForm.get('prodId').setValue('');
+ this.jobForm.get("jobId").setValue("");
+ this.jobForm.get("typeId").setValue("");
+ this.jobForm.get("owner").setValue("");
+ this.jobForm.get("targetUri").setValue("");
+ this.jobForm.get("prodIds").setValue("");
}
sortJobs(sort: Sort) {
- const data = this.jobsDataSource.data
+ const data = this.jobsDataSource.data;
data.sort((a: Job, b: Job) => {
- const isAsc = sort.direction === 'asc';
+ const isAsc = sort.direction === "asc";
switch (sort.active) {
- case 'jobId': return this.compare(a.jobId, b.jobId, isAsc);
- case 'typeId': return this.compare(a.typeId, b.typeId, isAsc);
- case 'owner': return this.compare(a.owner, b.owner, isAsc);
- case 'targetUri': return this.compare(a.targetUri, b.targetUri, isAsc);
- case 'prodId': return this.compare(a.prodId, b.prodId, isAsc);
- default: return 0;
+ case "jobId":
+ return this.compare(a.jobId, b.jobId, isAsc);
+ case "typeId":
+ return this.compare(a.typeId, b.typeId, isAsc);
+ case "owner":
+ return this.compare(a.owner, b.owner, isAsc);
+ case "targetUri":
+ return this.compare(a.targetUri, b.targetUri, isAsc);
+ case "prodIds":
+ return this.compare(a.prodIds, b.prodIds, isAsc);
+ default:
+ return 0;
}
});
this.jobsDataSource.data = data;
}
+ stopPolling(checked) {
+ this.checked = checked;
+ this.polling$.next(this.jobs().length);
+ }
+
compare(a: any, b: any, isAsc: boolean) {
return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
}
return data.toLowerCase().includes(transformedFilter);
}
- getJobTypeId(eiJob: Job): string {
- if (eiJob.typeId) {
- return eiJob.typeId;
+ isArrayIncluding(data: string[], filter: string): boolean {
+ if(!data)
+ return true;
+ for (let i = 0; i < data.length; i++) {
+ return this.isDataIncluding(data[i], filter);
}
- return '< No type >';
}
- getJobOwner(eiJob: Job): string {
- if (eiJob.owner) {
- return eiJob.owner;
+ getJobTypeId(job: Job): string {
+ if (job.typeId) {
+ return job.typeId;
}
- return '< No owner >';
+ return "< No type >";
+ }
+
+ getJobOwner(job: Job): string {
+ if (job.owner) {
+ return job.owner;
+ }
+ return "< No owner >";
}
public jobs(): Job[] {
- return this.jobsSubject.value;
- }
-
- loadJobs() {
- this.loadingSubject.next(true);
- let jobs = [];
- let prodId = [];
- this.eiSvc.getProducerIds().pipe(
- tap(data => prodId = data),
- mergeMap(prodIds =>
- forkJoin(prodIds.map(id => this.eiSvc.getJobsForProducer(id)))),
- finalize(() => this.loadingSubject.next(false))
- ).subscribe(result => {
- jobs = this.createJobList(prodId, result);
- this.jobsSubject.next(jobs);
- });
+ return this.jobsSubject$.value;
}
- createJobList(prodId: any[], result: EIJob[][]) {
+
+ private extractJobs(res: any) {
+ this.clearFilter();
let jobList = [];
- prodId.forEach((element, index) => {
- let jobs = result[index];
- jobList = jobList.concat(jobs.map(job => this.createJob(element, job)));
- });
+ 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);
+ this.firstTime = false;
+ }
return jobList;
}
- createJob(element: any, job: EIJob): any {
- let eiJob = <Job>{};
- eiJob.jobId = job.ei_job_identity;
- eiJob.typeId = job.ei_type_identity;
- eiJob.owner = job.owner;
- eiJob.targetUri = job.target_uri;
- eiJob.prodId = element;
- return eiJob;
- }
+ refreshDataClick() {
+ this.refresh$.next("");
+ }
}
Code Review / portal / nonrtric-controlpanel.git / blobdiff