1 files changed, 7 insertions, 33 deletions

diff --git a/app/assets/javascripts/boards/issue_board_filters.js b/app/assets/javascripts/boards/issue_board_filters.js
index 27efb3f775c..ba5da70c6ec 100644
--- a/app/assets/javascripts/boards/issue_board_filters.js
+++ b/app/assets/javascripts/boards/issue_board_filters.js
@@ -1,7 +1,5 @@
-import groupBoardMembers from '~/boards/graphql/group_board_members.query.graphql';
-import projectBoardMembers from '~/boards/graphql/project_board_members.query.graphql';
-import groupBoardMilestonesQuery from './graphql/group_board_milestones.query.graphql';
-import projectBoardMilestonesQuery from './graphql/project_board_milestones.query.graphql';
+import { BoardType } from 'ee_else_ce/boards/constants';
+import usersAutocompleteQuery from '~/graphql_shared/queries/users_autocomplete.query.graphql';
 import boardLabels from './graphql/board_labels.query.graphql';
 
 export default function issueBoardFilters(apollo, fullPath, isGroupBoard) {
@@ -9,20 +7,15 @@ export default function issueBoardFilters(apollo, fullPath, isGroupBoard) {
     return isGroupBoard ? data.group?.labels.nodes || [] : data.project?.labels.nodes || [];
   };
 
-  const boardAssigneesQuery = () => {
-    return isGroupBoard ? groupBoardMembers : projectBoardMembers;
-  };
-
   const fetchUsers = (usersSearchTerm) => {
+    const namespace = isGroupBoard ? BoardType.group : BoardType.project;
+
     return apollo
       .query({
-        query: boardAssigneesQuery(),
-        variables: {
-          fullPath,
-          search: usersSearchTerm,
-        },
+        query: usersAutocompleteQuery,
+        variables: { fullPath, search: usersSearchTerm, isProject: !isGroupBoard },
       })
-      .then(({ data }) => data.workspace?.assignees.nodes.map(({ user }) => user));
+      .then(({ data }) => data[namespace]?.autocompleteUsers);
   };
 
   const fetchLabels = (labelSearchTerm) => {
@@ -39,27 +32,8 @@ export default function issueBoardFilters(apollo, fullPath, isGroupBoard) {
       .then(transformLabels);
   };
 
-  const fetchMilestones = (searchTerm) => {
-    const variables = {
-      fullPath,
-      searchTerm,
-    };
-
-    const query = isGroupBoard ? groupBoardMilestonesQuery : projectBoardMilestonesQuery;
-
-    return apollo
-      .query({
-        query,
-        variables,
-      })
-      .then(({ data }) => {
-        return data.workspace?.milestones.nodes;
-      });
-  };
-
   return {
     fetchLabels,
     fetchUsers,
-    fetchMilestones,
   };
 }