Merge branch '322137-update-users-search' into 'master'

Fix(oncallschedules): limit users to current project / avatar fix

See merge request gitlab-org/gitlab!55014

app/assets/javascripts/graphql_shared/queries/project_user_members_search.query.graphql

+query searchProjectMembers($fullPath: ID!, $search: String) {
+  project(fullPath: $fullPath) {
+    projectMembers(search: $search) {
+      nodes {
+        user {
+          id
+          name
+          username
+          avatarUrl
+        }
+      }
+    }
+  }
+}

ee/app/assets/javascripts/oncall_schedules/components/rotations/components/add_edit_rotation_modal.vue

@@ -8,7 +8,7 @@ import getOncallSchedulesWithRotationsQuery from 'ee/oncall_schedules/graphql/qu
 import { updateStoreAfterRotationEdit } from 'ee/oncall_schedules/utils/cache_updates';
 import { isNameFieldValid, getParticipantsForSave } from 'ee/oncall_schedules/utils/common_utils';
 import createFlash, { FLASH_TYPES } from '~/flash';
-import usersSearchQuery from '~/graphql_shared/queries/users_search.query.graphql';
+import searchProjectMembersQuery from '~/graphql_shared/queries/project_user_members_search.query.graphql';
 import { format24HourTimeStringFromInt, formatDate } from '~/lib/utils/datetime_utility';
 import { s__, __ } from '~/locale';
 import AddEditRotationForm from './add_edit_rotation_form.vue';
@@ -47,14 +47,15 @@ export default {
   },
   apollo: {
     participants: {
-      query: usersSearchQuery,
+      query: searchProjectMembersQuery,
       variables() {
         return {
+          fullPath: this.projectPath,
           search: this.ptSearchTerm,
         };
       },
-      update({ users: { nodes = [] } = {} }) {
-        return nodes;
+      update({ project: { projectMembers: { nodes = [] } = {} } = {} } = {}) {
+        return nodes.map(({ user }) => ({ ...user }));
       },
       error(error) {
         this.error = error;

ee/app/assets/javascripts/oncall_schedules/components/rotations/components/rotation_assignee.vue

@@ -79,7 +79,7 @@ export default {
       :view-only="true"
     >
       <div class="gl-display-flex gl-text-white gl-font-weight-normal">
-        <gl-avatar :src="assignee.avatarUrl" :size="16" />
+        <gl-avatar :src="assignee.user.avatarUrl" :size="16" />
         <span v-if="!rotationMobileView" class="gl-ml-2" data-testid="rotation-assignee-name">{{
           assigneeName
         }}</span>

ee/spec/frontend/oncall_schedule/mocks/mock_rotation.json

@@ -26,7 +26,8 @@
             "colorPalette": "blue",
             "user": {
               "id": "1",
-              "username": "nora.schaden"
+              "username": "nora.schaden",
+              "avatarUrl": "/url"
             }
           },
           "startsAt": "2021-01-12T10:04:56.333Z",
@@ -39,7 +40,8 @@
             "colorPalette": "orange",
             "user": {
               "id": "2",
-              "username": "racheal.loving"
+              "username": "racheal.loving",
+              "avatarUrl": "/url"
             }
           },
           "startsAt": "2021-01-16T10:04:56.333Z",

ee/spec/frontend/oncall_schedule/rotations/components/add_edit_rotation_modal_spec.js

@@ -10,7 +10,7 @@ import getOncallSchedulesWithRotationsQuery from 'ee/oncall_schedules/graphql/qu
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import createFlash, { FLASH_TYPES } from '~/flash';
-import usersSearchQuery from '~/graphql_shared/queries/users_search.query.graphql';
+import searchProjectMembersQuery from '~/graphql_shared/queries/project_user_members_search.query.graphql';
 import {
   participants,
   getOncallSchedulesQueryResponse,
@@ -84,7 +84,7 @@ describe('AddEditRotationModal', () => {
         getOncallSchedulesWithRotationsQuery,
         jest.fn().mockResolvedValue(getOncallSchedulesQueryResponse),
       ],
-      [usersSearchQuery, userSearchQueryHandler],
+      [searchProjectMembersQuery, userSearchQueryHandler],
       [createOncallScheduleRotationMutation, createRotationHandler],
     ]);
 
@@ -158,7 +158,7 @@ describe('AddEditRotationModal', () => {
   });
 
   describe('with mocked Apollo client', () => {
-    it('it calls searchUsers query with the search parameter', async () => {
+    it('it calls the `searchProjectMembersQuery` query with the search parameter and project path', async () => {
       userSearchQueryHandler = jest.fn().mockResolvedValue({
         data: {
           users: {
@@ -168,7 +168,10 @@ describe('AddEditRotationModal', () => {
       });
       createComponentWithApollo({ search: 'root' });
       await awaitApolloDomMock();
-      expect(userSearchQueryHandler).toHaveBeenCalledWith({ search: 'root' });
+      expect(userSearchQueryHandler).toHaveBeenCalledWith({
+        search: 'root',
+        fullPath: projectPath,
+      });
     });
 
     it('calls a mutation with correct parameters and creates a rotation', async () => {

ee/spec/frontend/oncall_schedule/rotations/components/rotation_assignee_spec.js

@@ -28,7 +28,7 @@ describe('RotationAssignee', () => {
     wrapper = extendedWrapper(
       shallowMount(RotationAssignee, {
         propsData: {
-          assignee: { avatarUrl: '/url', ...assignee.participant },
+          assignee: { ...assignee.participant },
           rotationAssigneeStartsAt: assignee.startsAt,
           rotationAssigneeEndsAt: assignee.endsAt,
           rotationAssigneeStyle: { left: '0px', width: `${shiftWidth}px` },
@@ -49,7 +49,7 @@ describe('RotationAssignee', () => {
 
   describe('rotation assignee token', () => {
     it('should render an assignee name and avatar', () => {
-      expect(findAvatar().props('src')).toBe(wrapper.vm.assignee.avatarUrl);
+      expect(findAvatar().props('src')).toBe(assignee.participant.user.avatarUrl);
       expect(findName().text()).toBe(assignee.participant.user.username);
     });
 

ee/spec/frontend/oncall_schedule/schedule/components/__snapshots__/rotations_list_section_spec.js.snap

@@ -90,13 +90,11 @@ exports[`RotationsListSectionComponent when the timeframe includes today renders
                 <div
                   class="gl-display-flex gl-text-white gl-font-weight-normal"
                 >
-                  <div
-                    class="gl-avatar gl-avatar-identicon gl-avatar-circle gl-avatar-s16 gl-avatar-identicon-bg1"
-                  >
-                    
-  
-
-                  </div>
+                  <img
+                    alt="avatar"
+                    class="gl-avatar gl-avatar-circle gl-avatar-s16"
+                    src="/url"
+                  />
                    
                   <!---->
                 </div>
@@ -138,13 +136,11 @@ exports[`RotationsListSectionComponent when the timeframe includes today renders
                 <div
                   class="gl-display-flex gl-text-white gl-font-weight-normal"
                 >
-                  <div
-                    class="gl-avatar gl-avatar-identicon gl-avatar-circle gl-avatar-s16 gl-avatar-identicon-bg1"
-                  >
-                    
-  
-
-                  </div>
+                  <img
+                    alt="avatar"
+                    class="gl-avatar gl-avatar-circle gl-avatar-s16"
+                    src="/url"
+                  />
                    
                   <!---->
                 </div>