Provide filter query by job displayName, add disabled pristine jobs r…

…eports
MGSousa · Jan 25, 2021 · 5be4196 · 5be4196
1 parent 1911787
commit 5be4196
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/dkron/store.go b/dkron/store.go
@@ -327,7 +327,7 @@ func (s *Store) GetJobs(options *JobOptions) ([]*Job, error) {
 
 		if options == nil ||
 			(options.Metadata == nil || len(options.Metadata) == 0 || s.jobHasMetadata(job, options.Metadata)) &&
-				(options.Query == "" || strings.Contains(job.Name, options.Query)) &&
+				(options.Query == "" || strings.Contains(job.Name, options.Query) || strings.Contains(job.DisplayName, options.Query)) &&
 				(options.Status == "" || job.Status == options.Status) {
 
 			jobs = append(jobs, job)

diff --git a/dkron/ui.go b/dkron/ui.go
@@ -40,14 +40,17 @@ func (h *HTTPTransport) UI(r *gin.RouterGroup) {
 			if err != nil {
 				log.Error(err)
 			}
-			totalJobs := len(jobs)
-			successfulJobs := 0
-			failedJobs := 0
+			var (
+				totalJobs = len(jobs)
+				successfulJobs, failedJobs, pristineJobs int
+			)
 			for _, j := range jobs {
 				if j.Status == "success" {
 					successfulJobs++
-				} else {
+				} else if j.Status == "failed" {
 					failedJobs++
+				} else {
+					pristineJobs++
 				}
 			}
 			l, err := h.agent.leaderMember()
@@ -58,11 +61,12 @@ func (h *HTTPTransport) UI(r *gin.RouterGroup) {
 				ln = l.Name
 			}
 			ctx.HTML(http.StatusOK, "index.html", gin.H{
-				"DKRON_API_URL":         fmt.Sprintf("/%s", apiPathPrefix),
-				"DKRON_LEADER":          ln,
-				"DKRON_TOTAL_JOBS":      totalJobs,
-				"DKRON_FAILED_JOBS":     failedJobs,
-				"DKRON_SUCCESSFUL_JOBS": successfulJobs,
+				"DKRON_API_URL":         	fmt.Sprintf("/%s", apiPathPrefix),
+				"DKRON_LEADER":          	ln,
+				"DKRON_TOTAL_JOBS":      	totalJobs,
+				"DKRON_FAILED_JOBS":     	failedJobs,
+				"DKRON_DIS_PRISTINE_JOBS":   pristineJobs,
+				"DKRON_SUCCESSFUL_JOBS": 	successfulJobs,
 			})
 		}
 	})