Commit f4a90915 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '338790-add-operational-report-message' into 'master'

Add operational report message to vulnerability report

See merge request gitlab-org/gitlab!75614
parents a216d3a8 c2cb770e
<script> <script>
import { GlTabs, GlTab } from '@gitlab/ui'; import { GlTabs, GlTab, GlCard } from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import SurveyRequestBanner from '../survey_request_banner.vue'; import SurveyRequestBanner from '../survey_request_banner.vue';
import VulnerabilityReportHeader from './vulnerability_report_header.vue'; import VulnerabilityReportHeader from './vulnerability_report_header.vue';
...@@ -10,6 +10,7 @@ export default { ...@@ -10,6 +10,7 @@ export default {
components: { components: {
GlTabs, GlTabs,
GlTab, GlTab,
GlCard,
SurveyRequestBanner, SurveyRequestBanner,
VulnerabilityReportHeader, VulnerabilityReportHeader,
VulnerabilityReport, VulnerabilityReport,
...@@ -29,6 +30,9 @@ export default { ...@@ -29,6 +30,9 @@ export default {
operationalTabParameter: REPORT_TAB.OPERATIONAL.toLowerCase(), operationalTabParameter: REPORT_TAB.OPERATIONAL.toLowerCase(),
developmentTab: s__('SecurityReports|Development vulnerabilities'), developmentTab: s__('SecurityReports|Development vulnerabilities'),
operationalTab: s__('SecurityReports|Operational vulnerabilities'), operationalTab: s__('SecurityReports|Operational vulnerabilities'),
operationalTabMessage: s__(
'SecurityReports|These vulnerabilities were detected in external sources. They are not necessarily tied to your GitLab project. For example, running containers, URLs, and so on.',
),
}, },
REPORT_TAB, REPORT_TAB,
}; };
...@@ -40,7 +44,7 @@ export default { ...@@ -40,7 +44,7 @@ export default {
<vulnerability-report-header /> <vulnerability-report-header />
<gl-tabs class="gl-mt-5" sync-active-tab-with-query-params> <gl-tabs class="gl-mt-5" content-class="gl-pt-0" sync-active-tab-with-query-params>
<gl-tab :title="$options.i18n.developmentTab" lazy> <gl-tab :title="$options.i18n.developmentTab" lazy>
<vulnerability-report <vulnerability-report
:type="$options.REPORT_TAB.DEVELOPMENT" :type="$options.REPORT_TAB.DEVELOPMENT"
...@@ -54,6 +58,8 @@ export default { ...@@ -54,6 +58,8 @@ export default {
:query-param-value="$options.i18n.operationalTabParameter" :query-param-value="$options.i18n.operationalTabParameter"
lazy lazy
> >
<gl-card body-class="gl-p-6">{{ $options.i18n.operationalTabMessage }}</gl-card>
<vulnerability-report <vulnerability-report
:type="$options.REPORT_TAB.OPERATIONAL" :type="$options.REPORT_TAB.OPERATIONAL"
:query="query" :query="query"
......
...@@ -31250,6 +31250,9 @@ msgstr "" ...@@ -31250,6 +31250,9 @@ msgstr ""
msgid "SecurityReports|There was an error while generating the report." msgid "SecurityReports|There was an error while generating the report."
msgstr "" msgstr ""
msgid "SecurityReports|These vulnerabilities were detected in external sources. They are not necessarily tied to your GitLab project. For example, running containers, URLs, and so on."
msgstr ""
msgid "SecurityReports|To widen your search, change or remove filters above" msgid "SecurityReports|To widen your search, change or remove filters above"
msgstr "" 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