Commit 5ee883bb authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'djadmin-site-validation-help-text' into 'master'

Add help text for DAST validation modal

See merge request gitlab-org/gitlab!68142
parents 86d77565 199e990e
......@@ -10,8 +10,10 @@ import {
GlModal,
GlSkeletonLoader,
GlTruncate,
GlLink,
} from '@gitlab/ui';
import * as Sentry from '@sentry/browser';
import { helpPagePath } from '~/helpers/help_page_helper';
import download from '~/lib/utils/downloader';
import { cleanLeadingSeparator, joinPaths, stripPathTail } from '~/lib/utils/url_utility';
import { __, s__ } from '~/locale';
......@@ -43,6 +45,7 @@ export default {
GlModal,
GlSkeletonLoader,
GlTruncate,
GlLink,
},
mixins: [glFeatureFlagMixin()],
props: {
......@@ -63,6 +66,9 @@ export default {
tokenId: null,
validationMethod: DAST_SITE_VALIDATION_METHOD_TEXT_FILE,
validationPath: '',
helpUrl: helpPagePath('user/application_security/dast/index', {
anchor: 'site-profile-validation',
}),
};
},
computed: {
......@@ -235,6 +241,14 @@ export default {
{{ s__('DastSiteValidation|Could not create validation token. Please try again.') }}
</gl-alert>
<template v-else>
<p>
{{
s__(
'DastSiteValidation|To run an active scan, validate your target site. All site profiles that share the same base URL share the same validation status.',
)
}}
<gl-link :href="helpUrl" target="_blank">{{ __('Learn more.') }}</gl-link>
</p>
<gl-form-group :label="s__('DastSiteValidation|Step 1 - Choose site validation method')">
<gl-form-radio-group v-model="validationMethod" :options="validationMethodOptions" />
</gl-form-group>
......
......@@ -10534,6 +10534,9 @@ msgid_plural "DastSiteValidation|This will affect %d other profiles targeting th
msgstr[0] ""
msgstr[1] ""
msgid "DastSiteValidation|To run an active scan, validate your target site. All site profiles that share the same base URL share the same validation status."
msgstr ""
msgid "DastSiteValidation|Validate"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment