Merge branch '27124-search-bar-does-not-load-discussion-notes-selected-labels' into 'master'

Fix filtered search so that labels selected from discussion notes display correctly

Closes #27124

See merge request !8756

2 files changed, 20 insertions, 1 deletions

diff --git a/app/assets/javascripts/filtered_search/filtered_search_token_keys.js.es6 b/app/assets/javascripts/filtered_search/filtered_search_token_keys.js.es6
index e46373024b6..e6b53cd4b55 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_token_keys.js.es6
+++ b/app/assets/javascripts/filtered_search/filtered_search_token_keys.js.es6
@@ -21,6 +21,15 @@
     symbol: '~',
   }];
 
+  const alternativeTokenKeys = [{
+    key: 'label',
+    type: 'string',
+    param: 'name',
+    symbol: '~',
+  }];
+
+  const tokenKeysWithAlternative = tokenKeys.concat(alternativeTokenKeys);
+
   const conditions = [{
     url: 'assignee_id=0',
     tokenKey: 'assignee',
@@ -44,6 +53,10 @@
       return tokenKeys;
     }
 
+    static getAlternatives() {
+      return alternativeTokenKeys;
+    }
+
     static getConditions() {
       return conditions;
     }
@@ -57,7 +70,7 @@
     }
 
     static searchByKeyParam(keyParam) {
-      return tokenKeys.find((tokenKey) => {
+      return tokenKeysWithAlternative.find((tokenKey) => {
         let tokenKeyParam = tokenKey.key;
 
         if (tokenKey.param) {
diff --git a/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6 b/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
index 6df7c0e44ef..9d9097419ea 100644
--- a/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
+++ b/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
@@ -72,6 +72,12 @@
         const result = gl.FilteredSearchTokenKeys.searchByKeyParam(`${tokenKeys[0].key}_${tokenKeys[0].param}`);
         expect(result).toEqual(tokenKeys[0]);
       });
+
+      it('should return alternative tokenKey when found by key param', () => {
+        const tokenKeys = gl.FilteredSearchTokenKeys.getAlternatives();
+        const result = gl.FilteredSearchTokenKeys.searchByKeyParam(`${tokenKeys[0].key}_${tokenKeys[0].param}`);
+        expect(result).toEqual(tokenKeys[0]);
+      });
     });
 
     describe('searchByConditionUrl', () => {