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

api/history_contents, index: handle hda_dict building exceptions by appending an error-state hda_dict (instead of 'fail-on-first'); history panel: handle bootstrapped and ajax hda api exceptions more gracefully, show hda api exceptions as hdas in the error state.

Browse Source
This commit is contained in:
Carl Eberhard
2013-01-18 16:32:05 -05:00
parent 35f16b1d29
commit b12eb16aba
4 changed files with 116 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/scripts/mvc/dataset/hda-base.js
+1 -1
View File
@@ -445,7 +445,7 @@ var HDABaseView = BaseView.extend( LoggableMixin ).extend(
if( !this.model.get( 'purged' ) ){
parent.append( $( '<div>' + this.model.get( 'misc_blurb' ) + '</div>' ) );
}
parent.append( ( _l( 'An error occurred running this job' ) + ': '
parent.append( ( _l( 'An error occurred with this dataset' ) + ': '
+ '<i>' + $.trim( this.model.get( 'misc_info' ) ) + '</i>' ) );
parent.append( this._render_primaryActionButtons(
this.defaultPrimaryActionButtonRenderers.concat([ this._render_downloadButton ])
static/scripts/mvc/history/history-model.js
+68 -28
View File
@@ -55,9 +55,17 @@ var History = BaseModel.extend( LoggableMixin ).extend(
this.hdas = new HDACollection();
// if we've got hdas passed in the constructor, load them and set up updates if needed
if( initialHdas && initialHdas.length ){
this.hdas.reset( initialHdas );
this.checkForUpdates();
if( initialHdas ){
if( _.isArray( initialHdas ) ){
this.hdas.reset( initialHdas );
this.checkForUpdates();
// handle errors in initialHdas
//TODO: errors from the api shouldn't be plain strings...
//TODO: remove when mappers and hda_dict are unified (or move to alt history)
} else if( _.isString( initialHdas ) && ( initialHdas.match( /error/i ) ) ){
alert( _l( 'Error loading bootstrapped history' ) + ':\n' + initialHdas );
}
}
// events
@@ -163,7 +171,7 @@ var History = BaseModel.extend( LoggableMixin ).extend(
// send the changed ids (if any) to dataset collection to have them fetch their own model changes
if( changedIds.length ){
history.updateHdas( changedIds );
history.fetchHdaUpdates( changedIds );
}
// set up to keep pulling if this history in run/queue state
@@ -193,16 +201,37 @@ var History = BaseModel.extend( LoggableMixin ).extend(
* If it's not in the collection, addHdas will be used to create it.
* @param {String[]} hdaIds an array of the encoded ids of the hdas to get from the server.
*/
updateHdas : function( hdaIds ){
fetchHdaUpdates : function( hdaIds ){
//TODO:?? move to collection? still need proper url
var history = this;
jQuery.ajax({
url : this.url() + '/contents?' + jQuery.param({ ids : hdaIds.join(',') }),
/**
* @inner
*/
error : function( xhr, status, error ){
var msg = 'ERROR updating hdas from api history contents:';
history.log( msg, hdaIds, xhr, status, error );
alert( msg + hdaIds.join(',') );
if( ( xhr.readyState === 0 ) && ( xhr.status === 0 ) ){ return; }
var errorJson = JSON.parse( xhr.responseText );
if( _.isArray( errorJson ) ){
// just for debugging/reporting purposes
var grouped = _.groupBy( errorJson, function( hdaData ){
if( _.has( hdaData, 'error' ) ){ return 'errored'; }
return 'ok';
});
history.log( 'fetched, errored datasets:', grouped.errored );
// the server already formats the error'd hdas in proper hda-model form
// so we're good to send these on
history.updateHdas( errorJson );
} else {
var msg = _l( 'ERROR updating hdas from api history contents' ) + ': ';
history.log( msg, hdaIds, xhr, status, error, errorJSON );
alert( msg + hdaIds.join(',') );
}
},
/** when the proper models for the requested ids are returned,
@@ -210,30 +239,41 @@ var History = BaseModel.extend( LoggableMixin ).extend(
* @inner
*/
success : function( hdaDataList, status, xhr ){
history.log( history + '.updateHdas, success:', hdaDataList, status, xhr );
//TODO: compile new models to be added in one go
var hdasToAdd = [];
_.each( hdaDataList, function( hdaData, index ){
var existingModel = history.hdas.get( hdaData.id );
// if this model exists already, update it
if( existingModel ){
history.log( 'found existing model in list for id ' + hdaData.id + ', updating...:' );
existingModel.set( hdaData );
// if this model is new and isn't in the hda collection, cache it to be created
} else {
history.log( 'NO existing model for id ' + hdaData.id + ', creating...:' );
hdasToAdd.push( hdaData );
}
});
if( hdasToAdd.length ){
history.addHdas( hdasToAdd );
}
history.log( history + '.fetchHdaUpdates, success:', status, xhr );
history.updateHdas( hdaDataList );
}
});
},
/** Update the models in the hdas collection from the data given.
* If a model exists in the collection, set will be used with the new data.
* If it's not in the collection, addHdas will be used to create it.
* @param {Object[]} hdaDataList an array of the model data used to update.
*/
updateHdas : function( hdaDataList ){
var history = this,
// models/views that need to be created
hdasToAdd = [];
history.log( history + '.updateHdas:', hdaDataList );
_.each( hdaDataList, function( hdaData, index ){
var existingModel = history.hdas.get( hdaData.id );
// if this model exists already, update it
if( existingModel ){
history.log( 'found existing model in list for id ' + hdaData.id + ', updating...:' );
existingModel.set( hdaData );
// if this model is new and isn't in the hda collection, cache it to be created
} else {
history.log( 'NO existing model for id ' + hdaData.id + ', creating...:' );
hdasToAdd.push( hdaData );
}
});
if( hdasToAdd.length ){
history.addHdas( hdasToAdd );
}
},
/** Add multiple hda models to the hdas collection from an array of hda data.
*/
addHdas : function( hdaDataList ){