Merge branch '247901-add-remove-all-approvals-option' into 'master'

Add remove approvals on commit to group-level MR approval settings

See merge request gitlab-org/gitlab!57816

ee/app/assets/javascripts/approvals/components/approval_settings.vue

@@ -36,10 +36,14 @@ export default {
     preventAuthorApprovalDocsAnchor:
       'allowing-merge-request-authors-to-approve-their-own-merge-requests',
     requireUserPasswordDocsAnchor: 'require-authentication-when-approving-a-merge-request',
+    removeApprovalsOnPushDocsAnchor: 'resetting-approvals-on-push',
   },
   i18n: {
     authorApprovalLabel: __('Prevent MR approvals by the author.'),
     requireUserPasswordLabel: __('Require user password for approvals.'),
+    removeApprovalsOnPushLabel: __(
+      'Remove all approvals in a merge request when new commits are pushed to its source branch.',
+    ),
     saveChanges: __('Save changes'),
   },
 };
@@ -60,6 +64,12 @@ export default {
         :anchor="$options.links.requireUserPasswordDocsAnchor"
         data-testid="require-user-password"
       />
+      <approval-settings-checkbox
+        v-model="settings.removeApprovalsOnPush"
+        :label="$options.i18n.removeApprovalsOnPushLabel"
+        :anchor="$options.links.removeApprovalsOnPushDocsAnchor"
+        data-testid="remove-approvals-on-push"
+      />
     </gl-form-group>
     <gl-button type="submit" variant="success" category="primary" :disabled="isLoading">
       {{ $options.i18n.saveChanges }}

ee/app/assets/javascripts/approvals/stores/modules/group_settings/actions.js

@@ -27,6 +27,7 @@ export const updateSettings = ({ commit, state }, endpoint) => {
   const payload = {
     allow_author_approval: !state.settings.preventAuthorApproval,
     require_password_to_approve: state.settings.requireUserPassword,
+    retain_approvals_on_push: !state.settings.removeApprovalsOnPush,
   };
 
   commit(types.REQUEST_UPDATE_SETTINGS);

ee/app/assets/javascripts/approvals/stores/modules/group_settings/mutations.js

@@ -7,6 +7,7 @@ export default {
   [types.RECEIVE_SETTINGS_SUCCESS](state, data) {
     state.settings.preventAuthorApproval = !data.allow_author_approval;
     state.settings.requireUserPassword = data.require_password_to_approve;
+    state.settings.removeApprovalsOnPush = !data.retain_approvals_on_push;
     state.isLoading = false;
   },
   [types.RECEIVE_SETTINGS_ERROR](state) {
@@ -18,6 +19,7 @@ export default {
   [types.UPDATE_SETTINGS_SUCCESS](state, data) {
     state.settings.preventAuthorApproval = !data.allow_author_approval;
     state.settings.requireUserPassword = data.require_password_to_approve;
+    state.settings.removeApprovalsOnPush = !data.retain_approvals_on_push;
     state.isLoading = false;
   },
   [types.UPDATE_SETTINGS_ERROR](state) {

ee/spec/frontend/approvals/components/approval_settings_spec.js

@@ -50,9 +50,10 @@ describe('ApprovalSettings', () => {
   });
 
   describe.each`
-    testid                       | setting                    | label                                     | anchor
-    ${'prevent-author-approval'} | ${'preventAuthorApproval'} | ${'Prevent MR approvals by the author.'}  | ${'allowing-merge-request-authors-to-approve-their-own-merge-requests'}
-    ${'require-user-password'}   | ${'requireUserPassword'}   | ${'Require user password for approvals.'} | ${'require-authentication-when-approving-a-merge-request'}
+    testid                        | setting                    | label                                                                                          | anchor
+    ${'prevent-author-approval'}  | ${'preventAuthorApproval'} | ${'Prevent MR approvals by the author.'}                                                       | ${'allowing-merge-request-authors-to-approve-their-own-merge-requests'}
+    ${'require-user-password'}    | ${'requireUserPassword'}   | ${'Require user password for approvals.'}                                                      | ${'require-authentication-when-approving-a-merge-request'}
+    ${'remove-approvals-on-push'} | ${'removeApprovalsOnPush'} | ${'Remove all approvals in a merge request when new commits are pushed to its source branch.'} | ${'resetting-approvals-on-push'}
   `('with $testid checkbox', ({ testid, setting, label, anchor }) => {
     let checkbox = null;
 

ee/spec/frontend/approvals/stores/modules/group_settings/actions_spec.js

@@ -75,13 +75,18 @@ describe('EE approvals group settings module actions', () => {
         settings: {
           preventAuthorApproval: false,
           requireUserPassword: false,
+          removeApprovalsOnPush: false,
         },
       };
     });
 
     describe('on success', () => {
       it('dispatches the request and updates payload', () => {
-        const data = { allow_author_approval: true, require_password_to_approve: true };
+        const data = {
+          allow_author_approval: true,
+          require_password_to_approve: true,
+          retain_approvals_on_push: true,
+        };
         mock.onPut(approvalSettingsPath).replyOnce(httpStatus.OK, data);
 
         return testAction(

ee/spec/frontend/approvals/stores/modules/group_settings/mutations_spec.js

@@ -21,10 +21,12 @@ describe('Group settings store mutations', () => {
       mutations.RECEIVE_SETTINGS_SUCCESS(state, {
         allow_author_approval: true,
         require_password_to_approve: true,
+        retain_approvals_on_push: true,
       });
 
       expect(state.settings.preventAuthorApproval).toBe(false);
       expect(state.settings.requireUserPassword).toBe(true);
+      expect(state.settings.removeApprovalsOnPush).toBe(false);
       expect(state.isLoading).toBe(false);
     });
   });
@@ -50,10 +52,12 @@ describe('Group settings store mutations', () => {
       mutations.UPDATE_SETTINGS_SUCCESS(state, {
         allow_author_approval: true,
         require_password_to_approve: true,
+        retain_approvals_on_push: true,
       });
 
       expect(state.settings.preventAuthorApproval).toBe(false);
       expect(state.settings.requireUserPassword).toBe(true);
+      expect(state.settings.removeApprovalsOnPush).toBe(false);
       expect(state.isLoading).toBe(false);
     });
   });

locale/gitlab.pot

@@ -25539,6 +25539,9 @@ msgstr ""
 msgid "Remove Zoom meeting"
 msgstr ""
 
+msgid "Remove all approvals in a merge request when new commits are pushed to its source branch."
+msgstr ""
+
 msgid "Remove all or specific assignee(s)"
 msgstr ""