Parse entry point in dictionary

galaxyproject · Feb 11, 2018 · 80222ba · 80222ba
1 parent 33ae04a
commit 80222ba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/client/galaxy/scripts/mvc/visualization/visualization-client.js b/client/galaxy/scripts/mvc/visualization/visualization-client.js
@@ -14,15 +14,17 @@ var View = Backbone.View.extend({
         $.ajax({
             url: `${Galaxy.root}api/visualizations/${options.id}`
         })
-        .done(response => {
-            window.console.log(response);
-            this.chart = new Chart({}, response.latest_revision.config.chart_dict);
+        .done(visualization => {
+            window.console.log(visualization);
+            this.visualization = visualization;
+            this.chart = new Chart({}, visualization.latest_revision.config.chart_dict);
             this.deferred = new Deferred();
             this.viewer = new Viewer(this);
             this.editor = new Editor(this);
             this.$el.append(this.viewer.$el);
             this.$el.append(this.editor.$el);
             this.render();
+
         })
         .fail(response => {
             let message = response.responseJSON && response.responseJSON.err_msg;
@@ -32,6 +34,8 @@ var View = Backbone.View.extend({
 
     /** Build client ui */
     render: function() {
+        let plugin_path = this.visualization.plugin.static_url + '/' + this.visualization.type;
+        //import Plugin from plugin_path;
         /*this.go(this.chart.load() ? "viewer" : "editor");
         require(["repository/build/" + chart.get("type")], function(ChartView) {
             new ChartView({ process: process, chart: chart, dataset: self.app.dataset, targets: self.targets });

diff --git a/lib/galaxy/visualization/plugins/plugin.py b/lib/galaxy/visualization/plugins/plugin.py
@@ -151,7 +151,8 @@ def to_dict(self):
             'title'         : self.config.get('title'),
             'target'        : self.config.get('render_target', 'galaxy_main'),
             'embeddable'    : self.config.get('embeddable', False),
-            'static_url'    : self.static_url if self.serves_static else None
+            'entry_point'   : self.config.get('entry_point'),
+            'static_url'    : '/'.join(['plugins', self.static_url])
         }
 
     def _get_saved_visualization_config(self, visualization, revision=None, **kwargs):
@@ -170,7 +171,7 @@ def _check_path(self, path):
     def _set_up_static_images(self):
         default_path = 'static/logo.png'
         if self._check_path(default_path):
-            self.config['logo'] = 'plugins/%s/%s' % (self.base_url, default_path)
+            self.config['logo'] = '/'.join(['plugins', self.base_url, default_path])
 
     def _build_render_vars(self, config, trans=None, **kwargs):
         """

diff --git a/lib/galaxy/visualization/plugins/registry.py b/lib/galaxy/visualization/plugins/registry.py
@@ -263,7 +263,7 @@ def get_visualization(self, trans, visualization_name, target_object):
             param_data = data_source['to_params']
             response = visualization.to_dict()
             response['href'] =  self.get_visualization_url(trans, target_object, visualization, param_data),
-
+            return response
         return None
 
     def is_object_applicable(self, trans, target_object, data_source_tests):