Merge branch '12250-mvc-security-navigation-section-project-ee' into 'master'

Add 'Security & Compliance' as top-level navigation item to the project-sidebar

See merge request gitlab-org/gitlab-ee!14628

app/views/layouts/nav/sidebar/_project.html.haml

@@ -34,10 +34,6 @@
               = link_to project_releases_path(@project), title: _('Releases'), class: 'shortcuts-project-releases' do
                 %span= _('Releases')
 
-          = render_if_exists 'projects/sidebar/security_dashboard'
-
-          = render_if_exists 'projects/sidebar/dependencies'
-
           - if can?(current_user, :read_cycle_analytics, @project)
             = nav_link(path: 'cycle_analytics#show') do
               = link_to project_cycle_analytics_path(@project), title: _('Cycle Analytics'), class: 'shortcuts-project-cycle-analytics' do
@@ -203,6 +199,8 @@
                   %span
                     = _('Charts')
 
+      = render_if_exists 'layouts/nav/sidebar/project_security_link' # EE-specific
+
       - if project_nav_tab? :operations
         = nav_link(controller: sidebar_operations_paths) do
           = link_to sidebar_operations_link_path, class: 'shortcuts-operations qa-link-operations' do

ee/app/helpers/ee/projects_helper.rb

@@ -7,8 +7,6 @@ module EE
     override :sidebar_projects_paths
     def sidebar_projects_paths
       super + %w[
-        projects/dependencies#show
-        projects/security/dashboard#show
         projects/insights#show
       ]
     end
@@ -38,6 +36,10 @@ module EE
     def get_project_nav_tabs(project, current_user)
       nav_tabs = super
 
+      if can?(current_user, :read_project_security_dashboard, @project)
+        nav_tabs << :security
+      end
+
       if ::Gitlab.config.packages.enabled &&
           project.feature_available?(:packages) &&
           can?(current_user, :read_package, project)
@@ -128,6 +130,13 @@ module EE
       @project.feature_available?(:merge_trains)
     end
 
+    def sidebar_security_paths
+      %w[
+        projects/security/dashboard#show
+        projects/dependencies#show
+      ]
+    end
+
     def size_limit_message(project)
       show_lfs = project.lfs_enabled? ? 'including files in LFS' : ''
 

ee/app/views/layouts/nav/sidebar/_project_security_link.html.haml

+- if project_nav_tab?(:security)
+  = nav_link(path: sidebar_security_paths) do
+    = link_to project_security_dashboard_path(@project), title: _('Security Dashboard') do
+      .nav-icon-container
+        = sprite_icon('shield')
+      %span.nav-item-name
+        = _('Security & Compliance')
+
+    %ul.sidebar-sub-level-items
+      = nav_link(path: sidebar_security_paths, html_options: { class: "fly-out-top-item" } ) do
+        = link_to project_security_dashboard_path(@project) do
+          %strong.fly-out-top-item-name
+            = _('Security & Compliance')
+      %li.divider.fly-out-top-item
+
+      = nav_link(path: 'projects/security/dashboard#show') do
+        = link_to project_security_dashboard_path(@project), title: _('Security Dashboard') do
+          %span= _('Security Dashboard')
+
+      - if @project.feature_available?(:dependency_list)
+        = nav_link(path: 'projects/dependencies#show') do
+          = link_to project_dependencies_path(@project), title: _('Dependency List') do
+            %span= _('Dependency List')

ee/app/views/projects/sidebar/_dependencies.html.haml

-- if @project.feature_available?(:dependency_list)
-  = nav_link(path: 'projects/dependencies#show') do
-    = link_to project_dependencies_path(@project), title: _('Dependency List'), class: 'shortcuts-project-dependencies' do
-      %span= _('Dependency List')

ee/app/views/projects/sidebar/_security_dashboard.html.haml

-- if can?(current_user, :read_project_security_dashboard, @project)
-  = nav_link(path: 'projects/security/dashboard#show') do
-    = link_to project_security_dashboard_path(@project), title: _('Security Dashboard'), class: 'shortcuts-project-security-dashboard' do
-      %span= _('Security Dashboard')

ee/changelogs/unreleased/12250-mvc-security-navigation-section-project-ee.yml

+---
+title: Add 'Security & Compliance' as top-level navigation item to the project-sidebar
+merge_request: 14628
+author:
+type: changed

locale/gitlab.pot

@@ -12232,6 +12232,9 @@ msgstr ""
 msgid "Security"
 msgstr ""
 
+msgid "Security & Compliance"
+msgstr ""
+
 msgid "Security Dashboard"
 msgstr ""