From f6dbd2451b800e4543a80eb4cb09ce312ef6b779 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 3 Jan 2020 20:50:14 -0500
Subject: [PATCH] Merge _uploadFtp functionality between collection and default
 uploads.

---
 .../scripts/components/Upload/Collection.vue  |  3 +-
 .../scripts/components/Upload/Default.vue     | 29 -------------------
 .../components/Upload/UploadBoxMixin.js       | 26 +++++++++++++++++
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/client/galaxy/scripts/components/Upload/Collection.vue b/client/galaxy/scripts/components/Upload/Collection.vue
index af3ccfca370f..523dc6f49f48 100644
--- a/client/galaxy/scripts/components/Upload/Collection.vue
+++ b/client/galaxy/scripts/components/Upload/Collection.vue
@@ -239,7 +239,6 @@ export default {
 
         /** Success */
         _eventSuccess: function(index, message) {
-            // var hdaId = message["outputs"][0]["id"];
             var hids = _.pluck(message["outputs"], "hid");
             var it = this.collection.get(index);
             it.set({ percentage: 100, status: "success", hids: hids });
@@ -281,6 +280,8 @@ export default {
             this.appModel.set({ percentage: 0, status: "success" });
             this.counterRunning = this.counterAnnounce;
             this.history_id = this.app.currentHistory();
+            // package ftp files separately, and remove them from queue
+            this._uploadFtp();
             this.uploadbox.start();
             this._updateStateForCounters();
         },
diff --git a/client/galaxy/scripts/components/Upload/Default.vue b/client/galaxy/scripts/components/Upload/Default.vue
index 34a3190d6e99..53c2654ddf44 100644
--- a/client/galaxy/scripts/components/Upload/Default.vue
+++ b/client/galaxy/scripts/components/Upload/Default.vue
@@ -103,7 +103,6 @@
 <script>
 import _l from "utils/localization";
 import _ from "underscore";
-import $ from "jquery";
 import { getGalaxyInstance } from "app";
 import UploadRow from "mvc/upload/default/default-row";
 import UploadBoxMixin from "./UploadBoxMixin";
@@ -264,34 +263,6 @@ export default {
                 this.appModel.set("percentage", 0);
                 this._updateStateForCounters();
             }
-        },
-
-        /** Package and upload ftp files in a single request */
-        _uploadFtp: function() {
-            var self = this;
-            var list = [];
-            this.collection.each(model => {
-                if (model.get("status") == "queued" && model.get("file_mode") == "ftp") {
-                    self.uploadbox.remove(model.id);
-                    list.push(model);
-                }
-            });
-            if (list.length > 0) {
-                $.uploadpost({
-                    data: this.app.toData(list),
-                    url: this.app.uploadPath,
-                    success: function(message) {
-                        _.each(list, model => {
-                            self._eventSuccess(model.id);
-                        });
-                    },
-                    error: function(message) {
-                        _.each(list, model => {
-                            self._eventError(model.id, message);
-                        });
-                    }
-                });
-            }
         }
     }
 };
diff --git a/client/galaxy/scripts/components/Upload/UploadBoxMixin.js b/client/galaxy/scripts/components/Upload/UploadBoxMixin.js
index 3b3d3031b26f..a96e4ab23054 100644
--- a/client/galaxy/scripts/components/Upload/UploadBoxMixin.js
+++ b/client/galaxy/scripts/components/Upload/UploadBoxMixin.js
@@ -47,6 +47,32 @@ export default {
         uploadSelect: function() {
             this.uploadbox.select();
         },
+        /** Package and upload ftp files in a single request */
+        _uploadFtp: function() {
+            const list = [];
+            this.collection.each(model => {
+                if (model.get("status") == "queued" && model.get("file_mode") == "ftp") {
+                    this.uploadbox.remove(model.id);
+                    list.push(model);
+                }
+            });
+            if (list.length > 0) {
+                $.uploadpost({
+                    data: this.app.toData(list),
+                    url: this.app.uploadPath,
+                    success: message => {
+                        _.each(list, model => {
+                            this._eventSuccess(model.id, message);
+                        });
+                    },
+                    error: message => {
+                        _.each(list, model => {
+                            self._eventError(model.id, message);
+                        });
+                    }
+                });
+            }
+        },
         renderNewModel: function(model) {
             // Turn backbone upload model into row model and place in table,
             // render in next tick so table can respond first and dynamic