opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore URL splitting

Browse Source
This commit is contained in:
mvdbeek
2021-11-06 11:22:10 +01:00
parent efbcdefa4a
commit 0f3141f49e
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/Upload/helpers.js
+22 -5
View File
@@ -20,10 +20,29 @@ export function uploadModelsToPayload(items, history_id, composite = false) {
fileName = null;
}
const url = (item.get("file_uri") || item.get("file_path") || item.get("url_paste")).trim();
const elem = {
dbkey: item.get("genome", "?"),
ext: item.get("extension", "auto"),
space_to_tab: item.get("space_to_tab"),
to_posix_lines: item.get("to_posix_lines"),
};
switch (item.get("file_mode")) {
case "new":
if (itemIsUrl(item)) {
src = "url";
/* Could be multiple URLs pasted in.
TODO: eliminate backbone models,
then suggest to split multiple URLs
across multiple uploads directly in upload modal,
instead of this intransparent magic. */
return url.split("\n").map((splitUrl) => {
return {
src: src,
url: splitUrl,
name: fileName,
...elem,
};
});
} else {
pasteContent = item.get("url_paste");
src = "pasted";
@@ -46,13 +65,11 @@ export function uploadModelsToPayload(items, history_id, composite = false) {
url: url,
paste_content: pasteContent,
name: fileName,
dbkey: item.get("genome", "?"),
ext: item.get("extension", "auto"),
space_to_tab: item.get("space_to_tab"),
to_posix_lines: item.get("to_posix_lines"),
...elem,
};
})
.filter((item) => item);
.filter((item) => item)
.flat();
const target = {
destination: { type: "hdas" },