Merge branch...

Merge branch '8343-dismissed-state-not-correctly-set-in-vulnerability-modal-on-group-security-dashboard' into 'master'

Resolve "Dismissed state not correctly set in Vulnerability modal on Group Security Dashboard"

Closes #8343

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

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

@@ -63,6 +63,7 @@ export default {
     Vue.set(state.modal.data.instances, 'value', vulnerability.instances);
     Vue.set(state.modal, 'vulnerability', vulnerability);
     Vue.set(state.modal.vulnerability, 'hasIssue', Boolean(vulnerability.issue_feedback));
+    Vue.set(state.modal.vulnerability, 'isDismissed', Boolean(vulnerability.dismissal_feedback));
     Vue.set(state.modal, 'error', null);
   },
   [types.REQUEST_CREATE_ISSUE](state) {

ee/changelogs/unreleased/8343-dismissed-state-not-correctly-set-in-vulnerability-modal-on-group-security-dashboard.yml

+---
+title: Fixes a dismissed vulnerability bug on the group security dashboard
+merge_request: 8343
+author:
+type: fixed

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

@@ -132,6 +132,7 @@ describe('vulnerabilities module mutations', () => {
   });
 
   describe('SET_MODAL_DATA', () => {
+    describe('with all the data', () => {
       const vulnerability = mockData[0];
       let payload;
       let state;
@@ -188,6 +189,32 @@ describe('vulnerabilities module mutations', () => {
       });
     });
 
+    describe('with irregular data', () => {
+      const vulnerability = mockData[0];
+      let state;
+
+      beforeEach(() => {
+        state = createState();
+      });
+
+      it('should set isDismissed when the vulnerabilitiy is dismissed', () => {
+        const payload = {
+          vulnerability: { ...vulnerability, dismissal_feedback: 'I am dismissed' },
+        };
+        mutations[types.SET_MODAL_DATA](state, payload);
+
+        expect(state.modal.vulnerability.isDismissed).toEqual(true);
+      });
+
+      it('should set hasIssue when the vulnerabilitiy has a related issue', () => {
+        const payload = { vulnerability: { ...vulnerability, issue_feedback: 'I am an issue' } };
+        mutations[types.SET_MODAL_DATA](state, payload);
+
+        expect(state.modal.vulnerability.hasIssue).toEqual(true);
+      });
+    });
+  });
+
   describe('REQUEST_CREATE_ISSUE', () => {
     let state;