Merge branch 'feedback-dismissal-path-fix' into 'master'

Fixes a bug with dismissals on the Project security dashboard

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

ee/app/assets/javascripts/pages/projects/security/dashboard/show/index.js

@@ -43,6 +43,9 @@ document.addEventListener('DOMContentLoaded', () => {
           canCreateIssue: Boolean(createVulnerabilityFeedbackIssuePath),
           canCreateMergeRequest: Boolean(createVulnerabilityFeedbackMergeRequestPath),
           canDismissVulnerability: Boolean(createVulnerabilityFeedbackDismissalPath),
+          createVulnerabilityFeedbackIssuePath,
+          createVulnerabilityFeedbackMergeRequestPath,
+          createVulnerabilityFeedbackDismissalPath,
           triggeredBy: {
             avatarPath: userAvatarPath,
             name: userName,

ee/app/assets/javascripts/vue_shared/security_reports/card_security_reports_app.vue

@@ -127,6 +127,21 @@ export default {
       type: Boolean,
       required: true,
     },
+    createVulnerabilityFeedbackIssuePath: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    createVulnerabilityFeedbackMergeRequestPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    createVulnerabilityFeedbackDismissalPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   computed: {
     headline() {
@@ -177,6 +192,11 @@ export default {
         :dependency-scanning-help-path="dependencyScanningHelpPath"
         :vulnerability-feedback-path="vulnerabilityFeedbackPath"
         :vulnerability-feedback-help-path="vulnerabilityFeedbackHelpPath"
+        :create-vulnerability-feedback-issue-path="createVulnerabilityFeedbackIssuePath"
+        :create-vulnerability-feedback-merge-request-path="
+          createVulnerabilityFeedbackMergeRequestPath
+        "
+        :create-vulnerability-feedback-dismissal-path="createVulnerabilityFeedbackDismissalPath"
         :can-create-issue="canCreateIssue"
         :can-create-merge-request="canCreateMergeRequest"
         :can-dismiss-vulnerability="canDismissVulnerability"

ee/changelogs/unreleased/feedback-dismissal-path-fix.yml

+---
+title: Fixes the feedback paths on the project security dashboard
+merge_request: 12849
+author:
+type: fixed

ee/spec/javascripts/vue_shared/security_reports/card_security_reports_app_spec.js

@@ -56,6 +56,9 @@ describe('Card security reports app', () => {
         sastHelpPath: 'path',
         dependencyScanningHelpPath: 'path',
         vulnerabilityFeedbackPath: `${TEST_HOST}/vulnerability_feedback_path`,
+        createVulnerabilityFeedbackIssuePath: `${TEST_HOST}/vulnerability_feedback_path`,
+        createVulnerabilityFeedbackDismissalPath: `${TEST_HOST}/vulnerability_feedback_path`,
+        createVulnerabilityFeedbackMergeRequestPath: `${TEST_HOST}/vulnerability_feedback_path`,
         vulnerabilityFeedbackHelpPath: 'path',
         dastHelpPath: 'path',
         sastContainerHelpPath: 'path',