Use plugin object instead of chart definition

Use plugin instead of definition
galaxyproject · Feb 11, 2018 · 1eccb2a · 1eccb2a
1 parent 664bf8b
commit 1eccb2a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 15 deletions.
diff --git a/client/galaxy/scripts/mvc/visualization/chart/chart-client.js b/client/galaxy/scripts/mvc/visualization/chart/chart-client.js
@@ -17,9 +17,7 @@ var View = Backbone.View.extend({
         .done(dataset => {
             this.dataset = dataset;
             this.chart = new Chart({}, options);
-            window.console.log(options);
-            this.chart.definition = options.visualization_plugin;
-            this.plugin = options.visualization_plugin;
+            this.chart.plugin = options.visualization_plugin;
             this.deferred = new Deferred();
             this.viewer = new Viewer(this);
             this.editor = new Editor(this);

diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/description.js b/client/galaxy/scripts/mvc/visualization/chart/views/description.js
@@ -2,7 +2,7 @@
 import Utils from "utils/utils";
 export default Backbone.View.extend({
     initialize: function(app) {
-        this.plugin = app.plugin;
+        this.plugin = app.chart.plugin;
         this.setElement(this._template());
         this.$title = this.$(".charts-description-title");
         this.$image = this.$(".charts-description-image");

diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/editor.js b/client/galaxy/scripts/mvc/visualization/chart/views/editor.js
@@ -124,7 +124,6 @@ export default Backbone.View.extend({
             return;
         }
         var valid = true;
-        var chart_def = this.chart.definition;
         this.chart.groups.each(function(group) {
             if (valid) {
                 _.each(group.get("__data_columns"), function(data_columns, name) {

diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/groups.js b/client/galaxy/scripts/mvc/visualization/chart/views/groups.js
@@ -8,23 +8,22 @@ import Description from "mvc/visualization/chart/views/description";
 var GroupView = Backbone.View.extend({
     initialize: function(app, options) {
         var self = this;
-        this.app = app;
+        this.deferred = app.deferred;
         this.chart = app.chart;
         this.group = options.group;
         this.setElement($("<div/>"));
-        this.listenTo(this.chart, "change:dataset_id change:type", function() {
+        this.listenTo(this.chart, "change:dataset_id", function() {
             self.render();
         });
         this.render();
     },
     render: function() {
         var self = this;
-        var inputs = this.chart.definition.groups ? Utils.clone(this.chart.definition.groups) : {};
+        var inputs = Utils.clone(this.chart.plugin.groups) || {};
         var dataset_id = this.chart.get("dataset_id");
-        var chart_definition = this.chart.definition;
         if (dataset_id) {
             this.chart.state("wait", "Loading metadata...");
-            this.app.deferred.execute(function(process) {
+            this.deferred.execute(function(process) {
                 Utils.get({
                     url: Galaxy.root + "api/datasets/" + dataset_id,
                     cache: true,
@@ -123,7 +122,7 @@ export default Backbone.View.extend({
         });
     },
     render: function() {
-        if (_.size(this.chart.definition.groups) > 0) {
+        if (_.size(this.chart.plugin.groups) > 0) {
             this.repeat.$el.show();
             this.message.$el.hide();
         } else {

diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/settings.js b/client/galaxy/scripts/mvc/visualization/chart/views/settings.js
@@ -14,8 +14,8 @@ export default Backbone.View.extend({
     },
     render: function() {
         var self = this;
-        var inputs = Utils.clone(this.chart.definition.settings) || {};
-        var panel_option = this.chart.definition.use_panels;
+        var inputs = Utils.clone(this.chart.plugin.settings) || {};
+        var panel_option = this.chart.plugin.use_panels;
         if (panel_option == "both") {
             inputs["__use_panels"] = {
                 type: "boolean",

diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/viewer.js b/client/galaxy/scripts/mvc/visualization/chart/views/viewer.js
@@ -140,7 +140,7 @@ export default Backbone.View.extend({
     render: function() {
         var title = this.chart.get("title");
         this.portlet.title(title);
-        var exports = (this.chart.definition && this.chart.definition.exports) || [];
+        var exports = (this.chart.plugin && this.chart.plugin.exports) || [];
         this.export_button.collection.each(function(model) {
             model.set("visible", exports.indexOf(model.get("key")) !== -1);
         });

diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/viewport.js b/client/galaxy/scripts/mvc/visualization/chart/views/viewport.js
@@ -95,7 +95,7 @@ export default Backbone.View.extend({
     _draw: function(process, chart) {
         var self = this;
         var n_panels = chart.settings.get("__use_panels") == "true" ? chart.groups.length : 1;
-        this._createContainer(chart.definition.tag, n_panels);
+        this._createContainer(chart.plugin.tag, n_panels);
         chart.state("wait", "Please wait...");
         /*require(["repository/build/" + chart.get("type")], function(ChartView) {
             new ChartView({ process: process, chart: chart, dataset: self.app.dataset, targets: self.targets });