From 3ce7f23a855e9061e8f702ae9c9c07ce91e24738 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Tue, 8 Nov 2016 16:20:47 -0600
Subject: [PATCH] Fix bug where search terms would not work after switching to
 another state tab

---
 .../filtered_search_manager.js.es6            | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js.es6 b/app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
index 393e0b8a4b2..3528d9da88c 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
@@ -55,12 +55,13 @@
 
     loadSearchParamsFromURL() {
       // We can trust that each param has one & since values containing & will be encoded
-      const params = window.location.search.split('&');
+      // Remove the first character of search as it is always ?
+      const params = window.location.search.slice(1).split('&');
       let inputValue = '';
 
       params.forEach((p) => {
         const split = p.split('=');
-        const key = split[0];
+        const key = decodeURIComponent(split[0]);
         const value = decodeURIComponent(split[1]);
 
         const match = validTokenKeys.find((t) => {
@@ -69,17 +70,24 @@
 
         if (match) {
           const sanitizedKey = key.slice(0, key.indexOf('_'));
-          let sanitizedValue = value;
+          const valueHasSpace = value.indexOf(' ') !== -1;
 
-          if (match && sanitizedKey === 'label') {
-            sanitizedValue = sanitizedValue.replace(/%20/g, ' ');
+          const preferredQuotations = '"';
+          let quotationsToUse = preferredQuotations;
+
+          if (valueHasSpace) {
+            // Prefer ", but use ' if required
+            quotationsToUse = value.indexOf(preferredQuotations) === -1 ? preferredQuotations : '\'';
           }
 
-          inputValue += `${sanitizedKey}:${sanitizedValue} `;
+          inputValue += valueHasSpace ? `${sanitizedKey}:${quotationsToUse}${value}${quotationsToUse}` : `${sanitizedKey}:${value}`;
+          inputValue += ' ';
+
         } else if (!match && key === 'search') {
           // Sanitize value as URL converts spaces into +
           const sanitizedValue = value.replace(/[+]/g, ' ');
-          inputValue += `${sanitizedValue} `;
+          inputValue += sanitizedValue;
+          inputValue += ' ';
         }
       });