Merge branch 'remove-group-release-filter' into 'master'

Resolve "Hide inoperable group search Releases filter - frontend"

See merge request gitlab-org/gitlab!50010

app/assets/javascripts/filtered_search/filtered_search_token_keys.js

@@ -93,4 +93,13 @@ export default class FilteredSearchTokenKeys {
     this.tokenKeys.push(confidentialToken);
     this.tokenKeysWithAlternative.push(confidentialToken);
   }
+
+  removeTokensForKeys(...keys) {
+    const keysSet = new Set(keys);
+
+    this.tokenKeys = this.tokenKeys.filter(({ key }) => !keysSet.has(key));
+    this.tokenKeysWithAlternative = this.tokenKeysWithAlternative.filter(
+      ({ key }) => !keysSet.has(key),
+    );
+  }
 }

app/assets/javascripts/pages/groups/issues/index.js

@@ -9,6 +9,7 @@ import initManualOrdering from '~/manual_ordering';
 const ISSUE_BULK_UPDATE_PREFIX = 'issue_';
 
 IssuableFilteredSearchTokenKeys.addExtraTokensForIssues();
+IssuableFilteredSearchTokenKeys.removeTokensForKeys('release');
 issuableInitBulkUpdateSidebar.init(ISSUE_BULK_UPDATE_PREFIX);
 
 initIssuablesList();

changelogs/unreleased/remove-group-release-filter.yml

+---
+title: Hide inoperable group search Releases filter
+merge_request: 50010
+author:
+type: fixed

ee/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js

@@ -145,18 +145,11 @@ class IssuesFilteredSearchTokenKeysEE extends FilteredSearchTokenKeys {
   }
 
   removeEpicToken() {
-    this.removeToken(epicTokenKey);
+    this.removeTokensForKeys(epicTokenKey.key);
   }
 
   removeIterationToken() {
-    this.removeToken(iterationTokenKey);
-  }
-
-  removeToken(tokenKey) {
-    const index = this.tokenKeys.findIndex((token) => token.key === tokenKey.key);
-    if (index >= 0) {
-      this.tokenKeys.splice(index, 1);
-    }
+    this.removeTokensForKeys(iterationTokenKey.key);
   }
 }
 

spec/frontend/filtered_search/issues_filtered_search_token_keys_spec.js

@@ -145,4 +145,25 @@ describe('Issues Filtered Search Token Keys', () => {
       expect(result).toEqual(conditions[0]);
     });
   });
+
+  describe('removeTokensForKeys', () => {
+    let initTokenKeys;
+
+    beforeEach(() => {
+      initTokenKeys = [...IssuableFilteredSearchTokenKeys.get()];
+    });
+
+    it('should remove the tokenKeys corresponding to the given keys', () => {
+      const [firstTokenKey, secondTokenKey, ...restTokens] = initTokenKeys;
+      IssuableFilteredSearchTokenKeys.removeTokensForKeys(firstTokenKey.key, secondTokenKey.key);
+
+      expect(IssuableFilteredSearchTokenKeys.get()).toEqual(restTokens);
+    });
+
+    it('should do nothing when key is not found', () => {
+      IssuableFilteredSearchTokenKeys.removeTokensForKeys('bogus');
+
+      expect(IssuableFilteredSearchTokenKeys.get()).toEqual(initTokenKeys);
+    });
+  });
 });