Feature: Allow special _xy_override_ prefixed event param IDs to override job props at runtime (i.e. targets, algo).

Author: jhuckaby

htdocs/js/pages/Base.class.js

@@ -587,6 +587,7 @@ Page.Base = class Base extends Page {
 		var self = this;
 		if (!glue) glue = ', ';
 		if (!targets || !targets.length) return '(None)';
+		if (typeof(targets) == 'string') targets = targets.split(/\,\s*/);
 		return targets.map( function(target) { return self.getNiceTarget(target, link); } ).join(glue);
 	}
 

htdocs/js/pages/PageUtils.class.js

@@ -3691,7 +3691,7 @@ Page.PageUtils = class PageUtils extends Page.Base {
 				break;
 
 				case 'code':
-					if (elem_value.toString().length) {
+					if (String(elem_value).length) {
 						html += '<i class="mdi mdi-' + elem_icon + '">&nbsp;</i>';
 						html += '<span class="monospace">' + strip_html(elem_value) + '</span>';
 					}
@@ -3713,11 +3713,11 @@ Page.PageUtils = class PageUtils extends Page.Base {
 
 				case 'select':
 					html += '<i class="mdi mdi-' + elem_icon + '">&nbsp;</i>';
-					html += strip_html( elem_value.toString().replace(/\,.*$/, '').replace(/^.+\[([\w\-\.]+)\]\s*$/, '$1') );
+					html += strip_html( str_value(elem_value).replace(/\,.*$/, '').replace(/^.+\[([\w\-\.]+)\]\s*$/, '$1') );
 				break;
 
 				case 'bucket':
-					if (elem_value.toString().length) {
+					if (str_value(elem_value).length) {
 						html += '<i class="mdi mdi-' + elem_icon + '">&nbsp;</i>';
 						html += strip_html( elem_value );
 					}
@@ -3726,7 +3726,7 @@ Page.PageUtils = class PageUtils extends Page.Base {
 
 				case 'system':
 					html += '<i class="mdi mdi-' + elem_icon + '">&nbsp;</i>';
-					html += strip_html( elem_value.toString() || '(None)' );
+					html += strip_html( str_value(elem_value) || '(None)' );
 				break;
 
 				case 'toolset':

lib/api/jobs.js

@@ -704,11 +704,22 @@ class Jobs {
 			else action.details = sus_details;
 
 			// import custom params into job
-			if (!job.complete) {
+			if (!job.complete && params.params && Tools.firstKey(params.params)) {
 				// job is starting, merge params into current job params
-				Tools.mergeHashInto( job.params, params.params || {} );
+				Tools.mergeHashInto( job.params, params.params );
+				
+				for (var key in job.params) {
+					if (key.match(/^_xy_override_(\w+)$/) && job.params[key]) {
+						var sub_key = RegExp.$1;
+						self.logDebug(9, "Overriding job property with param: " + key, { key: sub_key, value: job.params[key] } );
+						job[sub_key] = job.params[key];
+					}
+				} // foreach param
 			}
 
+			// remove job.server so it has to be re-chosen
+			delete job.server;
+			
 			self.logTransaction('job_resume', job.id, self.getClientInfo(args, params));
 
 			callback({ code: 0 });

lib/job.js

@@ -167,8 +167,15 @@ class Jobs {
 				if (typeof(job.params[key]) == 'string') {
 					job.params[key] = this.messageSub( job.params[key], context );
 				}
-			}
-		}
+				
+				// allow special prefixed params to override top-level props
+				if (key.match(/^_xy_override_(\w+)$/) && job.params[key]) {
+					var sub_key = RegExp.$1;
+					this.logJob(9, "Overriding job property with param: " + key, { key: sub_key, value: job.params[key] } );
+					job[sub_key] = job.params[key];
+				}
+			} // foreach param
+		} // job.params
 
 		// workflows: filter out notes without 'show' prop
 		if (job.workflow && job.workflow.nodes) {
@@ -376,6 +383,9 @@ class Jobs {
 					// branch off for workflows here
 					if (job.type == 'workflow') return self.startWorkflow(job);
 
+					// if job was suspended / resumed, we may need to re-choose a server
+					if (!job.server && !self.chooseJobServer(job)) return;
+					
 					// send command to server
 					var server = self.servers[ job.server ];
 					if (!server) {
@@ -849,6 +859,9 @@ class Jobs {
 		// skip this entirely for workflows
 		if (job.type == 'workflow') return true;
 
+		// convert CSV into array if needed
+		if (typeof(job.targets) == 'string') job.targets = job.targets.split(/\,\s*/);
+		
 		// gather all server candidates (targets may be groups and/or servers)
 		(job.targets || []).forEach( function(target) {
 			if (self.servers[target]) {
@@ -907,6 +920,9 @@ class Jobs {
 
 		this.logJob(9, "Choosing server for job: " + job.id);
 
+		// convert CSV into array if needed
+		if (typeof(job.targets) == 'string') job.targets = job.targets.split(/\,\s*/);
+		
 		// gather all server candidates (targets may be groups and/or servers)
 		(job.targets || []).forEach( function(target) {
 			if (self.servers[target]) {

lib/workflow.js

@@ -222,6 +222,16 @@ class Workflows {
 		// copy over workflow data so job can share it
 		new_job.workflowData = this.jobDetails[job.id].workflowData;
 
+		// pass workflow-level _xy_override_ params into sub-job props
+		if (job.params) {
+			for (var key in job.params) {
+				if (key.match(/^_xy_override_(\w+)$/) && job.params[key]) {
+					var sub_key = RegExp.$1;
+					new_job[sub_key] = job.params[key];
+				}
+			} // foreach param
+		} // job.params
+		
 		Tools.findObjects( workflow.connections, { source: node.id } ).forEach( function(conn) {
 			var dest = Tools.findObject( workflow.nodes, { id: conn.dest } );
 			if (dest.type == 'limit') {
@@ -306,6 +316,16 @@ class Workflows {
 		// copy over workflow data so job can share it
 		new_job.workflowData = this.jobDetails[job.id].workflowData;
 
+		// pass workflow-level _xy_override_ params into sub-job props
+		if (job.params) {
+			for (var key in job.params) {
+				if (key.match(/^_xy_override_(\w+)$/) && job.params[key]) {
+					var sub_key = RegExp.$1;
+					new_job[sub_key] = job.params[key];
+				}
+			} // foreach param
+		} // job.params
+		
 		// add actions and limits
 		new_job.actions = [];
 		new_job.limits = [];