Skip to content

Commit

Permalink
Move json config to xml
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Feb 11, 2018
1 parent 76fac91 commit 9be9593
Show file tree
Hide file tree
Showing 12 changed files with 279 additions and 33 deletions.
7 changes: 2 additions & 5 deletions client/galaxy/scripts/mvc/form/form-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import Portlet from "mvc/ui/ui-portlet";
import Ui from "mvc/ui/ui-misc";
import FormSection from "mvc/form/form-section";
import FormData from "mvc/form/form-data";

export var View = Backbone.View.extend({
export default Backbone.View.extend({
initialize: function(options) {
this.model = new Backbone.Model({
initial_errors: false,
Expand Down Expand Up @@ -173,6 +172,4 @@ export var View = Backbone.View.extend({
}
Galaxy.emit.debug("form-view::initialize()", "Completed");
}
});

export default View;
});
5 changes: 3 additions & 2 deletions client/galaxy/scripts/mvc/visualization/chart/chart-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ import Viewer from "mvc/visualization/chart/views/viewer";
var View = Backbone.View.extend({
initialize: function(options) {
this.options = options;
window.console.log(options);
this.modal = (parent.Galaxy && parent.Galaxy.modal) || new Modal.View();
this.setElement("<div/>")
$.ajax({
url: `${Galaxy.root}api/datasets/${options.dataset_id}`
})
.done(dataset => {
this.dataset = dataset;
this.chart = new Chart({}, options);
this.chart = new Chart({}, options.charts_dict);
this.chart.definition = options.visualization_plugin;
window.console.log(this.chart.definition);
this.deferred = new Deferred();
this.viewer = new Viewer(this);
this.editor = new Editor(this);
Expand Down
40 changes: 18 additions & 22 deletions client/galaxy/scripts/mvc/visualization/chart/views/description.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/** This class renders the chart configuration form. */
import Utils from "utils/utils";
export default Backbone.View.extend({
initialize: function(app, options) {
initialize: function(app) {
var self = this;
this.chart = app.chart;
this.app = app;
this.setElement(this._template());
this.$title = this.$(".charts-description-title");
this.$image = this.$(".charts-description-image");
Expand All @@ -16,32 +15,29 @@ export default Backbone.View.extend({
},
render: function() {
if (this.chart.get("type")) {
/*this.$image.attr(
"src",
repository_root + "/visualizations/" + this.app.split(this.chart.get("type")) + "/logo.png"
);*/
this.$title.html(this.chart.definition.title + " (" + this.chart.definition.library + ")");
this.$image.attr(
"src", Galaxy.root + this.chart.definition.logo
);
this.$title.html(this.chart.definition.html);
this.$text.html(Utils.linkify(this.chart.definition.description || ""));
this.$el.show();
} else {
this.$el.hide();
}
},
_template: function() {
return (
'<div class="charts-description">' +
"<table>" +
"<tr>" +
'<td class="charts-description-image-td">' +
'<img class="charts-description-image"/>' +
"</td>" +
"<td>" +
'<div class="charts-description-title ui-form-info"/>' +
'<div class="charts-description-text ui-form-info"/>' +
"</td>" +
"</tr>" +
"</table>" +
"</div>"
);
return `<div class="charts-description">
<table>
<tr>
<td class="charts-description-image-td">
<img class="charts-description-image"/>
</td>
<td>
<div class="charts-description-title ui-form-info"/>
<div class="charts-description-text ui-form-info"/>
</td>
</tr>
</table>
</div>`;
}
});
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default Backbone.View.extend({
var model_value = self.chart.settings.get(name);
model_value !== undefined && !input.hidden && (input.value = model_value);
});
this.form = new Form.View({
this.form = new Form({
inputs: inputs,
cls: "ui-portlet-plain",
onchange: function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var View = Backbone.View.extend({
id : id,
name : v.name,
keywords : v.keywords || [],
title : v.title ? type.title + ' (' + v.html + ')' : v.html,
title : v.html,
image_src : v.logo ? Galaxy.root + v.logo : null,
description : v.description || 'No description available.',
regular : v.regular,
Expand Down
1 change: 1 addition & 0 deletions client/galaxy/style/less/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
@import "jstree.less";
@import "tour.less";
@import "flex.less";
@import "charts.less";

// Mixins
.unselectable {
Expand Down
83 changes: 83 additions & 0 deletions client/galaxy/style/less/charts.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
.charts-viewer {
overflow: auto;
}

.charts-viewer .ui-message {
position: absolute;
width: calc(100% - 20px);
z-index: 100;
}

.charts-description {
margin-bottom: 20px;
}
.charts-description-image-td {
vertical-align: top;
}

.charts-description-image {
width: 50px;
height: 43px;
margin-right: 10px;
}

.charts-description-title {
font-weight: bold;
}

.charts-description-text {
word-wrap: break-word;
}

.charts-tooltip {
position: absolute;
text-align: center;
padding: 3px 5px 3px 5px;
font: 12px sans-serif;
background: white;
border: 1px solid gray;
border-radius: 4px;
pointer-events: none;
}

.charts-tooltip-first {
font-weight: bold;
text-align: left;
padding-right: 5px;
}

.charts-viewport {
height: inherit;
min-height: 50px;
}

.charts-viewport .info {
position: absolute;
margin: 40px 20px 50px 10px;
}

.charts-viewport .text {
position: relative;
margin-left: 5px;
top: -1px;
font-size: 1.0em;
display: inline;
}

.charts-viewport .icon {
font-size: 1.2em;
display: inline-block;
}

.charts-viewport .charts-viewport-container {
float: left;
display: block;
height: 100%;
}

.charts-viewport .charts-viewport-canvas {
display: block;
width: 100%;
min-height: 100px;
height: inherit;
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
var app = bundleEntries.chart({
visualization_id : ${h.dumps(visualization_id)} || undefined,
visualization_name : ${h.dumps(visualization_name)},
visualization_plugin: ${h.dumps(visualization_plugin)},
dataset_id : config.dataset_id,
chart_dict : config.chart_dict
});
Expand Down
56 changes: 56 additions & 0 deletions config/plugins/visualizations/nvd3bar/config/nvd3bar.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE visualization SYSTEM "../../visualization.dtd">
<visualization name="Bar diagram (NVD3)" regular="True">
<description>Renders a regular bar diagram using NVD3 hosted at http://www.nvd3.org.</description>
<data_sources>
<data_source>
<model_class>HistoryDatasetAssociation</model_class>
<test type="isinstance" test_attr="datatype" result_type="datatype">tabular.Tabular</test>
<test type="isinstance" test_attr="datatype" result_type="datatype">tabular.CSV</test>
<to_param param_attr="id">dataset_id</to_param>
</data_source>
</data_sources>
<params>
<param type="dataset" var_name_in_template="hda" required="true">dataset_id</param>
</params>
<entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
<groups>
<color>
<label>Pick a series color</label>
<type>color</type>
</color>
<tooltip>
<label>Data point labels</label>
<type>data_column</type>
<is_label>true</is_label>
<is_auto>true</is_auto>
</tooltip>
<x>
<label>Values for x-axis</label>
<type>data_column</type>
<is_label>true</is_label>
<is_auto>true</is_auto>
</x>
<y>
<label>Values for y-axis</label>
<type>data_column</type>
<is_numeric>true</is_numeric>
</y>
<key>
<label>Provide a label</label>
<type>text</type>
<placeholder>Data label</placeholder>
<value>Data label</value>
</key>
</groups>
<settings>
<x_axis_label>
<name>x_axis_label</name>
<label>X-Axis label</label>
<help>Provide a label for the axis.</help>
<type>text</type>
<value>X-axis</value>
<placeholder>Axis label</placeholder>
</x_axis_label>
</settings>
</visualization>

0 comments on commit 9be9593

Please sign in to comment.