Merge branch...

Merge branch '214448-change-icon-for-uncategorised-licenses-in-license-compliance-merge-request-widget' into 'master'

Change default icon for MR-report items with a 'neutral' state

See merge request gitlab-org/gitlab!30008

app/assets/javascripts/reports/components/issue_status_icon.vue

@@ -8,7 +8,6 @@ export default {
     Icon,
   },
   props: {
-    // failed || success
     status: {
       type: String,
       required: true,
@@ -27,7 +26,7 @@ export default {
         return 'status_success_borderless';
       }
 
-      return 'status_created_borderless';
+      return 'dash';
     },
     isStatusFailed() {
       return this.status === STATUS_FAILED;

doc/ci/metrics_reports.md

@@ -12,7 +12,7 @@ GitLab provides a lot of great reporting tools for [merge requests](../user/proj
 
 You can configure your job to use custom Metrics Reports, and GitLab will display a report on the merge request so that it's easier and faster to identify changes without having to check the entire log.
 
-![Metrics Reports](img/metrics_reports.png)
+![Metrics Reports](img/metrics_reports_v13_0.png)
 
 ## Use cases
 

doc/user/compliance/license_compliance/index.md

@@ -432,7 +432,7 @@ From your project's left sidebar, navigate to **CI/CD > Pipelines** and click on
 pipeline ID that has a `license_management` job to see the Licenses tab with the listed
 licenses (if any).
 
-![License Compliance Pipeline Tab](img/license_compliance_pipeline_tab_v12_3.png)
+![License Compliance Pipeline Tab](img/license_compliance_pipeline_tab_v13_0.png)
 
 <!-- ## Troubleshooting
 

ee/changelogs/unreleased/214448-change-icon-for-uncategorised-licenses-in-license-compliance-me.yml

+---
+title: Change default icon for neutral-state items in merge request widget
+merge_request: 30008
+author:
+type: changed

spec/frontend/reports/components/__snapshots__/issue_status_icon_spec.js.snap

+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`IssueStatusIcon renders "failed" state correctly 1`] = `
+<div
+  class="report-block-list-icon failed"
+>
+  <icon-stub
+    data-qa-selector="status_failed_icon"
+    name="status_failed_borderless"
+    size="24"
+  />
+</div>
+`;
+
+exports[`IssueStatusIcon renders "neutral" state correctly 1`] = `
+<div
+  class="report-block-list-icon neutral"
+>
+  <icon-stub
+    data-qa-selector="status_neutral_icon"
+    name="dash"
+    size="24"
+  />
+</div>
+`;
+
+exports[`IssueStatusIcon renders "success" state correctly 1`] = `
+<div
+  class="report-block-list-icon success"
+>
+  <icon-stub
+    data-qa-selector="status_success_icon"
+    name="status_success_borderless"
+    size="24"
+  />
+</div>
+`;

spec/frontend/reports/components/issue_status_icon_spec.js

+import { shallowMount } from '@vue/test-utils';
+import ReportItem from '~/reports/components/issue_status_icon.vue';
+import { STATUS_FAILED, STATUS_NEUTRAL, STATUS_SUCCESS } from '~/reports/constants';
+
+describe('IssueStatusIcon', () => {
+  let wrapper;
+
+  const createComponent = ({ status }) => {
+    wrapper = shallowMount(ReportItem, {
+      propsData: {
+        status,
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  it.each([STATUS_SUCCESS, STATUS_NEUTRAL, STATUS_FAILED])(
+    'renders "%s" state correctly',
+    status => {
+      createComponent({ status });
+
+      expect(wrapper.element).toMatchSnapshot();
+    },
+  );
+});