Commit 906d7813 authored by Jiaan Louw's avatar Jiaan Louw Committed by Andy Soiron

Update compliance report title and navigation

Changes the compliance report's breadcrumb, title and menu
name to "Compliance report".

Changelog: changed
EE: true
parent a755a6ef
...@@ -30,7 +30,7 @@ Prerequisites: ...@@ -30,7 +30,7 @@ Prerequisites:
To view the compliance report: To view the compliance report:
1. On the top bar, select **Menu > Groups** and find your group. 1. On the top bar, select **Menu > Groups** and find your group.
1. On the left sidebar, select **Security & Compliance > Compliance**. 1. On the left sidebar, select **Security & Compliance > Compliance report**.
NOTE: NOTE:
The compliance report shows only the latest merge request on each project. The compliance report shows only the latest merge request on each project.
...@@ -87,7 +87,7 @@ Depending on the merge strategy, the merge commit SHA can be a merge commit, squ ...@@ -87,7 +87,7 @@ Depending on the merge strategy, the merge commit SHA can be a merge commit, squ
To download the Chain of Custody report: To download the Chain of Custody report:
1. On the top bar, select **Menu > Groups** and find your group. 1. On the top bar, select **Menu > Groups** and find your group.
1. On the left sidebar, select **Security & Compliance > Compliance**. 1. On the left sidebar, select **Security & Compliance > Compliance report**.
1. Select **List of all merge commits**. 1. Select **List of all merge commits**.
### Commit-specific Chain of Custody Report **(ULTIMATE)** ### Commit-specific Chain of Custody Report **(ULTIMATE)**
...@@ -97,7 +97,7 @@ To download the Chain of Custody report: ...@@ -97,7 +97,7 @@ To download the Chain of Custody report:
You can generate a commit-specific Chain of Custody report for a given commit SHA. You can generate a commit-specific Chain of Custody report for a given commit SHA.
1. On the top bar, select **Menu > Groups** and find your group. 1. On the top bar, select **Menu > Groups** and find your group.
1. On the left sidebar, select **Security & Compliance > Compliance**. 1. On the left sidebar, select **Security & Compliance > Compliance report**.
1. At the top of the compliance report, to the right of **List of all merge commits**, select the down arrow (**{angle-down}**). 1. At the top of the compliance report, to the right of **List of all merge commits**, select the down arrow (**{angle-down}**).
1. Enter the merge commit SHA, and then select **Export commit custody report**. 1. Enter the merge commit SHA, and then select **Export commit custody report**.
SHA and then select **Export commit custody report**. SHA and then select **Export commit custody report**.
......
...@@ -3,7 +3,7 @@ import { parseBoolean } from '~/lib/utils/common_utils'; ...@@ -3,7 +3,7 @@ import { parseBoolean } from '~/lib/utils/common_utils';
import ComplianceDashboard from './components/dashboard.vue'; import ComplianceDashboard from './components/dashboard.vue';
export default () => { export default () => {
const el = document.getElementById('js-compliance-dashboard'); const el = document.getElementById('js-compliance-report');
const { mergeRequests, emptyStateSvgPath, isLastPage, mergeCommitsCsvExportPath } = el.dataset; const { mergeRequests, emptyStateSvgPath, isLastPage, mergeCommitsCsvExportPath } = el.dataset;
......
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
}, },
}, },
strings: { strings: {
heading: __('Compliance Dashboard'), heading: __('Compliance report'),
subheading: __('Here you will find recent merge request activity'), subheading: __('Here you will find recent merge request activity'),
mergeRequestsTabLabel: __('Merge Requests'), mergeRequestsTabLabel: __('Merge Requests'),
}, },
......
- breadcrumb_title _("Compliance Dashboard") - breadcrumb_title _("Compliance report")
- page_title _("Compliance Dashboard") - page_title _("Compliance report")
#js-compliance-dashboard{ data: { merge_requests: @merge_requests.to_json, #js-compliance-report{ data: { merge_requests: @merge_requests.to_json,
is_last_page: @last_page.to_json, is_last_page: @last_page.to_json,
empty_state_svg_path: image_path('illustrations/merge_requests.svg'), empty_state_svg_path: image_path('illustrations/merge_requests.svg'),
merge_commits_csv_export_path: group_security_merge_commit_reports_path(@group, format: :csv) } } merge_commits_csv_export_path: group_security_merge_commit_reports_path(@group, format: :csv) } }
...@@ -78,7 +78,7 @@ module Sidebars ...@@ -78,7 +78,7 @@ module Sidebars
end end
::Sidebars::MenuItem.new( ::Sidebars::MenuItem.new(
title: _('Compliance'), title: _('Compliance report'),
link: group_security_compliance_dashboard_path(context.group), link: group_security_compliance_dashboard_path(context.group),
active_routes: { path: 'compliance_dashboards#show' }, active_routes: { path: 'compliance_dashboards#show' },
item_id: :compliance item_id: :compliance
......
...@@ -147,7 +147,7 @@ RSpec.describe 'Group navbar' do ...@@ -147,7 +147,7 @@ RSpec.describe 'Group navbar' do
nav_sub_items: [ nav_sub_items: [
_('Security Dashboard'), _('Security Dashboard'),
_('Vulnerability Report'), _('Vulnerability Report'),
_('Compliance'), _('Compliance report'),
_('Audit Events') _('Audit Events')
] ]
} }
......
...@@ -11,7 +11,7 @@ exports[`ComplianceDashboard component when there are merge requests and the sho ...@@ -11,7 +11,7 @@ exports[`ComplianceDashboard component when there are merge requests and the sho
<h4 <h4
class="gl-flex-grow-1 gl-my-0" class="gl-flex-grow-1 gl-my-0"
> >
Compliance Dashboard Compliance report
</h4> </h4>
<merge-commits-export-button-stub <merge-commits-export-button-stub
...@@ -62,7 +62,7 @@ exports[`ComplianceDashboard component when there are merge requests matches the ...@@ -62,7 +62,7 @@ exports[`ComplianceDashboard component when there are merge requests matches the
<h4 <h4
class="gl-flex-grow-1 gl-my-0" class="gl-flex-grow-1 gl-my-0"
> >
Compliance Dashboard Compliance report
</h4> </h4>
<merge-commits-export-button-stub <merge-commits-export-button-stub
......
...@@ -8460,13 +8460,10 @@ msgstr "" ...@@ -8460,13 +8460,10 @@ msgstr ""
msgid "Completed" msgid "Completed"
msgstr "" msgstr ""
msgid "Compliance" msgid "Compliance framework"
msgstr ""
msgid "Compliance Dashboard"
msgstr "" msgstr ""
msgid "Compliance framework" msgid "Compliance report"
msgstr "" msgstr ""
msgid "ComplianceDashboard|created by:" msgid "ComplianceDashboard|created by:"
......
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