Merge pull request #3215 from evazion/fix-ss-autocomplete

Fix #3214: Add autocomplete for saved searches.

app/assets/javascripts/autocomplete.js

@@ -93,7 +93,7 @@
     var prefixes = "-|~|general:|gen:|artist:|art:|copyright:|copy:|co:|character:|char:|ch:";
     var metatags = "order|-status|status|-rating|rating|-locked|locked|child|filetype|-filetype|" +
       "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-fav|fav|ordfav|" +
-      "sub|-pool|pool|ordpool|favgroup";
+      "sub|-pool|pool|ordpool|favgroup|-search|search";
 
     $fields_multiple.autocomplete({
       delay: 100,
@@ -183,6 +183,10 @@
         case "-favgroup":
           Danbooru.Autocomplete.favorite_group_source(term, resp, metatag);
           break;
+        case "search":
+        case "-search":
+          Danbooru.Autocomplete.saved_search_source(term, resp);
+          break;
         default:
           Danbooru.Autocomplete.normal_source(term, resp);
           break;
@@ -420,6 +424,17 @@
       }
     });
   }
+
+  Danbooru.Autocomplete.saved_search_source = function(term, resp) {
+    return Danbooru.SavedSearch.labels(term).success(function(labels) {
+      resp(labels.map(function(label) {
+        return {
+          label: label.replace(/_/g, " "),
+          value: "search:" + label,
+        };
+      }));
+    });
+  }
 })();
 
 $(document).ready(function() {

app/assets/javascripts/posts.js

@@ -548,23 +548,15 @@
 
   Danbooru.Post.initialize_saved_searches = function() {
     $("#saved_search_labels").autocomplete({
-      minLength: 2,
       source: function(req, resp) {
-        $.ajax({
+        Danbooru.SavedSearch.labels(req.term).success(function(labels) {
-          url: "/saved_searches/labels.json",
+          resp(labels.map(function(label) {
-          data: {
+            return {
-            label: req.term
+              label: label.replace(/_/g, " "),
-          },
+              value: label
-          method: "get",
+            };
-          success: function(data) {
+          }));
-            resp($.map(data, function(saved_search) {
+        });
-              return {
-                label: saved_search.replace(/_/g, " "),
-                value: saved_search
-              };
-            }));
-          }
-        })
       }
     });
 

app/assets/javascripts/saved_searches.js

@@ -1,5 +1,16 @@
-$(document).ready(function() {
+Danbooru.SavedSearch = {};
-  if ($("#c-saved-searches".length)) {
+
+Danbooru.SavedSearch.initialize_all = function() {
+  if ($("#c-saved-searches").length) {
     Danbooru.sorttable($("#c-saved-searches table"));
   }
-});
+}
+
+Danbooru.SavedSearch.labels = function(term) {
+  return $.getJSON("/saved_searches/labels", {
+    "search[label]": term + "*",
+    "limit": 10
+  });
+}
+
+$(Danbooru.SavedSearch.initialize_all);

app/controllers/saved_searches_controller.rb

@@ -17,11 +17,7 @@ class SavedSearchesController < ApplicationController
   end
 
   def labels
-    @labels = SavedSearch.labels_for(CurrentUser.user.id)
+    @labels = SavedSearch.search_labels(CurrentUser.id, params[:search])
-    if params[:label]
-      regexp = Regexp.compile(Regexp.escape(params[:label]))
-      @labels = @labels.grep(regexp)
-    end
     respond_with(@labels)
   end
 

app/models/saved_search.rb

@@ -62,6 +62,19 @@ class SavedSearch < ApplicationRecord
     label.to_s.strip.downcase.gsub(/[[:space:]]/, "_")
   end
 
+  def self.search_labels(user_id, params)
+    labels = labels_for(user_id)
+
+    if params[:label].present?
+      query = Regexp.escape(params[:label]).gsub("\\*", ".*")
+      query = ".*#{query}.*" unless query.include?("*")
+      query = /\A#{query}\z/
+      labels = labels.grep(query)
+    end
+
+    labels
+  end
+
   def self.labels_for(user_id)
     Cache.get(cache_key(user_id)) do
       SavedSearch.where(user_id: user_id).order("label").pluck("distinct unnest(labels) as label")