Merge branch '9270-relabel-dismiss-button-in-the-more-info-modal-for-vulnerabilities' into 'master'

Relabel dismiss button in the More Info modal for vulnerabilities

Closes #9270

See merge request gitlab-org/gitlab-ee!9500

doc/user/group/security_dashboard/index.md

@@ -112,7 +112,7 @@ the "More info" modal.
 
 You can also dismiss vulnerabilities by clicking the "Dismiss vulnerability" button.
 This will dismiss the vulnerability and re-render it to reflect its dismissed state.
-If you wish to undo this dismissal, you can click the "Revert dismissal" button.
+If you wish to undo this dismissal, you can click the "Undo dismiss" button.
 
 You can get the same behaviour if you dismiss a vulnerability from within the
 "More info" modal.

ee/app/assets/javascripts/security_dashboard/components/app.vue

@@ -76,7 +76,7 @@ export default {
       'fetchVulnerabilities',
       'fetchVulnerabilitiesCount',
       'fetchVulnerabilitiesHistory',
-      'revertDismissal',
+      'undoDismiss',
       'setVulnerabilitiesCountEndpoint',
       'setVulnerabilitiesEndpoint',
       'setVulnerabilitiesHistoryEndpoint',
@@ -104,7 +104,7 @@ export default {
       :can-create-feedback-permission="canCreateFeedbackPermission"
       @createNewIssue="createIssue({ vulnerability: modal.vulnerability })"
       @dismissIssue="dismissVulnerability({ vulnerability: modal.vulnerability })"
-      @revertDismissIssue="revertDismissal({ vulnerability: modal.vulnerability })"
+      @revertDismissIssue="undoDismiss({ vulnerability: modal.vulnerability })"
     />
   </div>
 </template>

ee/app/assets/javascripts/security_dashboard/components/vulnerability_action_buttons.vue

@@ -42,7 +42,7 @@ export default {
       'openModal',
       'createIssue',
       'dismissVulnerability',
-      'revertDismissal',
+      'undoDismiss',
     ]),
     handleCreateIssue() {
       const { vulnerability } = this;
@@ -52,9 +52,9 @@ export default {
       const { vulnerability } = this;
       this.dismissVulnerability({ vulnerability, flashError: true });
     },
-    handleRevertDismissal() {
+    handleUndoDismiss() {
       const { vulnerability } = this;
-      this.revertDismissal({ vulnerability, flashError: true });
+      this.undoDismiss({ vulnerability, flashError: true });
     },
   },
 };
@@ -89,14 +89,14 @@ export default {
     <template v-if="canDismissVulnerability">
       <loading-button
         v-if="isDismissed"
-        key="revert-dismissal"
+        key="undo-dismiss"
         v-gl-tooltip
         :aria-label="s__('Security Reports|Undo dismiss')"
         :loading="isDismissingVulnerability"
         :title="s__('Security Reports|Undo dismiss')"
-        container-class="btn btn-inverted btn-warning btn-border-color js-revert-dismissal"
+        container-class="btn btn-inverted btn-warning btn-border-color js-undo-dismiss"
         type="button"
-        @click="handleRevertDismissal"
+        @click="handleUndoDismiss"
       >
         <icon name="repeat" />
       </loading-button>

ee/app/assets/javascripts/security_dashboard/store/modules/vulnerabilities/actions.js

@@ -172,33 +172,33 @@ export const receiveDismissVulnerabilityError = ({ commit }, { flashError }) =>
   }
 };
 
-export const revertDismissal = ({ dispatch }, { vulnerability, flashError }) => {
+export const undoDismiss = ({ dispatch }, { vulnerability, flashError }) => {
   const { vulnerability_feedback_dismissal_path, dismissal_feedback } = vulnerability;
   // eslint-disable-next-line camelcase
   const url = `${vulnerability_feedback_dismissal_path}/${dismissal_feedback.id}`;
 
-  dispatch('requestRevertDismissal');
+  dispatch('requestUndoDismiss');
 
   axios
     .delete(url)
     .then(() => {
       const { id } = vulnerability;
-      dispatch('receiveRevertDismissalSuccess', { id });
+      dispatch('receiveUndoDismissSuccess', { id });
     })
     .catch(() => {
-      dispatch('receiveRevertDismissalError', { flashError });
+      dispatch('receiveUndoDismissError', { flashError });
     });
 };
 
-export const requestRevertDismissal = ({ commit }) => {
+export const requestUndoDismiss = ({ commit }) => {
   commit(types.REQUEST_REVERT_DISMISSAL);
 };
 
-export const receiveRevertDismissalSuccess = ({ commit }, payload) => {
+export const receiveUndoDismissSuccess = ({ commit }, payload) => {
   commit(types.RECEIVE_REVERT_DISMISSAL_SUCCESS, payload);
 };
 
-export const receiveRevertDismissalError = ({ commit }, { flashError }) => {
+export const receiveUndoDismissError = ({ commit }, { flashError }) => {
   commit(types.RECEIVE_REVERT_DISMISSAL_ERROR);
   if (flashError) {
     createFlash(

ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue

@@ -40,7 +40,7 @@ export default {
   computed: {
     revertTitle() {
       return this.modal.vulnerability.isDismissed
-        ? s__('ciReport|Revert dismissal')
+        ? s__('ciReport|Undo dismiss')
         : s__('ciReport|Dismiss vulnerability');
     },
     hasDismissedBy() {

ee/changelogs/unreleased/9270-relabel-dismiss-button-in-the-more-info-modal-for-vulnerabilities.yml

+---
+title: Renames 'revert dismissal' to 'undo dismiss' on the Group security dashboard
+merge_request: 9500
+author:
+type: other

ee/spec/javascripts/security_dashboard/components/vulnerability_action_buttons_spec.js

@@ -146,8 +146,8 @@ describe('Security Dashboard Action Buttons', () => {
       expect(vm.$el.querySelector('.js-dismiss-vulnerability')).toBeNull();
     });
 
-    it('should render the revert dismissal button', () => {
-      expect(vm.$el.querySelector('.js-revert-dismissal')).not.toBeNull();
+    it('should render the undo dismiss button', () => {
+      expect(vm.$el.querySelector('.js-undo-dismiss')).not.toBeNull();
     });
   });
 });

ee/spec/javascripts/security_dashboard/store/vulnerabilities/actions_spec.js

@@ -572,7 +572,7 @@ describe('vulnerability dismissal', () => {
 });
 
 describe('revert vulnerability dismissal', () => {
-  describe('revertDismissal', () => {
+  describe('undoDismiss', () => {
     const vulnerability = mockDataVulnerabilities[2];
     const url = `${vulnerability.vulnerability_feedback_dismissal_path}/${
       vulnerability.dismissal_feedback.id
@@ -594,13 +594,13 @@ describe('revert vulnerability dismissal', () => {
 
       it('should dispatch the request and success actions', done => {
         testAction(
-          actions.revertDismissal,
+          actions.undoDismiss,
           { vulnerability },
           {},
           [],
           [
-            { type: 'requestRevertDismissal' },
-            { type: 'receiveRevertDismissalSuccess', payload: { id: vulnerability.id } },
+            { type: 'requestUndoDismiss' },
+            { type: 'receiveUndoDismissSuccess', payload: { id: vulnerability.id } },
           ],
           done,
         );
@@ -616,13 +616,13 @@ describe('revert vulnerability dismissal', () => {
         const flashError = false;
 
         testAction(
-          actions.revertDismissal,
+          actions.undoDismiss,
           { vulnerability, flashError },
           {},
           [],
           [
-            { type: 'requestRevertDismissal' },
-            { type: 'receiveRevertDismissalError', payload: { flashError: false } },
+            { type: 'requestUndoDismiss' },
+            { type: 'receiveUndoDismissError', payload: { flashError: false } },
           ],
           done,
         );
@@ -630,13 +630,13 @@ describe('revert vulnerability dismissal', () => {
     });
   });
 
-  describe('receiveRevertDismissalSuccess', () => {
+  describe('receiveUndoDismissSuccess', () => {
     it('should commit the success mutation', done => {
       const state = initialState;
       const data = mockDataVulnerabilities[0];
 
       testAction(
-        actions.receiveRevertDismissalSuccess,
+        actions.receiveUndoDismissSuccess,
         { data },
         state,
         [
@@ -651,12 +651,12 @@ describe('revert vulnerability dismissal', () => {
     });
   });
 
-  describe('receiveRevertDismissalError', () => {
+  describe('receiveUndoDismissError', () => {
     it('should commit the error mutation', done => {
       const state = initialState;
 
       testAction(
-        actions.receiveRevertDismissalError,
+        actions.receiveUndoDismissError,
         {},
         state,
         [{ type: types.RECEIVE_REVERT_DISMISSAL_ERROR }],
@@ -666,12 +666,12 @@ describe('revert vulnerability dismissal', () => {
     });
   });
 
-  describe('requestRevertDismissal', () => {
+  describe('requestUndoDismiss', () => {
     it('should commit the request mutation', done => {
       const state = initialState;
 
       testAction(
-        actions.requestRevertDismissal,
+        actions.requestUndoDismiss,
         {},
         state,
         [{ type: types.REQUEST_REVERT_DISMISSAL }],

ee/spec/javascripts/vue_shared/security_reports/components/modal_spec.js

@@ -33,13 +33,11 @@ describe('Security Reports modal', () => {
         expect(vm.$el.textContent.trim()).toContain('#123');
       });
 
-      it('renders button to revert dismissal', () => {
-        expect(vm.$el.querySelector('.js-dismiss-btn').textContent.trim()).toEqual(
-          'Revert dismissal',
-        );
+      it('renders button to undo dismiss', () => {
+        expect(vm.$el.querySelector('.js-dismiss-btn').textContent.trim()).toEqual('Undo dismiss');
       });
 
-      it('emits revertDismissIssue when revert dismissal button is clicked', () => {
+      it('emits revertDismissIssue when undo dismiss button is clicked', () => {
         spyOn(vm, '$emit');
 
         const button = vm.$el.querySelector('.js-dismiss-btn');

locale/gitlab.pot

@@ -11434,9 +11434,6 @@ msgstr ""
 msgid "ciReport|Performance metrics"
 msgstr ""
 
-msgid "ciReport|Revert dismissal"
-msgstr ""
-
 msgid "ciReport|SAST"
 msgstr ""
 
@@ -11476,6 +11473,9 @@ msgstr ""
 msgid "ciReport|There was an error reverting the dismissal. Please try again."
 msgstr ""
 
+msgid "ciReport|Undo dismiss"
+msgstr ""
+
 msgid "ciReport|Upgrade %{name} from %{version} to %{fixed}."
 msgstr ""