Merge branch '246780-refactor-on-demand-profiles-selection' into 'master'

Improve reusability in On-demand DAST Scans form

See merge request gitlab-org/gitlab!42013

doc/user/application_security/dast/index.md

@@ -737,8 +737,8 @@ To run an on-demand DAST scan, you need:
 
 1. From your project's home page, go to **Security & Compliance > On-demand Scans** in the left sidebar.
 1. Click **Create new DAST scan**.
-1. In **Scanner settings**, select a scanner profile from the dropdown.
-1. In **Site profiles**, select a site profile from the dropdown.
+1. In **Scanner profile**, select a scanner profile from the dropdown.
+1. In **Site profile**, select a site profile from the dropdown.
 1. Click **Run scan**.
 
 The on-demand DAST scan runs and the project's dashboard shows the results.

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

@@ -20,12 +20,10 @@ export const SCANNER_PROFILES_QUERY = {
   field: 'dastScannerProfileId',
   fetchQuery: dastScannerProfilesQuery,
   fetchError: ERROR_FETCH_SCANNER_PROFILES,
-  queryKind: 'scannerProfiles',
 };
 
 export const SITE_PROFILES_QUERY = {
   field: 'dastSiteProfileId',
   fetchQuery: dastSiteProfilesQuery,
   fetchError: ERROR_FETCH_SITE_PROFILES,
-  queryKind: 'siteProfiles',
 };

locale/gitlab.pot

@@ -17847,9 +17847,6 @@ msgstr ""
 msgid "OnDemandScans|Scanner profile"
 msgstr ""
 
-msgid "OnDemandScans|Scanner settings"
-msgstr ""
-
 msgid "OnDemandScans|Schedule or run scans immediately against target sites. Currently available on-demand scan type: DAST. %{helpLinkStart}More information%{helpLinkEnd}"
 msgstr ""
 
@@ -17859,9 +17856,6 @@ msgstr ""
 msgid "OnDemandScans|Site profile"
 msgstr ""
 
-msgid "OnDemandScans|Site profiles"
-msgstr ""
-
 msgid "OnDemandScans|Use existing scanner profile"
 msgstr ""