Add latest changes from gitlab-org/gitlab@master

4 files changed, 40 insertions, 9 deletions

diff --git a/app/assets/javascripts/graphql_shared/queries/project_autocomplete_users.query.graphql b/app/assets/javascripts/graphql_shared/queries/project_autocomplete_users.query.graphql
new file mode 100644
index 00000000000..ed318ef1b8d
--- /dev/null
+++ b/app/assets/javascripts/graphql_shared/queries/project_autocomplete_users.query.graphql
@@ -0,0 +1,12 @@
+#import "../fragments/user.fragment.graphql"
+#import "~/graphql_shared/fragments/user_availability.fragment.graphql"
+
+query projectAutocompleteUsersSearch($search: String!, $fullPath: ID!) {
+  workspace: project(fullPath: $fullPath) {
+    id
+    users: autocompleteUsers(search: $search) {
+      ...User
+      ...UserAvailability
+    }
+  }
+}
diff --git a/app/assets/javascripts/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql b/app/assets/javascripts/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql
new file mode 100644
index 00000000000..8155451fb7c
--- /dev/null
+++ b/app/assets/javascripts/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql
@@ -0,0 +1,19 @@
+#import "../fragments/user.fragment.graphql"
+#import "~/graphql_shared/fragments/user_availability.fragment.graphql"
+
+query projectAutocompleteUsersSearchWithMRPermissions(
+  $search: String!
+  $fullPath: ID!
+  $mergeRequestId: MergeRequestID!
+) {
+  workspace: project(fullPath: $fullPath) {
+    id
+    users: autocompleteUsers(search: $search) {
+      ...User
+      ...UserAvailability
+      mergeRequestInteraction(id: $mergeRequestId) {
+        canMerge
+      }
+    }
+  }
+}
diff --git a/app/assets/javascripts/sidebar/constants.js b/app/assets/javascripts/sidebar/constants.js
index 0f82182c6e2..752d0315227 100644
--- a/app/assets/javascripts/sidebar/constants.js
+++ b/app/assets/javascripts/sidebar/constants.js
@@ -1,8 +1,8 @@
 import { invert } from 'lodash';
 import { s__, __, sprintf } from '~/locale';
 import updateIssueLabelsMutation from '~/boards/graphql/issue_set_labels.mutation.graphql';
-import userSearchQuery from '~/graphql_shared/queries/users_search.query.graphql';
-import userSearchWithMRPermissionsQuery from '~/graphql_shared/queries/users_search_with_mr_permissions.graphql';
+import userAutocompleteQuery from '~/graphql_shared/queries/project_autocomplete_users.query.graphql';
+import userAutocompleteWithMRPermissionsQuery from '~/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql';
 import {
   TYPE_ALERT,
   TYPE_EPIC,
@@ -106,10 +106,10 @@ export const participantsQueries = {
 
 export const userSearchQueries = {
   [TYPE_ISSUE]: {
-    query: userSearchQuery,
+    query: userAutocompleteQuery,
   },
   [TYPE_MERGE_REQUEST]: {
-    query: userSearchWithMRPermissionsQuery,
+    query: userAutocompleteWithMRPermissionsQuery,
   },
 };
 
diff --git a/app/assets/javascripts/vue_shared/components/user_select/user_select.vue b/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
index 4879baced0d..1e79d2cdcd7 100644
--- a/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
+++ b/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
@@ -130,11 +130,11 @@ export default {
       },
       update(data) {
         return (
-          data.workspace?.users?.nodes
-            .filter((x) => x?.user)
-            .map((node) => ({
-              ...node.user,
-              canMerge: node.mergeRequestInteraction?.canMerge || false,
+          data.workspace?.users
+            .filter((user) => user)
+            .map((user) => ({
+              ...user,
+              canMerge: user.mergeRequestInteraction?.canMerge || false,
             })) || []
         );
       },