Feature: Add new "Custom Error" action trigger and search filter, for job errors that aren't warning, critical or abort (i.e. user-generated errors). Fixes #166.

Author: jhuckaby

htdocs/js/pages/Search.class.js

@@ -76,6 +76,7 @@ Page.Search = class Search extends Page.PageUtils {
 								['', 'Any Result'], 
 								{ id: 'success', title: 'Success', icon: 'check-circle-outline' },
 								{ id: 'error', title: 'Any Error', icon: 'alert-decagram-outline' },
+								{ id: 'user', title: 'Custom Error', icon: 'account-alert' },
 								{ id: 'warning', title: 'Warning', icon: 'alert-outline' },
 								{ id: 'critical', title: 'Critical', icon: 'fire-alert' },
 								{ id: 'abort', title: 'Abort', icon: 'cancel' },
@@ -398,6 +399,8 @@ Page.Search = class Search extends Page.PageUtils {
 			case 'success': query += ' tags:_success'; break;
 			case 'error': query += ' tags:_error'; break;
 
+			case 'user': query += ' tags:_error code:-warning -critical -abort'; break;
+			
 			case 'warning':
 			case 'critical':
 			case 'abort':

internal/ui.json

@@ -1165,6 +1165,7 @@
 		{ "id": "continue", "title": "On Continue", "icon": "step-forward-2" },
 		{ "id": "success", "title": "On Success", "icon": "check-circle-outline", "group": "On Result:" },
 		{ "id": "error", "title": "On Any Error", "icon": "alert-decagram-outline" },
+		{ "id": "user", "title": "On Custom Error", "icon": "account-alert" },
 		{ "id": "warning", "title": "On Warning", "icon": "alert-outline" },
 		{ "id": "critical", "title": "On Critical", "icon": "fire-alert" },
 		{ "id": "abort", "title": "On Abort", "icon": "cancel" }

lib/api.js

@@ -398,7 +398,7 @@ class API {
 			if (!Tools.isaHash(action)) return this.doError('api', err_prefix + " (not an object)", callback);
 			if (!('enabled' in action)) return this.doError('api', err_prefix + ": Missing enabled flag", callback);
 
-			if (!action.condition || !action.condition.toString().match(/^(start|complete|success|warning|error|critical|abort|tag:\w+|alert_new|alert_cleared)$/)) {
+			if (!action.condition || !action.condition.toString().match(/^(start|complete|success|warning|error|user|critical|abort|tag:\w+|alert_new|alert_cleared)$/)) {
 				return this.doError('api', err_prefix + ": Invalid condition", callback);
 			}
 

lib/job.js

@@ -1193,6 +1193,7 @@ class Jobs {
 			if (job.code) {
 				conditions.push('error');
 				if (job.code.toString().match(/^(warning|critical|abort)$/)) conditions.push(job.code);
+				else conditions.push('user');
 			}
 			else conditions.push('success');