aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/system/jobs/job.service.ts8
-rw-r--r--client/src/app/+admin/system/jobs/jobs.component.html49
-rw-r--r--client/src/app/+admin/system/jobs/jobs.component.scss4
-rw-r--r--client/src/app/+admin/system/jobs/jobs.component.ts5
-rw-r--r--client/src/types/job-state-client.type.ts3
5 files changed, 41 insertions, 28 deletions
diff --git a/client/src/app/+admin/system/jobs/job.service.ts b/client/src/app/+admin/system/jobs/job.service.ts
index 120144dff..1e2291ad1 100644
--- a/client/src/app/+admin/system/jobs/job.service.ts
+++ b/client/src/app/+admin/system/jobs/job.service.ts
@@ -3,11 +3,11 @@ import { HttpClient, HttpParams } from '@angular/common/http'
3import { Injectable } from '@angular/core' 3import { Injectable } from '@angular/core'
4import { SortMeta } from 'primeng/api' 4import { SortMeta } from 'primeng/api'
5import { Observable } from 'rxjs' 5import { Observable } from 'rxjs'
6import { JobType, ResultList } from '../../../../../../shared' 6import { ResultList } from '../../../../../../shared'
7import { JobState } from '../../../../../../shared/models'
8import { Job } from '../../../../../../shared/models/server/job.model' 7import { Job } from '../../../../../../shared/models/server/job.model'
9import { environment } from '../../../../environments/environment' 8import { environment } from '../../../../environments/environment'
10import { RestExtractor, RestPagination, RestService } from '../../../shared' 9import { RestExtractor, RestPagination, RestService } from '../../../shared'
10import { JobStateClient } from '../../../../types/job-state-client.type'
11import { JobTypeClient } from '../../../../types/job-type-client.type' 11import { JobTypeClient } from '../../../../types/job-type-client.type'
12 12
13@Injectable() 13@Injectable()
@@ -20,13 +20,13 @@ export class JobService {
20 private restExtractor: RestExtractor 20 private restExtractor: RestExtractor
21 ) {} 21 ) {}
22 22
23 getJobs (state: JobState, jobType: JobTypeClient, pagination: RestPagination, sort: SortMeta): Observable<ResultList<Job>> { 23 getJobs (jobState: JobStateClient, jobType: JobTypeClient, pagination: RestPagination, sort: SortMeta): Observable<ResultList<Job>> {
24 let params = new HttpParams() 24 let params = new HttpParams()
25 params = this.restService.addRestGetParams(params, pagination, sort) 25 params = this.restService.addRestGetParams(params, pagination, sort)
26 26
27 if (jobType !== 'all') params = params.append('jobType', jobType) 27 if (jobType !== 'all') params = params.append('jobType', jobType)
28 28
29 return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL + '/' + state, { params }) 29 return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL + '/' + jobState, { params })
30 .pipe( 30 .pipe(
31 map(res => { 31 map(res => {
32 return this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'processedOn', 'finishedOn' ]) 32 return this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'processedOn', 'finishedOn' ])
diff --git a/client/src/app/+admin/system/jobs/jobs.component.html b/client/src/app/+admin/system/jobs/jobs.component.html
index de43b6448..af07a32a1 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.html
+++ b/client/src/app/+admin/system/jobs/jobs.component.html
@@ -2,7 +2,7 @@
2 <div i18n class="form-sub-title">Jobs list</div> 2 <div i18n class="form-sub-title">Jobs list</div>
3 3
4 <div class="select-filter-block"> 4 <div class="select-filter-block">
5 <label for="jobType">Job type</label> 5 <label for="jobType" i18n>Job type</label>
6 <div class="peertube-select-container"> 6 <div class="peertube-select-container">
7 <select id="jobType" name="jobType" [(ngModel)]="jobType" (ngModelChange)="onJobStateOrTypeChanged()"> 7 <select id="jobType" name="jobType" [(ngModel)]="jobType" (ngModelChange)="onJobStateOrTypeChanged()">
8 <option *ngFor="let jobType of jobTypes" [value]="jobType">{{ jobType }}</option> 8 <option *ngFor="let jobType of jobTypes" [value]="jobType">{{ jobType }}</option>
@@ -11,7 +11,7 @@
11 </div> 11 </div>
12 12
13 <div class="select-filter-block"> 13 <div class="select-filter-block">
14 <label for="jobState">Job state</label> 14 <label for="jobState" i18n>Job state</label>
15 <div class="peertube-select-container"> 15 <div class="peertube-select-container">
16 <select id="jobState" name="jobState" [(ngModel)]="jobState" (ngModelChange)="onJobStateOrTypeChanged()"> 16 <select id="jobState" name="jobState" [(ngModel)]="jobState" (ngModelChange)="onJobStateOrTypeChanged()">
17 <option *ngFor="let state of jobStates" [value]="state">{{ state }}</option> 17 <option *ngFor="let state of jobStates" [value]="state">{{ state }}</option>
@@ -23,43 +23,48 @@
23<p-table 23<p-table
24 [value]="jobs" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" dataKey="uniqId" 24 [value]="jobs" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" dataKey="uniqId"
25 [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" [first]="pagination.start" 25 [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" [first]="pagination.start"
26 [tableStyle]="{'table-layout':'auto'}"
26> 27>
27 <ng-template pTemplate="header"> 28 <ng-template pTemplate="header">
28 <tr> 29 <tr>
29 <th style="width: 27px"></th> 30 <th i18n style="max-width: 60px;">ID</th>
30 <th i18n style="width: 60px">ID</th> 31 <th i18n style="max-width: 120px;">Type</th>
31 <th i18n style="width: 210px">Type</th> 32 <th i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th>
32 <th i18n style="width: 130px">State</th> 33 <th i18n>State</th>
33 <th i18n style="width: 250px" pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th>
34 <th i18n style="width: 250px">Processed on</th>
35 <th i18n style="width: 250px">Finished on</th>
36 </tr> 34 </tr>
37 </ng-template> 35 </ng-template>
38 36
39 <ng-template pTemplate="body" let-expanded="expanded" let-job> 37 <ng-template pTemplate="body" let-expanded="expanded" let-job>
40 <tr> 38 <tr class="expander" [pRowToggler]="job">
41 <td class="expand-cell"> 39 <td style="max-width: 60px;">{{ job.id }}</td>
42 <span class="expander" [pRowToggler]="job"> 40 <td style="max-width: 120px;">{{ job.type }}</td>
43 <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i>
44 </span>
45 </td>
46 <td>{{ job.id }}</td>
47 <td>{{ job.type }}</td>
48 <td>{{ job.state }}</td>
49 <td>{{ job.createdAt }}</td> 41 <td>{{ job.createdAt }}</td>
50 <td>{{ job.processedOn }}</td> 42 <td *ngIf="job.state === 'delayed'" class="text-muted"><span class="glyphicon glyphicon-repeat"></span> <span i18n>Delayed.</span></td>
51 <td>{{ job.finishedOn }}</td> 43 <td *ngIf="job.state === 'waiting'" class="text-warning"><span class="glyphicon glyphicon-hourglass"></span> <span i18n>Will start soon...</span></td>
44 <td *ngIf="job.state === 'active'" class="text-warning"><span class="glyphicon glyphicon-cog"></span> <span i18n>Running...</span></td>
45 <td *ngIf="job.state === 'completed'" class="text-success"><span class="glyphicon glyphicon-ok"></span> <span i18n>Finished</span></td>
46 <td *ngIf="job.state === 'failed'" class="text-danger"><span class="glyphicon glyphicon-remove"></span> <span i18n>Failed</span></td>
52 </tr> 47 </tr>
53 </ng-template> 48 </ng-template>
54 49
55 <ng-template pTemplate="rowexpansion" let-job> 50 <ng-template pTemplate="rowexpansion" let-job>
56 <tr> 51 <tr>
57 <td colspan="7"> 52 <td colspan="4">
53 <pre>{{ [
54 'Job: ' + job.id,
55 'Type: ' + job.type,
56 'Processed on ' + (job.processedOn || '-'),
57 'Finished on ' + (job.finishedOn || '-')
58 ].join('\n') }}</pre>
59 </td>
60 </tr>
61 <tr>
62 <td colspan="4">
58 <pre>{{ job.data }}</pre> 63 <pre>{{ job.data }}</pre>
59 </td> 64 </td>
60 </tr> 65 </tr>
61 <tr class="job-error" *ngIf="job.error"> 66 <tr class="job-error" *ngIf="job.error">
62 <td colspan="7"> 67 <td colspan="4">
63 <pre>{{ job.error }}</pre> 68 <pre>{{ job.error }}</pre>
64 </td> 69 </td>
65 </tr> 70 </tr>
diff --git a/client/src/app/+admin/system/jobs/jobs.component.scss b/client/src/app/+admin/system/jobs/jobs.component.scss
index ccc0b35ca..d07d5078b 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.scss
+++ b/client/src/app/+admin/system/jobs/jobs.component.scss
@@ -19,6 +19,10 @@
19 } 19 }
20} 20}
21 21
22td .glyphicon {
23 margin-right: 10px;
24}
25
22pre { 26pre {
23 font-size: 11px; 27 font-size: 11px;
24} 28}
diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts
index c3211d71f..20c8ea71a 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.ts
+++ b/client/src/app/+admin/system/jobs/jobs.component.ts
@@ -7,6 +7,7 @@ import { JobState } from '../../../../../../shared/models'
7import { RestPagination, RestTable } from '../../../shared' 7import { RestPagination, RestTable } from '../../../shared'
8import { JobService } from './job.service' 8import { JobService } from './job.service'
9import { I18n } from '@ngx-translate/i18n-polyfill' 9import { I18n } from '@ngx-translate/i18n-polyfill'
10import { JobStateClient } from '../../../../types/job-state-client.type'
10import { JobTypeClient } from '../../../../types/job-type-client.type' 11import { JobTypeClient } from '../../../../types/job-type-client.type'
11 12
12@Component({ 13@Component({
@@ -18,8 +19,8 @@ export class JobsComponent extends RestTable implements OnInit {
18 private static JOB_STATE_LOCAL_STORAGE_STATE = 'jobs-list-state' 19 private static JOB_STATE_LOCAL_STORAGE_STATE = 'jobs-list-state'
19 private static JOB_STATE_LOCAL_STORAGE_TYPE = 'jobs-list-type' 20 private static JOB_STATE_LOCAL_STORAGE_TYPE = 'jobs-list-type'
20 21
21 jobState: JobState = 'waiting' 22 jobState: JobStateClient = 'waiting'
22 jobStates: JobState[] = [ 'active', 'completed', 'failed', 'waiting', 'delayed' ] 23 jobStates: JobStateClient[] = [ 'active', 'completed', 'failed', 'waiting', 'delayed' ]
23 24
24 jobType: JobTypeClient = 'all' 25 jobType: JobTypeClient = 'all'
25 jobTypes: JobTypeClient[] = [ 26 jobTypes: JobTypeClient[] = [
diff --git a/client/src/types/job-state-client.type.ts b/client/src/types/job-state-client.type.ts
new file mode 100644
index 000000000..6123678df
--- /dev/null
+++ b/client/src/types/job-state-client.type.ts
@@ -0,0 +1,3 @@
1import { JobState } from '@shared/models'
2
3export type JobStateClient = JobState