Remove custom status for untriggered/pristine jobs && Minor changes

MGSousa · Mar 15, 2021 · ffaf975 · ffaf975
1 parent 8c9440b
commit ffaf975
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 184 deletions.
diff --git a/dkron/assets_ui/assets_vfsdata.go b/dkron/assets_ui/assets_vfsdata.go
diff --git a/dkron/store.go b/dkron/store.go
@@ -127,9 +127,6 @@ func (s *Store) SetJob(job *Job, copyDependentJobs bool) error {
 	}
 
 	err := s.db.Update(func(tx *buntdb.Tx) error {
-		// set pristine as default for newly created jobs
-		job.Status = "pristine"
-
 		// Get if the requested job already exist
 		err := s.getJobTxFunc(job.Name, &pbej)(tx)
 		if err != nil && err != buntdb.ErrNotFound {
@@ -332,9 +329,9 @@ 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.Disabled == "" || strconv.FormatBool(job.Disabled) == options.Disabled) {
+			(options.Query == "" || strings.Contains(job.Name, options.Query) || strings.Contains(job.DisplayName, options.Query)) &&
+			(options.Disabled == "" || strconv.FormatBool(job.Disabled) == options.Disabled) && 
+			((options.Status == "untriggered" && job.Status == "") || (options.Status == "" || job.Status == options.Status)) {
 
 			jobs = append(jobs, job)
 		}

diff --git a/dkron/ui.go b/dkron/ui.go
@@ -42,15 +42,15 @@ func (h *HTTPTransport) UI(r *gin.RouterGroup) {
 			}
 			var (
 				totalJobs = len(jobs)
-				successfulJobs, failedJobs, pristineJobs int
+				successfulJobs, failedJobs, untriggeredJobs int
 			)
 			for _, j := range jobs {
 				if j.Status == "success" {
 					successfulJobs++
 				} else if j.Status == "failed" {
 					failedJobs++
 				} else {
-					pristineJobs++
+					untriggeredJobs++
 				}
 			}
 			l, err := h.agent.leaderMember()
@@ -65,7 +65,7 @@ func (h *HTTPTransport) UI(r *gin.RouterGroup) {
 				"DKRON_LEADER":          	ln,
 				"DKRON_TOTAL_JOBS":      	totalJobs,
 				"DKRON_FAILED_JOBS":     	failedJobs,
-				"DKRON_PRISTINE_JOBS":   	pristineJobs,
+				"DKRON_PRISTINE_JOBS":   	untriggeredJobs,
 				"DKRON_SUCCESSFUL_JOBS": 	successfulJobs,
 			})
 		}

diff --git a/ui/src/dashboard/PristineJobs.tsx b/ui/src/dashboard/PristineJobs.tsx
@@ -11,9 +11,9 @@ interface Props {
 const PristineJobs: FC<Props> = ({ value }) => {
     return (
         <CardWithIcon
-            to='/jobs?filter={"status":"pristine"}'
+            to='/jobs?filter={"status":"untriggered"}'
             icon={Icon}
-            title='Pristine Jobs'
+            title='Untriggered Jobs'
             subtitle={value}
         />
     );

diff --git a/ui/src/jobs/JobList.tsx b/ui/src/jobs/JobList.tsx
@@ -24,7 +24,7 @@ const JobFilter = (props: any) => (
         <SelectInput source="status" choices={[
             { id: 'success', name: 'Success' },
             { id: 'failed', name: 'Failed' },
-            { id: 'pristine', name: 'Waiting to Run' },
+            { id: 'untriggered', name: 'Waiting to Run' },
         ]} />
         <BooleanInput source="disabled"/>
     </Filter>