Merge pull request #6311 from martenson/backport-and-build

[18.05] Backport and build client changes

client/galaxy/scripts/components/RuleCollectionBuilder.vue

@@ -1725,7 +1725,7 @@ export default {
             if (mappingAsDict.file_type) {
                 const fileTypeColumn = mappingAsDict.file_type.columns[0];
                 const fileType = data[dataIndex][fileTypeColumn];
-                res["ext"] = file_type;
+                res["ext"] = fileType;
             } else if (this.extension) {
                 res["ext"] = this.extension;
             }

client/galaxy/scripts/mvc/history/hdca-li-edit.js

@@ -41,7 +41,7 @@ var HDCAListItemEdit = _super.extend(
                         <span class="fa fa-times"></span>
                     </a>
                     <div class="dropdown-menu" role="menu">
-                            <a href="#" class="dropdown-item" delete-collection">
+                            <a href="#" class="dropdown-item delete-collection">
                                 ${_l("Collection Only")}
                             </a>
                             <a href="#" class="dropdown-item delete-collection-and-datasets">

config/plugins/webhooks/demo/search/script.js

@@ -33,7 +33,7 @@ $(document).ready(function() {
             };
 
             // Open search overlay on click of magnifier icon in the masthead
-            self.parentElement.find( 'ul#searchover a' ).on( 'click', function( e ) {
+            self.parentElement.find( 'ul #searchover a' ).on( 'click', function( e ) {
                 e.preventDefault();
                 e.stopPropagation();
                 if ( $( '.search-screen-overlay' ).is( ':visible' ) ){

static/scripts/mvc/history/hdca-li-edit.js

@@ -1 +1 @@
-define("mvc/history/hdca-li-edit",["exports","underscore","mvc/history/hdca-li","mvc/collection/collection-view-edit","utils/localization"],function(e,t,n,l,i){"use strict";function o(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(e,"__esModule",{value:!0});var d=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(t),a=o(n),r=o(l),s=o(i),c=a.default.HDCAListItemView,u=c.extend({initialize:function(e){c.prototype.initialize.call(this,e),this.purgeAllowed=e.purgeAllowed||!1},_getFoldoutPanelClass:function(){return r.default.CollectionViewEdit},_renderPrimaryActions:function(){return this.log(this+"._renderPrimaryActions"),c.prototype._renderPrimaryActions.call(this).concat([this._renderDeleteButton()])},_renderDeleteButton:function(){return $('\n                <div class="dropdown">\n                    <a class="delete-btn icon-btn" title="'+(0,s.default)("Delete")+'" data-toggle="dropdown">\n                        <span class="fa fa-times"></span>\n                    </a>\n                    <div class="dropdown-menu" role="menu">\n                            <a href="#" class="dropdown-item" delete-collection">\n                                '+(0,s.default)("Collection Only")+'\n                            </a>\n                            <a href="#" class="dropdown-item delete-collection-and-datasets">\n                                '+(0,s.default)("Delete Datasets")+'\n                            </a>\n                            <a href="#" style="display: '+(this.purgeAllowed?"inherit":"none")+'" class="dropdown-item delete-collection-and-purge-datasets">\n                                '+(0,s.default)("Permanently Delete Datasets")+"\n                            </a>\n                    </div>\n                </div>")},events:d.extend(d.clone(c.prototype.events),{"click .delete-collection":function(e){this.model.delete()},"click .delete-collection-and-datasets":function(e){this.model.delete(!0)},"click .delete-collection-and-purge-datasets":function(e){this.model.delete(!0,!0)}}),toString:function(){return"HDCAListItemEdit("+(this.model?""+this.model:"(no model)")+")"}});e.default={HDCAListItemEdit:u}});
+define("mvc/history/hdca-li-edit",["exports","underscore","mvc/history/hdca-li","mvc/collection/collection-view-edit","utils/localization"],function(e,t,n,l,i){"use strict";function o(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(e,"__esModule",{value:!0});var d=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(t),a=o(n),r=o(l),s=o(i),c=a.default.HDCAListItemView,u=c.extend({initialize:function(e){c.prototype.initialize.call(this,e),this.purgeAllowed=e.purgeAllowed||!1},_getFoldoutPanelClass:function(){return r.default.CollectionViewEdit},_renderPrimaryActions:function(){return this.log(this+"._renderPrimaryActions"),c.prototype._renderPrimaryActions.call(this).concat([this._renderDeleteButton()])},_renderDeleteButton:function(){return $('\n                <div class="dropdown">\n                    <a class="delete-btn icon-btn" title="'+(0,s.default)("Delete")+'" data-toggle="dropdown">\n                        <span class="fa fa-times"></span>\n                    </a>\n                    <div class="dropdown-menu" role="menu">\n                            <a href="#" class="dropdown-item delete-collection">\n                                '+(0,s.default)("Collection Only")+'\n                            </a>\n                            <a href="#" class="dropdown-item delete-collection-and-datasets">\n                                '+(0,s.default)("Delete Datasets")+'\n                            </a>\n                            <a href="#" style="display: '+(this.purgeAllowed?"inherit":"none")+'" class="dropdown-item delete-collection-and-purge-datasets">\n                                '+(0,s.default)("Permanently Delete Datasets")+"\n                            </a>\n                    </div>\n                </div>")},events:d.extend(d.clone(c.prototype.events),{"click .delete-collection":function(e){this.model.delete()},"click .delete-collection-and-datasets":function(e){this.model.delete(!0)},"click .delete-collection-and-purge-datasets":function(e){this.model.delete(!0,!0)}}),toString:function(){return"HDCAListItemEdit("+(this.model?""+this.model:"(no model)")+")"}});e.default={HDCAListItemEdit:u}});