opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI, datasets: Move support for rerunnable to dataset-li expansion; remove redundant listener set up

Browse Source
This commit is contained in:
carlfeberhard
2015-09-24 15:25:29 -04:00
parent bf0ab52e75
commit b58c7203d0
6 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/dataset/dataset-li.js
+10 -3
View File
@@ -37,8 +37,6 @@ var DatasetListItemView = _super.extend(
/** where should pages from links be displayed? (default to new tab/window) */
this.linkTarget = attributes.linkTarget || '_blank';
this._setUpListeners();
},
/** event listeners */
@@ -60,13 +58,22 @@ var DatasetListItemView = _super.extend(
},
// ......................................................................... expandable
/** In this override, only get details if in the ready state.
/** In this override, only get details if in the ready state, get rerunnable if in other states.
* Note: fetch with no 'change' event triggering to prevent automatic rendering.
*/
_fetchModelDetails : function(){
var view = this;
if( view.model.inReadyState() && !view.model.hasDetails() ){
return view.model.fetch({ silent: true });
// special case the need for the rerunnable attribute
// needed for rendering re-run button on queued, running datasets
} else if( !view.model.has( 'rerunnable' ) ){
return view.model.fetch({ silent: true, data: {
view: 'summary',
// only fetch rerunnable to keep overhead down
keys: 'rerunnable'
}});
}
return jQuery.when();
},
client/galaxy/scripts/mvc/tools/tools-jobs.js
+4 -8
View File
@@ -35,12 +35,8 @@ return {
success : function(response) {
callback && callback();
form.reciept(ToolTemplate.success(response));
// Get hda ids from response, request detailed refresh of these.
var detailIds = [];
response.outputs.forEach(function(e, i, a){
detailIds.push(e.id);
});
self._refreshHdas(detailIds);
// begin checking the history for updates
self._refreshHdas();
},
error : function(response, response_full) {
callback && callback();
@@ -140,9 +136,9 @@ return {
/** Refreshes the history panel
*/
_refreshHdas: function(detailIds) {
_refreshHdas: function(detailIds, options) {
if (parent.Galaxy && parent.Galaxy.currHistoryPanel) {
parent.Galaxy.currHistoryPanel.refreshContents(detailIds);
parent.Galaxy.currHistoryPanel.refreshContents(detailIds, options);
}
}
};
static/maps/mvc/dataset/dataset-li.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/maps/mvc/tools/tools-jobs.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"tools-jobs.js","sources":["../../../src/mvc/tools/tools-jobs.js"],"names":["define","Utils","ToolTemplate","submit","form","options","callback","self","this","job_def","tool_id","id","tool_version","version","inputs","data","create","trigger","_validation","console","debug","request","type","url","galaxy_config","root","success","response","reciept","detailIds","outputs","forEach","e","push","_refreshHdas","error","message","error_messages","matchResponse","input_id","highlight","modal","show","title","body","buttons","Close","hide","job_inputs","batch_n","batch_src","job_input_id","input_value","match","input_field","field_list","input_def","input_list","optional","batch","n","values","length","src","parent","Galaxy","currHistoryPanel","refreshContents"],"mappings":"AAGAA,QAAQ,cAAe,4BAA6B,SAASC,EAAOC,GACpE,OACIC,OAAQ,SAASC,EAAMC,EAASC,GAE5B,GAAIC,GAAOC,KAGPC,GACAC,QAAkBL,EAAQM,GAC1BC,aAAkBP,EAAQQ,QAC1BC,OAAkBV,EAAKW,KAAKC,SAOhC,OAHAZ,GAAKa,QAAQ,SAGRT,KAAKU,YAAYd,EAAMK,IAO5BU,QAAQC,MAAMX,OAGdR,GAAMoB,SACFC,KAAU,OACVC,IAAUC,cAAcC,KAAO,YAC/BV,KAAUN,EACViB,QAAU,SAASC,GACfrB,GAAYA,IACZF,EAAKwB,QAAQ1B,EAAawB,QAAQC,GAElC,IAAIE,KACJF,GAASG,QAAQC,QAAQ,SAASC,GAC9BH,EAAUI,KAAKD,EAAErB,MAErBJ,EAAK2B,aAAaL,IAEtBM,MAAU,SAASR,GAEf,GADArB,GAAYA,IACRqB,GAAYA,EAASS,SAAWT,EAASS,QAAQrB,KAAM,CACvD,GAAIsB,GAAiBjC,EAAKW,KAAKuB,cAAcX,EAASS,QAAQrB,KAC9D,KAAK,GAAIwB,KAAYF,GAAgB,CACjCjC,EAAKoC,UAAUD,EAAUF,EAAeE,GACxC,YAIJpB,SAAQC,MAAMO,GACdA,GAAYvB,EAAKqC,MAAMC,MACnBC,MAAU,wBACVC,KAAU1C,EAAaiC,MAAM1B,GAC7BoC,SACIC,MAAU,WACN1C,EAAKqC,MAAMM,gBAvC/B5B,QAAQC,MAAM,qEACdd,GAAYA,OAiDpBY,YAAa,SAASd,EAAMK,GAExB,GAAIuC,GAAavC,EAAQK,OAGrBmC,EAAU,GACVC,EAAY,IAGhB,KAAK,GAAIC,KAAgBH,GAAY,CAEjC,GAAII,GAAcJ,EAAWG,GAGzBZ,EAAWnC,EAAKW,KAAKsC,MAAMF,GAC3BG,EAAclD,EAAKmD,WAAWhB,GAC9BiB,EAAYpD,EAAKqD,WAAWlB,EAGhC,IAAKA,GAAaiB,GAAcF,EAAhC,CAMA,IAAKE,EAAUE,UAA2B,MAAfN,EAEvB,MADAhD,GAAKoC,UAAUD,IACR,CAIX,IAAIa,GAAeA,EAAYO,MAAO,CAElC,GAAIC,GAAIR,EAAYS,OAAOC,OAGvBC,EAAM,IAMV,IALIH,EAAI,IACJG,EAAMX,EAAYS,OAAO,IAAMT,EAAYS,OAAO,GAAGE,KAIrDA,EACA,GAAkB,OAAdb,EACAA,EAAYa,MAEZ,IAAIb,IAAca,EAEd,MADA3D,GAAKoC,UAAUD,EAAU,mFAClB,CAMnB,IAAgB,KAAZU,EACAA,EAAUW,MAEV,IAAIX,IAAYW,EAEZ,MADAxD,GAAKoC,UAAUD,EAAU,gHAAkHqB,EAAI,wDAA0DX,EAAU,UAC5M,OAvCf9B,SAAQC,MAAM,8DA8CtB,OAAO,GAKXc,aAAc,SAASL,GACfmC,OAAOC,QAAUD,OAAOC,OAAOC,kBAC/BF,OAAOC,OAAOC,iBAAiBC,gBAAgBtC"}
{"version":3,"file":"tools-jobs.js","sources":["../../../src/mvc/tools/tools-jobs.js"],"names":["define","Utils","ToolTemplate","submit","form","options","callback","self","this","job_def","tool_id","id","tool_version","version","inputs","data","create","trigger","_validation","console","debug","request","type","url","galaxy_config","root","success","response","reciept","_refreshHdas","error","message","error_messages","matchResponse","input_id","highlight","modal","show","title","body","buttons","Close","hide","job_inputs","batch_n","batch_src","job_input_id","input_value","match","input_field","field_list","input_def","input_list","optional","batch","n","values","length","src","detailIds","parent","Galaxy","currHistoryPanel","refreshContents"],"mappings":"AAGAA,QAAQ,cAAe,4BAA6B,SAASC,EAAOC,GACpE,OACIC,OAAQ,SAASC,EAAMC,EAASC,GAE5B,GAAIC,GAAOC,KAGPC,GACAC,QAAkBL,EAAQM,GAC1BC,aAAkBP,EAAQQ,QAC1BC,OAAkBV,EAAKW,KAAKC,SAOhC,OAHAZ,GAAKa,QAAQ,SAGRT,KAAKU,YAAYd,EAAMK,IAO5BU,QAAQC,MAAMX,OAGdR,GAAMoB,SACFC,KAAU,OACVC,IAAUC,cAAcC,KAAO,YAC/BV,KAAUN,EACViB,QAAU,SAASC,GACfrB,GAAYA,IACZF,EAAKwB,QAAQ1B,EAAawB,QAAQC,IAElCpB,EAAKsB,gBAETC,MAAU,SAASH,GAEf,GADArB,GAAYA,IACRqB,GAAYA,EAASI,SAAWJ,EAASI,QAAQhB,KAAM,CACvD,GAAIiB,GAAiB5B,EAAKW,KAAKkB,cAAcN,EAASI,QAAQhB,KAC9D,KAAK,GAAImB,KAAYF,GAAgB,CACjC5B,EAAK+B,UAAUD,EAAUF,EAAeE,GACxC,YAIJf,SAAQC,MAAMO,GACdA,GAAYvB,EAAKgC,MAAMC,MACnBC,MAAU,wBACVC,KAAUrC,EAAa4B,MAAMrB,GAC7B+B,SACIC,MAAU,WACNrC,EAAKgC,MAAMM,gBAnC/BvB,QAAQC,MAAM,qEACdd,GAAYA,OA6CpBY,YAAa,SAASd,EAAMK,GAExB,GAAIkC,GAAalC,EAAQK,OAGrB8B,EAAU,GACVC,EAAY,IAGhB,KAAK,GAAIC,KAAgBH,GAAY,CAEjC,GAAII,GAAcJ,EAAWG,GAGzBZ,EAAW9B,EAAKW,KAAKiC,MAAMF,GAC3BG,EAAc7C,EAAK8C,WAAWhB,GAC9BiB,EAAY/C,EAAKgD,WAAWlB,EAGhC,IAAKA,GAAaiB,GAAcF,EAAhC,CAMA,IAAKE,EAAUE,UAA2B,MAAfN,EAEvB,MADA3C,GAAK+B,UAAUD,IACR,CAIX,IAAIa,GAAeA,EAAYO,MAAO,CAElC,GAAIC,GAAIR,EAAYS,OAAOC,OAGvBC,EAAM,IAMV,IALIH,EAAI,IACJG,EAAMX,EAAYS,OAAO,IAAMT,EAAYS,OAAO,GAAGE,KAIrDA,EACA,GAAkB,OAAdb,EACAA,EAAYa,MAEZ,IAAIb,IAAca,EAEd,MADAtD,GAAK+B,UAAUD,EAAU,mFAClB,CAMnB,IAAgB,KAAZU,EACAA,EAAUW,MAEV,IAAIX,IAAYW,EAEZ,MADAnD,GAAK+B,UAAUD,EAAU,gHAAkHqB,EAAI,wDAA0DX,EAAU,UAC5M,OAvCfzB,SAAQC,MAAM,8DA8CtB,OAAO,GAKXS,aAAc,SAAS8B,EAAWtD,GAC1BuD,OAAOC,QAAUD,OAAOC,OAAOC,kBAC/BF,OAAOC,OAAOC,iBAAiBC,gBAAgBJ,EAAWtD"}
static/scripts/mvc/dataset/dataset-li.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/mvc/tools/tools-jobs.js
+1 -1
View File
@@ -1,2 +1,2 @@
define(["utils/utils","mvc/tools/tools-template"],function(a,b){return{submit:function(c,d,e){var f=this,g={tool_id:d.id,tool_version:d.version,inputs:c.data.create()};return c.trigger("reset"),this._validation(c,g)?(console.debug(g),void a.request({type:"POST",url:galaxy_config.root+"api/tools",data:g,success:function(a){e&&e(),c.reciept(b.success(a));var d=[];a.outputs.forEach(function(a){d.push(a.id)}),f._refreshHdas(d)},error:function(a){if(e&&e(),a&&a.message&&a.message.data){var d=c.data.matchResponse(a.message.data);for(var f in d){c.highlight(f,d[f]);break}}else console.debug(a),a&&c.modal.show({title:"Job submission failed",body:b.error(g),buttons:{Close:function(){c.modal.hide()}}})}})):(console.debug("tools-jobs::submit - Submission canceled. Validation failed."),void(e&&e()))},_validation:function(a,b){var c=b.inputs,d=-1,e=null;for(var f in c){var g=c[f],h=a.data.match(f),i=a.field_list[h],j=a.input_list[h];if(h&&j&&i){if(!j.optional&&null==g)return a.highlight(h),!1;if(g&&g.batch){var k=g.values.length,l=null;if(k>0&&(l=g.values[0]&&g.values[0].src),l)if(null===e)e=l;else if(e!==l)return a.highlight(h,"Please select either dataset or dataset list fields for all batch mode fields."),!1;if(-1===d)d=k;else if(d!==k)return a.highlight(h,"Please make sure that you select the same number of inputs for all batch mode fields. This field contains <b>"+k+"</b> selection(s) while a previous field contains <b>"+d+"</b>."),!1}}else console.debug("tools-jobs::_validation - Retrieving input objects failed.")}return!0},_refreshHdas:function(a){parent.Galaxy&&parent.Galaxy.currHistoryPanel&&parent.Galaxy.currHistoryPanel.refreshContents(a)}}});
define(["utils/utils","mvc/tools/tools-template"],function(a,b){return{submit:function(c,d,e){var f=this,g={tool_id:d.id,tool_version:d.version,inputs:c.data.create()};return c.trigger("reset"),this._validation(c,g)?(console.debug(g),void a.request({type:"POST",url:galaxy_config.root+"api/tools",data:g,success:function(a){e&&e(),c.reciept(b.success(a)),f._refreshHdas()},error:function(a){if(e&&e(),a&&a.message&&a.message.data){var d=c.data.matchResponse(a.message.data);for(var f in d){c.highlight(f,d[f]);break}}else console.debug(a),a&&c.modal.show({title:"Job submission failed",body:b.error(g),buttons:{Close:function(){c.modal.hide()}}})}})):(console.debug("tools-jobs::submit - Submission canceled. Validation failed."),void(e&&e()))},_validation:function(a,b){var c=b.inputs,d=-1,e=null;for(var f in c){var g=c[f],h=a.data.match(f),i=a.field_list[h],j=a.input_list[h];if(h&&j&&i){if(!j.optional&&null==g)return a.highlight(h),!1;if(g&&g.batch){var k=g.values.length,l=null;if(k>0&&(l=g.values[0]&&g.values[0].src),l)if(null===e)e=l;else if(e!==l)return a.highlight(h,"Please select either dataset or dataset list fields for all batch mode fields."),!1;if(-1===d)d=k;else if(d!==k)return a.highlight(h,"Please make sure that you select the same number of inputs for all batch mode fields. This field contains <b>"+k+"</b> selection(s) while a previous field contains <b>"+d+"</b>."),!1}}else console.debug("tools-jobs::_validation - Retrieving input objects failed.")}return!0},_refreshHdas:function(a,b){parent.Galaxy&&parent.Galaxy.currHistoryPanel&&parent.Galaxy.currHistoryPanel.refreshContents(a,b)}}});
//# sourceMappingURL=../../../maps/mvc/tools/tools-jobs.js.map