Revert "Merge branch 'charlieeekroon/rename-tool-to-reporttype' into 'master'"

This reverts merge request !178050

ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/constants.js

@@ -37,9 +37,9 @@ export const FIELDS = {
     label: s__('Vulnerability|Identifier'),
     class: 'identifier gl-break-all',
   },
-  REPORT_TYPE: {
+  TOOL: {
     key: 'reportType',
-    label: s__('Reports|Report Type'),
+    label: s__('Reports|Tool'),
     class: 'scanner',
   },
   CLUSTER: {
@@ -82,7 +82,7 @@ const BASE_FIELDS = {
 };
 
 export const FIELD_PRESETS = {
-  DEVELOPMENT: [...BASE_FIELDS.START, FIELDS.IDENTIFIER, FIELDS.REPORT_TYPE, ...BASE_FIELDS.END],
+  DEVELOPMENT: [...BASE_FIELDS.START, FIELDS.IDENTIFIER, FIELDS.TOOL, ...BASE_FIELDS.END],
   OPERATIONAL: [...BASE_FIELDS.START, FIELDS.CLUSTER, ...BASE_FIELDS.END],
   AGENT: [...BASE_FIELDS.START, ...BASE_FIELDS.END],
   PIPELINE: [
@@ -90,7 +90,7 @@ export const FIELD_PRESETS = {
     FIELDS.SEVERITY,
     FIELDS.DESCRIPTION,
     FIELDS.IDENTIFIER,
-    FIELDS.REPORT_TYPE,
+    FIELDS.TOOL,
     FIELDS.ACTIVITY,
   ],
   CONTAINER_REGISTRY: [...BASE_FIELDS.START, FIELDS.IDENTIFIER, FIELDS.IMAGE, ...BASE_FIELDS.END],

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

@@ -293,7 +293,7 @@ export default {
           <gl-link :href="project.fullPath" target="_blank">{{ project.fullName }}</gl-link>
         </detail-item>
 
-        <detail-item :sprintf-message="__('%{labelStart}Report Type:%{labelEnd} %{reportType}')">{{
+        <detail-item :sprintf-message="__('%{labelStart}Tool:%{labelEnd} %{reportType}')">{{
           humanReadableReportType
         }}</detail-item>
         <detail-item

ee/spec/frontend/security_dashboard/components/pipeline/pipeline_vulnerability_report_spec.js

@@ -34,7 +34,7 @@ describe('Pipeline vulnerability report', () => {
         FIELDS.SEVERITY,
         FIELDS.DESCRIPTION,
         FIELDS.IDENTIFIER,
-        FIELDS.REPORT_TYPE,
+        FIELDS.TOOL,
         FIELDS.ACTIVITY,
       ],
       filterDropdowns: [FILTERS.PIPELINE_STATUS, FILTERS.SEVERITY, FILTERS.TOOL_PIPELINE],

ee/spec/frontend/vulnerabilities/vulnerability_details_spec.js

@@ -71,7 +71,7 @@ describe('Vulnerability Details', () => {
     createWrapper();
     expect(getById('description').html()).toContain(vulnerability.descriptionHtml);
     expect(wrapper.findComponent(SeverityBadge).props('severity')).toBe(vulnerability.severity);
-    expect(getText('reportType')).toBe(`Report Type: ${vulnerability.reportType}`);
+    expect(getText('reportType')).toBe(`Tool: ${vulnerability.reportType}`);
 
     expect(getById('project').exists()).toBe(false);
     expect(findFalsePositiveAlert().exists()).toBe(false);
@@ -136,7 +136,7 @@ describe('Vulnerability Details', () => {
     'displays "$expectedOutput" when report type is "$reportType"',
     ({ reportType, expectedOutput }) => {
       createWrapper({ reportType });
-      expect(getText('reportType')).toBe(`Report Type: ${expectedOutput}`);
+      expect(getText('reportType')).toBe(`Tool: ${expectedOutput}`);
     },
   );
 

locale/gitlab.pot

@@ -1010,9 +1010,6 @@ msgstr ""
 msgid "%{labelStart}Project:%{labelEnd} %{project}"
 msgstr ""
-msgid "%{labelStart}Report Type:%{labelEnd} %{reportType}"
-msgstr ""
-
 msgid "%{labelStart}Scanner:%{labelEnd} %{scanner}"
 msgstr ""
@@ -1022,6 +1019,9 @@ msgstr ""
 msgid "%{labelStart}Severity:%{labelEnd} %{severity}"
 msgstr ""
+msgid "%{labelStart}Tool:%{labelEnd} %{reportType}"
+msgstr ""
+
 msgid "%{labelStart}URL:%{labelEnd} %{url}"
 msgstr ""
@@ -47464,9 +47464,6 @@ msgstr ""
 msgid "Reports|New"
 msgstr ""
-msgid "Reports|Report Type"
-msgstr ""
-
 msgid "Reports|See test results while the pipeline is running"
 msgstr ""
@@ -47479,6 +47476,9 @@ msgstr ""
 msgid "Reports|Test summary results are being parsed"
 msgstr ""
+msgid "Reports|Tool"
+msgstr ""
+
 msgid "Reports|View partial report"
 msgstr ""