Merge branch '510296-resolve-error-race-condition' into 'master'

Resolve vulnerability modal error race condition

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/177463



Merged-by: David Pisek <dpisek@gitlab.com>
Approved-by: David Pisek <dpisek@gitlab.com>
Reviewed-by: David Pisek <dpisek@gitlab.com>
Co-authored-by: Samantha Ming <sming@gitlab.com>

ee/app/assets/javascripts/security_dashboard/components/pipeline/resolve_with_ai_button.vue

@@ -106,9 +106,6 @@ export default {
         })
         .then(({ data }) => {
           this.createdVulnerabilityId = data.securityFindingCreateVulnerability.vulnerability.id;
-        })
-        .catch((e) => {
-          this.handleError(e);
         });
     },
     resolveVulnerabilityWithAi() {
@@ -142,7 +139,12 @@ export default {
       this.isResolving = true;
       // if there is no vulnerability then kick of the mutation to create one
       if (!this.vulnerabilityId) {
-        await this.createVulnerabilityForFinding();
+        try {
+          await this.createVulnerabilityForFinding();
+        } catch (e) {
+          this.handleError(e);
+          return;
+        }
       }
       this.startResolveWithAISubscription();
       this.$emit('resolveStart');

ee/spec/frontend/security_dashboard/components/pipeline/resolve_with_ai_button_spec.js

@@ -173,15 +173,19 @@ describe('ee/security_dashboard/components/pipeline/resolve_with_ai_button.vue',
       });
 
       describe('error handling', () => {
-        it('emits an error when the "securityFindingCreateVulnerability" errors', async () => {
+        const setupErrorFindingCreationSpy = () => {
           const findingCreationSpy = jest.fn().mockRejectedValue(new Error('creation error'));
-
           createWrapperWithApollo({
             responseHandlers: {
               securityFindingCreateVulnerability: findingCreationSpy,
             },
             propsData: { vulnerabilityId: undefined },
           });
+          return findingCreationSpy;
+        };
+
+        it('emits an error when the "securityFindingCreateVulnerability" errors', async () => {
+          const findingCreationSpy = setupErrorFindingCreationSpy();
 
           expect(wrapper.emitted('error')).toBeUndefined();
 
@@ -192,6 +196,20 @@ describe('ee/security_dashboard/components/pipeline/resolve_with_ai_button.vue',
           expect(findingCreationSpy).toHaveBeenCalledWith({ uuid: '1' });
           expect(wrapper.emitted('error')).toHaveLength(1);
           expect(wrapper.emitted('error')[0][0]).toEqual(new Error('creation error'));
+          expect(wrapper.emitted('resolveStart')).toBeUndefined();
+        });
+
+        it('prevents error message from being cleared by "resolveStart" when "securityFindingCreateVulnerability" errors', async () => {
+          setupErrorFindingCreationSpy();
+
+          expect(wrapper.emitted('error')).toBeUndefined();
+          expect(wrapper.emitted('resolveStart')).toBeUndefined();
+
+          clickButton();
+
+          await waitForPromises();
+          expect(wrapper.emitted('error')).toHaveLength(1);
+          expect(wrapper.emitted('resolveStart')).toBeUndefined();
         });
       });
     });