Universal Actions / Limits: Add some additional crash protection in case the configuration is invalid.

Future: Do a full validation pass on these on startup and when the configuration is reloaded.

Author: jhuckaby

htdocs/js/pages/Events.class.js

@@ -1025,7 +1025,7 @@ Page.Events = class Events extends Page.PageUtils {
 		// add universal actions (not hidden)
 		var temp_event_type = this.workflow ? 'workflow' : 'default';
 		config.job_universal_actions[temp_event_type].forEach( function(action) {
-			if (action.enabled && !action.hidden) rows.push({ ...action, source: 'universal' });
+			if (action.enabled && action.condition && !action.hidden) rows.push({ ...action, source: 'universal' });
 		} );
 
 		html += this.getCompactGrid(targs, function(item, idx) {
@@ -1076,7 +1076,7 @@ Page.Events = class Events extends Page.PageUtils {
 		// add universal limits (not hidden)
 		var temp_event_type = this.workflow ? 'workflow' : 'default';
 		config.job_universal_limits[temp_event_type].forEach( function(limit) {
-			if (limit.enabled && !limit.hidden) rows.push({ ...limit, source: 'universal' });
+			if (limit.enabled && limit.type && !limit.hidden) rows.push({ ...limit, source: 'universal' });
 		} );
 
 		html += this.getCompactGrid(targs, function(item, idx) {

lib/job.js

@@ -101,12 +101,12 @@ class Jobs {
 
 		if (!job.test || (job.test && job.test_actions)) {
 			this.config.getPath('job_universal_actions.' + temp_job_type).forEach( function(action) {
-				if (action.enabled) job.actions.push( Tools.mergeHashes( Tools.copyHash(action, true), { source: 'universal' } ) );
+				if (action.enabled && action.condition) job.actions.push( Tools.mergeHashes( Tools.copyHash(action, true), { source: 'universal' } ) );
 			} );
 		}
 		if (!job.test || (job.test && job.test_limits)) {
 			this.config.getPath('job_universal_limits.' + temp_job_type).forEach( function(limit) {
-				if (limit.enabled) job.limits.push( Tools.mergeHashes( Tools.copyHash(limit, true), { source: 'universal' } ) );
+				if (limit.enabled && limit.type) job.limits.push( Tools.mergeHashes( Tools.copyHash(limit, true), { source: 'universal' } ) );
 			} );
 		}