Fixing PR review comments

galaxyproject · Jun 9, 2017 · 785e3e5 · 785e3e5
1 parent 3573f4d
commit 785e3e5
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 78 deletions.
diff --git a/client/galaxy/scripts/apps/analysis.js b/client/galaxy/scripts/apps/analysis.js
@@ -11,7 +11,9 @@ var jQuery = require( 'jquery' ),
     Tours = require( 'mvc/tours' ),
     GridView = require( 'mvc/grid/grid-view' )
     Workflows = require( 'mvc/workflow/workflow' ),
-    WorkflowsConfigureMenu = require( 'mvc/workflow/workflow-configure-menu' );
+    WorkflowsConfigureMenu = require( 'mvc/workflow/workflow-configure-menu' ),
+    ToolFormComposite = require( 'mvc/tool/tool-form-composite' ),
+    Utils = require( 'utils/utils' );
 
 /** define the 'Analyze Data'/analysis/main/home page for Galaxy
  *  * has a masthead
@@ -128,11 +130,11 @@ window.app = function app( options, bootstrapped ){
         },
 
         show_run : function() {
-            this.page.display( new Workflows.Run_Workflow_View() );
+            this._loadWorkflow();
         },
 
         show_import_workflow : function() {
-            this.page.display( new Workflows.Import_Workflow_View() );
+            this.page.display( new Workflows.ImportWorkflowView() );
         },
 
         show_configure_menu : function(){
@@ -163,7 +165,7 @@ window.app = function app( options, bootstrapped ){
             } else {
                 // show the workflow run form
                 if( params.workflow_id ){
-                    this.page.display( new Workflows.Run_Workflow_View() )
+                    this._loadWorkflow();
                 // load the center iframe with controller.action: galaxy.org/?m_c=history&m_a=list -> history/list
                 } else if( params.m_c ){
                     this._loadCenterIframe( params.m_c + '/' + params.m_a );
@@ -188,6 +190,23 @@ window.app = function app( options, bootstrapped ){
             this.page.$( '#galaxy_main' ).prop( 'src', url );
         },
 
+        /** load workflow by its url in run mode */
+        _loadWorkflow: function() {
+            var self = this;
+            self.page.$( '#galaxy-main' ).hide();
+            self.page.$( "#center-panel" ).show();
+            Utils.get({
+                url : Galaxy.root + 'workflow/run_workflow?id=' + Utils.getQueryString( 'id' ),
+                success : function( response ) {
+                    var form = new ToolFormComposite.View( response );
+                    self.page.$( "#center-panel" ).empty().append( form.$el )
+                },
+                error : function( response ) {
+                    var $el_error = "<div class='response-message errormessage'><p>Error occurred while loading the resource.</p></div>";
+                    self.page.$( "#center-panel" ).empty().append( $el_error );
+                }
+            });
+        }
     });
 
     // render and start the router

diff --git a/client/galaxy/scripts/apps/panels/tool-panel.js b/client/galaxy/scripts/apps/panels/tool-panel.js
@@ -61,24 +61,8 @@ var ToolPanel = Backbone.View.extend({
         _.each( this.stored_workflow_menu_entries, function( menu_entry ){
             self.$( '#internal-workflows' ).append( self._templateWorkflowLink({
                 title : menu_entry.stored_workflow.name,
-                href  : 'workflow/run?id=' + menu_entry.encoded_stored_workflow_id,
-                cls   : 'workflow-menu-' + menu_entry.encoded_stored_workflow_id
+                href  : 'workflow/run?id=' + menu_entry.encoded_stored_workflow_id
             }));
-            self._registerWorkflowMenuClick( self, menu_entry.encoded_stored_workflow_id );
-        });
-    },
-
-    /** Open the items in workflow menu in the center panel */
-    _registerWorkflowMenuClick: function( self, workflow_id ) {
-        $( '.workflow-menu-' + workflow_id ).click(function( e ) {
-            var url = Galaxy.root + 'workflow/run_workflow?id=' + workflow_id;
-            $.getJSON(url, function( response ) {
-                var wf_parsed = JSON.parse( JSON.stringify( response ) );
-                var form = new ToolForm.View( wf_parsed[0] );
-                $( '#galaxy_main' ).hide();
-                $( "#center-panel" ).show();
-                $( "#center-panel" ).empty().append( form.$el );
-            });
         });
     },
 

diff --git a/client/galaxy/scripts/mvc/workflow/workflow.js b/client/galaxy/scripts/mvc/workflow/workflow.js
@@ -1,16 +1,11 @@
 /** Workflow view */
-define( [ 'mvc/tool/tool-form-composite' ], function( ToolForm ) {
-
-    /** Get querystrings from url */
-    function get_querystring( key ) {
-        return decodeURIComponent( window.location.search.replace(new RegExp("^(?:.*[&\\?]" + encodeURIComponent( key ).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1") );
-    }
+define( [ 'utils/utils' ], function( Utils ) {
 
     /** Build messages after user action */
     function build_messages( self ) {
         var $el_message = self.$el.find( '.response-message' ),
-        status = get_querystring( 'status' ),
-        message = get_querystring( 'message' );
+            status = Utils.getQueryString( 'status' ),
+            message = Utils.getQueryString( 'message' );
 
         if( message && message !== null && message !== "" ) {
             $el_message.addClass( status + 'message' );
@@ -186,28 +181,7 @@ define( [ 'mvc/tool/tool-form-composite' ], function( ToolForm ) {
         }
     });
 
-    var Run_Workflow_View = Backbone.View.extend({
-
-        initialize: function( options ) {
-            this.setElement( '<div/>' );
-            this.run_workflow( options );
-        },
-
-        /** Open workflow to run */
-        run_workflow: function() {
-            var self = this,
-                id = get_querystring( 'id' ),
-                url = Galaxy.root + 'workflow/run_workflow?id=' + id;
-            $.getJSON(url, function( response ) {
-                var wf_parsed = JSON.parse( JSON.stringify( response ) );
-                var form = new ToolForm.View( wf_parsed[0] );
-                build_messages( self );
-                self.$el.empty().append( form.$el );
-            });
-        }
-    });
-
-    var Import_Workflow_View = Backbone.View.extend({
+    var ImportWorkflowView = Backbone.View.extend({
 
         initialize: function() {
             this.setElement( '<div/>' );
@@ -269,7 +243,6 @@ define( [ 'mvc/tool/tool-form-composite' ], function( ToolForm ) {
 
     return {
         View  : View,
-        Run_Workflow_View : Run_Workflow_View,
-        Import_Workflow_View : Import_Workflow_View
+        ImportWorkflowView : ImportWorkflowView
     };
 });
diff --git a/client/galaxy/scripts/utils/utils.js b/client/galaxy/scripts/utils/utils.js
@@ -277,6 +277,11 @@ define( [], function() {
                     + minutes;
     };
 
+    /** Get querystrings from url */
+    function getQueryString( key ) {
+        return decodeURIComponent( window.location.search.replace(new RegExp("^(?:.*[&\\?]" + encodeURIComponent( key ).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1") );
+    };
+
     return {
         cssLoadFile: cssLoadFile,
         cssGetAttribute: cssGetAttribute,
@@ -293,6 +298,7 @@ define( [], function() {
         deepeach: deepeach,
         isJSON: isJSON,
         clone: clone,
-        linkify: linkify
+        linkify: linkify,
+        getQueryString: getQueryString
     };
-});
+});
diff --git a/lib/galaxy/webapps/galaxy/controllers/workflow.py b/lib/galaxy/webapps/galaxy/controllers/workflow.py
@@ -740,6 +740,7 @@ def export_to_file( self, trans, id ):
         return stored_dict
 
     @web.expose
+    @web.json
     def upload_import_workflow( self, trans, cntrller='workflow', **kwd ):
         """
         Import a workflow by reading an url, uploading a file, opening and reading the contents
@@ -908,12 +909,12 @@ def upload_import_workflow( self, trans, cntrller='workflow', **kwd ):
             redirect_url = url_for( '/' ) + 'workflow?status=' + status + '&message=%s' % escape( message )
             return trans.response.send_redirect( redirect_url )
         else:
-            return json.dumps({
+            return {
                 'url' : url,
                 'message' : message,
                 'status' : status,
                 'myexperiment_target_url' : myexperiment_target_url
-            })
+            }
 
     @web.expose
     def build_from_current_history( self, trans, job_ids=None, dataset_ids=None, dataset_collection_ids=None, workflow_name=None, dataset_names=None, dataset_collection_names=None ):
@@ -953,6 +954,7 @@ def build_from_current_history( self, trans, job_ids=None, dataset_ids=None, dat
                                            url_for( controller='workflow', action='run', id=workflow_id ) ) )
 
     @web.expose
+    @web.json
     def run_workflow( self, trans, id, history_id=None, **kwargs ):
         history = None
         try:
@@ -970,9 +972,7 @@ def run_workflow( self, trans, id, history_id=None, **kwargs ):
         workflow_contents_manager = workflows.WorkflowContentsManager( trans.app )
         stored = workflow_manager.get_stored_accessible_workflow( trans, id )
         workflow_dict = workflow_contents_manager.workflow_to_dict( trans, stored, style='run' )
-        wf_dict = list()
-        wf_dict.append( workflow_dict )
-        return json.dumps( wf_dict )
+        return workflow_dict
 
     def get_item( self, trans, id ):
         return self.get_stored_workflow( trans, id )

diff --git a/static/maps/mvc/workflow/workflow.js.map b/static/maps/mvc/workflow/workflow.js.map