opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8018 from WilliamHolden/fix_tool_run_ellipses

Browse Source 
Fix tool run uses ellipses slightly too soon
This commit is contained in:
Dannon
2019-06-06 16:34:18 -04:00
committed by GitHub
parent f1775a3582 320655337b
commit 169e78df7c
1 changed files with 65 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/tool/tool-form.js
+65 -70
View File
@@ -12,23 +12,22 @@ import Modal from "mvc/ui/ui-modal";
import ToolFormBase from "mvc/tool/tool-form-base";
import Webhooks from "mvc/webhooks";
var View = Backbone.View.extend({
const View = Backbone.View.extend({
initialize: function(options) {
const Galaxy = getGalaxyInstance();
const self = this;
this.modal = Galaxy.modal || new Modal.View();
this.form = new ToolFormBase(
Utils.merge(
{
listen_to_history: true,
always_refresh: false,
buildmodel: function(process, form) {
var options = form.model.attributes;
buildmodel: (process, form) => {
const options = form.model.attributes;
// build request url
var build_url = "";
var build_data = {};
var job_id = options.job_id;
let build_url = "";
let build_data = {};
const job_id = options.job_id;
if (job_id) {
build_url = `${getAppRoot()}api/jobs/${job_id}/build_for_rerun`;
} else {
@@ -42,18 +41,18 @@ var View = Backbone.View.extend({
Utils.get({
url: build_url,
data: build_data,
success: function(data) {
success: data => {
if (!data.display) {
window.location = getAppRoot();
return;
}
form.model.set(data);
self._customize(form);
this._customize(form);
Galaxy.emit.debug("tool-form-base::_buildModel()", "Initial tool model ready.", data);
process.resolve();
},
error: function(response, status) {
var error_message = (response && response.err_msg) || "Uncaught error.";
error: (response, status) => {
const error_message = (response && response.err_msg) || "Uncaught error.";
if (status == 401) {
window.location = `${getAppRoot()}user/login?${$.param({
redirect: `${getAppRoot()}?tool_id=${options.id}`
@@ -72,7 +71,7 @@ var View = Backbone.View.extend({
title: _l("Tool request failed"),
body: error_message,
buttons: {
Close: function() {
Close: () => {
Galaxy.modal.hide();
}
}
@@ -87,8 +86,8 @@ var View = Backbone.View.extend({
}
});
},
postchange: function(process, form) {
var current_state = {
postchange: (process, form) => {
const current_state = {
tool_id: form.model.get("id"),
tool_version: form.model.get("version"),
inputs: $.extend(true, {}, form.data.create())
@@ -99,13 +98,13 @@ var View = Backbone.View.extend({
type: "POST",
url: `${getAppRoot()}api/tools/${form.model.get("id")}/build`,
data: current_state,
success: function(data) {
success: data => {
form.update(data);
form.wait(false);
Galaxy.emit.debug("tool-form::postchange()", "Received new model.", data);
process.resolve();
},
error: function(response) {
error: response => {
Galaxy.emit.debug("tool-form::postchange()", "Refresh request failed.", response);
process.reject();
}
@@ -121,19 +120,18 @@ var View = Backbone.View.extend({
},
_customize: function(form) {
var self = this;
var options = form.model.attributes;
const options = form.model.attributes;
// build execute button
var execute_button = new Ui.Button({
const execute_button = new Ui.Button({
icon: "fa-check",
tooltip: `Execute: ${options.name} (${options.version})`,
title: _l("Execute"),
cls: "btn btn-primary",
wait_cls: "btn btn-info",
onclick: function() {
onclick: () => {
execute_button.wait();
form.portlet.disable();
self.submit(options, () => {
this.submit(options, () => {
execute_button.unwait();
form.portlet.enable();
});
@@ -143,7 +141,7 @@ var View = Backbone.View.extend({
// remap feature
if (options.job_id && options.job_remap) {
var label, help;
let label, help;
if (options.job_remap === "job_produced_collection_elements") {
label = "Replace elements in collection ?";
help =
@@ -167,11 +165,11 @@ var View = Backbone.View.extend({
// Job Re-use Options
const Galaxy = getGalaxyInstance();
var extra_user_preferences = {};
let extra_user_preferences = {};
if (Galaxy.user.attributes.preferences && "extra_user_preferences" in Galaxy.user.attributes.preferences) {
extra_user_preferences = JSON.parse(Galaxy.user.attributes.preferences.extra_user_preferences);
}
var use_cached_job =
const use_cached_job =
"use_cached_job|use_cached_job_checkbox" in extra_user_preferences
? extra_user_preferences["use_cached_job|use_cached_job_checkbox"]
: false;
@@ -196,7 +194,6 @@ var View = Backbone.View.extend({
submit: function(options, callback) {
const Galaxy = getGalaxyInstance();
const history_id = Galaxy.currHistoryPanel && Galaxy.currHistoryPanel.model.id;
const self = this;
const job_def = {
history_id: history_id,
tool_id: options.id,
@@ -204,7 +201,7 @@ var View = Backbone.View.extend({
inputs: this.form.data.create()
};
this.form.trigger("reset");
if (!self.validate(job_def)) {
if (!this.validate(job_def)) {
Galaxy.emit.debug("tool-form::submit()", "Submission canceled. Validation failed.");
callback && callback();
return;
@@ -230,42 +227,43 @@ var View = Backbone.View.extend({
type: "POST",
url: `${getAppRoot()}api/tools`,
data: job_def,
success: function(response) {
success: response => {
callback && callback();
self.$el.children().hide();
self.$el.append(self._templateSuccess(response, job_def));
this.$el.children().hide();
this.$el.append(this._templateSuccess(response, job_def));
this.$el.parent().scrollTop(0);
// Show Webhook if job is running
if (response.jobs && response.jobs.length > 0) {
self.$el.append($("<div/>", { id: "webhook-view" }));
this.$el.append($("<div/>", { id: "webhook-view" }));
new Webhooks.WebhookView({
type: "tool",
toolId: job_def.tool_id
});
}
if (Galaxy.currHistoryPanel) {
self.form.stopListening(Galaxy.currHistoryPanel.collection);
this.form.stopListening(Galaxy.currHistoryPanel.collection);
Galaxy.currHistoryPanel.refreshContents();
}
},
error: function(response) {
error: response => {
callback && callback();
Galaxy.emit.debug("tool-form::submit", "Submission failed.", response);
let input_found = false;
if (response && response.err_data) {
const error_messages = self.form.data.matchResponse(response.err_data);
const error_messages = this.form.data.matchResponse(response.err_data);
for (const input_id in error_messages) {
self.form.highlight(input_id, error_messages[input_id]);
this.form.highlight(input_id, error_messages[input_id]);
input_found = true;
break;
}
}
if (!input_found) {
self.modal.show({
this.modal.show({
title: _l("Job submission failed"),
body: self._templateError(job_def, response && response.err_msg),
body: this._templateError(job_def, response && response.err_msg),
buttons: {
Close: function() {
self.modal.hide();
Close: () => {
this.modal.hide();
}
}
});
@@ -279,14 +277,14 @@ var View = Backbone.View.extend({
*/
validate: function(job_def) {
const Galaxy = getGalaxyInstance();
var job_inputs = job_def.inputs;
var batch_n = -1;
var batch_src = null;
for (var job_input_id in job_inputs) {
var input_value = job_inputs[job_input_id];
var input_id = this.form.data.match(job_input_id);
var input_field = this.form.field_list[input_id];
var input_def = this.form.input_list[input_id];
const job_inputs = job_def.inputs;
let batch_n = -1;
let batch_src = null;
for (const job_input_id in job_inputs) {
const input_value = job_inputs[job_input_id];
const input_id = this.form.data.match(job_input_id);
const input_field = this.form.field_list[input_id];
const input_def = this.form.input_list[input_id];
if (!input_id || !input_def || !input_field) {
Galaxy.emit.debug("tool-form::validate()", "Retrieving input objects failed.");
continue;
@@ -303,8 +301,8 @@ var View = Backbone.View.extend({
}
}
if (input_value && input_value.batch) {
var n = input_value.values.length;
var src = n > 0 && input_value.values[0] && input_value.values[0].src;
const n = input_value.values.length;
const src = n > 0 && input_value.values[0] && input_value.values[0].src;
if (src) {
if (batch_src === null) {
batch_src = src;
@@ -331,8 +329,8 @@ var View = Backbone.View.extend({
},
_getInputs: function(job_def) {
var inputs = [];
var index = {};
const inputs = [];
const index = {};
for (const i in job_def.inputs) {
const input = job_def.inputs[i];
if (input && $.isArray(input.values)) {
@@ -347,36 +345,33 @@ var View = Backbone.View.extend({
return inputs;
},
_templateRow: function(list, title, max = 3) {
var blurb = "";
list.sort(function(a, b) {
return b.hid - a.hid;
});
_templateRow: function(list, title) {
let blurb = "";
if (list.length > 0) {
blurb += `<p>${title}:</p>`;
list.sort((a, b) => {
b.hid - a.hid;
});
blurb += `<ul>`;
for (const item of list) {
const rowString = max > 0 ? `${item.hid}: ${_.escape(item.name)}` : "...";
blurb += `<p class="messagerow">
<b>${rowString}</b>
</p>`;
if (max-- <= 0) {
break;
}
const rowString = `${item.hid}: ${_.escape(item.name)}`;
blurb += `<li><b>${rowString}</b></li>`;
}
blurb += `</ul>`;
}
return blurb;
},
_templateSuccess: function(response, job_def) {
var njobs = response && response.jobs ? response.jobs.length : 0;
const njobs = response && response.jobs ? response.jobs.length : 0;
if (njobs > 0) {
var inputs = this._getInputs(job_def);
var ninputs = inputs.length;
var noutputs = response.outputs.length;
var njobsText = njobs > 1 ? `${njobs} jobs` : `1 job`;
var ninputsText = ninputs > 1 ? `${ninputs} inputs` : `this input`;
var noutputsText = noutputs > 1 ? `${noutputs} outputs` : `this output`;
var tool_name = this.form.model.get("name");
const inputs = this._getInputs(job_def);
const ninputs = inputs.length;
const noutputs = response.outputs.length;
const njobsText = njobs > 1 ? `${njobs} jobs` : `1 job`;
const ninputsText = ninputs > 1 ? `${ninputs} inputs` : `this input`;
const noutputsText = noutputs > 1 ? `${noutputs} outputs` : `this output`;
const tool_name = this.form.model.get("name");
return `<div class="donemessagelarge">
<p>
Executed <b>${tool_name}</b> and successfully added ${njobsText} to the queue.