From 1061c73fde3005100ead8764eacb444f240440d6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 4 Dec 2019 14:49:59 +0100 Subject: Add ability to filter per job type --- client/src/app/+admin/system/jobs/job.service.ts | 7 ++-- .../src/app/+admin/system/jobs/jobs.component.html | 20 ++++++++--- .../src/app/+admin/system/jobs/jobs.component.scss | 18 ++++++++-- .../src/app/+admin/system/jobs/jobs.component.ts | 39 +++++++++++++++++----- client/src/types/job-type-client.type.ts | 3 ++ 5 files changed, 70 insertions(+), 17 deletions(-) create mode 100644 client/src/types/job-type-client.type.ts (limited to 'client/src') diff --git a/client/src/app/+admin/system/jobs/job.service.ts b/client/src/app/+admin/system/jobs/job.service.ts index 1daae8f03..120144dff 100644 --- a/client/src/app/+admin/system/jobs/job.service.ts +++ b/client/src/app/+admin/system/jobs/job.service.ts @@ -3,11 +3,12 @@ import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { SortMeta } from 'primeng/api' import { Observable } from 'rxjs' -import { ResultList } from '../../../../../../shared' +import { JobType, ResultList } from '../../../../../../shared' import { JobState } from '../../../../../../shared/models' import { Job } from '../../../../../../shared/models/server/job.model' import { environment } from '../../../../environments/environment' import { RestExtractor, RestPagination, RestService } from '../../../shared' +import { JobTypeClient } from '../../../../types/job-type-client.type' @Injectable() export class JobService { @@ -19,10 +20,12 @@ export class JobService { private restExtractor: RestExtractor ) {} - getJobs (state: JobState, pagination: RestPagination, sort: SortMeta): Observable> { + getJobs (state: JobState, jobType: JobTypeClient, pagination: RestPagination, sort: SortMeta): Observable> { let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) + if (jobType !== 'all') params = params.append('jobType', jobType) + return this.authHttp.get>(JobService.BASE_JOB_URL + '/' + state, { params }) .pipe( map(res => { diff --git a/client/src/app/+admin/system/jobs/jobs.component.html b/client/src/app/+admin/system/jobs/jobs.component.html index 7ed1888e2..cd26257dd 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.html +++ b/client/src/app/+admin/system/jobs/jobs.component.html @@ -1,10 +1,22 @@
Jobs list
-
- +
+ +
+ +
+
+ +
+ +
+ +
diff --git a/client/src/app/+admin/system/jobs/jobs.component.scss b/client/src/app/+admin/system/jobs/jobs.component.scss index ab05f1982..ccc0b35ca 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.scss +++ b/client/src/app/+admin/system/jobs/jobs.component.scss @@ -1,8 +1,22 @@ @import '_variables'; @import '_mixins'; -.peertube-select-container { - @include peertube-select-container(auto); +.admin-sub-header { + align-items: flex-end; + + .select-filter-block { + &:not(:last-child) { + margin-right: 10px; + } + + label { + margin-bottom: 2px; + } + + .peertube-select-container { + @include peertube-select-container(auto); + } + } } pre { diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts index b24353ca6..95ee17023 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.ts +++ b/client/src/app/+admin/system/jobs/jobs.component.ts @@ -2,11 +2,12 @@ import { Component, OnInit } from '@angular/core' import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage' import { Notifier } from '@app/core' import { SortMeta } from 'primeng/api' -import { Job } from '../../../../../../shared/index' +import { Job, JobType } from '../../../../../../shared/index' import { JobState } from '../../../../../../shared/models' import { RestPagination, RestTable } from '../../../shared' import { JobService } from './job.service' import { I18n } from '@ngx-translate/i18n-polyfill' +import { JobTypeClient } from '../../../../types/job-type-client.type' @Component({ selector: 'my-jobs', @@ -15,9 +16,26 @@ import { I18n } from '@ngx-translate/i18n-polyfill' }) export class JobsComponent extends RestTable implements OnInit { private static JOB_STATE_LOCAL_STORAGE_STATE = 'jobs-list-state' + private static JOB_STATE_LOCAL_STORAGE_TYPE = 'jobs-list-type' jobState: JobState = 'waiting' jobStates: JobState[] = [ 'active', 'completed', 'failed', 'waiting', 'delayed' ] + + jobType: JobTypeClient = 'all' + jobTypes: JobTypeClient[] = [ + 'all', + 'activitypub-follow', + 'activitypub-http-broadcast', + 'activitypub-http-fetcher', + 'activitypub-http-unicast', + 'email', + 'video-transcoding', + 'video-file-import', + 'video-import', + 'videos-views', + 'activitypub-refresher' + ] + jobs: Job[] = [] totalRecords: number rowsPerPage = 10 @@ -33,20 +51,20 @@ export class JobsComponent extends RestTable implements OnInit { } ngOnInit () { - this.loadJobState() + this.loadJobStateAndType() this.initialize() } - onJobStateChanged () { + onJobStateOrTypeChanged () { this.pagination.start = 0 this.loadData() - this.saveJobState() + this.saveJobStateAndType() } protected loadData () { this.jobsService - .getJobs(this.jobState, this.pagination, this.sort) + .getJobs(this.jobState, this.jobType, this.pagination, this.sort) .subscribe( resultList => { this.jobs = resultList.data @@ -57,13 +75,16 @@ export class JobsComponent extends RestTable implements OnInit { ) } - private loadJobState () { - const result = peertubeLocalStorage.getItem(JobsComponent.JOB_STATE_LOCAL_STORAGE_STATE) + private loadJobStateAndType () { + const state = peertubeLocalStorage.getItem(JobsComponent.JOB_STATE_LOCAL_STORAGE_STATE) + if (state) this.jobState = state as JobState - if (result) this.jobState = result as JobState + const type = peertubeLocalStorage.getItem(JobsComponent.JOB_STATE_LOCAL_STORAGE_TYPE) + if (type) this.jobType = type as JobType } - private saveJobState () { + private saveJobStateAndType () { peertubeLocalStorage.setItem(JobsComponent.JOB_STATE_LOCAL_STORAGE_STATE, this.jobState) + peertubeLocalStorage.setItem(JobsComponent.JOB_STATE_LOCAL_STORAGE_TYPE, this.jobType) } } diff --git a/client/src/types/job-type-client.type.ts b/client/src/types/job-type-client.type.ts new file mode 100644 index 000000000..7d51f1db2 --- /dev/null +++ b/client/src/types/job-type-client.type.ts @@ -0,0 +1,3 @@ +import { JobType } from '@shared/models' + +export type JobTypeClient = 'all' | JobType -- cgit v1.2.3