From 6707c9d223ddd911db472692dc8696450a3715be Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Wed, 24 Jan 2018 21:29:20 -0500
Subject: [PATCH] Allow drag and drop datasets from collections to the tool
 form.

There are some shortcomings here - the original name will still be used in the tool since we are treating the dataset as a stand-alone dataset and not an element in the collection for instance. This is an issue in the display of the selected dataset and in tools that may want to leverage element_identifier. Still - this prevents the user from having to find the right dataset and unhide it to use it in the tool form - good enough for a step forward?
---
 .../scripts/mvc/collection/collection-view.js |  2 +
 .../scripts/mvc/ui/ui-select-content.js       | 38 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/client/galaxy/scripts/mvc/collection/collection-view.js b/client/galaxy/scripts/mvc/collection/collection-view.js
index 2b7de39e3c3b..8e4dcaa37cc5 100644
--- a/client/galaxy/scripts/mvc/collection/collection-view.js
+++ b/client/galaxy/scripts/mvc/collection/collection-view.js
@@ -33,6 +33,8 @@ var CollectionView = _super.extend(
             _super.prototype.initialize.call(this, attributes);
             this.linkTarget = attributes.linkTarget || "_blank";
 
+            this.dragItems = true;
+
             this.hasUser = attributes.hasUser;
             /** A stack of panels that currently cover or hide this panel */
             this.panelStack = [];
diff --git a/client/galaxy/scripts/mvc/ui/ui-select-content.js b/client/galaxy/scripts/mvc/ui/ui-select-content.js
index 16f919aa7501..1e561b7ef1b9 100644
--- a/client/galaxy/scripts/mvc/ui/ui-select-content.js
+++ b/client/galaxy/scripts/mvc/ui/ui-select-content.js
@@ -127,6 +127,7 @@ var View = Backbone.View.extend({
                 pagelimit: 100,
                 statustimer: 1000
             }).set(options);
+        this.displayMissingValue = false,
         this.setElement($("<div/>").addClass("ui-select-content"));
         this.button_product = new Ui.RadioButton.View({
             value: "false",
@@ -372,6 +373,19 @@ var View = Backbone.View.extend({
                 self.history[`${item.id}_${src}`] = item;
             });
         });
+        if (this.displayMissingValue) {
+            var new_value = this.model.get("value");
+            _.each(new_value.values, value => {
+                select_options[value.src].push({
+                    hid: 1000,
+                    keep: true,
+                    label: "Dropped Item",
+                    value: value.id,
+                    tags: [],
+                });
+                self.history[`${value.id}_${value.src}`] = {src: value.src, id: value.id};
+            });
+        }
         _.each(this.config, (c, i) => {
             select_options[c.src] && self.fields[i].add(select_options[c.src], (a, b) => b.hid - a.hid);
         });
@@ -389,15 +403,28 @@ var View = Backbone.View.extend({
             // sniff first suitable field type from config list
             var src = new_value.values[0].src;
             var multiple = new_value.values.length > 1;
+            let fieldFound = false;
             for (var i = 0; i < this.config.length; i++) {
                 var field = this.fields[i];
                 var c = this.config[i];
                 if (c.src == src && [multiple, true].indexOf(c.multiple) !== -1) {
                     this.model.set("current", i);
-                    field.value(list);
+                    let result = field.value(list);
+                    result = $.isArray(result) ? result : [result];
+                    const valueSet = _.isEqual(result, list);
+                    if (valueSet) {
+                        fieldFound = true;
+                    }
                     break;
                 }
             }
+            if (!fieldFound) {
+                this.displayMissingValue = true;
+                this._changeData();
+                this._changeValue();
+            } else {
+                this.displayMissingValue = false;
+            }
         } else {
             _.each(this.fields, field => {
                 field.value(null);
@@ -414,19 +441,22 @@ var View = Backbone.View.extend({
             var field = this.fields[current];
             var drop_data = JSON.parse(ev.originalEvent.dataTransfer.getData("text"))[0];
             var new_id = drop_data.id;
-            var new_src = drop_data.history_content_type == "dataset" ? "hda" : "hdca";
+            // Following line doesn't work for nested elements, should dispatch on model_class maybe?
+            var new_src = drop_data.history_content_type == "dataset_collection" ? "hdca" : "hda";
             var new_value = { id: new_id, src: new_src };
-            if (data && _.findWhere(data[new_src], new_value)) {
+            if (data) {
                 if (config.src == new_src) {
                     var current_value = field.value();
                     if (current_value && config.multiple) {
                         if (current_value.indexOf(new_id) == -1) {
                             current_value.push(new_id);
                         }
+                        field.value(current_value);
                     } else {
                         current_value = new_id;
+                        this.model.set("value", { values: [new_value] });
                     }
-                    field.value(current_value);
+
                 } else {
                     this.model.set("value", { values: [new_value] });
                     this.model.trigger("change:value");