Merge branch 'retrigger-license-compliance' into 'master'

Triggers the correct endpoint on licence approval

See merge request gitlab-org/gitlab!19078

changelogs/unreleased/retrigger-license-compliance.yml

+---
+title: Triggers the correct endpoint on licence approval
+merge_request: 19078
+author:
+type: fixed

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

@@ -131,7 +131,11 @@ export const requestSetLicenseApproval = ({ commit }) => {
 };
 export const receiveSetLicenseApproval = ({ commit, dispatch }) => {
   commit(types.RECEIVE_SET_LICENSE_APPROVAL);
-  dispatch('loadManagedLicenses');
+  if (gon.features && gon.features.parsedLicenseReport) {
+    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

@@ -186,16 +186,47 @@ describe('License store actions', () => {
   });
 
   describe('receiveSetLicenseApproval', () => {
-    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);
+    gon.features = gon.features || {};
+    const { parsedLicenseReport } = gon.features;
+
+    afterEach(() => {
+      gon.features.parsedLicenseReport = parsedLicenseReport;
+    });
+
+    describe('with the parsedLicenseReport feature flag enabled', () => {
+      beforeEach(() => {
+        gon.features.parsedLicenseReport = true;
+      });
+
+      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('with the parsedLicenseReport feature flag disabled', () => {
+      beforeEach(() => {
+        gon.features.parsedLicenseReport = false;
+      });
+
+      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);
+      });
     });
   });