Add latest changes from gitlab-org/gitlab@master

5 files changed, 40 insertions, 32 deletions

diff --git a/spec/frontend/members/components/action_buttons/remove_member_button_spec.js b/spec/frontend/members/components/action_buttons/remove_member_button_spec.js
index d8453d453e7..7eb0ea37fe6 100644
--- a/spec/frontend/members/components/action_buttons/remove_member_button_spec.js
+++ b/spec/frontend/members/components/action_buttons/remove_member_button_spec.js
@@ -45,7 +45,7 @@ describe('RemoveMemberButton', () => {
         title: 'Remove member',
         isAccessRequest: true,
         isInvite: true,
-        oncallSchedules: { name: 'user', schedules: [] },
+        userDeletionObstacles: { name: 'user', obstacles: [] },
         ...propsData,
       },
       directives: {
diff --git a/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js b/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js
index 0aa3780f030..10e451376c8 100644
--- a/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js
+++ b/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js
@@ -2,6 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 import LeaveButton from '~/members/components/action_buttons/leave_button.vue';
 import RemoveMemberButton from '~/members/components/action_buttons/remove_member_button.vue';
 import UserActionButtons from '~/members/components/action_buttons/user_action_buttons.vue';
+import { parseUserDeletionObstacles } from '~/vue_shared/components/user_deletion_obstacles/utils';
 import { member, orphanedMember } from '../../mock_data';
 
 describe('UserActionButtons', () => {
@@ -45,9 +46,9 @@ describe('UserActionButtons', () => {
         isAccessRequest: false,
         isInvite: false,
         icon: 'remove',
-        oncallSchedules: {
+        userDeletionObstacles: {
           name: member.user.name,
-          schedules: member.user.oncallSchedules,
+          obstacles: parseUserDeletionObstacles(member.user),
         },
       });
     });
diff --git a/spec/frontend/members/components/modals/leave_modal_spec.js b/spec/frontend/members/components/modals/leave_modal_spec.js
index 1dc913e5c78..f755f08dbf2 100644
--- a/spec/frontend/members/components/modals/leave_modal_spec.js
+++ b/spec/frontend/members/components/modals/leave_modal_spec.js
@@ -6,7 +6,8 @@ import { nextTick } from 'vue';
 import Vuex from 'vuex';
 import LeaveModal from '~/members/components/modals/leave_modal.vue';
 import { LEAVE_MODAL_ID, MEMBER_TYPES } from '~/members/constants';
-import OncallSchedulesList from '~/vue_shared/components/oncall_schedules_list.vue';
+import UserDeletionObstaclesList from '~/vue_shared/components/user_deletion_obstacles/user_deletion_obstacles_list.vue';
+import { parseUserDeletionObstacles } from '~/vue_shared/components/user_deletion_obstacles/utils';
 import { member } from '../../mock_data';
 
 jest.mock('~/lib/utils/csrf', () => ({ token: 'mock-csrf-token' }));
@@ -51,7 +52,7 @@ describe('LeaveModal', () => {
 
   const findModal = () => wrapper.findComponent(GlModal);
   const findForm = () => findModal().findComponent(GlForm);
-  const findOncallSchedulesList = () => findModal().findComponent(OncallSchedulesList);
+  const findUserDeletionObstaclesList = () => findModal().findComponent(UserDeletionObstaclesList);
 
   const getByText = (text, options) =>
     createWrapper(within(findModal().element).getByText(text, options));
@@ -89,25 +90,27 @@ describe('LeaveModal', () => {
     );
   });
 
-  describe('On-call schedules list', () => {
-    it("displays oncall schedules list when member's user is part of on-call schedules ", () => {
-      const schedulesList = findOncallSchedulesList();
-      expect(schedulesList.exists()).toBe(true);
-      expect(schedulesList.props()).toMatchObject({
+  describe('User deletion obstacles list', () => {
+    it("displays obstacles list when member's user is part of on-call management", () => {
+      const obstaclesList = findUserDeletionObstaclesList();
+      expect(obstaclesList.exists()).toBe(true);
+      expect(obstaclesList.props()).toMatchObject({
         isCurrentUser: true,
-        schedules: member.user.oncallSchedules,
+        obstacles: parseUserDeletionObstacles(member.user),
       });
     });
 
-    it("does NOT display oncall schedules list when member's user is NOT a part of on-call schedules ", async () => {
+    it("does NOT display obstacles list when member's user is NOT a part of on-call management", async () => {
       wrapper.destroy();
 
-      const memberWithoutOncallSchedules = cloneDeep(member);
-      delete memberWithoutOncallSchedules.user.oncallSchedules;
-      createComponent({ member: memberWithoutOncallSchedules });
+      const memberWithoutOncall = cloneDeep(member);
+      delete memberWithoutOncall.user.oncallSchedules;
+      delete memberWithoutOncall.user.escalationPolicies;
+
+      createComponent({ member: memberWithoutOncall });
       await nextTick();
 
-      expect(findOncallSchedulesList().exists()).toBe(false);
+      expect(findUserDeletionObstaclesList().exists()).toBe(false);
     });
   });
 
diff --git a/spec/frontend/members/components/modals/remove_member_modal_spec.js b/spec/frontend/members/components/modals/remove_member_modal_spec.js
index 1dc41582c12..1d39c4b3175 100644
--- a/spec/frontend/members/components/modals/remove_member_modal_spec.js
+++ b/spec/frontend/members/components/modals/remove_member_modal_spec.js
@@ -4,15 +4,19 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import RemoveMemberModal from '~/members/components/modals/remove_member_modal.vue';
 import { MEMBER_TYPES } from '~/members/constants';
-import OncallSchedulesList from '~/vue_shared/components/oncall_schedules_list.vue';
+import { OBSTACLE_TYPES } from '~/vue_shared/components/user_deletion_obstacles/constants';
+import UserDeletionObstaclesList from '~/vue_shared/components/user_deletion_obstacles/user_deletion_obstacles_list.vue';
 
 Vue.use(Vuex);
 
 describe('RemoveMemberModal', () => {
   const memberPath = '/gitlab-org/gitlab-test/-/project_members/90';
-  const mockSchedules = {
+  const mockObstacles = {
     name: 'User1',
-    schedules: [{ id: 1, name: 'Schedule 1' }],
+    obstacles: [
+      { name: 'Schedule 1', type: OBSTACLE_TYPES.oncallSchedules },
+      { name: 'Policy 1', type: OBSTACLE_TYPES.escalationPolicies },
+    ],
   };
   let wrapper;
 
@@ -44,18 +48,18 @@ describe('RemoveMemberModal', () => {
 
   const findForm = () => wrapper.find({ ref: 'form' });
   const findGlModal = () => wrapper.findComponent(GlModal);
-  const findOnCallSchedulesList = () => wrapper.findComponent(OncallSchedulesList);
+  const findUserDeletionObstaclesList = () => wrapper.findComponent(UserDeletionObstaclesList);
 
   afterEach(() => {
     wrapper.destroy();
   });
 
   describe.each`
-    state                          | memberType         | isAccessRequest | isInvite | actionText               | removeSubMembershipsCheckboxExpected | unassignIssuablesCheckboxExpected | message                                                                                                           | onCallSchedules
-    ${'removing a group member'}   | ${'GroupMember'}   | ${false}        | ${false} | ${'Remove member'}       | ${true}                              | ${true}                           | ${'Are you sure you want to remove Jane Doe from the Gitlab Org / Gitlab Test project?'}                          | ${{}}
-    ${'removing a project member'} | ${'ProjectMember'} | ${false}        | ${false} | ${'Remove member'}       | ${false}                             | ${true}                           | ${'Are you sure you want to remove Jane Doe from the Gitlab Org / Gitlab Test project?'}                          | ${mockSchedules}
-    ${'denying an access request'} | ${'ProjectMember'} | ${true}         | ${false} | ${'Deny access request'} | ${false}                             | ${false}                          | ${"Are you sure you want to deny Jane Doe's request to join the Gitlab Org / Gitlab Test project?"}               | ${{}}
-    ${'revoking invite'}           | ${'ProjectMember'} | ${false}        | ${true}  | ${'Revoke invite'}       | ${false}                             | ${false}                          | ${'Are you sure you want to revoke the invitation for foo@bar.com to join the Gitlab Org / Gitlab Test project?'} | ${mockSchedules}
+    state                          | memberType         | isAccessRequest | isInvite | actionText               | removeSubMembershipsCheckboxExpected | unassignIssuablesCheckboxExpected | message                                                                                                           | userDeletionObstacles | isPartOfOncall
+    ${'removing a group member'}   | ${'GroupMember'}   | ${false}        | ${false} | ${'Remove member'}       | ${true}                              | ${true}                           | ${'Are you sure you want to remove Jane Doe from the Gitlab Org / Gitlab Test project?'}                          | ${{}}                 | ${false}
+    ${'removing a project member'} | ${'ProjectMember'} | ${false}        | ${false} | ${'Remove member'}       | ${false}                             | ${true}                           | ${'Are you sure you want to remove Jane Doe from the Gitlab Org / Gitlab Test project?'}                          | ${mockObstacles}      | ${true}
+    ${'denying an access request'} | ${'ProjectMember'} | ${true}         | ${false} | ${'Deny access request'} | ${false}                             | ${false}                          | ${"Are you sure you want to deny Jane Doe's request to join the Gitlab Org / Gitlab Test project?"}               | ${{}}                 | ${false}
+    ${'revoking invite'}           | ${'ProjectMember'} | ${false}        | ${true}  | ${'Revoke invite'}       | ${false}                             | ${false}                          | ${'Are you sure you want to revoke the invitation for foo@bar.com to join the Gitlab Org / Gitlab Test project?'} | ${mockObstacles}      | ${false}
   `(
     'when $state',
     ({
@@ -66,7 +70,8 @@ describe('RemoveMemberModal', () => {
       message,
       removeSubMembershipsCheckboxExpected,
       unassignIssuablesCheckboxExpected,
-      onCallSchedules,
+      userDeletionObstacles,
+      isPartOfOncall,
     }) => {
       beforeEach(() => {
         createComponent({
@@ -75,12 +80,10 @@ describe('RemoveMemberModal', () => {
           message,
           memberPath,
           memberType,
-          onCallSchedules,
+          userDeletionObstacles,
         });
       });
 
-      const isPartOfOncallSchedules = Boolean(isAccessRequest && onCallSchedules.schedules?.length);
-
       it(`has the title ${actionText}`, () => {
         expect(findGlModal().attributes('title')).toBe(actionText);
       });
@@ -109,8 +112,8 @@ describe('RemoveMemberModal', () => {
         );
       });
 
-      it(`shows ${isPartOfOncallSchedules ? 'all' : 'no'} related on-call schedules`, () => {
-        expect(findOnCallSchedulesList().exists()).toBe(isPartOfOncallSchedules);
+      it(`shows ${isPartOfOncall ? 'all' : 'no'} related on-call schedules or policies`, () => {
+        expect(findUserDeletionObstaclesList().exists()).toBe(isPartOfOncall);
       });
 
       it('submits the form when the modal is submitted', () => {
diff --git a/spec/frontend/members/mock_data.js b/spec/frontend/members/mock_data.js
index eb9f905fea2..3afbe57a1aa 100644
--- a/spec/frontend/members/mock_data.js
+++ b/spec/frontend/members/mock_data.js
@@ -23,6 +23,7 @@ export const member = {
     blocked: false,
     twoFactorEnabled: false,
     oncallSchedules: [{ name: 'schedule 1' }],
+    escalationPolicies: [{ name: 'policy 1' }],
   },
   id: 238,
   createdAt: '2020-07-17T16:22:46.923Z',
@@ -63,7 +64,7 @@ export const modalData = {
   memberPath: '/groups/foo-bar/-/group_members/1',
   memberType: 'GroupMember',
   message: 'Are you sure you want to remove John Smith?',
-  oncallSchedules: { name: 'user', schedules: [] },
+  userDeletionObstacles: { name: 'user', obstacles: [] },
 };
 
 const { user, ...memberNoUser } = member;