feat(ui): add a filter on disabled state

distribworks · Mar 13, 2021 · c97f895 · c97f895
1 parent 92a9709
commit c97f895
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/dkron/api.go b/dkron/api.go
@@ -172,13 +172,21 @@ func (h *HTTPTransport) jobsHandler(c *gin.Context) {
 	order := c.DefaultQuery("_order", "ASC")
 	q := c.Query("q")
 
+	disabled := c.Query("disabled")
+	if disabled == "disabled" {
+		disabled = "true"
+	} else if disabled == "enabled" {
+		disabled = "false"
+	}
+
 	jobs, err := h.agent.Store.GetJobs(
 		&JobOptions{
 			Metadata: metadata,
 			Sort:     sort,
 			Order:    order,
 			Query:    q,
 			Status:   c.Query("status"),
+			Disabled: disabled,
 		},
 	)
 	if err != nil {
@@ -340,7 +348,7 @@ func (h *HTTPTransport) executionsHandler(c *gin.Context) {
 		return
 	}
 
-	executions, err := h.agent.Store.GetExecutions(job.Name, 
+	executions, err := h.agent.Store.GetExecutions(job.Name,
 		&ExecutionOptions{
 			Sort:     sort,
 			Order:    order,

diff --git a/dkron/store.go b/dkron/store.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"sort"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -45,6 +46,7 @@ type JobOptions struct {
 	Order    string
 	Query    string
 	Status   string
+	Disabled string
 }
 
 // ExecutionOptions additional options like "Sort" will be ready for JSON marshall
@@ -328,7 +330,8 @@ 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.Status == "" || job.Status == options.Status) {
+				(options.Status == "" || job.Status == options.Status) &&
+				(options.Disabled == "" || strconv.FormatBool(job.Disabled) == options.Disabled) {
 
 			jobs = append(jobs, job)
 		}

diff --git a/ui/src/jobs/JobList.tsx b/ui/src/jobs/JobList.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { 
+import {
     Datagrid,
     TextField,
     NumberField,
@@ -24,6 +24,10 @@ const JobFilter = (props: any) => (
             { id: 'success', name: 'Success' },
             { id: 'failed', name: 'Failed' },
         ]} />
+        <SelectInput source="disabled" choices={[
+            { id: 'disabled', name: 'Diabled' },
+            { id: 'enabled', name: 'Enabled' },
+        ]} />
     </Filter>
 );