Merge branch '342900-add-compliance-violation-severity-component' into 'master'

Render the compliance report violation severity using a component

See merge request gitlab-org/gitlab!78475

ee/app/assets/javascripts/compliance_dashboard/components/report.vue

@@ -7,6 +7,7 @@ import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import { DRAWER_Z_INDEX } from '~/lib/utils/constants';
 import UrlSync from '~/vue_shared/components/url_sync.vue';
 import { helpPagePath } from '~/helpers/help_page_helper';
+import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
 import complianceViolationsQuery from '../graphql/compliance_violations.query.graphql';
 import { mapViolations } from '../graphql/mappers';
 import { parseViolationsQueryFilter } from '../utils';
@@ -25,6 +26,7 @@ export default {
     MergeCommitsExportButton,
     MergeRequestDrawer,
     ViolationReason,
+    SeverityBadge,
     TimeAgoTooltip,
     ViolationFilter,
     UrlSync,
@@ -190,6 +192,9 @@ export default {
       thead-class="gl-border-b-solid gl-border-b-1 gl-border-b-gray-100"
       @row-selected="toggleDrawer"
     >
+      <template #cell(severity)="{ item: { severity } }">
+        <severity-badge :severity="severity" />
+      </template>
       <template #cell(reason)="{ item: { reason, violatingUser } }">
         <violation-reason :reason="reason" :user="violatingUser" />
       </template>

ee/app/assets/javascripts/compliance_dashboard/components/violations/reason.vue

@@ -29,7 +29,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-display-flex gl-align-items-center">
+  <div class="gl-display-inline-flex gl-align-items-center">
     <span class="gl-mr-2">{{ violationMessage }}</span>
     <user-avatar v-if="user" :user="user" />
   </div>

ee/app/assets/javascripts/compliance_dashboard/constants.js

@@ -29,3 +29,10 @@ export const MERGE_REQUEST_VIOLATION_MESSAGES = {
   [VIOLATION_TYPE_APPROVED_BY_COMMITTER]: s__('ComplianceReport|Approved by committer'),
   [VIOLATION_TYPE_APPROVED_BY_INSUFFICIENT_USERS]: s__('ComplianceReport|Less than 2 approvers'),
 };
+
+export const MERGE_REQUEST_VIOLATION_SEVERITY_LEVELS = {
+  1: 'high',
+  2: 'medium',
+  3: 'low',
+  4: 'info',
+};

ee/app/assets/javascripts/compliance_dashboard/graphql/mappers.js

+import { MERGE_REQUEST_VIOLATION_SEVERITY_LEVELS } from '../constants';
+
 export const mapViolations = (nodes = []) => {
   return nodes.map((node) => ({
     ...node,
@@ -11,5 +13,6 @@ export const mapViolations = (nodes = []) => {
       ...node.project,
       complianceFramework: node.project?.complianceFrameworks?.nodes[0] || null,
     },
+    severity: MERGE_REQUEST_VIOLATION_SEVERITY_LEVELS[node.severity],
   }));
 };

ee/spec/frontend/compliance_dashboard/components/report_spec.js

@@ -9,6 +9,7 @@ import MergeRequestDrawer from 'ee/compliance_dashboard/components/drawer.vue';
 import MergeCommitsExportButton from 'ee/compliance_dashboard/components/merge_requests/merge_commits_export_button.vue';
 import ViolationReason from 'ee/compliance_dashboard/components/violations/reason.vue';
 import ViolationFilter from 'ee/compliance_dashboard/components/violations/filter.vue';
+import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
 import resolvers from 'ee/compliance_dashboard/graphql/resolvers';
 import { mapViolations } from 'ee/compliance_dashboard/graphql/mappers';
 import { stripTypenames } from 'helpers/graphql_helpers';
@@ -43,6 +44,7 @@ describe('ComplianceReport component', () => {
   const findMergeRequestDrawer = () => wrapper.findComponent(MergeRequestDrawer);
   const findMergeCommitsExportButton = () => wrapper.findComponent(MergeCommitsExportButton);
   const findViolationReason = () => wrapper.findComponent(ViolationReason);
+  const findSeverityBadge = () => wrapper.findComponent(SeverityBadge);
   const findTimeAgoTooltip = () => wrapper.findComponent(TimeAgoTooltip);
   const findViolationFilter = () => wrapper.findComponent(ViolationFilter);
   const findUrlSync = () => wrapper.findComponent(UrlSync);
@@ -176,19 +178,23 @@ describe('ComplianceReport component', () => {
       expect(headerTexts).toStrictEqual(['Severity', 'Violation', 'Merge request', 'Date merged']);
     });
 
-    // Note: This should be refactored as each table component is created
-    // Severity: https://gitlab.com/gitlab-org/gitlab/-/issues/342900
     it('has the correct first row data', () => {
       const headerTexts = findTablesFirstRowData().wrappers.map((d) => d.text());
 
       expect(headerTexts).toEqual([
-        '1',
+        'High',
         'Approved by committer',
         'Officiis architecto voluptas ut sit qui qui quisquam sequi consectetur porro.',
         'in 1 year',
       ]);
     });
 
+    it('renders the violation severity badge', () => {
+      const { severity } = mapViolations(mockResolver().mergeRequestViolations.nodes)[0];
+
+      expect(findSeverityBadge().props()).toStrictEqual({ severity });
+    });
+
     it('renders the violation reason', () => {
       const {
         violatingUser: { __typename, ...user },

ee/spec/frontend/compliance_dashboard/graphql/mappers_spec.js

+import { mapViolations } from 'ee/compliance_dashboard/graphql/mappers';
+import resolvers from 'ee/compliance_dashboard/graphql/resolvers';
+import { MERGE_REQUEST_VIOLATION_SEVERITY_LEVELS } from 'ee/compliance_dashboard/constants';
+
+describe('mapViolations', () => {
+  const mockViolations = resolvers.Query.group().mergeRequestViolations.nodes;
+  const severityLevels = Object.keys(MERGE_REQUEST_VIOLATION_SEVERITY_LEVELS).map(Number);
+
+  it.each(severityLevels)(
+    'maps to the expected severity level when the violation severity number is %s',
+    (severity) => {
+      const { severity: severityLevel } = mapViolations([{ ...mockViolations[0], severity }])[0];
+
+      expect(severityLevel).toBe(MERGE_REQUEST_VIOLATION_SEVERITY_LEVELS[severity]);
+    },
+  );
+});