Merge branch '325999-update-compliance-nav-item-and-breadcrumb' into 'master'

Update Compliance nav item and breadcrumb

See merge request gitlab-org/gitlab!71383

doc/user/compliance/compliance_report/index.md

@@ -30,7 +30,7 @@ Prerequisites:
 To view the compliance report:
 
 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:
 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
 To download the Chain of Custody report:
 
 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**.
 
 ### Commit-specific Chain of Custody Report **(ULTIMATE)**
@@ -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.
 
 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. Enter the merge commit SHA, and then select **Export commit custody report**.
    SHA and then select **Export commit custody report**.

ee/app/assets/javascripts/compliance_dashboard/compliance_dashboard_bundle.js

@@ -3,7 +3,7 @@ import { parseBoolean } from '~/lib/utils/common_utils';
 import ComplianceDashboard from './components/dashboard.vue';
 
 export default () => {
-  const el = document.getElementById('js-compliance-dashboard');
+  const el = document.getElementById('js-compliance-report');
 
   const { mergeRequests, emptyStateSvgPath, isLastPage, mergeCommitsCsvExportPath } = el.dataset;
 

ee/app/assets/javascripts/compliance_dashboard/components/dashboard.vue

@@ -73,7 +73,7 @@ export default {
     },
   },
   strings: {
-    heading: __('Compliance Dashboard'),
+    heading: __('Compliance report'),
     subheading: __('Here you will find recent merge request activity'),
     mergeRequestsTabLabel: __('Merge Requests'),
   },

ee/app/views/groups/security/compliance_dashboards/show.html.haml

-- breadcrumb_title _("Compliance Dashboard")
-- page_title _("Compliance Dashboard")
+- breadcrumb_title _("Compliance report")
+- 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,
   empty_state_svg_path: image_path('illustrations/merge_requests.svg'),
   merge_commits_csv_export_path: group_security_merge_commit_reports_path(@group, format: :csv) } }

ee/lib/sidebars/groups/menus/security_compliance_menu.rb

@@ -78,7 +78,7 @@ module Sidebars
           end
 
           ::Sidebars::MenuItem.new(
-            title: _('Compliance'),
+            title: _('Compliance report'),
             link: group_security_compliance_dashboard_path(context.group),
             active_routes: { path: 'compliance_dashboards#show' },
             item_id: :compliance

ee/spec/features/groups/navbar_spec.rb

@@ -147,7 +147,7 @@ RSpec.describe 'Group navbar' do
         nav_sub_items: [
           _('Security Dashboard'),
           _('Vulnerability Report'),
-          _('Compliance'),
+          _('Compliance report'),
           _('Audit Events')
         ]
       }

ee/spec/frontend/compliance_dashboard/components/__snapshots__/dashboard_spec.js.snap

@@ -11,7 +11,7 @@ exports[`ComplianceDashboard component when there are merge requests and the sho
       <h4
         class="gl-flex-grow-1 gl-my-0"
       >
-        Compliance Dashboard
+        Compliance report
       </h4>
        
       <merge-commits-export-button-stub
@@ -62,7 +62,7 @@ exports[`ComplianceDashboard component when there are merge requests matches the
       <h4
         class="gl-flex-grow-1 gl-my-0"
       >
-        Compliance Dashboard
+        Compliance report
       </h4>
        
       <merge-commits-export-button-stub

locale/gitlab.pot

@@ -8460,13 +8460,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-msgid "Compliance"
-msgstr ""
-
-msgid "Compliance Dashboard"
+msgid "Compliance framework"
 msgstr ""
 
-msgid "Compliance framework"
+msgid "Compliance report"
 msgstr ""
 
 msgid "ComplianceDashboard|created by:"