Commit c1b7d41a authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch '8370-view-issue-button-doesn-t-work-in-dashboard-modal' into 'master'

Resolve "View issue button doesn't work in dashboard modal"

Closes #8370

See merge request gitlab-org/gitlab-ee!8385
parents 3579a601 09412931
...@@ -249,7 +249,7 @@ export default { ...@@ -249,7 +249,7 @@ export default {
<a <a
v-if="modal.vulnerability.hasIssue" v-if="modal.vulnerability.hasIssue"
:href="modal.vulnerability.issueFeedback && modal.vulnerability.issueFeedback.issue_url" :href="modal.vulnerability.issue_feedback && modal.vulnerability.issue_feedback.issue_url"
rel="noopener noreferrer nofollow" rel="noopener noreferrer nofollow"
class="btn btn-success btn-inverted" class="btn btn-success btn-inverted"
> >
......
...@@ -31,7 +31,7 @@ function enrichVulnerabilityWithfeedback(vulnerability, feedback = []) { ...@@ -31,7 +31,7 @@ function enrichVulnerabilityWithfeedback(vulnerability, feedback = []) {
return { return {
...vuln, ...vuln,
hasIssue: true, hasIssue: true,
issueFeedback: fb, issue_feedback: fb,
}; };
} }
return vuln; return vuln;
......
---
title: Fixes the view issue button in the Group Security Dashboard
merge_request: 8385
author:
type: fixed
...@@ -87,7 +87,7 @@ describe('security reports utils', () => { ...@@ -87,7 +87,7 @@ describe('security reports utils', () => {
expect(parsed.hasIssue).toEqual(true); expect(parsed.hasIssue).toEqual(true);
expect(parsed.isDismissed).toEqual(true); expect(parsed.isDismissed).toEqual(true);
expect(parsed.dismissalFeedback).toEqual(sastFeedbacks[0]); expect(parsed.dismissalFeedback).toEqual(sastFeedbacks[0]);
expect(parsed.issueFeedback).toEqual(sastFeedbacks[1]); expect(parsed.issue_feedback).toEqual(sastFeedbacks[1]);
}); });
}); });
...@@ -129,7 +129,7 @@ describe('security reports utils', () => { ...@@ -129,7 +129,7 @@ describe('security reports utils', () => {
expect(parsed.hasIssue).toEqual(true); expect(parsed.hasIssue).toEqual(true);
expect(parsed.isDismissed).toEqual(true); expect(parsed.isDismissed).toEqual(true);
expect(parsed.dismissalFeedback).toEqual(dependencyScanningFeedbacks[0]); expect(parsed.dismissalFeedback).toEqual(dependencyScanningFeedbacks[0]);
expect(parsed.issueFeedback).toEqual(dependencyScanningFeedbacks[1]); expect(parsed.issue_feedback).toEqual(dependencyScanningFeedbacks[1]);
}); });
}); });
...@@ -165,7 +165,7 @@ describe('security reports utils', () => { ...@@ -165,7 +165,7 @@ describe('security reports utils', () => {
expect(parsed.hasIssue).toEqual(true); expect(parsed.hasIssue).toEqual(true);
expect(parsed.isDismissed).toEqual(true); expect(parsed.isDismissed).toEqual(true);
expect(parsed.dismissalFeedback).toEqual(containerScanningFeedbacks[0]); expect(parsed.dismissalFeedback).toEqual(containerScanningFeedbacks[0]);
expect(parsed.issueFeedback).toEqual(containerScanningFeedbacks[1]); expect(parsed.issue_feedback).toEqual(containerScanningFeedbacks[1]);
}); });
}); });
...@@ -180,7 +180,7 @@ describe('security reports utils', () => { ...@@ -180,7 +180,7 @@ describe('security reports utils', () => {
expect(parsed.hasIssue).toEqual(true); expect(parsed.hasIssue).toEqual(true);
expect(parsed.isDismissed).toEqual(true); expect(parsed.isDismissed).toEqual(true);
expect(parsed.dismissalFeedback).toEqual(dastFeedbacks[0]); expect(parsed.dismissalFeedback).toEqual(dastFeedbacks[0]);
expect(parsed.issueFeedback).toEqual(dastFeedbacks[1]); expect(parsed.issue_feedback).toEqual(dastFeedbacks[1]);
}); });
}); });
......
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