-import { Component, OnInit } from '@angular/core'
-import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
-import { Notifier } from '@app/core'
import { SortMeta } from 'primeng/api'
-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 { Component, OnInit } from '@angular/core'
+import { Notifier, RestPagination, RestTable } from '@app/core'
+import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
+import { Job, JobState, JobType } from '@shared/models'
import { JobStateClient } from '../../../../types/job-state-client.type'
import { JobTypeClient } from '../../../../types/job-type-client.type'
+import { JobService } from './job.service'
@Component({
selector: 'my-jobs',
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-cleaner',
'activitypub-follow',
+ 'activitypub-http-broadcast-parallel',
'activitypub-http-broadcast',
'activitypub-http-fetcher',
'activitypub-http-unicast',
+ 'activitypub-refresher',
+ 'actor-keys',
+ 'after-video-channel-import',
'email',
- 'video-transcoding',
+ 'federate-video',
+ 'manage-video-torrent',
+ 'move-to-object-storage',
+ 'notify',
+ 'video-channel-import',
'video-file-import',
'video-import',
- 'videos-views',
- 'activitypub-refresher',
- 'video-redundancy'
+ 'video-live-ending',
+ 'video-redundancy',
+ 'video-studio-edition',
+ 'video-transcoding',
+ 'videos-views-stats'
]
jobs: Job[] = []
constructor (
private notifier: Notifier,
- private jobsService: JobService,
- private i18n: I18n
+ private jobsService: JobService
) {
super()
}
return 'JobsComponent'
}
+ getJobStateClass (state: JobStateClient) {
+ switch (state) {
+ case 'active':
+ return 'badge-blue'
+ case 'completed':
+ return 'badge-green'
+ case 'delayed':
+ return 'badge-brown'
+ case 'failed':
+ return 'badge-red'
+ case 'waiting':
+ return 'badge-yellow'
+ }
+ }
+
+ getColspan () {
+ if (this.jobState === 'all' && this.hasGlobalProgress()) return 7
+
+ if (this.jobState === 'all' || this.hasGlobalProgress()) return 6
+
+ return 5
+ }
+
onJobStateOrTypeChanged () {
this.pagination.start = 0
- this.loadData()
+ this.reloadData()
this.saveJobStateAndType()
}
- protected loadData () {
+ hasGlobalProgress () {
+ return this.jobType === 'all' || this.jobType === 'video-transcoding'
+ }
+
+ hasProgress (job: Job) {
+ return job.type === '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 () {