Commit 84913943 authored by Sam Beckham's avatar Sam Beckham Committed by Fatih Acet

Fixes a bug with dismissals on the PSD

Where PSD is the Project Security Dashboard

The new dismissal paths weren't being passed to the application
correctly. This fixes the issue and links them up as expected
parent 55175d04
......@@ -43,6 +43,9 @@ document.addEventListener('DOMContentLoaded', () => {
canCreateIssue: Boolean(createVulnerabilityFeedbackIssuePath),
canCreateMergeRequest: Boolean(createVulnerabilityFeedbackMergeRequestPath),
canDismissVulnerability: Boolean(createVulnerabilityFeedbackDismissalPath),
createVulnerabilityFeedbackIssuePath,
createVulnerabilityFeedbackMergeRequestPath,
createVulnerabilityFeedbackDismissalPath,
triggeredBy: {
avatarPath: userAvatarPath,
name: userName,
......
......@@ -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"
......
---
title: Fixes the feedback paths on the project security dashboard
merge_request: 12849
author:
type: fixed
......@@ -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',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment