X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fsystem%2Fjobs%2Fjobs.component.ts;h=d5da1b743a835f4f4fe4abf2f4b3534c117fc074;hb=b1934b7e9cdece7c0c38e05b0f905dc2ccab9167;hp=b12d7f80a5e7d29e723fdf4cc152ed9c8e0b1739;hpb=1378c0d343028f3d40d7d795422684ab9e6a1599;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts index b12d7f80a..d5da1b743 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.ts +++ b/client/src/app/+admin/system/jobs/jobs.component.ts @@ -23,21 +23,28 @@ export class JobsComponent extends RestTable implements OnInit { jobTypes: JobTypeClient[] = [ 'all', + 'activitypub-cleaner', 'activitypub-follow', + 'activitypub-http-broadcast-parallel', 'activitypub-http-broadcast', 'activitypub-http-fetcher', 'activitypub-http-unicast', 'activitypub-refresher', - 'activitypub-cleaner', 'actor-keys', + 'after-video-channel-import', 'email', + 'federate-video', + 'manage-video-torrent', + 'move-to-object-storage', + 'notify', + 'video-channel-import', 'video-file-import', 'video-import', 'video-live-ending', 'video-redundancy', + 'video-studio-edition', 'video-transcoding', - 'videos-views', - 'move-to-object-storage' + 'videos-views-stats' ] jobs: Job[] = [] @@ -77,9 +84,9 @@ export class JobsComponent extends RestTable implements OnInit { } getColspan () { - if (this.jobState === 'all' && this.hasProgress()) return 7 + if (this.jobState === 'all' && this.hasGlobalProgress()) return 7 - if (this.jobState === 'all' || this.hasProgress()) return 6 + if (this.jobState === 'all' || this.hasGlobalProgress()) return 6 return 5 } @@ -91,10 +98,14 @@ export class JobsComponent extends RestTable implements OnInit { this.saveJobStateAndType() } - hasProgress () { + 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 + '%'