Merge branch 'hide-severity-sort-pipeline-security-tab' into 'master'

Hide severity sorting for pipeline security tab

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138799



Merged-by: David Pisek <dpisek@gitlab.com>
Approved-by: Savas Vedova <svedova@gitlab.com>
Approved-by: David Pisek <dpisek@gitlab.com>
Reviewed-by: David Pisek <dpisek@gitlab.com>
Co-authored-by: lorenzvanherwaarden <lvanherwaarden@gitlab.com>

ee/app/assets/javascripts/security_dashboard/components/pipeline/pipeline_vulnerability_report.vue

 <script>
 import VulnerabilityReport from '../shared/vulnerability_report/vulnerability_report.vue';
-import { FILTERS, FIELDS } from '../shared/vulnerability_report/constants';
+import { FILTER_PRESETS, FIELD_PRESETS } from '../shared/vulnerability_report/constants';
 import VulnerabilityFindingModal from './vulnerability_finding_modal.vue';
 
 export default {
@@ -36,15 +36,8 @@ export default {
       this.selectedFinding = undefined;
     },
   },
-  filtersToShow: [FILTERS.STATUS, FILTERS.SEVERITY, FILTERS.TOOL_PIPELINE],
-  fieldsToShow: [
-    FIELDS.CHECKBOX,
-    FIELDS.STATUS,
-    FIELDS.SEVERITY,
-    FIELDS.DESCRIPTION,
-    FIELDS.IDENTIFIER,
-    FIELDS.TOOL,
-  ],
+  filtersToShow: FILTER_PRESETS.PIPELINE,
+  fieldsToShow: FIELD_PRESETS.PIPELINE,
 };
 </script>
 

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

@@ -24,6 +24,12 @@ export const FIELDS = {
     class: 'severity',
     sortable: true,
   },
+  // This field can be removed once we can sort findings on severity: https://gitlab.com/gitlab-org/gitlab/-/issues/360480
+  PIPELINE_SEVERITY: {
+    key: 'severity',
+    label: s__('Vulnerability|Severity'),
+    class: 'severity',
+  },
   DESCRIPTION: {
     key: 'title',
     label: __('Description'),
@@ -75,6 +81,13 @@ export const FIELD_PRESETS = {
   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: [
+    FIELDS.STATUS,
+    FIELDS.PIPELINE_SEVERITY,
+    FIELDS.DESCRIPTION,
+    FIELDS.IDENTIFIER,
+    FIELDS.TOOL,
+  ],
 };
 
 const BASE_FILTERS = { START: [FILTERS.STATUS, FILTERS.SEVERITY], END: [FILTERS.ACTIVITY] };
@@ -85,6 +98,7 @@ export const FILTER_PRESETS = {
   OPERATIONAL_PROJECT: [...BASE_FILTERS.START, FILTERS.CLUSTER, FILTERS.IMAGE, ...BASE_FILTERS.END],
   OPERATIONAL: [...BASE_FILTERS.START, FILTERS.PROJECT, ...BASE_FILTERS.END],
   AGENT: [...BASE_FILTERS.START, FILTERS.IMAGE, ...BASE_FILTERS.END],
+  PIPELINE: [FILTERS.STATUS, FILTERS.SEVERITY, FILTERS.TOOL_PIPELINE],
 };
 
 export const REPORT_TYPE_PRESETS = {