Merge branch 'revert-a2bdc67c' into 'master'

Revert "Add scanner name"

See merge request gitlab-org/gitlab!33442

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

@@ -77,9 +77,6 @@ export default {
       <div class="table-section flex-grow-1" role="rowheader">
         {{ s__('Reports|Vulnerability') }}
       </div>
-      <div class="table-section section-15" role="rowheader">
-        {{ s__('Reports|Scanner') }}
-      </div>
       <div class="table-section section-20" role="rowheader"></div>
     </div>
 

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

@@ -43,10 +43,6 @@ export default {
       }
       return location && (location.image || location.file || location.path);
     },
-    vulnerabilityScanner() {
-      const { scanner } = this.vulnerability;
-      return scanner?.name;
-    },
     isDismissed() {
       return Boolean(this.vulnerability.dismissal_feedback);
     },
@@ -139,13 +135,6 @@ export default {
       </div>
     </div>
 
-    <div class="table-section section-15">
-      <div class="table-mobile-header" role="rowheader">{{ s__('Reports|Scanner') }}</div>
-      <div class="table-mobile-content">
-        {{ vulnerabilityScanner }}
-      </div>
-    </div>
-
     <div class="table-section section-20">
       <div class="table-mobile-header" role="rowheader">{{ s__('Reports|Actions') }}</div>
       <div class="table-mobile-content action-buttons d-flex justify-content-end">

ee/app/assets/javascripts/security_dashboard/helpers.js

@@ -27,7 +27,7 @@ export const initFirstClassVulnerabilityFilters = projects => {
       selection: new Set([ALL]),
     },
     {
-      name: s__('Reports|Scanner'),
+      name: s__('SecurityReports|Report type'),
       id: 'reportType',
       options: [BASE_FILTERS.report_type, ...parseOptions(REPORT_TYPES)],
       selection: new Set([ALL]),

ee/app/assets/javascripts/security_dashboard/store/modules/filters/constants.js

@@ -8,7 +8,7 @@ export const BASE_FILTERS = {
     id: ALL,
   },
   report_type: {
-    name: s__('ciReport|All scanner types'),
+    name: s__('ciReport|All report types'),
     id: ALL,
   },
   project_id: {

ee/app/assets/javascripts/security_dashboard/store/modules/filters/state.js

@@ -14,7 +14,7 @@ export default () => ({
       selection: new Set([BASE_FILTERS.severity.id]),
     },
     {
-      name: s__('SecurityReports|Scanner type'),
+      name: s__('SecurityReports|Report type'),
       id: 'report_type',
       options: [BASE_FILTERS.report_type, ...optionsObjectToArray(REPORT_TYPES)],
       hidden: false,

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

@@ -93,11 +93,6 @@ export default {
           label: __('Description'),
           thClass: commonThClass,
         },
-        {
-          key: 'reportType',
-          label: s__('Reports|Scanner'),
-          thClass: `${commonThClass}`,
-        },
       ];
     },
   },
@@ -206,10 +201,6 @@ export default {
         <remediated-badge v-if="item.resolved_on_default_branch" class="ml-2" />
       </template>
 
-      <template #cell(reportType)="{ item }">
-        <span class="text-capitalize js-reportType">{{ item.reportType }}</span>
-      </template>
-
       <template #table-busy>
         <gl-skeleton-loading
           v-for="n in $options.VULNERABILITIES_PER_PAGE"

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

@@ -4,7 +4,6 @@ fragment Vulnerability on Vulnerability {
   state
   severity
   vulnerabilityPath
-  reportType
   location {
     ... on VulnerabilityLocationContainerScanning {
       image

ee/changelogs/unreleased/add-scanner-name-to-row.yml

----
-title: Add scanner name to vulnerability row
-merge_request: 31775
-author:
-type: changed

ee/changelogs/unreleased/revert-a2bdc67c.yml

+---
+title: Revert Add scanner name
+merge_request: 33442
+author:
+type: removed

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

@@ -77,14 +77,6 @@ describe('Security Dashboard Table Row', () => {
       ).toContain(wrapper.props().vulnerability.severity);
     });
 
-    it('should render the scanner name', () => {
-      expect(
-        findContent(2)
-          .text()
-          .toLowerCase(),
-      ).toContain(wrapper.props().vulnerability.scanner.name.toLowerCase());
-    });
-
     describe('the project name', () => {
       it('should render the name', () => {
         expect(findContent(1).text()).toContain(wrapper.props().vulnerability.name);

ee/spec/frontend/vulnerabilities/mock_data.js

@@ -4,7 +4,6 @@ export const generateVulnerabilities = () => [
     title: 'Vulnerability 1',
     severity: 'critical',
     state: 'dismissed',
-    reportType: 'sast',
     location: {
       image:
         'registry.gitlab.com/groulot/container-scanning-test/master:5f21de6956aee99ddb68ae49498662d9872f50ff',
@@ -18,7 +17,6 @@ export const generateVulnerabilities = () => [
     title: 'Vulnerability 2',
     severity: 'high',
     state: 'opened',
-    reportType: 'sast',
     location: {
       file: 'src/main/java/com/gitlab/security_products/tests/App.java',
     },

ee/spec/frontend/vulnerabilities/vulnerability_list_spec.js

@@ -63,11 +63,6 @@ describe('Vulnerability list component', () => {
       expect(cell.text().toLowerCase()).toBe(newVulnerabilities[0].severity);
     });
 
-    it('should correctly render the scanner type', () => {
-      const cell = findCell('reportType');
-      expect(cell.text().toLowerCase()).toBe(newVulnerabilities[0].reportType);
-    });
-
     it('should correctly render the description', () => {
       const cell = findCell('description');
 

locale/gitlab.pot

@@ -18384,9 +18384,6 @@ msgstr ""
 msgid "Reports|Metrics reports failed loading results"
 msgstr ""
 
-msgid "Reports|Scanner"
-msgstr ""
-
 msgid "Reports|Severity"
 msgstr ""
 
@@ -19340,10 +19337,10 @@ msgstr ""
 msgid "SecurityReports|Remove project from dashboard"
 msgstr ""
 
-msgid "SecurityReports|Return to dashboard"
+msgid "SecurityReports|Report type"
 msgstr ""
 
-msgid "SecurityReports|Scanner type"
+msgid "SecurityReports|Return to dashboard"
 msgstr ""
 
 msgid "SecurityReports|Security Dashboard"
@@ -25958,7 +25955,7 @@ msgstr ""
 msgid "ciReport|All projects"
 msgstr ""
 
-msgid "ciReport|All scanner types"
+msgid "ciReport|All report types"
 msgstr ""
 
 msgid "ciReport|All severities"