Merge branch '234014-refactor-on-demand-scans' into 'master'

Replace static props with provide/inject

See merge request gitlab-org/gitlab!68760

ee/app/assets/javascripts/on_demand_scans/components/on_demand_scans_form.vue

@@ -98,23 +98,8 @@ export default {
       SITE_PROFILES_QUERY,
     ),
   },
-  inject: {
-    dastSiteValidationDocsPath: {
-      default: '',
-    },
-    profilesLibraryPath: {
-      default: '',
-    },
-  },
+  inject: ['projectPath', 'helpPagePath', 'dastSiteValidationDocsPath', 'profilesLibraryPath'],
   props: {
-    helpPagePath: {
-      type: String,
-      required: true,
-    },
-    projectPath: {
-      type: String,
-      required: true,
-    },
     defaultBranch: {
       type: String,
       required: false,

ee/app/assets/javascripts/on_demand_scans/index.js

@@ -26,6 +26,8 @@ export default () => {
     el,
     apolloProvider,
     provide: {
+      projectPath,
+      helpPagePath,
       profilesLibraryPath,
       scannerProfilesLibraryPath,
       siteProfilesLibraryPath,
@@ -36,8 +38,6 @@ export default () => {
     render(h) {
       return h(OnDemandScansForm, {
         props: {
-          helpPagePath,
-          projectPath,
           defaultBranch,
           dastScan: dastScan ? convertObjectPropsToCamelCase(JSON.parse(dastScan)) : null,
         },

ee/spec/frontend/on_demand_scans/components/on_demand_scans_form_spec.js

@@ -21,6 +21,7 @@ import * as responses from '../mocks/apollo_mocks';
 import { scannerProfiles, siteProfiles } from '../mocks/mock_data';
 
 const helpPagePath = '/application_security/dast/index#on-demand-scans';
+const dastSiteValidationDocsPath = '/application_security/dast/index#dast-site-validation';
 const projectPath = 'group/project';
 const defaultBranch = 'main';
 const selectedBranch = 'some-other-branch';
@@ -29,13 +30,6 @@ const scannerProfilesLibraryPath = '/security/configuration/dast_scans#scanner-p
 const siteProfilesLibraryPath = '/security/configuration/dast_scans#site-profiles';
 const newScannerProfilePath = '/security/configuration/dast_scans/dast_scanner_profile/new';
 const newSiteProfilePath = `/${projectPath}/-/security/configuration/dast_scans`;
-
-const defaultProps = {
-  helpPagePath,
-  projectPath,
-  defaultBranch,
-};
-
 const pipelineUrl = `/${projectPath}/pipelines/123`;
 const editPath = `/${projectPath}/on_demand_scans/1/edit`;
 const [passiveScannerProfile, activeScannerProfile] = scannerProfiles;
@@ -154,14 +148,19 @@ describe('OnDemandScansForm', () => {
       merge(
         {},
         {
-          propsData: defaultProps,
+          propsData: {
+            defaultBranch,
+          },
           mocks: defaultMocks,
           provide: {
+            projectPath,
+            helpPagePath,
             profilesLibraryPath,
             scannerProfilesLibraryPath,
             siteProfilesLibraryPath,
             newScannerProfilePath,
             newSiteProfilePath,
+            dastSiteValidationDocsPath,
           },
           stubs: {
             GlFormInput: GlFormInputStub,