diff --git a/ee/spec/features/dashboard/navbar_spec.rb b/ee/spec/features/dashboard/navbar_spec.rb index 2c476e736f38f425f9eb1533711c84739e262737..a19c2865c7cb05ab3c9207f9ef07542c0f9c841f 100644 --- a/ee/spec/features/dashboard/navbar_spec.rb +++ b/ee/spec/features/dashboard/navbar_spec.rb @@ -15,7 +15,7 @@ sign_in(user) insert_after_nav_item( - _('Activity'), + _('Import history'), new_nav_item: { nav_item: _("Environments"), nav_sub_items: [] @@ -41,7 +41,7 @@ sign_in(user) insert_after_nav_item( - _('Activity'), + _('Import history'), new_nav_item: { nav_item: _("Security"), nav_sub_items: [ diff --git a/lib/sidebars/your_work/menus/import_history_menu.rb b/lib/sidebars/your_work/menus/import_history_menu.rb new file mode 100644 index 0000000000000000000000000000000000000000..0e04be86d910c24aef6c5a7978b6a51dbc74229b --- /dev/null +++ b/lib/sidebars/your_work/menus/import_history_menu.rb @@ -0,0 +1,36 @@ +# frozen_string_literal: true + +# rubocop:disable Gitlab/BoundedContexts -- disabling this to match current structure of other sidebar menu items (.rubocop_todo/gitlab/bounded_contexts.yml) +module Sidebars + module YourWork + module Menus + class ImportHistoryMenu < ::Sidebars::Menu + override :link + def link + history_import_bulk_imports_path + end + + override :title + def title + _('Import history') + end + + override :sprite_icon + def sprite_icon + 'cloud-gear' + end + + override :render? + def render? + !!context.current_user + end + + override :active_routes + def active_routes + { controller: ['import/bulk_imports', 'import/history'], path: 'import/github#details' } + end + end + end + end +end +# rubocop:enable Gitlab/BoundedContexts diff --git a/lib/sidebars/your_work/panel.rb b/lib/sidebars/your_work/panel.rb index d1297fb439db9d748fd0fbd585d1610f16bc9ac0..06c81c162818ce28e1984996202800a475523a33 100644 --- a/lib/sidebars/your_work/panel.rb +++ b/lib/sidebars/your_work/panel.rb @@ -32,6 +32,7 @@ def add_menus add_menu(Sidebars::YourWork::Menus::MilestonesMenu.new(context)) add_menu(Sidebars::YourWork::Menus::SnippetsMenu.new(context)) add_menu(Sidebars::YourWork::Menus::ActivityMenu.new(context)) + add_menu(Sidebars::YourWork::Menus::ImportHistoryMenu.new(context)) end end end diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb index c5920d6e74ede511aef60f3063d64796353dc782..15aa7db00459376817f50a3291325059c78a67c4 100644 --- a/spec/support/shared_contexts/navbar_structure_context.rb +++ b/spec/support/shared_contexts/navbar_structure_context.rb @@ -248,6 +248,10 @@ { nav_item: _("Activity"), nav_sub_items: [] + }, + { + nav_item: _("Import history"), + nav_sub_items: [] } ] end