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

Add "security" top-level item to group sidebar

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

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

@@ -36,8 +36,6 @@
                   %span
                     = _('Activity')
 
-            = render_if_exists 'groups/sidebar/security_dashboard' # EE-specific
-
             - if group_sidebar_link?(:contribution_analytics)
               = nav_link(path: 'analytics#show') do
                 = link_to group_analytics_path(@group), title: _('Contribution Analytics'), data: { placement: 'right' } do
@@ -105,6 +103,8 @@
                   = _('Merge Requests')
                 %span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(merge_requests_count)
 
+      = render_if_exists "layouts/nav/ee/security_link" # EE-specific
+
       - if group_sidebar_link?(:kubernetes)
         = nav_link(controller: [:clusters]) do
           = link_to group_clusters_path(@group) do

ee/app/helpers/ee/groups_helper.rb

@@ -7,7 +7,6 @@ module EE
     override :group_overview_nav_link_paths
     def group_overview_nav_link_paths
       super + %w[
-        groups/security/dashboard#show
         groups/insights#show
       ]
     end

ee/app/views/groups/sidebar/_security_dashboard.html.haml → ee/app/views/layouts/nav/ee/_security_link.html.haml

 - if @group.feature_available?(:security_dashboard)
   = nav_link(path: 'groups/security/dashboard#show') do
-    = link_to group_security_dashboard_path(@group), title: _('Security Dashboard') do
-      %span= _('Security Dashboard')
+    = link_to group_security_dashboard_path(@group), title: _('Security') do
+      .nav-icon-container
+        = sprite_icon('shield')
+      %span.nav-item-name
+        = _('Security')
+    %ul.sidebar-sub-level-items.is-fly-out-only
+      = nav_link(path: 'groups/security/dashboard#show') do
+        = link_to group_security_dashboard_path(@group), title: _('Security') do
+          %strong.fly-out-top-item-name
+            = _('Security')

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

+---
+title: Add "Security" as nav-item to group-view sidebar
+merge_request: 14639
+author:
+type: changed

ee/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb

@@ -81,7 +81,7 @@ describe 'layouts/nav/sidebar/_group' do
       it 'is visible' do
         render
 
-        expect(rendered).to have_link 'Security Dashboard'
+        expect(rendered).to have_link 'Security'
       end
     end
 
@@ -91,7 +91,7 @@ describe 'layouts/nav/sidebar/_group' do
       it 'is not visible' do
         render
 
-        expect(rendered).not_to have_link 'Security Dashboard'
+        expect(rendered).not_to have_link 'Security'
       end
     end
   end