From a13953dabcbd614811adc17f3b46229b74407ea6 Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Sat, 6 Jul 2019 11:51:10 +0200
Subject: [PATCH 1/5] initial filter implementation

---
 .../mvc/library/library-folderlist-view.js    | 22 +++++++++++++++++--
 .../mvc/library/library-foldertoolbar-view.js | 15 ++++++++++++-
 .../scripts/mvc/library/library-model.js      | 17 +++++++++++++-
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/client/galaxy/scripts/mvc/library/library-folderlist-view.js b/client/galaxy/scripts/mvc/library/library-folderlist-view.js
index 55d210fb633..b8ebb71a37b 100644
--- a/client/galaxy/scripts/mvc/library/library-folderlist-view.js
+++ b/client/galaxy/scripts/mvc/library/library-folderlist-view.js
@@ -275,6 +275,24 @@ var FolderListView = Backbone.View.extend({
         this.renderSortIcon();
     },
 
+    /**
+     * In case the search_term is not empty perform the search and render
+     * the result. Render all visible folder items otherwise.
+     * @param  {string} search_term string to search for
+     */
+    searchFolder: function(search_term) {
+        const trimmed_term = $.trim(search_term);
+        if (trimmed_term !== "") {
+            let result_collection = null;
+            result_collection = this.collection.search(search_term);
+            this.options.result_models = result_collection.models;
+            this.collection.reset(result_collection);
+        } else {
+            this.options.result_models = null;
+            this.paginate();
+        }
+    },
+
     /**
      * User clicked the checkbox in the table heading
      * @param  {context} event
@@ -463,7 +481,7 @@ var FolderListView = Backbone.View.extend({
                             <a title="Return to this folder" href="#/folders/<%- path_item[0] %>">
                                 <%- path_item[1] %>
                             </a>
-                        </li> 
+                        </li>
                     <% } else { %>
                         <li class="breadcrumb-item active">
                             <span title="You are in this folder">
@@ -501,7 +519,7 @@ var FolderListView = Backbone.View.extend({
                         <a class="sort-folder-state" title="Click to reverse order" href="#">State</a>
                         <span title="Sorted alphabetically" class="sort-icon-state fa"></span>
                     </th>
-                    <th style="width:160px;"></th> 
+                    <th style="width:160px;"></th>
                 </thead>
                 <tbody id="folder_list_body">
                     <tr id="first_folder_item">
diff --git a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
index b3d5ec39d6d..8d66ef3f8b1 100644
--- a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
+++ b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
@@ -25,7 +25,8 @@ var FolderToolbarView = Backbone.View.extend({
         "click .toolbtn-show-locinfo": "showLocInfo",
         "keydown .page_size": "changePageSize",
         "blur .page_size": "changePageSize",
-        "click .toolbtn-collection-import": "showCollectionSelect"
+        "click .toolbtn-collection-import": "showCollectionSelect",
+        "keyup .folder-search-input": "searchFolder"
     },
 
     defaults: {
@@ -1416,6 +1417,17 @@ var FolderToolbarView = Backbone.View.extend({
         return hdca.save(options);
     },
 
+    /**
+     * Take the contents of the search field and send it to the list view
+     * to query the collection of folder items.
+     */
+    searchFolder: function(event) {
+        const Galaxy = getGalaxyInstance();
+        var search_term = $(".folder-search-input").val();
+        this.options.search_term = search_term;
+        Galaxy.libraries.folderListView.searchFolder(search_term);
+    },
+
     templateToolBar: function() {
         return _.template(
             `<div class="library_style_container">
@@ -1425,6 +1437,7 @@ var FolderToolbarView = Backbone.View.extend({
                     </a>
                     <div>
                         <form class="form-inline">
+                            <input type="text" id="folder-filter" class="form-control folder-search-input mr-1" placeholder="Search" size="15">
                             <button style="display:none;" title="Create new folder"
                                 class="btn btn-secondary toolbtn-create-folder add-library-items add-library-items-folder mr-1"
                                 type="button">
diff --git a/client/galaxy/scripts/mvc/library/library-model.js b/client/galaxy/scripts/mvc/library/library-model.js
index b1c91a25e40..789f357fa3b 100644
--- a/client/galaxy/scripts/mvc/library/library-model.js
+++ b/client/galaxy/scripts/mvc/library/library-model.js
@@ -81,7 +81,22 @@ var Folder = Backbone.Collection.extend({
     sortFolder: function(sort_key, sort_order) {
         this.comparator = mod_util.generateFolderComparator(sort_key, sort_order);
         this.sort();
-    }
+    },
+
+    /**
+     * Search the collection and return only the models that have
+     * the search term in their names.
+     * [the term to search]
+     * @type {string}
+     */
+    search: function(search_term) {
+        if (search_term == "") return this;
+        const lowercase_term = search_term.toLowerCase();
+        return this.filter(data => {
+            const lowercase_name = data.get("name").toLowerCase();
+            return lowercase_name.indexOf(lowercase_term) !== -1;
+        });
+    },
 });
 
 var FolderContainer = Backbone.Model.extend({

From 5cfed80eacdaa24f8d8114ddbde198c6bda51486 Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Sat, 6 Jul 2019 11:56:08 +0200
Subject: [PATCH 2/5] move the searching to the proper collection

so everything get filtered, not just the visible
---
 .../mvc/library/library-folderlist-view.js    |  2 +-
 .../scripts/mvc/library/library-model.js      | 33 ++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/client/galaxy/scripts/mvc/library/library-folderlist-view.js b/client/galaxy/scripts/mvc/library/library-folderlist-view.js
index b8ebb71a37b..86385f3830d 100644
--- a/client/galaxy/scripts/mvc/library/library-folderlist-view.js
+++ b/client/galaxy/scripts/mvc/library/library-folderlist-view.js
@@ -284,7 +284,7 @@ var FolderListView = Backbone.View.extend({
         const trimmed_term = $.trim(search_term);
         if (trimmed_term !== "") {
             let result_collection = null;
-            result_collection = this.collection.search(search_term);
+            result_collection = this.folder_container.search(search_term);
             this.options.result_models = result_collection.models;
             this.collection.reset(result_collection);
         } else {
diff --git a/client/galaxy/scripts/mvc/library/library-model.js b/client/galaxy/scripts/mvc/library/library-model.js
index 789f357fa3b..bf5ba5d8d7b 100644
--- a/client/galaxy/scripts/mvc/library/library-model.js
+++ b/client/galaxy/scripts/mvc/library/library-model.js
@@ -81,22 +81,7 @@ var Folder = Backbone.Collection.extend({
     sortFolder: function(sort_key, sort_order) {
         this.comparator = mod_util.generateFolderComparator(sort_key, sort_order);
         this.sort();
-    },
-
-    /**
-     * Search the collection and return only the models that have
-     * the search term in their names.
-     * [the term to search]
-     * @type {string}
-     */
-    search: function(search_term) {
-        if (search_term == "") return this;
-        const lowercase_term = search_term.toLowerCase();
-        return this.filter(data => {
-            const lowercase_name = data.get("name").toLowerCase();
-            return lowercase_name.indexOf(lowercase_term) !== -1;
-        });
-    },
+    }
 });
 
 var FolderContainer = Backbone.Model.extend({
@@ -105,6 +90,22 @@ var FolderContainer = Backbone.Model.extend({
         urlRoot: `${getAppRoot()}api/folders/`,
         id: "unknown"
     },
+
+    /**
+     * Search the folder and return only the models that have
+     * the search term in their names.
+     * [the term to search]
+     * @type {string}
+     */
+    search: function(search_term) {
+        if (search_term == "") return this;
+        const lowercase_term = search_term.toLowerCase();
+        return this.get("folder").filter(data => {
+            const lowercase_name = data.get("name").toLowerCase();
+            return lowercase_name.indexOf(lowercase_term) !== -1;
+        });
+    },
+
     parse: function(obj) {
         const Galaxy = getGalaxyInstance();
         // empty the collection

From e9c4114ca07534a3483d262ac716fe8399407ef9 Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Sat, 6 Jul 2019 12:00:05 +0200
Subject: [PATCH 3/5] remove dead code

---
 client/galaxy/scripts/mvc/library/library-folderlist-view.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/galaxy/scripts/mvc/library/library-folderlist-view.js b/client/galaxy/scripts/mvc/library/library-folderlist-view.js
index 86385f3830d..ae9244b2eb0 100644
--- a/client/galaxy/scripts/mvc/library/library-folderlist-view.js
+++ b/client/galaxy/scripts/mvc/library/library-folderlist-view.js
@@ -285,10 +285,8 @@ var FolderListView = Backbone.View.extend({
         if (trimmed_term !== "") {
             let result_collection = null;
             result_collection = this.folder_container.search(search_term);
-            this.options.result_models = result_collection.models;
             this.collection.reset(result_collection);
         } else {
-            this.options.result_models = null;
             this.paginate();
         }
     },

From 837d602e4952b1b6fc491f4d5d57d77e77e86959 Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Sat, 6 Jul 2019 12:02:56 +0200
Subject: [PATCH 4/5] minor refactor

---
 client/galaxy/scripts/mvc/library/library-folderlist-view.js   | 3 +--
 .../galaxy/scripts/mvc/library/library-foldertoolbar-view.js   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/galaxy/scripts/mvc/library/library-folderlist-view.js b/client/galaxy/scripts/mvc/library/library-folderlist-view.js
index ae9244b2eb0..54736208756 100644
--- a/client/galaxy/scripts/mvc/library/library-folderlist-view.js
+++ b/client/galaxy/scripts/mvc/library/library-folderlist-view.js
@@ -283,8 +283,7 @@ var FolderListView = Backbone.View.extend({
     searchFolder: function(search_term) {
         const trimmed_term = $.trim(search_term);
         if (trimmed_term !== "") {
-            let result_collection = null;
-            result_collection = this.folder_container.search(search_term);
+            let result_collection = this.folder_container.search(search_term);
             this.collection.reset(result_collection);
         } else {
             this.paginate();
diff --git a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
index 8d66ef3f8b1..c2c1c505ab0 100644
--- a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
+++ b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
@@ -1423,7 +1423,7 @@ var FolderToolbarView = Backbone.View.extend({
      */
     searchFolder: function(event) {
         const Galaxy = getGalaxyInstance();
-        var search_term = $(".folder-search-input").val();
+        let search_term = $(".folder-search-input").val();
         this.options.search_term = search_term;
         Galaxy.libraries.folderListView.searchFolder(search_term);
     },

From e9a8b69d52905c9be467da57f6dcb04ae9d87535 Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Sat, 6 Jul 2019 12:55:55 +0200
Subject: [PATCH 5/5] const the things

---
 client/galaxy/scripts/mvc/library/library-folderlist-view.js    | 2 +-
 client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/galaxy/scripts/mvc/library/library-folderlist-view.js b/client/galaxy/scripts/mvc/library/library-folderlist-view.js
index 54736208756..1a3ec589011 100644
--- a/client/galaxy/scripts/mvc/library/library-folderlist-view.js
+++ b/client/galaxy/scripts/mvc/library/library-folderlist-view.js
@@ -283,7 +283,7 @@ var FolderListView = Backbone.View.extend({
     searchFolder: function(search_term) {
         const trimmed_term = $.trim(search_term);
         if (trimmed_term !== "") {
-            let result_collection = this.folder_container.search(search_term);
+            const result_collection = this.folder_container.search(search_term);
             this.collection.reset(result_collection);
         } else {
             this.paginate();
diff --git a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
index c2c1c505ab0..a5ccd932c52 100644
--- a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
+++ b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
@@ -1423,7 +1423,7 @@ var FolderToolbarView = Backbone.View.extend({
      */
     searchFolder: function(event) {
         const Galaxy = getGalaxyInstance();
-        let search_term = $(".folder-search-input").val();
+        const search_term = $(".folder-search-input").val();
         this.options.search_term = search_term;
         Galaxy.libraries.folderListView.searchFolder(search_term);
     },