Merge branch 'fix-dast-site-validation' into 'master'

Realign DAST site validation frontend with backend

See merge request gitlab-org/gitlab!46475

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

@@ -214,9 +214,7 @@ export default {
       try {
         const {
           data: {
-            project: {
-              dastSiteValidation: { status },
-            },
+            project: { dastSiteValidation },
           },
         } = await this.$apollo.query({
           query: dastSiteValidationQuery,
@@ -226,7 +224,7 @@ export default {
           },
           fetchPolicy: fetchPolicies.NETWORK_ONLY,
         });
-        this.validationStatus = status;
+        this.validationStatus = dastSiteValidation?.status || null;
 
         if (this.validationStatusMatches(INPROGRESS)) {
           await new Promise(resolve => {
@@ -254,7 +252,7 @@ export default {
         } = await this.$apollo.mutate({
           mutation: dastSiteTokenCreateMutation,
           variables: {
-            projectFullPath: this.fullPath,
+            fullPath: this.fullPath,
             targetUrl: this.form.fields.targetUrl.value,
           },
         });

ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/graphql/dast_site_token_create.mutation.graphql

-mutation dastSiteTokenCreate($projectFullPath: ID!, $targetUrl: String!) {
-  dastSiteTokenCreate(input: { projectFullPath: $projectFullPath, targetUrl: $targetUrl }) {
+mutation dastSiteTokenCreate($fullPath: ID!, $targetUrl: String!) {
+  dastSiteTokenCreate(input: { fullPath: $fullPath, targetUrl: $targetUrl }) {
     id
     token
     errors

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

@@ -237,7 +237,7 @@ describe('DastSiteProfileForm', () => {
         await waitForPromises();
 
         expect(requestHandlers.dastSiteTokenCreate).toHaveBeenCalledWith({
-          projectFullPath: fullPath,
+          fullPath,
           targetUrl,
         });