Merge branch '210327-project-vendor-in-scanner-column' into 'master'

Add the scan vendor into the scanner column

See merge request gitlab-org/gitlab!36145

ee/app/assets/javascripts/security_dashboard/components/vulnerability_list.vue

@@ -287,9 +287,12 @@ export default {
       </template>
 
       <template #cell(reportType)="{ item }">
-        <span data-testid="vulnerability-report-type" class="text-capitalize">{{
-          useConvertReportType(item.reportType)
-        }}</span>
+        <div data-testid="vulnerability-report-type" class="text-capitalize">
+          {{ useConvertReportType(item.reportType) }}
+        </div>
+        <div data-testid="vulnerability-vendor" class="gl-text-gray-500">
+          {{ item.scanner.vendor }}
+        </div>
       </template>
 
       <template #table-busy>

ee/app/assets/javascripts/security_dashboard/graphql/vulnerability.fragment.graphql

@@ -39,4 +39,7 @@ fragment Vulnerability on Vulnerability {
     nameWithNamespace
   }
   reportType
+  scanner {
+    vendor
+  }
 }

ee/changelogs/unreleased/210327-project-vendor-in-scanner-column-of-the-vulnerability-list.yml

+---
+title: Add the scan vendor into the scanner column of the vulnerability list
+merge_request: 36145
+author:
+type: changed

ee/spec/frontend/security_dashboard/components/mock_data.js

@@ -22,6 +22,9 @@ export const generateVulnerabilities = () => [
     project: {
       nameWithNamespace: 'Administrator / Security reports',
     },
+    scanner: {
+      vendor: 'GitLab',
+    },
   },
   {
     id: 'id_1',
@@ -42,6 +45,9 @@ export const generateVulnerabilities = () => [
     project: {
       nameWithNamespace: 'Administrator / Vulnerability reports',
     },
+    scanner: {
+      vendor: 'GitLab',
+    },
   },
   {
     id: 'id_2',
@@ -55,6 +61,9 @@ export const generateVulnerabilities = () => [
     project: {
       nameWithNamespace: 'Mixed Vulnerabilities / Dependency List Test 01',
     },
+    scanner: {
+      vendor: 'My Custom Scanner',
+    },
   },
   {
     id: 'id_3',
@@ -67,6 +76,7 @@ export const generateVulnerabilities = () => [
     project: {
       nameWithNamespace: 'Mixed Vulnerabilities / Rails App',
     },
+    scanner: {},
   },
   {
     id: 'id_4',
@@ -77,6 +87,7 @@ export const generateVulnerabilities = () => [
     project: {
       nameWithNamespace: 'Administrator / Security reports',
     },
+    scanner: {},
   },
 ];
 

ee/spec/frontend/security_dashboard/components/vulnerability_list_spec.js

@@ -214,6 +214,16 @@ describe('Vulnerability list component', () => {
       expect(cells.at(2).text()).toBe('Custom scanner without translation');
       expect(cells.at(3).text()).toBe('');
     });
+
+    it('should display the vulnerability vendor if the vulnerability vendor does exist', () => {
+      const cells = findDataCells('vulnerability-vendor');
+      expect(cells.at(0).text()).toBe('GitLab');
+    });
+
+    it('should display an empty string if the vulnerability vendor does not exist', () => {
+      const cells = findDataCells('vulnerability-vendor');
+      expect(cells.at(3).text()).toBe('');
+    });
   });
 
   describe('when has an issue associated', () => {