Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3696 from jmchilton/upload_collection
Allow uploading to collections.
- Loading branch information
Showing
35 changed files
with
800 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
163 changes: 163 additions & 0 deletions
163
client/galaxy/scripts/mvc/upload/collection/collection-row.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| /** Renders the collection uploader rows */ | ||
| define( [ 'utils/utils', 'mvc/upload/upload-model', 'mvc/upload/upload-settings', 'mvc/ui/ui-popover', 'mvc/ui/ui-select' ], | ||
| function( Utils, UploadModel, UploadSettings, Popover, Select ) { | ||
| return Backbone.View.extend({ | ||
| /** Dictionary of upload states and associated icons */ | ||
| status_classes : { | ||
| init : 'upload-icon-button fa fa-trash-o', | ||
| queued : 'upload-icon fa fa-spinner fa-spin', | ||
| running : 'upload-icon fa fa-spinner fa-spin', | ||
| success : 'upload-icon-button fa fa-check', | ||
| error : 'upload-icon-button fa fa-exclamation-triangle' | ||
| }, | ||
|
|
||
| initialize: function( app, options ) { | ||
| var self = this; | ||
| this.app = app; | ||
| this.model = options.model; | ||
| this.setElement( this._template( options.model ) ); | ||
| this.$mode = this.$( '.upload-mode' ); | ||
| this.$title = this.$( '.upload-title-extended' ); | ||
| this.$text = this.$( '.upload-text' ); | ||
| this.$size = this.$( '.upload-size' ); | ||
| this.$info_text = this.$( '.upload-info-text' ); | ||
| this.$info_progress = this.$( '.upload-info-progress' ); | ||
| this.$text_content = this.$( '.upload-text-content' ); | ||
| this.$symbol = this.$( '.upload-symbol' ); | ||
| this.$progress_bar = this.$( '.upload-progress-bar' ); | ||
| this.$percentage = this.$( '.upload-percentage' ); | ||
|
|
||
| // append popup to settings icon | ||
| this.settings = new Popover.View({ | ||
| title : 'Upload configuration', | ||
| container : this.$( '.upload-settings' ), | ||
| placement : 'bottom' | ||
| }); | ||
|
|
||
| // identify default genome and extension values | ||
| var default_genome = this.app.select_genome.value(); | ||
| var default_extension = this.app.select_extension.value(); | ||
|
|
||
| // handle click event | ||
| this.$symbol.on('click', function() { self._removeRow(); }); | ||
|
|
||
| // handle text editing event | ||
| this.$text_content.on( 'change input', function( e ) { | ||
| self.model.set( { 'url_paste': $( e.target ).val(), | ||
| 'file_size': $( e.target ).val().length } ); | ||
| }); | ||
|
|
||
| // model events | ||
| this.listenTo( this.model, 'change:percentage', function() { self._refreshPercentage() } ); | ||
| this.listenTo( this.model, 'change:status', function() { self._refreshStatus() } ); | ||
| this.listenTo( this.model, 'change:info', function() { self._refreshInfo() } ); | ||
| this.listenTo( this.model, 'change:file_size', function() { self._refreshFileSize() } ); | ||
| this.listenTo( this.model, 'remove', function() { self.remove() } ); | ||
| this.app.collection.on('reset', function() { self.remove() } ); | ||
| }, | ||
|
|
||
| render: function() { | ||
| var options = this.model.attributes; | ||
| this.$title.html( _.escape( options.file_name ) ); | ||
| this.$size.html( Utils.bytesToString ( options.file_size ) ); | ||
| this.$mode.removeClass().addClass( 'upload-mode' ).addClass( 'text-primary' ); | ||
| if ( options.file_mode == 'new' ) { | ||
| this.$text.css( { 'width' : this.$el.width() - 16 + 'px', 'top' : this.$el.height() - 8 + 'px' } ).show(); | ||
| this.$el.height( this.$el.height() - 8 + this.$text.height() + 16 ); | ||
| this.$mode.addClass( 'fa fa-edit' ); | ||
| } else if ( options.file_mode == 'local' ) { | ||
| this.$mode.addClass( 'fa fa-laptop' ); | ||
| } else if ( options.file_mode == 'ftp' ) { | ||
| this.$mode.addClass( 'fa fa-folder-open-o' ); | ||
| } | ||
| }, | ||
|
|
||
| /** Refresh info text */ | ||
| _refreshInfo: function() { | ||
| var info = this.model.get( 'info' ); | ||
| if ( info ) { | ||
| this.$info_text.html( '<strong>Failed: </strong>' + info ).show(); | ||
| } else { | ||
| this.$info_text.hide(); | ||
| } | ||
| }, | ||
|
|
||
| /** Refresh percentage status */ | ||
| _refreshPercentage : function() { | ||
| var percentage = parseInt( this.model.get( 'percentage' ) ); | ||
| this.$progress_bar.css( { width : percentage + '%' } ); | ||
| this.$percentage.html( percentage != 100 ? percentage + '%' : 'Adding to history...' ); | ||
| }, | ||
|
|
||
| /** Refresh status */ | ||
| _refreshStatus : function() { | ||
| var status = this.model.get( 'status' ); | ||
| this.$symbol.removeClass().addClass( 'upload-symbol' ).addClass( this.status_classes[ status ] ); | ||
| this.model.set( 'enabled', status == 'init' ); | ||
| var enabled = this.model.get( 'enabled' ); | ||
| this.$text_content.attr( 'disabled', !enabled ); | ||
| if ( status == 'success' ) { | ||
| this.$el.addClass( 'success' ); | ||
| this.$percentage.html( '100%' ); | ||
| } | ||
| if ( status == 'error' ) { | ||
| this.$el.addClass( 'danger' ); | ||
| this.$info_progress.hide(); | ||
| } | ||
| }, | ||
|
|
||
| /** Refresh file size */ | ||
| _refreshFileSize: function() { | ||
| this.$size.html( Utils.bytesToString ( this.model.get( 'file_size' ) ) ); | ||
| }, | ||
|
|
||
| /** Remove row */ | ||
| _removeRow: function() { | ||
| if ( [ 'init', 'success', 'error' ].indexOf( this.model.get( 'status' ) ) !== -1 ) { | ||
| this.app.collection.remove( this.model ); | ||
| } | ||
| }, | ||
|
|
||
| /** Attach file info popup */ | ||
| _showSettings : function() { | ||
| if ( !this.settings.visible ) { | ||
| this.settings.empty(); | ||
| this.settings.append( ( new UploadSettings( this ) ).$el ); | ||
| this.settings.show(); | ||
| } else { | ||
| this.settings.hide(); | ||
| } | ||
| }, | ||
|
|
||
| /** View template */ | ||
| _template: function( options ) { | ||
| return '<tr id="upload-row-' + options.id + '" class="upload-row">' + | ||
| '<td>' + | ||
| '<div class="upload-text-column">' + | ||
| '<div class="upload-mode"/>' + | ||
| '<div class="upload-title-extended"/>' + | ||
| '<div class="upload-text">' + | ||
| '<div class="upload-text-info">You can tell Galaxy to download data from web by entering URL in this box (one per line). You can also directly paste the contents of a file.</div>' + | ||
| '<textarea class="upload-text-content form-control"/>' + | ||
| '</div>' + | ||
| '</div>' + | ||
| '</td>' + | ||
| '<td>' + | ||
| '<div class="upload-size"/>' + | ||
| '</td>' + | ||
| '<td>' + | ||
| '<div class="upload-info">' + | ||
| '<div class="upload-info-text"/>' + | ||
| '<div class="upload-info-progress progress">' + | ||
| '<div class="upload-progress-bar progress-bar progress-bar-success"/>' + | ||
| '<div class="upload-percentage">0%</div>' + | ||
| '</div>' + | ||
| '</div>' + | ||
| '</td>' + | ||
| '<td>' + | ||
| '<div class="upload-symbol ' + this.status_classes.init + '"/>' + | ||
| '</td>' + | ||
| '</tr>'; | ||
| } | ||
| }); | ||
| }); |
Oops, something went wrong.