Fixed issue when label or milestone had space

3 files changed, 27 insertions, 6 deletions

diff --git a/app/assets/javascripts/filtered_search/dropdown_utils.js.es6 b/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
index 0027f79aecb..54792f987b0 100644
--- a/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
+++ b/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
@@ -83,14 +83,23 @@
         return inputValue;
       }
 
-      return inputValue.slice(0, right + selectionStart + 1).trim();
+      return inputValue.slice(0, right + 1).trim();
     }
 
     static getInputSelectionPosition(input) {
-      const inputValue = input.value;
+      let inputValue = input.value;
+      // Replace all spaces inside quote marks with underscores
+      // This helps with matching the beginning & end of a token:key
+      inputValue = inputValue.replace(/"(.*?)"/g, str => str.replace(/\s/g, '_') );
+
       const selectionStart = input.selectionStart;
-      let left = inputValue.slice(0, selectionStart + 1).search(/\S+$/);
-      const right = inputValue.slice(selectionStart).search(/\s/);
+      let right = inputValue.slice(selectionStart).search(/\s/);
+
+      if (right >= 0) {
+        right += selectionStart;
+      }
+
+      let left = inputValue.slice(0, right).search(/\S+$/);
 
       if (selectionStart === 0) {
         left = 0;
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 9edb6ade4f2..cd0f41eb8ef 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
@@ -69,7 +69,7 @@
         right = inputValue.length;
       }
 
-      input.value = `${inputValue.substr(0, left)}${word}${inputValue.substr(right + selectionStart)}`;
+      input.value = `${inputValue.substr(0, left)}${word}${inputValue.substr(right)}`;
       gl.FilteredSearchDropdownManager.updateInputCaretPosition(selectionStart, input);
     }
 
@@ -85,7 +85,7 @@
         right = inputValue.length;
       }
 
-      input.setSelectionRange(selectionStart + right, selectionStart + right);
+      input.setSelectionRange(selectionStart + right, selectionStart);
     }
 
     updateCurrentDropdownOffset() {
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb
index dff25b53e08..1cdac520181 100644
--- a/spec/features/issues/filtered_search/filter_issues_spec.rb
+++ b/spec/features/issues/filtered_search/filter_issues_spec.rb
@@ -553,6 +553,18 @@ describe 'Filter issues', js: true, feature: true do
 
       expect(filtered_search.value).to eq("author:@#{user.username} label:~#{label.name}")
     end
+
+    it 'changes label correctly space is in previous label' do
+      input_filtered_search("label:~\"#{multiple_words_label.title}\"", submit: false)
+
+      select_search_at_index(0)
+
+      page.within '#js-dropdown-label' do
+        click_button label.name
+      end
+
+      expect(filtered_search.value).to eq("label:~#{label.name}")
+    end
   end
 
   describe 'filter issues by text' do