diff options
Diffstat (limited to 'app/assets/javascripts/ci_lint/components/ci_lint_results.vue')
-rw-r--r-- | app/assets/javascripts/ci_lint/components/ci_lint_results.vue | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/app/assets/javascripts/ci_lint/components/ci_lint_results.vue b/app/assets/javascripts/ci_lint/components/ci_lint_results.vue index 28b2a028b29..8b37c94de19 100644 --- a/app/assets/javascripts/ci_lint/components/ci_lint_results.vue +++ b/app/assets/javascripts/ci_lint/components/ci_lint_results.vue @@ -1,5 +1,5 @@ <script> -import { GlAlert, GlTable } from '@gitlab/ui'; +import { GlAlert, GlLink, GlSprintf, GlTable } from '@gitlab/ui'; import CiLintWarnings from './ci_lint_warnings.vue'; import CiLintResultsValue from './ci_lint_results_value.vue'; import CiLintResultsParam from './ci_lint_results_param.vue'; @@ -8,8 +8,17 @@ import { __ } from '~/locale'; const thBorderColor = 'gl-border-gray-100!'; export default { - correct: { variant: 'success', text: __('syntax is correct') }, - incorrect: { variant: 'danger', text: __('syntax is incorrect') }, + correct: { + variant: 'success', + text: __('syntax is correct.'), + }, + incorrect: { + variant: 'danger', + text: __('syntax is incorrect.'), + }, + includesText: __( + 'CI configuration validated, including all configuration added with the %{codeStart}includes%{codeEnd} keyword. %{link}', + ), warningTitle: __('The form contains the following warning:'), fields: [ { @@ -25,6 +34,8 @@ export default { ], components: { GlAlert, + GlLink, + GlSprintf, GlTable, CiLintWarnings, CiLintResultsValue, @@ -51,6 +62,10 @@ export default { type: Boolean, required: true, }, + lintHelpPagePath: { + type: String, + required: true, + }, }, data() { return { @@ -82,8 +97,20 @@ export default { :title="__('Status:')" :dismissible="false" data-testid="ci-lint-status" - >{{ status.text }}</gl-alert - > + >{{ status.text }} + <gl-sprintf :message="$options.includesText"> + <template #code="{content}"> + <code> + {{ content }} + </code> + </template> + <template #link> + <gl-link :href="lintHelpPagePath" target="_blank"> + {{ __('More information') }} + </gl-link> + </template> + </gl-sprintf> + </gl-alert> <pre v-if="shouldShowError" |