From 040d6896a3cd5622e78cccdedd8cce2afcf49a31 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Sun, 13 Dec 2020 19:27:25 +0100
Subject: add display of logs matching any state

---
 client/src/app/+admin/system/jobs/job.service.ts   | 11 ++++++--
 .../src/app/+admin/system/jobs/jobs.component.html | 33 +++++++++++++++-------
 .../src/app/+admin/system/jobs/jobs.component.ts   | 16 +++++++++--
 3 files changed, 46 insertions(+), 14 deletions(-)

(limited to 'client/src/app/+admin/system')

diff --git a/client/src/app/+admin/system/jobs/job.service.ts b/client/src/app/+admin/system/jobs/job.service.ts
index 1ac50f050..4b4a8914f 100644
--- a/client/src/app/+admin/system/jobs/job.service.ts
+++ b/client/src/app/+admin/system/jobs/job.service.ts
@@ -19,13 +19,20 @@ export class JobService {
     private restExtractor: RestExtractor
   ) {}
 
-  getJobs (jobState: JobStateClient, jobType: JobTypeClient, pagination: RestPagination, sort: SortMeta): Observable<ResultList<Job>> {
+  getJobs (options: {
+    jobState?: JobStateClient,
+    jobType: JobTypeClient,
+    pagination: RestPagination,
+    sort: SortMeta
+  }): Observable<ResultList<Job>> {
+    const { jobState, jobType, pagination, sort } = options
+
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination, sort)
 
     if (jobType !== 'all') params = params.append('jobType', jobType)
 
-    return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL + '/' + jobState, { params })
+    return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL + `/${jobState ? jobState : ''}`, { params })
                .pipe(
                  map(res => {
                    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 e06156a9e..2d60e7b9e 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.html
+++ b/client/src/app/+admin/system/jobs/jobs.component.html
@@ -17,6 +17,9 @@
       [clearable]="false"
       [searchable]="false"
     >
+      <ng-option value="all">
+        <span i18n="Selector for the list displaying jobs, filtering by their state">any</span>
+      </ng-option>
       <ng-option *ngFor="let state of jobStates" [value]="state">
         <span class="badge" [ngClass]="getJobStateClass(state)">{{ state }}</span>
       </ng-option>
@@ -37,27 +40,31 @@
       <th style="width: 40px"></th>
       <th style="width: calc(100% - 390px)" class="job-id" i18n>ID</th>
       <th style="width: 200px" class="job-type" i18n>Type</th>
+      <th style="width: 200px" class="job-type" i18n *ngIf="jobState === 'all'">State</th>
       <th style="width: 150px" class="job-date" i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th>
     </tr>
   </ng-template>
 
   <ng-template pTemplate="body" let-expanded="expanded" let-job>
     <tr>
-      <td class="expand-cell" [pRowToggler]="job" i18n-ngbTooltip ngbTooltip="More information" placement="top-left" container="body">
+      <td class="expand-cell c-hand" [pRowToggler]="job" i18n-ngbTooltip ngbTooltip="More information" placement="top-left" container="body">
         <span class="expander">
           <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i>
         </span>
       </td>
 
-      <td class="job-id" [pRowToggler]="job" [title]="job.id">{{ job.id }}</td>
-      <td class="job-type" [pRowToggler]="job">{{ job.type }}</td>
-      <td class="job-date" [pRowToggler]="job">{{ job.createdAt | date: 'short' }}</td>
+      <td class="job-id c-hand" [pRowToggler]="job" [title]="job.id">{{ job.id }}</td>
+      <td class="job-type c-hand" [pRowToggler]="job">{{ job.type }}</td>
+      <td class="job-type c-hand" [pRowToggler]="job" *ngIf="jobState === 'all'">
+        <span class="badge" [ngClass]="getJobStateClass(job.state)">{{ job.state }}</span>
+      </td>
+      <td class="job-date c-hand" [pRowToggler]="job">{{ job.createdAt | date: 'short' }}</td>
     </tr>
   </ng-template>
 
   <ng-template pTemplate="rowexpansion" let-job>
     <tr>
-      <td colspan="4">
+      <td [attr.colspan]="getColspan()">
         <pre>{{ [
           'Job: ' + job.id,
           'Type: ' + job.type,
@@ -67,12 +74,12 @@
       </td>
     </tr>
     <tr>
-      <td colspan="4">
+      <td [attr.colspan]="getColspan()">
         <pre>{{ job.data }}</pre>
       </td>
     </tr>
     <tr class="job-error" *ngIf="job.error">
-      <td colspan="4">
+      <td [attr.colspan]="getColspan()">
         <pre>{{ job.error }}</pre>
       </td>
     </tr>
@@ -80,11 +87,17 @@
 
   <ng-template pTemplate="emptymessage">
     <tr>
-      <td colspan="4">
+      <td [attr.colspan]="getColspan()">
         <div class="no-results">
           <div class="d-block">
-            <ng-container *ngIf="jobType === 'all'" i18n>No <span class="badge" [ngClass]="getJobStateClass(jobState)">{{ jobState }}</span> jobs found.</ng-container>
-            <ng-container *ngIf="jobType !== 'all'" i18n>No <code>{{ jobType }}</code> jobs found that are <span class="badge" [ngClass]="getJobStateClass(jobState)">{{ jobState }}</span>.</ng-container>
+            <ng-container *ngIf="jobState === 'all'">
+              <ng-container *ngIf="jobType === 'all'" i18n>No jobs found.</ng-container>
+              <ng-container *ngIf="jobType !== 'all'" i18n>No <code>{{ jobType }}</code> jobs found.</ng-container>
+            </ng-container>
+            <ng-container *ngIf="jobState !== 'all'"> 
+              <ng-container *ngIf="jobType === 'all'" i18n>No <span class="badge" [ngClass]="getJobStateClass(jobState)">{{ jobState }}</span> jobs found.</ng-container>
+              <ng-container *ngIf="jobType !== 'all'" i18n>No <code>{{ jobType }}</code> jobs found that are <span class="badge" [ngClass]="getJobStateClass(jobState)">{{ jobState }}</span>.</ng-container>
+            </ng-container>
           </div>
         </div>
       </td>
diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts
index f8e12d1b6..b7f18067b 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.ts
+++ b/client/src/app/+admin/system/jobs/jobs.component.ts
@@ -16,7 +16,7 @@ export class JobsComponent extends RestTable implements OnInit {
   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'
@@ -73,6 +73,10 @@ export class JobsComponent extends RestTable implements OnInit {
     }
   }
 
+  getColspan () {
+    return this.jobState === 'all' ? 5 : 4
+  }
+
   onJobStateOrTypeChanged () {
     this.pagination.start = 0
 
@@ -81,8 +85,16 @@ export class JobsComponent extends RestTable implements OnInit {
   }
 
   protected loadData () {
+    let jobState = this.jobState as JobState
+    if (this.jobState === 'all') jobState = null
+
     this.jobsService
-      .getJobs(this.jobState, this.jobType, this.pagination, this.sort)
+      .getJobs({
+        jobState,
+        jobType: this.jobType,
+        pagination: this.pagination,
+        sort: this.sort
+      })
       .subscribe(
         resultList => {
           this.jobs = resultList.data
-- 
cgit v1.2.3