private static LOCAL_STORAGE_STATE = 'jobs-list-state'
private static LOCAL_STORAGE_TYPE = 'jobs-list-type'
- jobState: JobStateClient = 'waiting'
+ jobState?: JobStateClient | 'all'
jobStates: JobStateClient[] = [ 'active', 'completed', 'failed', 'waiting', 'delayed' ]
jobType: JobTypeClient = 'all'
jobTypes: JobTypeClient[] = [
'all',
+
'activitypub-follow',
'activitypub-http-broadcast',
'activitypub-http-fetcher',
'activitypub-http-unicast',
+ 'activitypub-refresher',
+ 'activitypub-cleaner',
+ 'actor-keys',
'email',
- 'video-transcoding',
'video-file-import',
'video-import',
+ 'video-live-ending',
+ 'video-redundancy',
+ 'video-transcoding',
'videos-views',
- 'activitypub-refresher',
- 'video-redundancy'
+ 'move-to-object-storage'
]
jobs: Job[] = []
constructor (
private notifier: Notifier,
private jobsService: JobService
- ) {
+ ) {
super()
}
}
}
+ getColspan () {
+ if (this.jobState === 'all' && this.hasProgress()) return 7
+
+ if (this.jobState === 'all' || this.hasProgress()) return 6
+
+ return 5
+ }
+
onJobStateOrTypeChanged () {
this.pagination.start = 0
- this.loadData()
+ this.reloadData()
this.saveJobStateAndType()
}
- protected loadData () {
+ hasProgress () {
+ return this.jobType === 'all' || this.jobType === 'video-transcoding'
+ }
+
+ getProgress (job: Job) {
+ if (job.state === 'active') return job.progress + '%'
+
+ return ''
+ }
+
+ refresh () {
+ this.jobs = []
+ this.totalRecords = 0
+
+ this.reloadData()
+ }
+
+ protected reloadData () {
+ let jobState = this.jobState as JobState
+ if (this.jobState === 'all') jobState = null
+
this.jobsService
- .getJobs(this.jobState, this.jobType, this.pagination, this.sort)
- .subscribe(
- resultList => {
+ .getJobs({
+ jobState,
+ jobType: this.jobType,
+ pagination: this.pagination,
+ sort: this.sort
+ })
+ .subscribe({
+ next: resultList => {
this.jobs = resultList.data
this.totalRecords = resultList.total
},
- err => this.notifier.error(err.message)
- )
+ error: err => this.notifier.error(err.message)
+ })
}
private loadJobStateAndType () {