From 3017c61f380c8caa722ff04d11e2e3d37ca56b1c Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 1 Dec 2015 17:46:17 -0500 Subject: [PATCH] Fix step order --- .../galaxy/scripts/mvc/tool/tool-form-composite.js | 12 ++++++------ static/maps/mvc/tool/tool-form-composite.js.map | 2 +- static/scripts/mvc/tool/tool-form-composite.js | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js index 4946d2abd6d..f261c786705 100644 --- a/client/galaxy/scripts/mvc/tool/tool-form-composite.js +++ b/client/galaxy/scripts/mvc/tool/tool-form-composite.js @@ -7,8 +7,8 @@ define([ 'utils/utils', 'mvc/ui/ui-misc', 'mvc/form/form-view', 'mvc/form/form-d initialize: function( options ) { var self = this; this.workflow_id = options.id; - this.forms = {}; - this.steps = {}; + this.forms = []; + this.steps = []; // initialize elements this.setElement( '
' ); @@ -88,8 +88,8 @@ define([ 'utils/utils', 'mvc/ui/ui-misc', 'mvc/form/form-view', 'mvc/form/form-d } // backup objects - self.forms[ step.step_id ] = form; - self.steps[ step.step_id ] = step; + self.forms[ i ] = form; + self.steps[ i ] = step; }); // build workflow parameters @@ -200,9 +200,9 @@ define([ 'utils/utils', 'mvc/ui/ui-misc', 'mvc/form/form-view', 'mvc/form/form-d parameters : {} }; var validated = true; - _.each( this.forms, function( form, key ) { + _.each( this.forms, function( form, i ) { var job_inputs = form.data.create(); - var step = self.steps[ key ]; + var step = self.steps[ i ]; var step_id = step.step_id; var step_type = step.step_type; var order_index = step.order_index; diff --git a/static/maps/mvc/tool/tool-form-composite.js.map b/static/maps/mvc/tool/tool-form-composite.js.map index f33590a65c4..b4b9579eb85 100644 --- a/static/maps/mvc/tool/tool-form-composite.js.map +++ b/static/maps/mvc/tool/tool-form-composite.js.map @@ -1 +1 @@ -{"version":3,"file":"tool-form-composite.js","sources":["../../../src/mvc/tool/tool-form-composite.js"],"names":["define","Utils","Ui","Form","FormData","ToolFormBase","View","Backbone","extend","initialize","options","self","this","workflow_id","id","forms","steps","setElement","$header","$","addClass","append","Label","title","name","$el","Button","icon","onclick","_","each","form","portlet","collapse","expand","step","i","Galaxy","emit","debug","merge","parseInt","help","description","annotation","citations","collapsible","collapsed","sustain_version","sustain_repeats","sustain_conditionals","narrow","text_enable","text_disable","cls_enable","cls_disable","indexOf","step_type","deepeach","inputs","input","type","length","is_workflow","value","__class__","_isWorkflowParameter","collapsible_value","collapsible_preview","matchIds","input_connections_by_name","connection","ignore","reduce","memo","output_name","order_index","matchContext","reference","step_id","wp_fields","wp_inputs","wp_count","wp_style","wp_field","wp_color","wp_cls","$wp_input","css","color","border-color","wp_name","field_list","wp_element","element_list","push","disable","label","isEmpty","wp_form","onchange","data","create","wp_value","sanitize","input_list","post_job_actions","short_str","history_form","history_id","test_param","cases","execute_btn","cls","floating","_execute","job_def","parameters","validated","key","job_inputs","trigger","job_input_id","input_value","input_id","match","input_def","values","highlight","optional","console","log","JSON","stringify","_enabled","request","url","root","success","response","parent","currHistoryPanel","refreshContents","error","err_data","error_messages","matchResponse","modal","show","body","err_msg","ToolTemplate","buttons","Close","hide","complete","enabled","unwait","wait","enable","String","substring"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tool-form-composite.js","sources":["../../../src/mvc/tool/tool-form-composite.js"],"names":["define","Utils","Ui","Form","FormData","ToolFormBase","View","Backbone","extend","initialize","options","self","this","workflow_id","id","forms","steps","setElement","$header","$","addClass","append","Label","title","name","$el","Button","icon","onclick","_","each","form","portlet","collapse","expand","step","i","Galaxy","emit","debug","merge","parseInt","help","description","annotation","citations","collapsible","collapsed","sustain_version","sustain_repeats","sustain_conditionals","narrow","text_enable","text_disable","cls_enable","cls_disable","indexOf","step_type","deepeach","inputs","input","type","length","is_workflow","value","__class__","_isWorkflowParameter","collapsible_value","collapsible_preview","matchIds","input_connections_by_name","connection","ignore","reduce","memo","output_name","order_index","matchContext","reference","wp_fields","wp_inputs","wp_count","wp_style","wp_field","wp_color","wp_cls","$wp_input","css","color","border-color","wp_name","field_list","wp_element","element_list","push","disable","label","isEmpty","wp_form","onchange","data","create","wp_value","sanitize","input_list","post_job_actions","short_str","history_form","history_id","test_param","cases","execute_btn","cls","floating","_execute","job_def","parameters","validated","job_inputs","step_id","trigger","job_input_id","input_value","input_id","match","input_def","values","highlight","optional","console","log","JSON","stringify","_enabled","request","url","root","success","response","parent","currHistoryPanel","refreshContents","error","err_data","error_messages","matchResponse","modal","show","body","err_msg","ToolTemplate","buttons","Close","hide","complete","enabled","unwait","wait","enable","String","substring"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/mvc/tool/tool-form-composite.js b/static/scripts/mvc/tool/tool-form-composite.js index cecd069010f..bb9eea1e62a 100644 --- a/static/scripts/mvc/tool/tool-form-composite.js +++ b/static/scripts/mvc/tool/tool-form-composite.js @@ -1,2 +1,2 @@ -define(["utils/utils","mvc/ui/ui-misc","mvc/form/form-view","mvc/form/form-data","mvc/tool/tool-form-base"],function(a,b,c,d,e){var f=Backbone.View.extend({initialize:function(f){var g=this;this.workflow_id=f.id,this.forms={},this.steps={},this.setElement('
'),this.$header=$("
").addClass("ui-form-header"),this.$header.append(new b.Label({title:"Workflow: "+f.name}).$el),this.$header.append(new b.Button({title:"Collapse",icon:"fa-angle-double-up",onclick:function(){_.each(g.forms,function(a){a.portlet.collapse()})}}).$el),this.$header.append(new b.Button({title:"Expand all",icon:"fa-angle-double-down",onclick:function(){_.each(g.forms,function(a){a.portlet.expand()})}}).$el),this.$el.append(this.$header),_.each(f.steps,function(b,f){Galaxy.emit.debug("tool-form-composite::initialize()",f+" : Preparing workflow step."),b=a.merge({name:"Step "+(parseInt(f)+1)+": "+b.name,icon:"",help:null,description:b.annotation&&" - "+b.annotation||b.description,citations:null,collapsible:!0,collapsed:f>0,sustain_version:!0,sustain_repeats:!0,sustain_conditionals:!0,narrow:!0,text_enable:"Edit",text_disable:"Undo",cls_enable:"fa fa-edit",cls_disable:"fa fa-undo"},b);var h=null;-1!=["data_input","data_collection_input"].indexOf(b.step_type)?h=new c(a.merge({title:""+b.name+""},b)):"tool"==b.step_type&&(a.deepeach(b.inputs,function(a){a.type&&(a.options&&0==a.options.length&&(a.is_workflow=!0),a.value&&"RuntimeValue"==a.value.__class__?a.value=null:-1!=["data","data_collection"].indexOf(a.type)||g._isWorkflowParameter(a.value)||(a.collapsible_value=a.value,a.collapsible_preview=!0))}),d.matchIds(b.inputs,b.input_connections_by_name,function(a,b){b&&(b.type="hidden",b.value=b.ignore="",b.options=null,b.help=_.reduce(a,function(a,b){return a&&(a+=", "),a+"Output dataset '"+b.output_name+"' from step "+b.order_index},""))}),d.matchContext(b.inputs,"data_ref",function(a,b){a.is_workflow=!b.options||g._isWorkflowParameter(a.value)}),h=new e(b).form),g.forms[b.step_id]=h,g.steps[b.step_id]=b});var h={},i={},j=0,k=function(a,b,c){var d=a.$("input");0===d.length&&(d=a.$el),d.addClass(c).css({color:b,"border-color":b})};if(_.each(this.steps,function(a,b){_.each(a.inputs,function(a){var c=g._isWorkflowParameter(a.value);if(c){var d=g.forms[b].field_list[a.id],e=g.forms[b].element_list[a.id];h[c]=h[c]||[],h[c].push(d),d.value(c),e.disable(!0),i[c]=i[c]||{type:a.type,is_workflow:a.options,label:c,name:c,color:"hsl( "+100*++j+", 70%, 30% )"},k(d,i[c].color,"ui-form-wp-target")}})}),!_.isEmpty(i)){var l=new c({title:"Workflow Parameters",inputs:i,onchange:function(){_.each(l.data.create(),function(b,c){_.each(h[c],function(d){d.value(a.sanitize(b)||c)})})}});_.each(l.field_list,function(a,b){k(a,l.input_list[b].color,"ui-form-wp-source")}),this.$el.append("

").addClass("ui-margin-top"),this.$el.append(l.$el)}_.each(g.steps,function(a,b){g.$el.append("

").addClass("ui-margin-top"),g.$el.append(g.forms[b].$el),a.post_job_actions&&a.post_job_actions.length&&g.$el.append($("

").addClass("fa fa-bolt")).append(_.reduce(a.post_job_actions,function(a,b){return a+" "+b.short_str},"")),Galaxy.emit.debug("tool-form-composite::initialize()",b+" : Workflow step state ready.",a)}),this.history_form=null,f.history_id||(this.history_form=new c({inputs:[{type:"conditional",test_param:{name:"new_history",label:"Send results to a new history",type:"boolean",value:"false",help:""},cases:[{value:"true",inputs:[{name:"new_history_name",label:"History name",type:"text",value:f.name}]}]}]}),this.$el.append("

").addClass("ui-margin-top"),this.$el.append(this.history_form.$el)),this.$el.append("

").addClass("ui-margin-top"),this.execute_btn=new b.Button({icon:"fa-check",title:"Run workflow",cls:"btn btn-primary",floating:"clear",onclick:function(){g._execute()}}),this.$el.append(this.execute_btn.$el),$("body").append(this.$el)},_execute:function(){var b=this,c={inputs:{},parameters:{}},d=!0;_.each(this.forms,function(a,e){var f=a.data.create(),g=b.steps[e],h=g.step_id,i=g.step_type,j=g.order_index;c.parameters[h]={},a.trigger("reset");for(var k in f){var l=f[k],m=a.data.match(k),n=(a.field_list[m],a.input_list[m]);-1!=["data_input","data_collection_input"].indexOf(i)?l&&l.values&&l.values.length>0?c.inputs[j]=l.values[0]:d&&(a.highlight(m),d=!1):n.optional||n.is_workflow||null!=l?c.parameters[h][k]=l:(a.highlight(m),d=!1)}}),console.log(JSON.stringify(c)),d?(b._enabled(!1),Galaxy.emit.debug("tools-form-composite::submit()","Validation complete.",c),a.request({type:"POST",url:Galaxy.root+"api/workflows/"+this.workflow_id+"/invocations",data:c,success:function(a){Galaxy.emit.debug("tool-form-composite::submit","Submission successful.",a),parent.Galaxy&&parent.Galaxy.currHistoryPanel&&parent.Galaxy.currHistoryPanel.refreshContents(),console.log(a)},error:function(a){if(console.log(a),a&&a.err_data){var b=form.data.matchResponse(a.err_data);for(var c in b){form.highlight(c,b[c]);break}}else Galaxy.modal&&Galaxy.modal.show({title:"Job submission failed",body:a&&a.err_msg||ToolTemplate.error(options.job_def),buttons:{Close:function(){Galaxy.modal.hide()}}})},complete:function(){b._enabled(!0)}})):b._enabled(!0)},_enabled:function(a){a?this.execute_btn.unwait():this.execute_btn.wait(),a?this.history_form.portlet.enable():this.history_form.portlet.disable(),_.each(this.forms,function(b){a?b.portlet.enable():b.portlet.disable()})},_isWorkflowParameter:function(b){return"$"===String(b).substring(0,1)?a.sanitize(b.substring(2,b.length-1)):void 0}});return{View:f}}); +define(["utils/utils","mvc/ui/ui-misc","mvc/form/form-view","mvc/form/form-data","mvc/tool/tool-form-base"],function(a,b,c,d,e){var f=Backbone.View.extend({initialize:function(f){var g=this;this.workflow_id=f.id,this.forms=[],this.steps=[],this.setElement('

'),this.$header=$("
").addClass("ui-form-header"),this.$header.append(new b.Label({title:"Workflow: "+f.name}).$el),this.$header.append(new b.Button({title:"Collapse",icon:"fa-angle-double-up",onclick:function(){_.each(g.forms,function(a){a.portlet.collapse()})}}).$el),this.$header.append(new b.Button({title:"Expand all",icon:"fa-angle-double-down",onclick:function(){_.each(g.forms,function(a){a.portlet.expand()})}}).$el),this.$el.append(this.$header),_.each(f.steps,function(b,f){Galaxy.emit.debug("tool-form-composite::initialize()",f+" : Preparing workflow step."),b=a.merge({name:"Step "+(parseInt(f)+1)+": "+b.name,icon:"",help:null,description:b.annotation&&" - "+b.annotation||b.description,citations:null,collapsible:!0,collapsed:f>0,sustain_version:!0,sustain_repeats:!0,sustain_conditionals:!0,narrow:!0,text_enable:"Edit",text_disable:"Undo",cls_enable:"fa fa-edit",cls_disable:"fa fa-undo"},b);var h=null;-1!=["data_input","data_collection_input"].indexOf(b.step_type)?h=new c(a.merge({title:""+b.name+""},b)):"tool"==b.step_type&&(a.deepeach(b.inputs,function(a){a.type&&(a.options&&0==a.options.length&&(a.is_workflow=!0),a.value&&"RuntimeValue"==a.value.__class__?a.value=null:-1!=["data","data_collection"].indexOf(a.type)||g._isWorkflowParameter(a.value)||(a.collapsible_value=a.value,a.collapsible_preview=!0))}),d.matchIds(b.inputs,b.input_connections_by_name,function(a,b){b&&(b.type="hidden",b.value=b.ignore="",b.options=null,b.help=_.reduce(a,function(a,b){return a&&(a+=", "),a+"Output dataset '"+b.output_name+"' from step "+b.order_index},""))}),d.matchContext(b.inputs,"data_ref",function(a,b){a.is_workflow=!b.options||g._isWorkflowParameter(a.value)}),h=new e(b).form),g.forms[f]=h,g.steps[f]=b});var h={},i={},j=0,k=function(a,b,c){var d=a.$("input");0===d.length&&(d=a.$el),d.addClass(c).css({color:b,"border-color":b})};if(_.each(this.steps,function(a,b){_.each(a.inputs,function(a){var c=g._isWorkflowParameter(a.value);if(c){var d=g.forms[b].field_list[a.id],e=g.forms[b].element_list[a.id];h[c]=h[c]||[],h[c].push(d),d.value(c),e.disable(!0),i[c]=i[c]||{type:a.type,is_workflow:a.options,label:c,name:c,color:"hsl( "+100*++j+", 70%, 30% )"},k(d,i[c].color,"ui-form-wp-target")}})}),!_.isEmpty(i)){var l=new c({title:"Workflow Parameters",inputs:i,onchange:function(){_.each(l.data.create(),function(b,c){_.each(h[c],function(d){d.value(a.sanitize(b)||c)})})}});_.each(l.field_list,function(a,b){k(a,l.input_list[b].color,"ui-form-wp-source")}),this.$el.append("

").addClass("ui-margin-top"),this.$el.append(l.$el)}_.each(g.steps,function(a,b){g.$el.append("

").addClass("ui-margin-top"),g.$el.append(g.forms[b].$el),a.post_job_actions&&a.post_job_actions.length&&g.$el.append($("

").addClass("fa fa-bolt")).append(_.reduce(a.post_job_actions,function(a,b){return a+" "+b.short_str},"")),Galaxy.emit.debug("tool-form-composite::initialize()",b+" : Workflow step state ready.",a)}),this.history_form=null,f.history_id||(this.history_form=new c({inputs:[{type:"conditional",test_param:{name:"new_history",label:"Send results to a new history",type:"boolean",value:"false",help:""},cases:[{value:"true",inputs:[{name:"new_history_name",label:"History name",type:"text",value:f.name}]}]}]}),this.$el.append("

").addClass("ui-margin-top"),this.$el.append(this.history_form.$el)),this.$el.append("

").addClass("ui-margin-top"),this.execute_btn=new b.Button({icon:"fa-check",title:"Run workflow",cls:"btn btn-primary",floating:"clear",onclick:function(){g._execute()}}),this.$el.append(this.execute_btn.$el),$("body").append(this.$el)},_execute:function(){var b=this,c={inputs:{},parameters:{}},d=!0;_.each(this.forms,function(a,e){var f=a.data.create(),g=b.steps[e],h=g.step_id,i=g.step_type,j=g.order_index;c.parameters[h]={},a.trigger("reset");for(var k in f){var l=f[k],m=a.data.match(k),n=(a.field_list[m],a.input_list[m]);-1!=["data_input","data_collection_input"].indexOf(i)?l&&l.values&&l.values.length>0?c.inputs[j]=l.values[0]:d&&(a.highlight(m),d=!1):n.optional||n.is_workflow||null!=l?c.parameters[h][k]=l:(a.highlight(m),d=!1)}}),console.log(JSON.stringify(c)),d?(b._enabled(!1),Galaxy.emit.debug("tools-form-composite::submit()","Validation complete.",c),a.request({type:"POST",url:Galaxy.root+"api/workflows/"+this.workflow_id+"/invocations",data:c,success:function(a){Galaxy.emit.debug("tool-form-composite::submit","Submission successful.",a),parent.Galaxy&&parent.Galaxy.currHistoryPanel&&parent.Galaxy.currHistoryPanel.refreshContents(),console.log(a)},error:function(a){if(console.log(a),a&&a.err_data){var b=form.data.matchResponse(a.err_data);for(var c in b){form.highlight(c,b[c]);break}}else Galaxy.modal&&Galaxy.modal.show({title:"Job submission failed",body:a&&a.err_msg||ToolTemplate.error(options.job_def),buttons:{Close:function(){Galaxy.modal.hide()}}})},complete:function(){b._enabled(!0)}})):b._enabled(!0)},_enabled:function(a){a?this.execute_btn.unwait():this.execute_btn.wait(),a?this.history_form.portlet.enable():this.history_form.portlet.disable(),_.each(this.forms,function(b){a?b.portlet.enable():b.portlet.disable()})},_isWorkflowParameter:function(b){return"$"===String(b).substring(0,1)?a.sanitize(b.substring(2,b.length-1)):void 0}});return{View:f}}); //# sourceMappingURL=../../../maps/mvc/tool/tool-form-composite.js.map \ No newline at end of file