Merge branch '200013-render-error-in-license-compliance-ee' into 'master'

Display error when license report fails to load

Closes #200013

See merge request gitlab-org/gitlab!24201

ee/app/assets/javascripts/vue_shared/license_management/store/actions.js

@@ -81,8 +81,8 @@ export const loadParsedLicenseReport = ({ dispatch, state }) => {
       const existingLicenses = (data.existing_licenses || []).map(convertToOldReportFormat);
       dispatch('receiveLoadParsedLicenseReport', { newLicenses, existingLicenses });
     })
-    .catch(() => {
-      dispatch('receiveLoadLicenseReportError');
+    .catch(error => {
+      dispatch('receiveLoadLicenseReportError', error);
     });
 };
 

ee/changelogs/unreleased/200013-render-error-in-license-compliance-ee.yml

+---
+title: Display error message in MR License Report if it fails to load
+merge_request: 24201
+author:
+type: fixed

ee/spec/javascripts/license_management/store/actions_spec.js

@@ -596,7 +596,10 @@ describe('License store actions', () => {
           null,
           state,
           [],
-          [{ type: 'requestLoadParsedLicenseReport' }, { type: 'receiveLoadLicenseReportError' }],
+          [
+            { type: 'requestLoadParsedLicenseReport' },
+            { type: 'receiveLoadLicenseReportError', payload: jasmine.any(Error) },
+          ],
         )
           .then(done)
           .catch(done.fail);