Skip to content

Commit

Permalink
Client formatting.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dannon @guerler
dannon authored and guerler committed Feb 11, 2018
1 parent a0fa190 commit 2b0fbe8
Show file tree
Hide file tree
Showing 15 changed files with 93 additions and 80 deletions.
6 changes: 3 additions & 3 deletions client/galaxy/scripts/apps/analysis.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ window.app = function app(options, bootstrapped) {
"(/)pages(/)edit(/)": "show_pages_edit",
"(/)pages(/)(:action_id)": "show_pages",
"(/)visualizations(/)edit(/)": "show_visualizations_edit",
"(/)visualizations/show/(:visualization_id)" : "show_visualizations_client",
"(/)visualizations/dataset_id=(:dataset_id)" : "show_visualizations_selector",
"(/)visualizations/show/(:visualization_id)": "show_visualizations_client",
"(/)visualizations/dataset_id=(:dataset_id)": "show_visualizations_selector",
"(/)visualizations/(:action_id)": "show_visualizations",
"(/)workflows/import_workflow": "show_import_workflow",
"(/)workflows/run(/)": "show_run",
Expand Down Expand Up @@ -321,4 +321,4 @@ window.app = function app(options, bootstrapped) {
})
);
});
};
};
2 changes: 1 addition & 1 deletion client/galaxy/scripts/apps/chart.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ export const bundleEntries = {
return new ChartClient.View(options);
}
};
window.bundleEntries = bundleEntries;
window.bundleEntries = bundleEntries;
21 changes: 11 additions & 10 deletions client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,15 +261,16 @@ var DatasetListItemEdit = _super.extend(
return null;
}

if( visualizations.length >= 1 ) {
var url = Galaxy.root + "visualizations/dataset_id=" + this.model.get( "id" );
return $( '<a/>' ).addClass( 'visualization-link icon-btn' )
.attr( 'href', url )
.append( $( '<span/>' ).addClass( 'fa fa-bar-chart-o' ) )
.on( 'click', function( e ) {
Galaxy.frame.add( { url: url } );
e.preventDefault();
});
if (visualizations.length >= 1) {
var url = Galaxy.root + "visualizations/dataset_id=" + this.model.get("id");
return $("<a/>")
.addClass("visualization-link icon-btn")
.attr("href", url)
.append($("<span/>").addClass("fa fa-bar-chart-o"))
.on("click", function(e) {
Galaxy.frame.add({ url: url });
e.preventDefault();
});
}
},

Expand Down Expand Up @@ -490,4 +491,4 @@ DatasetListItemEdit.prototype.templates = (() => {
//==============================================================================
export default {
DatasetListItemEdit: DatasetListItemEdit
};
};
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/form/form-view.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,4 @@ export default Backbone.View.extend({
}
Galaxy.emit.debug("form-view::initialize()", "Completed");
}
});
});
14 changes: 11 additions & 3 deletions client/galaxy/scripts/mvc/ui/ui-thumbnails.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,20 @@ var View = Backbone.View.extend({

/* Thumbnail template with image */
_templateThumbnailItem: function(options) {
return `<div class="ui-thumbnails-item ui-thumbnails-item-float" value="${options.id}">${this._templateImage(options)}<div class="ui-thumbnails-title ui-form-info"><span class="fa ${options.title_icon}"/>${options.title}</div><div>`;
return `<div class="ui-thumbnails-item ui-thumbnails-item-float" value="${options.id}">${this._templateImage(
options
)}<div class="ui-thumbnails-title ui-form-info"><span class="fa ${options.title_icon}"/>${
options.title
}</div><div>`;
},

/* Thumbnail template with image and description */
_templateRegularItem: function(options) {
return `<div class="ui-thumbnails-item" value="${options.id}"><table><tr><td>${this._templateImage(options)}</td><td><div class="ui-thumbnails-description-title ui-form-info">${options.title}</div><div class="ui-thumbnails-description-text ui-form-info">${options.description}</div></td></tr><div>`;
return `<div class="ui-thumbnails-item" value="${options.id}"><table><tr><td>${this._templateImage(
options
)}</td><td><div class="ui-thumbnails-description-title ui-form-info">${
options.title
}</div><div class="ui-thumbnails-description-text ui-form-info">${options.description}</div></td></tr><div>`;
}
});
export default { View: View };
export default { View: View };
36 changes: 18 additions & 18 deletions client/galaxy/scripts/mvc/visualization/chart/chart-client.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@ var View = Backbone.View.extend({
initialize: function(options) {
this.options = options;
this.modal = (parent.Galaxy && parent.Galaxy.modal) || new Modal.View();
this.setElement("<div/>")
this.setElement("<div/>");
$.ajax({
url: `${Galaxy.root}api/datasets/${options.dataset_id}`
})
.done(dataset => {
this.dataset = dataset;
this.chart = new Chart({}, options);
this.chart.plugin = options.visualization_plugin;
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.go(this.chart.load() ? "viewer" : "editor");
this.render();
})
.fail(response => {
let message = response.responseJSON && response.responseJSON.err_msg;
this.errormessage = message || "Import failed for unkown reason.";
});
.done(dataset => {
this.dataset = dataset;
this.chart = new Chart({}, options);
this.chart.plugin = options.visualization_plugin;
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.go(this.chart.load() ? "viewer" : "editor");
this.render();
})
.fail(response => {
let message = response.responseJSON && response.responseJSON.err_msg;
this.errormessage = message || "Import failed for unkown reason.";
});
},

/** Build client ui */
Expand Down Expand Up @@ -57,4 +57,4 @@ var View = Backbone.View.extend({
this[view_id].show();
}
});
export default { View: View }
export default { View: View };
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/visualization/chart/components/model.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ export default Backbone.Model.extend({
console.debug("model::load() - Visualization attributes unavailable.");
return false;
}
});
});
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/visualization/chart/components/screenshot.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,4 @@ export default {
createPNG: createPNG,
createSVG: createSVG,
createPDF: createPDF
};
};
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/visualization/chart/views/description.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ export default Backbone.View.extend({
</table>
</div>`;
}
});
});
11 changes: 5 additions & 6 deletions client/galaxy/scripts/mvc/visualization/chart/views/editor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import Portlet from "mvc/ui/ui-portlet";
import Ui from "mvc/ui/ui-misc";
import Utils from "utils/utils";
import Tabs from "mvc/ui/ui-tabs";
import Groups from "mvc/visualization/chart/views/groups"
import Settings from "mvc/visualization/chart/views/settings"
import Groups from "mvc/visualization/chart/views/groups";
import Settings from "mvc/visualization/chart/views/settings";
import Description from "mvc/visualization/chart/views/description";
export default Backbone.View.extend({
initialize: function(app, options) {
Expand Down Expand Up @@ -64,7 +64,7 @@ export default Backbone.View.extend({
.addClass("ui-form-info ui-margin-bottom")
.html("This title will appear in the list of 'Saved Visualizations'.")
)
.append( new Settings(this.app).$el )
.append(new Settings(this.app).$el)
});
this.tabs.add({
id: "groups",
Expand Down Expand Up @@ -130,8 +130,7 @@ export default Backbone.View.extend({
if (group.attributes[name] === null) {
self.message.update({
status: "danger",
message:
"This visualization type requires column types not found in your tabular file.",
message: "This visualization type requires column types not found in your tabular file.",
persistent: false
});
self.tabs.show("groups");
Expand All @@ -147,4 +146,4 @@ export default Backbone.View.extend({
});
}
}
});
});
5 changes: 2 additions & 3 deletions client/galaxy/scripts/mvc/visualization/chart/views/groups.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ var GroupView = Backbone.View.extend({
var valid =
(["int", "float"].indexOf(meta[key]) != -1 && input.is_numeric) ||
input.is_label;
valid &&
columns.push({ label: "Column: " + (parseInt(key) + 1), value: key });
valid && columns.push({ label: "Column: " + (parseInt(key) + 1), value: key });
}
input.data = columns;
}
Expand Down Expand Up @@ -130,4 +129,4 @@ export default Backbone.View.extend({
this.message.$el.show();
}
}
});
});
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/visualization/chart/views/settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ export default Backbone.View.extend({
this.$el.append(this.form.$el);
}
}
});
});
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/visualization/chart/views/viewer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,4 @@ export default Backbone.View.extend({
});
}
}
});
});
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/visualization/chart/views/viewport.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ export default Backbone.View.extend({
process.resolve();
});*/
}
});
});
64 changes: 35 additions & 29 deletions client/galaxy/scripts/mvc/visualization/visualization-view.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,53 +6,59 @@ import Thumbnails from "mvc/ui/ui-thumbnails";
import Portlet from "mvc/ui/ui-portlet";
import Ui from "mvc/ui/ui-misc";
var View = Backbone.View.extend({
initialize: function( options ) {
initialize: function(options) {
var self = this;
this.setElement( $( '<div/>' ) );
this.setElement($("<div/>"));
this.model = new Backbone.Model();
$.ajax({
url: `${Galaxy.root}api/datasets/${options.dataset_id}`
})
.done(dataset => {
if ( dataset.visualizations.length === 0 ) {
self.$el.append( $( '<div/>' ).addClass( 'errormessagelarge' )
.append( $( '<p/>' ).text( 'Unfortunately we could not identify a suitable plugin. Feel free to contact us if you are aware of visualizations for this datatype.' ) ) );
}).done(dataset => {
if (dataset.visualizations.length === 0) {
self.$el.append(
$("<div/>")
.addClass("errormessagelarge")
.append(
$("<p/>").text(
"Unfortunately we could not identify a suitable plugin. Feel free to contact us if you are aware of visualizations for this datatype."
)
)
);
} else {
self.model.set( { 'dataset': dataset } );
self.model.set({ dataset: dataset });
self.render();
}
});
},

render: function() {
var self = this;
var dataset = this.model.get( 'dataset' );
var dataset = this.model.get("dataset");
this.vis_index = {};
this.vis_array = [];
_.each( dataset.visualizations, function( v, id ) {
_.each(dataset.visualizations, function(v, id) {
var dict = {
id : id,
name : v.name,
keywords : v.keywords || [],
title : v.html,
image_src : v.logo ? Galaxy.root + v.logo : null,
description : v.description || 'No description available.',
regular : v.regular,
visualization : v
}
self.vis_index[ dict.id ] = dict;
self.vis_array.push( dict );
id: id,
name: v.name,
keywords: v.keywords || [],
title: v.html,
image_src: v.logo ? Galaxy.root + v.logo : null,
description: v.description || "No description available.",
regular: v.regular,
visualization: v
};
self.vis_index[dict.id] = dict;
self.vis_array.push(dict);
});
this.types = new Thumbnails.View({
title_default : 'Suggested plugins',
title_list : 'List of available plugins',
collection : this.vis_array,
ondblclick : function( id ) {
var vis_type = self.vis_index[ id ];
$('#galaxy_main').attr('src', vis_type.visualization.href);
title_default: "Suggested plugins",
title_list: "List of available plugins",
collection: this.vis_array,
ondblclick: function(id) {
var vis_type = self.vis_index[id];
$("#galaxy_main").attr("src", vis_type.visualization.href);
}
});
this.$el.empty().append( this.types.$el );
this.$el.empty().append(this.types.$el);
}
});
export default { View: View }
export default { View: View };

0 comments on commit 2b0fbe8

Please sign in to comment.