Merge branch '42675-fj-remove-collapsed-menu-link' into 'master'

Remove link in collapsed project sidebar top menu item

See merge request gitlab-org/gitlab!62883

app/views/shared/nav/_sidebar_menu.html.haml

@@ -15,12 +15,11 @@
 
   %ul.sidebar-sub-level-items{ class: ('is-fly-out-only' unless sidebar_menu.has_renderable_items?) }
     = nav_link(**sidebar_menu.all_active_routes, html_options: { class: 'fly-out-top-item' } ) do
-      = link_to sidebar_menu.link, **sidebar_menu.collapsed_container_html_options do
-        %strong.fly-out-top-item-name
-          = sidebar_menu.title
-        - if sidebar_menu.has_pill?
-          %span.badge.badge-pill.count.fly-out-badge{ **sidebar_menu.pill_html_options }
-            = number_with_delimiter(sidebar_menu.pill_count)
+      - if sidebar_refactor_disabled?
+        = link_to sidebar_menu.link, **sidebar_menu.collapsed_container_html_options do
+          = render 'shared/nav/sidebar_menu_collapsed', sidebar_menu: sidebar_menu
+      - else
+        = render 'shared/nav/sidebar_menu_collapsed', sidebar_menu: sidebar_menu
 
     - if sidebar_menu.has_items?
       %li.divider.fly-out-top-item

app/views/shared/nav/_sidebar_menu_collapsed.html.haml

+%strong.fly-out-top-item-name
+  = sidebar_menu.title
+- if sidebar_menu.has_pill?
+  %span.badge.badge-pill.count.fly-out-badge{ **sidebar_menu.pill_html_options }
+    = number_with_delimiter(sidebar_menu.pill_count)

spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb

@@ -1338,4 +1338,22 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
   end
 
   it_behaves_like 'sidebar includes snowplow attributes', 'render', 'projects_side_navigation', 'projects_side_navigation'
+
+  describe 'Collapsed menu items' do
+    it 'does not render the collapsed top menu as a link' do
+      render
+
+      expect(rendered).not_to have_selector('.sidebar-sub-level-items > li.fly-out-top-item > a')
+    end
+
+    context 'when feature flag :sidebar_refactor is disabled' do
+      it 'renders the collapsed top menu as a link' do
+        stub_feature_flags(sidebar_refactor: false)
+
+        render
+
+        expect(rendered).to have_selector('.sidebar-sub-level-items > li.fly-out-top-item > a')
+      end
+    end
+  end
 end