Merge branch 'dpisek-fix-revert-dismissal-deperecated-vuln-feedback' into 'master'

Fix revert dismissal See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117072 Merged-by: Savas Vedova <svedova@gitlab.com> Approved-by: Samantha Ming <sming@gitlab.com> Approved-by: Savas Vedova <svedova@gitlab.com> Co-authored-by: Dave Pisek <dpisek@gitlab.com>

Merge branch 'dpisek-fix-revert-dismissal-deperecated-vuln-feedback' into 'master'
Fix revert dismissal See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117072 Merged-by: Savas Vedova <svedova@gitlab.com> Approved-by: Samantha Ming <sming@gitlab.com> Approved-by: Savas Vedova <svedova@gitlab.com> Co-authored-by: Dave Pisek <dpisek@gitlab.com>
a9fe22f4 · Savas Vedova · 1c63715d · 04bf8c37 · a9fe22f4
--- a/ee/app/assets/javascripts/security_dashboard/store/modules/vulnerabilities/actions.js
+++ b/ee/app/assets/javascripts/security_dashboard/store/modules/vulnerabilities/actions.js
@@ -267,7 +267,13 @@ export const dismissVulnerability = (
        action: {
          text: s__('SecurityReports|Undo dismiss'),
          onClick: (e, toastObject) => {
-            if (vulnerability.dismissal_feedback) {
+            const shouldRevertDismiss = Boolean(
+              gon.features.deprecateVulnerabilitiesFeedback
+                ? getDismissalTransitionForVulnerability(vulnerability)
+                : vulnerability.dismissal_feedback,
+            );
+
+            if (shouldRevertDismiss) {
              dispatch('revertDismissVulnerability', { vulnerability })
                .then(() => dispatch('fetchVulnerabilities', { page }))
                .catch(() => {});
@@ -434,7 +440,7 @@ export const revertDismissVulnerability = ({ dispatch }, { vulnerability, flashE
      })
    : axios.delete(vulnerability.dismissal_feedback.destroy_vulnerability_feedback_dismissal_path);

-  action
+  return action
    .then(({ data }) => {
      dispatch('receiveUndoDismissSuccess', { vulnerability, data });
    })