Merge branch '277123_send_finding_uuid_while_creating_feedback' into 'master'

Send `finding_uuid` to backend while creating feedback

See merge request gitlab-org/gitlab!50628

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

@@ -91,6 +91,7 @@ export const createIssue = ({ dispatch }, { vulnerability, flashError }) => {
         feedback_type: FEEDBACK_TYPE_ISSUE,
         category: vulnerability.report_type,
         project_fingerprint: vulnerability.project_fingerprint,
+        finding_uuid: vulnerability.uuid,
         vulnerability_data: {
           ...vulnerability,
           category: vulnerability.report_type,
@@ -154,6 +155,7 @@ export const dismissSelectedVulnerabilities = ({ dispatch, state }, { comment }
         comment,
         feedback_type: FEEDBACK_TYPE_DISMISSAL,
         project_fingerprint: vulnerability.project_fingerprint,
+        finding_uuid: vulnerability.uuid,
         vulnerability_data: {
           id: vulnerability.id,
         },
@@ -240,6 +242,7 @@ export const dismissVulnerability = (
         feedback_type: FEEDBACK_TYPE_DISMISSAL,
         pipeline_id: state.pipelineId,
         project_fingerprint: vulnerability.project_fingerprint,
+        finding_uuid: vulnerability.uuid,
         vulnerability_data: {
           ...vulnerability,
           category: vulnerability.report_type,
@@ -442,6 +445,7 @@ export const createMergeRequest = ({ state, dispatch }, { vulnerability, flashEr
         feedback_type: FEEDBACK_TYPE_MERGE_REQUEST,
         category: report_type,
         project_fingerprint,
+        finding_uuid: vulnerability.uuid,
         vulnerability_data: {
           ...vulnerability,
           target_branch: targetBranch,

ee/app/assets/javascripts/vue_shared/security_reports/store/actions.js

@@ -204,6 +204,7 @@ export const dismissVulnerability = ({ state, dispatch }, comment) => {
         feedback_type: FEEDBACK_TYPE_DISMISSAL,
         pipeline_id: state.pipelineId,
         project_fingerprint: state.modal.vulnerability.project_fingerprint,
+        finding_uuid: state.modal.vulnerability.uuid,
         vulnerability_data: state.modal.vulnerability,
       },
     })
@@ -367,6 +368,7 @@ export const createNewIssue = ({ state, dispatch }) => {
         feedback_type: FEEDBACK_TYPE_ISSUE,
         category: state.modal.vulnerability.category,
         project_fingerprint: state.modal.vulnerability.project_fingerprint,
+        finding_uuid: state.modal.vulnerability.uuid,
         pipeline_id: state.pipelineId,
         vulnerability_data: state.modal.vulnerability,
       },
@@ -398,6 +400,7 @@ export const createMergeRequest = ({ state, dispatch }) => {
         feedback_type: FEEDBACK_TYPE_MERGE_REQUEST,
         category,
         project_fingerprint,
+        finding_uuid: vulnerability.uuid,
         vulnerability_data: vulnerability,
       },
     })

ee/app/helpers/vulnerabilities_helper.rb

 # frozen_string_literal: true
 
 module VulnerabilitiesHelper
-  FINDING_FIELDS = %i[metadata identifiers name issue_feedback merge_request_feedback project project_fingerprint scanner].freeze
+  FINDING_FIELDS = %i[metadata identifiers name issue_feedback merge_request_feedback project project_fingerprint scanner uuid].freeze
 
   def vulnerability_details_json(vulnerability, pipeline)
     vulnerability_details(vulnerability, pipeline).to_json

ee/spec/helpers/vulnerabilities_helper_spec.rb

@@ -38,10 +38,11 @@ RSpec.describe VulnerabilitiesHelper do
                     :issue_feedback,
                     :project,
                     :remediations,
-                    :solution)
+                    :solution,
+                    :uuid)
     end
 
-    let(:desired_serializer_fields) { %i[metadata identifiers name issue_feedback merge_request_feedback project project_fingerprint scanner] }
+    let(:desired_serializer_fields) { %i[metadata identifiers name issue_feedback merge_request_feedback project project_fingerprint scanner uuid] }
 
     before do
       vulnerability_serializer_stub = instance_double("VulnerabilitySerializer")
@@ -247,7 +248,8 @@ RSpec.describe VulnerabilitiesHelper do
         response: kind_of(Grape::Entity::Exposure::NestingExposure::OutputBuilder),
         evidence_source: anything,
         assets: kind_of(Array),
-        supporting_messages: kind_of(Array)
+        supporting_messages: kind_of(Array),
+        uuid: kind_of(String)
       )
 
       expect(subject[:location]['blob_path']).to match(kind_of(String))