Merge branch 'your_work_sidebar_activity' into 'master'

Show new "Your work" sidebar on Activity and Milestones dashboards

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107745



Merged-by: Max Woolf <mwoolf@gitlab.com>
Approved-by: Valery Sizov <valery@gitlab.com>
Approved-by: Max Woolf <mwoolf@gitlab.com>
Co-authored-by: Thomas Hutterer <thutterer@gitlab.com>

lib/sidebars/your_work/menus/activity_menu.rb

+# frozen_string_literal: true
+
+module Sidebars
+  module YourWork
+    module Menus
+      class ActivityMenu < ::Sidebars::Menu
+        override :link
+        def link
+          activity_dashboard_path
+        end
+
+        override :title
+        def title
+          _('Activity')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'history'
+        end
+
+        override :render?
+        def render?
+          !!context.current_user
+        end
+
+        override :active_routes
+        def active_routes
+          { path: 'dashboard#activity' }
+        end
+      end
+    end
+  end
+end

lib/sidebars/your_work/menus/milestones_menu.rb

+# frozen_string_literal: true
+
+module Sidebars
+  module YourWork
+    module Menus
+      class MilestonesMenu < ::Sidebars::Menu
+        override :link
+        def link
+          dashboard_milestones_path
+        end
+
+        override :title
+        def title
+          _('Milestones')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'clock'
+        end
+
+        override :render?
+        def render?
+          !!context.current_user
+        end
+
+        override :active_routes
+        def active_routes
+          { controller: 'dashboard/milestones' }
+        end
+      end
+    end
+  end
+end

lib/sidebars/your_work/panel.rb

@@ -22,6 +22,8 @@ def render_raw_scope_menu_partial
 
       def add_menus
         add_menu(Sidebars::YourWork::Menus::ProjectsMenu.new(context))
+        add_menu(Sidebars::YourWork::Menus::MilestonesMenu.new(context))
+        add_menu(Sidebars::YourWork::Menus::ActivityMenu.new(context))
       end
     end
   end

spec/features/dashboard/activity_spec.rb

@@ -9,6 +9,8 @@
     sign_in(user)
   end
 
+  it_behaves_like 'a dashboard page with sidebar', :activity_dashboard_path, :activity
+
   context 'tabs' do
     it 'shows Your Projects' do
       visit activity_dashboard_path

spec/features/dashboard/milestones_spec.rb

@@ -26,6 +26,8 @@
       visit dashboard_milestones_path
     end
 
+    it_behaves_like 'a dashboard page with sidebar', :dashboard_milestones_path, :milestones
+
     it 'sees milestones' do
       expect(page).to have_current_path dashboard_milestones_path, ignore_query: true
       expect(page).to have_content(milestone.title)

spec/support/shared_contexts/navbar_structure_context.rb

@@ -232,6 +232,14 @@
       {
         nav_item: _("Projects"),
         nav_sub_items: []
+      },
+      {
+        nav_item: _("Milestones"),
+        nav_sub_items: []
+      },
+      {
+        nav_item: _("Activity"),
+        nav_sub_items: []
       }
     ]
   end