From d5dee97becf193627f407815aa4013ea3c0a47a2 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Fri, 6 Jan 2017 12:47:00 -0600
Subject: Enable filtering with multiple words

---
 app/assets/javascripts/filtered_search/dropdown_utils.js.es6        | 6 +++++-
 .../filtered_search/filtered_search_dropdown_manager.js.es6         | 2 +-
 .../javascripts/filtered_search/filtered_search_tokenizer.js.es6    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/filtered_search/dropdown_utils.js.es6 b/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
index 88b172d6fc4..c27ef3042d1 100644
--- a/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
+++ b/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
@@ -25,8 +25,12 @@
       const { lastToken, searchToken } = gl.FilteredSearchTokenizer.processTokens(query);
 
       if (lastToken !== searchToken) {
-        const value = lastToken.value.toLowerCase();
         const title = updatedItem.title.toLowerCase();
+        let value = lastToken.value.toLowerCase();
+
+        if ((value[0] === '"' || value[0] === '\'') && title.indexOf(' ') !== -1) {
+          value = value.slice(1);
+        }
 
         // Eg. filterSymbol = ~ for labels
         const matchWithoutSymbol = lastToken.symbol === filterSymbol && title.indexOf(value) !== -1;
diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6 b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6
index 8b385d6b642..1cd0483877a 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6
+++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6
@@ -72,7 +72,7 @@
         }
 
         input.value = input.value.slice(0, -1 * lastSearchToken.length);
-      } else if (lastInputCharacter !== ' ') {
+      } else if (lastInputCharacter !== ' ' || (lastToken && lastToken.value[lastToken.value.length - 1] === ' ')) {
         // Remove the existing tokenValue
         const lastTokenString = `${lastToken.key}:${lastToken.symbol}${lastToken.value}`;
         input.value = input.value.slice(0, -1 * lastTokenString.length);
diff --git a/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js.es6 b/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js.es6
index 14ca78e139b..60473dddead 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js.es6
+++ b/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js.es6
@@ -1,7 +1,7 @@
 (() => {
   class FilteredSearchTokenizer {
     static processTokens(input) {
-      const tokenRegex = /(\w+):([~%@]?)(?:"(.*?)"|'(.*?)'|(\S+))/g;
+      const tokenRegex = /(\w+):([~%@]?)(?:('[^']*'{0,1})|("[^"]*"{0,1})|(\S+))/g;
       const tokens = [];
       let lastToken = null;
       const searchToken = input.replace(tokenRegex, (match, key, symbol, v1, v2, v3) => {
-- 
cgit v1.2.3