Fix filtered search tokenization

app/assets/javascripts/filtered_search/dropdown_operator.js

@@ -24,10 +24,12 @@ export default class DropdownOperator extends FilteredSearchDropdown {
 
     if (selected.tagName === 'LI') {
       if (selected.hasAttribute('data-value')) {
+        const name = FilteredSearchVisualTokens.getLastTokenPartial();
         const operator = selected.dataset.value;
+
         FilteredSearchVisualTokens.removeLastTokenPartial();
         FilteredSearchDropdownManager.addWordToInput({
-          tokenName: this.filter,
+          tokenName: name,
           tokenOperator: operator,
           clicked: false,
         });
@@ -38,8 +40,6 @@ export default class DropdownOperator extends FilteredSearchDropdown {
   }
 
   renderContent(forceShowList = false) {
-    this.filter = FilteredSearchVisualTokens.getLastTokenPartial();
-
     const dropdownData = [
       {
         tag: 'equal',

changelogs/unreleased/filtered-search-bug.yml

+---
+title: Fix filtered search tokenization
+merge_request: 27648
+author:
+type: fixed

spec/features/issues/filtered_search/visual_tokens_spec.rb

@@ -162,4 +162,17 @@ describe 'Visual tokens', :js do
       ])
     end
   end
+
+  it 'does retain hint token when mix of typing and clicks are performed' do
+    input_filtered_search('label:', extra_space: false, submit: false)
+
+    expect(page).to have_css('#js-dropdown-operator', visible: true)
+
+    find('#js-dropdown-operator li[data-value="="]').click
+
+    token = page.all('.tokens-container .js-visual-token')[0]
+
+    expect(token.find('.name').text).to eq('Label')
+    expect(token.find('.operator').text).to eq('=')
+  end
 end