Merge branch '195992-fix-license-compliance-ee' into 'master'

Fix reloading of licenses in project settings

Closes #195992

See merge request gitlab-org/gitlab!24361

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

@@ -93,9 +93,18 @@ export const receiveLoadLicenseReportError = ({ commit }, error) => {
 export const requestSetLicenseApproval = ({ commit }) => {
   commit(types.REQUEST_SET_LICENSE_APPROVAL);
 };
-export const receiveSetLicenseApproval = ({ commit, dispatch }) => {
+export const receiveSetLicenseApproval = ({ commit, dispatch, state }) => {
   commit(types.RECEIVE_SET_LICENSE_APPROVAL);
-  dispatch('loadParsedLicenseReport');
+  // If we have the licenses API endpoint, fetch from there. This corresponds
+  // to the cases that we're viewing the merge request or pipeline pages.
+  // Otherwise, fetch from the managed licenses endpoint, which corresponds to
+  // the project settings page.
+  // https://gitlab.com/gitlab-org/gitlab/issues/201867
+  if (state.licensesApiPath) {
+    dispatch('loadParsedLicenseReport');
+  } else {
+    dispatch('loadManagedLicenses');
+  }
 };
 export const receiveSetLicenseApprovalError = ({ commit }, error) => {
   commit(types.RECEIVE_SET_LICENSE_APPROVAL_ERROR, error);

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

@@ -10,6 +10,7 @@ import axios from '~/lib/utils/axios_utils';
 
 describe('License store actions', () => {
   const apiUrlManageLicenses = `${TEST_HOST}/licenses/management`;
+  const licensesApiPath = `${TEST_HOST}/licensesApiPath`;
 
   let axiosMock;
   let licenseId;
@@ -177,16 +178,32 @@ describe('License store actions', () => {
   });
 
   describe('receiveSetLicenseApproval', () => {
-    it('commits RECEIVE_SET_LICENSE_APPROVAL and dispatches loadParsedLicenseReport', done => {
-      testAction(
-        actions.receiveSetLicenseApproval,
-        null,
-        state,
-        [{ type: mutationTypes.RECEIVE_SET_LICENSE_APPROVAL }],
-        [{ type: 'loadParsedLicenseReport' }],
-      )
-        .then(done)
-        .catch(done.fail);
+    describe('given the licensesApiPath is provided', () => {
+      it('commits RECEIVE_SET_LICENSE_APPROVAL and dispatches loadParsedLicenseReport', done => {
+        testAction(
+          actions.receiveSetLicenseApproval,
+          null,
+          { ...state, licensesApiPath },
+          [{ type: mutationTypes.RECEIVE_SET_LICENSE_APPROVAL }],
+          [{ type: 'loadParsedLicenseReport' }],
+        )
+          .then(done)
+          .catch(done.fail);
+      });
+    });
+
+    describe('given the licensesApiPath is not provided', () => {
+      it('commits RECEIVE_SET_LICENSE_APPROVAL and dispatches loadManagedLicenses', done => {
+        testAction(
+          actions.receiveSetLicenseApproval,
+          null,
+          state,
+          [{ type: mutationTypes.RECEIVE_SET_LICENSE_APPROVAL }],
+          [{ type: 'loadManagedLicenses' }],
+        )
+          .then(done)
+          .catch(done.fail);
+      });
     });
   });
 
@@ -533,7 +550,6 @@ describe('License store actions', () => {
   });
 
   describe('loadParsedLicenseReport', () => {
-    const licensesApiPath = `${TEST_HOST}/licensesApiPath`;
     let licensesApiMock;
     let rawLicenseReport;