Merge branch '229651-hide-gitlab-name' into 'master'

Hide vendor name when GitLab is the only one

See merge request gitlab-org/gitlab!40370

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

@@ -85,6 +85,9 @@ export default {
     };
   },
   computed: {
+    hasAnyScannersOtherThanGitLab() {
+      return this.vulnerabilities.some(v => v.scanner?.vendor !== 'GitLab');
+    },
     notEnabledSecurityScanners() {
       const { available = [], enabled = [] } = this.securityScanners;
       return difference(available, enabled);
@@ -360,7 +363,11 @@ export default {
         <div data-testid="vulnerability-report-type" class="text-capitalize">
           {{ useConvertReportType(item.reportType) }}
         </div>
-        <div data-testid="vulnerability-vendor" class="gl-text-gray-300">
+        <div
+          v-if="hasAnyScannersOtherThanGitLab"
+          data-testid="vulnerability-vendor"
+          class="gl-text-gray-300"
+        >
           {{ item.scanner.vendor }}
         </div>
       </template>

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

@@ -48,6 +48,7 @@ describe('Vulnerability list component', () => {
   const findCellText = label => findDataCell(label).text();
   const findFiltersProducedNoResults = () => wrapper.find(FiltersProducedNoResults);
   const findDashboardHasNoVulnerabilities = () => wrapper.find(DashboardHasNoVulnerabilities);
+  const findVendorNames = () => wrapper.find(`[data-testid="vulnerability-vendor"]`);
 
   afterEach(() => {
     wrapper.destroy();
@@ -284,6 +285,48 @@ describe('Vulnerability list component', () => {
     });
   });
 
+  describe('when GitLab is the only scanner in the reports', () => {
+    let newVulnerabilities;
+
+    beforeEach(() => {
+      newVulnerabilities = generateVulnerabilities();
+      newVulnerabilities = newVulnerabilities.map(v => ({
+        ...v,
+        scanner: { vendor: 'GitLab' },
+      }));
+      wrapper = createWrapper({
+        props: {
+          vulnerabilities: newVulnerabilities,
+          shouldShowReportType: true,
+        },
+      });
+    });
+
+    it('should not render the vendor name', () => {
+      expect(findVendorNames().exists()).toBe(false);
+    });
+  });
+
+  describe('when there are other scanners in the report', () => {
+    let newVulnerabilities;
+
+    beforeEach(() => {
+      newVulnerabilities = generateVulnerabilities();
+      newVulnerabilities[0].scanner = { vendor: 'GitLab' };
+      newVulnerabilities[1].scanner = { vendor: 'Third Party Scanner' };
+      wrapper = createWrapper({
+        props: {
+          vulnerabilities: newVulnerabilities,
+          shouldShowReportType: true,
+        },
+      });
+    });
+
+    it('should not render the vendor name', () => {
+      expect(findVendorNames().exists()).toBe(true);
+    });
+  });
+
   describe('when a vulnerability is resolved on the default branch', () => {
     let newVulnerabilities;