Provide filter query by job displayName, add pristine jobs reports (#897

) * Provide filter query by job displayName, add disabled pristine jobs reports * Added Pristine Jobs to React UI * Provide filter query by job displayName, add disabled pristine jobs reports Co-authored-by: Miguel Sousa <miguelsousa@MacBook-Pro-de-Miguel.local> Co-authored-by: Victor Castell <victor@victorcastell.com>
distribworks · Mar 22, 2021 · 79eaa39 · 79eaa39
1 parent f1ba46a
commit 79eaa39
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 87 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
@@ -329,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)
 		}
@@ -716,4 +716,4 @@ func trimDirectoryKey(key []byte) []byte {
 
 func isDirectoryKey(key []byte) bool {
 	return len(key) > 0 && key[len(key)-1] == ':'
-}
+}
diff --git a/dkron/ui.go b/dkron/ui.go
@@ -50,14 +50,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, untriggeredJobs int
+			)
 			for _, j := range jobs {
 				if j.Status == "success" {
 					successfulJobs++
-				} else {
+				} else if j.Status == "failed" {
 					failedJobs++
+				} else if j.Status == "" {
+					untriggeredJobs++
 				}
 			}
 			l, err := h.agent.leaderMember()
@@ -68,11 +71,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_UNTRIGGERED_JOBS":	untriggeredJobs,
+				"DKRON_SUCCESSFUL_JOBS": 	successfulJobs,
 			})
 		}
 	})

diff --git a/ui/public/index.html b/ui/public/index.html
@@ -31,6 +31,7 @@
       window.DKRON_TOTAL_JOBS={{.DKRON_TOTAL_JOBS}};
       window.DKRON_SUCCESSFUL_JOBS={{.DKRON_SUCCESSFUL_JOBS}};
       window.DKRON_FAILED_JOBS={{.DKRON_FAILED_JOBS}};
+      window.DKRON_UNTRIGGERED_JOBS={{.DKRON_UNTRIGGERED_JOBS}};
     </script>
   </head>
   <body>

diff --git a/ui/public/manifest.json b/ui/public/manifest.json
@@ -17,4 +17,4 @@
   "display": "standalone",
   "theme_color": "#000000",
   "background_color": "#ffffff"
-}
+}
diff --git a/ui/public/robots.txt b/ui/public/robots.txt
@@ -1,3 +1,3 @@
 # https://www.robotstxt.org/robotstxt.html
 User-agent: *
-Disallow:
+Disallow:
diff --git a/ui/src/App.tsx b/ui/src/App.tsx
@@ -18,6 +18,7 @@ declare global {
     interface Window {
         DKRON_API_URL: string;
         DKRON_LEADER: string;
+        DKRON_UNTRIGGERED_JOBS: string;
         DKRON_FAILED_JOBS: string;
         DKRON_SUCCESSFUL_JOBS: string;
         DKRON_TOTAL_JOBS: string;

diff --git a/ui/src/dashboard/Dashboard.tsx b/ui/src/dashboard/Dashboard.tsx
@@ -5,6 +5,7 @@ import { TagsField } from '../TagsField'
 import Leader from './Leader';
 import FailedJobs from './FailedJobs';
 import SuccessfulJobs from './SuccessfulJobs';
+import UntriggeredJobs from './UntriggeredJobs';
 import TotalJobs from './TotalJobs';
 
 let fakeProps = {
@@ -46,6 +47,8 @@ const Dashboard = () => (
                             <SuccessfulJobs value={window.DKRON_SUCCESSFUL_JOBS || "0"} />
                             <Spacer />
                             <FailedJobs value={window.DKRON_FAILED_JOBS || "0"} />
+                            <Spacer />
+                            <UntriggeredJobs value={window.DKRON_UNTRIGGERED_JOBS || "0"} />
                         </div>
                     </div>
                 </div>

diff --git a/ui/src/dashboard/UntriggeredJobs.tsx b/ui/src/dashboard/UntriggeredJobs.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { FC } from 'react';
+import Icon from '@material-ui/icons/NewReleases';
+
+import CardWithIcon from './CardWithIcon';
+
+interface Props {
+    value?: string;
+}
+
+const UntriggeredJobs: FC<Props> = ({ value }) => {
+    return (
+        <CardWithIcon
+            to='/jobs?filter={"status":"untriggered"}'
+            icon={Icon}
+            title='Untriggered Jobs'
+            subtitle={value}
+        />
+    );
+};
+
+export default UntriggeredJobs;
diff --git a/ui/src/jobs/JobList.tsx b/ui/src/jobs/JobList.tsx
@@ -25,6 +25,7 @@ const JobFilter = (props: any) => (
         <SelectInput source="status" choices={[
             { id: 'success', name: 'Success' },
             { id: 'failed', name: 'Failed' },
+            { id: 'untriggered', name: 'Waiting to Run' },
         ]} />
         <BooleanInput source="disabled"/>
     </Filter>

diff --git a/ui/src/jobs/StatusField.tsx b/ui/src/jobs/StatusField.tsx
@@ -1,10 +1,21 @@
 import * as React from "react";
 import SuccessIcon from '@material-ui/icons/CheckCircle';
 import FailedIcon from '@material-ui/icons/Cancel';
+import UntriggeredIcon from '@material-ui/icons/Timer';
 import { Tooltip } from '@material-ui/core';
 
 const StatusField = (props: any) => {
-  return props.record === undefined ? null : (props.record[props.source] === 'success' ? <Tooltip title="Success"><SuccessIcon htmlColor="green" /></Tooltip> : <Tooltip title="Success"><FailedIcon htmlColor="red" /></Tooltip>);
+	if (props.record === undefined) {
+		return null
+	} else {
+		if (props.record[props.source] === 'success') {
+			return <Tooltip title="Success"><SuccessIcon htmlColor="green" /></Tooltip> 
+		} else if (props.record[props.source] === 'failed') {
+			return <Tooltip title="Error"><FailedIcon htmlColor="red" /></Tooltip>
+		} else {
+			return <Tooltip title="Waiting to Run"><UntriggeredIcon htmlColor="blue" /></Tooltip>
+		}
+	}
 };
 
 export default StatusField;