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

Client format

Browse Source
This commit is contained in:
Dannon Baker
2018-03-14 08:59:37 -04:00
parent 759511479f
commit fcd00166e2
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/grid/grid-template.js
+3 -1
View File
@@ -93,7 +93,9 @@ export default {
if (column.visible) {
tmpl += `<th id="${column.key}-header">`;
if (column.sortable) {
tmpl += `<a href="javascript:void(0)" class="sort-link" sort_key="${column.key}">${column.label}</a>`;
tmpl += `<a href="javascript:void(0)" class="sort-link" sort_key="${column.key}">${
column.label
}</a>`;
} else {
tmpl += column.label;
}
client/galaxy/scripts/mvc/upload/default/default-view.js
+2 -2
View File
@@ -250,7 +250,7 @@ export default Backbone.View.extend({
/** Progress */
_eventProgress: function(index, percentage) {
var it = this.collection.get(index);
it.set({percentage: percentage, status: "running", info: ""});
it.set({ percentage: percentage, status: "running", info: "" });
this.ui_button.model.set("percentage", this._uploadPercentage(percentage, it.get("file_size")));
},
@@ -464,7 +464,7 @@ export default Backbone.View.extend({
/** Template */
_template: function() {
return `<div class="upload-view-default">
return `<div class="upload-view-default">
<div class="upload-top">
<h6 class="upload-top-info"/>
</div>
client/galaxy/scripts/utils/uploadbox.js
+23 -19
View File
@@ -9,12 +9,15 @@
xhr request helper
*/
var _uploadrequest = config => {
var cnf = $.extend({
error_default: "Please make sure the file is available.",
error_server: "Upload request failed.",
error_login: "Uploads require you to log in.",
error_retry: "Waiting for server to resume...",
}, config);
var cnf = $.extend(
{
error_default: "Please make sure the file is available.",
error_server: "Upload request failed.",
error_login: "Uploads require you to log in.",
error_retry: "Waiting for server to resume..."
},
config
);
console.debug(cnf);
var xhr = new XMLHttpRequest();
xhr.open("POST", cnf.url, true);
@@ -23,7 +26,7 @@
xhr.setRequestHeader("Accept", "application/json");
xhr.onreadystatechange = () => {
if (xhr.readyState == xhr.DONE) {
if (([502, 0]).indexOf(xhr.status) !== -1 && cnf.warning) {
if ([502, 0].indexOf(xhr.status) !== -1 && cnf.warning) {
cnf.warning(cnf.error_retry);
} else if (xhr.status < 200 || xhr.status > 299) {
var text = xhr.statusText;
@@ -112,34 +115,33 @@
data: form,
success: upload_response => {
var new_start = start + chunk_size;
if (new_start < size ) {
if (new_start < size) {
attempts = cnf.attempts;
process(new_start);
} else {
console.debug("Upload completed.");
data.payload.inputs = JSON.parse(data.payload.inputs);
data.payload.inputs["files_0|file_data"] = {
"session_id": session_id,
"name": file.name
session_id: session_id,
name: file.name
};
data.payload.inputs = JSON.stringify(data.payload.inputs);
$.ajax({
url: `${Galaxy.root}api/tools`,
url: `${Galaxy.root}api/tools`,
method: "POST",
data: data.payload,
success: (tool_response) => {
success: tool_response => {
cnf.success(tool_response);
},
error: (tool_response) => {
var err_msg = tool_response &&
tool_response.responseJSON &&
tool_response.responseJSON.err_msg;
error: tool_response => {
var err_msg =
tool_response && tool_response.responseJSON && tool_response.responseJSON.err_msg;
cnf.error(err_msg || cnf.error_tool);
}
});
}
},
warning: (upload_response) => {
warning: upload_response => {
if (--attempts > 0) {
console.debug("Retrying last chunk...");
cnf.warning(upload_response);
@@ -382,11 +384,13 @@
// create and submit data
var submitter = $.uploadpost;
if (file.chunk_mode &&
if (
file.chunk_mode &&
session &&
session.id &&
session.chunk_upload_size &&
session.chunk_upload_size > 0) {
session.chunk_upload_size > 0
) {
submitter = $.uploadchunk;
}
submitter({