Merge branch 'dpisek-dast-site-profile-fix-inprogress-to-failed-transition' into 'master'

DAST scans site profile: Fix inprogress transition

See merge request gitlab-org/gitlab!44865

ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_profile_form.vue

@@ -176,9 +176,7 @@ export default {
       if (this.glFeatures.securityOnDemandScansSiteValidation) {
         await this.fetchValidationStatus();
 
-        if ([PASSED, INPROGRESS].some(this.validationStatusMatches)) {
-          this.isSiteValidationActive = true;
-        }
+        this.isSiteValidationActive = this.validationStatusMatches(PASSED);
       }
     }
   },
@@ -247,10 +245,10 @@ export default {
         this.validationStatus = status;
 
         if (this.validationStatusMatches(INPROGRESS)) {
-          this.fetchValidationTimeout = setTimeout(
-            this.fetchValidationStatus,
-            DAST_SITE_VALIDATION_POLL_INTERVAL,
-          );
+          await new Promise(resolve => {
+            this.fetchValidationTimeout = setTimeout(resolve, DAST_SITE_VALIDATION_POLL_INTERVAL);
+          });
+          await this.fetchValidationStatus();
         }
       } catch (exception) {
         this.showErrors({

ee/spec/frontend/security_configuration/dast_site_profiles_form/components/dast_site_profile_form_spec.js

@@ -443,7 +443,7 @@ describe('DastSiteProfileForm', () => {
   describe.each`
     givenValidationStatus                     | expectedDescription                                                                          | shouldShowDefaultDescriptionAfterToggle | shouldHaveSiteValidationActivated | shouldHaveSiteValidationDisabled | shouldPoll
     ${DAST_SITE_VALIDATION_STATUS.PENDING}    | ${'Site must be validated to run an active scan.'}                                           | ${false}                                | ${false}                          | ${false}                         | ${false}
-    ${DAST_SITE_VALIDATION_STATUS.INPROGRESS} | ${'Validation is in progress...'}                                                            | ${false}                                | ${true}                           | ${true}                          | ${true}
+    ${DAST_SITE_VALIDATION_STATUS.INPROGRESS} | ${'Validation is in progress...'}                                                            | ${false}                                | ${false}                          | ${true}                          | ${true}
     ${DAST_SITE_VALIDATION_STATUS.PASSED}     | ${'Validation succeeded. Both active and passive scans can be run against the target site.'} | ${false}                                | ${true}                           | ${false}                         | ${false}
     ${DAST_SITE_VALIDATION_STATUS.FAILED}     | ${'Validation failed. Please try again.'}                                                    | ${true}                                 | ${false}                          | ${false}                         | ${false}
   `(