Merge branch 'deduplicate-and-remove-nulls-from-project-members' into 'master'

Remove duplicate users and filter out nulls from projectMembers query

See merge request gitlab-org/gitlab!60890

app/assets/javascripts/vue_shared/components/user_select/user_select.vue

@@ -88,6 +88,9 @@ export default {
       },
     },
     searchUsers: {
+      // TODO Remove error policy
+      // https://gitlab.com/gitlab-org/gitlab/-/issues/329750
+      errorPolicy: 'all',
       query: searchUsers,
       variables() {
         return {
@@ -97,10 +100,26 @@ export default {
         };
       },
       update(data) {
-        return data.workspace?.users?.nodes.map(({ user }) => user) || [];
+        // TODO Remove null filter (BE fix required)
+        // https://gitlab.com/gitlab-org/gitlab/-/issues/329750
+        return data.workspace?.users?.nodes.filter((x) => x).map(({ user }) => user) || [];
       },
       debounce: ASSIGNEES_DEBOUNCE_DELAY,
-      error() {
+      error({ graphQLErrors }) {
+        // TODO This error suppression is temporary (BE fix required)
+        // https://gitlab.com/gitlab-org/gitlab/-/issues/329750
+        if (
+          graphQLErrors.length === 1 &&
+          graphQLErrors[0]?.message === 'Cannot return null for non-nullable field GroupMember.user'
+        ) {
+          // eslint-disable-next-line no-console
+          console.error(
+            "Suppressing the error 'Cannot return null for non-nullable field GroupMember.user'. Please see https://gitlab.com/gitlab-org/gitlab/-/issues/329750",
+          );
+          this.isSearching = false;
+          return;
+        }
+
         this.$emit('error');
         this.isSearching = false;
       },
@@ -117,15 +136,20 @@ export default {
       if (!this.participants) {
         return [];
       }
-      const mergedSearchResults = this.participants.reduce((acc, current) => {
-        if (
-          !acc.some((user) => current.username === user.username) &&
-          (current.name.includes(this.search) || current.username.includes(this.search))
-        ) {
-          acc.push(current);
-        }
-        return acc;
-      }, this.searchUsers);
+
+      const filteredParticipants = this.participants.filter(
+        (user) => user.name.includes(this.search) || user.username.includes(this.search),
+      );
+
+      // TODO this de-duplication is temporary (BE fix required)
+      // https://gitlab.com/gitlab-org/gitlab/-/issues/327822
+      const mergedSearchResults = filteredParticipants
+        .concat(this.searchUsers)
+        .reduce(
+          (acc, current) => (acc.some((user) => current.id === user.id) ? acc : [...acc, current]),
+          [],
+        );
+
       return this.moveCurrentUserToStart(mergedSearchResults);
     },
     isSearchEmpty() {

spec/frontend/sidebar/mock_data.js

@@ -380,6 +380,25 @@ export const subscriptionNullResponse = {
   },
 };
 
+const mockUser1 = {
+  id: 'gid://gitlab/User/1',
+  avatarUrl:
+    'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
+  name: 'Administrator',
+  username: 'root',
+  webUrl: '/root',
+  status: null,
+};
+
+const mockUser2 = {
+  id: 'gid://gitlab/User/4',
+  avatarUrl: '/avatar2',
+  name: 'rookie',
+  username: 'rookie',
+  webUrl: 'rookie',
+  status: null,
+};
+
 export const searchResponse = {
   data: {
     workspace: {
@@ -387,24 +406,10 @@ export const searchResponse = {
       users: {
         nodes: [
           {
-            user: {
-              id: '1',
-              avatarUrl: '/avatar',
-              name: 'root',
-              username: 'root',
-              webUrl: 'root',
-              status: null,
-            },
+            user: mockUser1,
           },
           {
-            user: {
-              id: '2',
-              avatarUrl: '/avatar2',
-              name: 'rookie',
-              username: 'rookie',
-              webUrl: 'rookie',
-              status: null,
-            },
+            user: mockUser2,
           },
         ],
       },
@@ -418,27 +423,13 @@ export const projectMembersResponse = {
       __typename: 'Project',
       users: {
         nodes: [
-          {
-            user: {
-              id: 'gid://gitlab/User/1',
-              avatarUrl:
-                'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
-              name: 'Administrator',
-              username: 'root',
-              webUrl: '/root',
-              status: null,
-            },
-          },
-          {
-            user: {
-              id: '2',
-              avatarUrl: '/avatar2',
-              name: 'rookie',
-              username: 'rookie',
-              webUrl: 'rookie',
-              status: null,
-            },
-          },
+          // Remove nulls https://gitlab.com/gitlab-org/gitlab/-/issues/329750
+          null,
+          null,
+          // Remove duplicated entry https://gitlab.com/gitlab-org/gitlab/-/issues/327822
+          mockUser1,
+          mockUser1,
+          mockUser2,
           {
             user: {
               id: 'gid://gitlab/User/2',
@@ -468,15 +459,9 @@ export const participantsQueryResponse = {
         iid: '1',
         participants: {
           nodes: [
-            {
-              id: 'gid://gitlab/User/1',
-              avatarUrl:
-                'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
-              name: 'Administrator',
-              username: 'root',
-              webUrl: '/root',
-              status: null,
-            },
+            // Remove duplicated entry https://gitlab.com/gitlab-org/gitlab/-/issues/327822
+            mockUser1,
+            mockUser1,
             {
               id: 'gid://gitlab/User/2',
               avatarUrl: