Merge branch 'hly-fix-backend-autocomplete-filtering-rte' into 'master'

Fix backend filtering in RTE autocomplete

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183637



Merged-by: Heinrich Lee Yu <heinrich@gitlab.com>
Approved-by: Simon Knox <simon@gitlab.com>

app/assets/javascripts/content_editor/services/autocomplete_helper.js

@@ -135,7 +135,7 @@ export default class AutocompleteHelper {
     });
   }
 
-  #getDataSource = (referenceType, { command } = {}) => {
+  #getDataSource = (referenceType, { command, ...options } = {}) => {
     const sources = {
       user: this.dataSourceUrls.members,
       issue: this.dataSourceUrls.issues,
@@ -214,6 +214,8 @@ export default class AutocompleteHelper {
       sorter: sorters[referenceType] || sorters.default,
       filter: filters[referenceType],
       command,
+
+      ...options,
     });
   };
 }

spec/frontend/content_editor/services/autocomplete_helper_spec.js

@@ -100,21 +100,6 @@ describe('createDataSource', () => {
         { name: 'abc', description: 'xyz' },
       ]);
     });
-
-    describe('if filterOnBackend: true', () => {
-      it('fetches data from source, passing a `search` param', async () => {
-        const dataSource = createDataSource({
-          ...dataSourceParams,
-          filterOnBackend: true,
-        });
-
-        const results = await dataSource.search('bcd');
-        expect(mock.history.get[0].params).toEqual({ search: 'bcd' });
-
-        // results are still filtered out on frontend, on top of backend filtering
-        expect(results).toEqual([{ name: 'bcd', description: 'wxy' }]);
-      });
-    });
   });
 
   it('handles source fetch errors', async () => {
@@ -329,4 +314,14 @@ describe('AutocompleteHelper', () => {
 
     expect(results.map(({ username }) => username)).toMatchSnapshot();
   });
+
+  describe('if filterOnBackend: true', () => {
+    it('fetches data passing a `search` param', async () => {
+      const dataSource = autocompleteHelper.getDataSource('user', { filterOnBackend: true });
+
+      await dataSource.search('bcd');
+
+      expect(mock.history.get[0].params).toEqual({ search: 'bcd' });
+    });
+  });
 });