diff options
Diffstat (limited to 'lib/sidebars')
-rw-r--r-- | lib/sidebars/groups/menus/observability_menu.rb | 20 | ||||
-rw-r--r-- | lib/sidebars/groups/menus/settings_menu.rb | 17 | ||||
-rw-r--r-- | lib/sidebars/projects/menus/deployments_menu.rb | 17 | ||||
-rw-r--r-- | lib/sidebars/projects/menus/settings_menu.rb | 6 | ||||
-rw-r--r-- | lib/sidebars/your_work/menus/activity_menu.rb | 34 | ||||
-rw-r--r-- | lib/sidebars/your_work/menus/groups_menu.rb | 34 | ||||
-rw-r--r-- | lib/sidebars/your_work/menus/issues_menu.rb | 47 | ||||
-rw-r--r-- | lib/sidebars/your_work/menus/merge_requests_menu.rb | 47 | ||||
-rw-r--r-- | lib/sidebars/your_work/menus/milestones_menu.rb | 34 | ||||
-rw-r--r-- | lib/sidebars/your_work/menus/projects_menu.rb | 34 | ||||
-rw-r--r-- | lib/sidebars/your_work/menus/snippets_menu.rb | 34 | ||||
-rw-r--r-- | lib/sidebars/your_work/menus/todos_menu.rb | 47 | ||||
-rw-r--r-- | lib/sidebars/your_work/panel.rb | 35 |
13 files changed, 399 insertions, 7 deletions
diff --git a/lib/sidebars/groups/menus/observability_menu.rb b/lib/sidebars/groups/menus/observability_menu.rb index 656142375af..d85efb1a002 100644 --- a/lib/sidebars/groups/menus/observability_menu.rb +++ b/lib/sidebars/groups/menus/observability_menu.rb @@ -6,9 +6,8 @@ module Sidebars class ObservabilityMenu < ::Sidebars::Menu override :configure_menu_items def configure_menu_items - add_item(dashboards_menu_item) add_item(explore_menu_item) - add_item(manage_menu_item) + add_item(datasources_menu_item) end override :title @@ -23,14 +22,14 @@ module Sidebars override :render? def render? - can?(context.current_user, :read_observability, context.group) + Gitlab::Observability.observability_enabled?(context.current_user, context.group) end private def dashboards_menu_item ::Sidebars::MenuItem.new( - title: _('Dashboards'), + title: s_('Observability|Dashboards'), link: group_observability_dashboards_path(context.group), active_routes: { path: 'groups/observability#dashboards' }, item_id: :dashboards @@ -39,16 +38,25 @@ module Sidebars def explore_menu_item ::Sidebars::MenuItem.new( - title: _('Explore'), + title: s_('Observability|Explore telemetry data'), link: group_observability_explore_path(context.group), active_routes: { path: 'groups/observability#explore' }, item_id: :explore ) end + def datasources_menu_item + ::Sidebars::MenuItem.new( + title: s_('Observability|Data sources'), + link: group_observability_datasources_path(context.group), + active_routes: { path: 'groups/observability#datasources' }, + item_id: :datasources + ) + end + def manage_menu_item ::Sidebars::MenuItem.new( - title: _('Manage Dashboards'), + title: s_('Observability|Manage dashboards'), link: group_observability_manage_path(context.group), active_routes: { path: 'groups/observability#manage' }, item_id: :manage diff --git a/lib/sidebars/groups/menus/settings_menu.rb b/lib/sidebars/groups/menus/settings_menu.rb index ede195a8e59..5b81f22c796 100644 --- a/lib/sidebars/groups/menus/settings_menu.rb +++ b/lib/sidebars/groups/menus/settings_menu.rb @@ -15,6 +15,7 @@ module Sidebars add_item(ci_cd_menu_item) add_item(applications_menu_item) add_item(packages_and_registries_menu_item) + add_item(usage_quotas_menu_item) return true elsif Gitlab.ee? && can?(context.current_user, :change_push_rules, context.group) # Push Rules are the only group setting that can also be edited by maintainers. @@ -115,6 +116,22 @@ module Sidebars ) end + def usage_quotas_menu_item + return ::Sidebars::NilMenuItem.new(item_id: :usage_quotas) unless usage_quotas_menu_enabled? + + ::Sidebars::MenuItem.new( + title: s_('UsageQuota|Usage Quotas'), + link: group_usage_quotas_path(context.group), + active_routes: { path: 'usage_quotas#index' }, + item_id: :usage_quotas + ) + end + + # overriden in ee/lib/ee/sidebars/groups/menus/settings_menu.rb + def usage_quotas_menu_enabled? + context.group.usage_quotas_enabled? + end + def packages_and_registries_menu_item unless context.group.packages_feature_enabled? return ::Sidebars::NilMenuItem.new(item_id: :packages_and_registries) diff --git a/lib/sidebars/projects/menus/deployments_menu.rb b/lib/sidebars/projects/menus/deployments_menu.rb index 5f789748288..4d4e65e9795 100644 --- a/lib/sidebars/projects/menus/deployments_menu.rb +++ b/lib/sidebars/projects/menus/deployments_menu.rb @@ -10,6 +10,10 @@ module Sidebars add_item(feature_flags_menu_item) add_item(releases_menu_item) + if Feature.enabled?(:show_pages_in_deployments_menu, context.current_user, type: :experiment) + add_item(pages_menu_item) + end + true end @@ -74,6 +78,19 @@ module Sidebars container_html_options: { class: 'shortcuts-deployments-releases' } ) end + + def pages_menu_item + unless context.project.pages_available? && context.current_user&.can?(:update_pages, context.project) + return ::Sidebars::NilMenuItem.new(item_id: :pages) + end + + ::Sidebars::MenuItem.new( + title: _('Pages'), + link: project_pages_path(context.project), + active_routes: { path: 'pages#show' }, + item_id: :pages + ) + end end end end diff --git a/lib/sidebars/projects/menus/settings_menu.rb b/lib/sidebars/projects/menus/settings_menu.rb index 11d5f4d59c7..eea32d8b626 100644 --- a/lib/sidebars/projects/menus/settings_menu.rb +++ b/lib/sidebars/projects/menus/settings_menu.rb @@ -16,7 +16,11 @@ module Sidebars add_item(merge_requests_menu_item) add_item(ci_cd_menu_item) add_item(packages_and_registries_menu_item) - add_item(pages_menu_item) + + if Feature.disabled?(:show_pages_in_deployments_menu, context.current_user, type: :experiment) + add_item(pages_menu_item) + end + add_item(monitor_menu_item) add_item(usage_quotas_menu_item) diff --git a/lib/sidebars/your_work/menus/activity_menu.rb b/lib/sidebars/your_work/menus/activity_menu.rb new file mode 100644 index 00000000000..d39c9bfda9c --- /dev/null +++ b/lib/sidebars/your_work/menus/activity_menu.rb @@ -0,0 +1,34 @@ +# 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 diff --git a/lib/sidebars/your_work/menus/groups_menu.rb b/lib/sidebars/your_work/menus/groups_menu.rb new file mode 100644 index 00000000000..fd50b9b4b50 --- /dev/null +++ b/lib/sidebars/your_work/menus/groups_menu.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +module Sidebars + module YourWork + module Menus + class GroupsMenu < ::Sidebars::Menu + override :link + def link + dashboard_groups_path + end + + override :title + def title + _('Groups') + end + + override :sprite_icon + def sprite_icon + 'group' + end + + override :render? + def render? + !!context.current_user + end + + override :active_routes + def active_routes + { controller: ['groups', 'dashboard/groups'] } + end + end + end + end +end diff --git a/lib/sidebars/your_work/menus/issues_menu.rb b/lib/sidebars/your_work/menus/issues_menu.rb new file mode 100644 index 00000000000..6046b78e54e --- /dev/null +++ b/lib/sidebars/your_work/menus/issues_menu.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +module Sidebars + module YourWork + module Menus + class IssuesMenu < ::Sidebars::Menu + include Gitlab::Utils::StrongMemoize + + override :link + def link + issues_dashboard_path(assignee_username: @context.current_user.username) + end + + override :title + def title + _('Issues') + end + + override :sprite_icon + def sprite_icon + 'issues' + end + + override :render? + def render? + !!context.current_user + end + + override :active_routes + def active_routes + { path: 'dashboard#issues' } + end + + override :has_pill? + def has_pill? + pill_count > 0 + end + + override :pill_count + def pill_count + context.current_user.assigned_open_issues_count + end + strong_memoize_attr :pill_count + end + end + end +end diff --git a/lib/sidebars/your_work/menus/merge_requests_menu.rb b/lib/sidebars/your_work/menus/merge_requests_menu.rb new file mode 100644 index 00000000000..695c2ffdf46 --- /dev/null +++ b/lib/sidebars/your_work/menus/merge_requests_menu.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +module Sidebars + module YourWork + module Menus + class MergeRequestsMenu < ::Sidebars::Menu + include Gitlab::Utils::StrongMemoize + + override :link + def link + merge_requests_dashboard_path(assignee_username: @context.current_user.username) + end + + override :title + def title + _('Merge requests') + end + + override :sprite_icon + def sprite_icon + 'merge-request' + end + + override :render? + def render? + !!context.current_user + end + + override :active_routes + def active_routes + { path: 'dashboard#merge_requests' } + end + + override :has_pill? + def has_pill? + pill_count > 0 + end + + override :pill_count + def pill_count + context.current_user.assigned_open_merge_requests_count + end + strong_memoize_attr :pill_count + end + end + end +end diff --git a/lib/sidebars/your_work/menus/milestones_menu.rb b/lib/sidebars/your_work/menus/milestones_menu.rb new file mode 100644 index 00000000000..9b643afeec5 --- /dev/null +++ b/lib/sidebars/your_work/menus/milestones_menu.rb @@ -0,0 +1,34 @@ +# 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 diff --git a/lib/sidebars/your_work/menus/projects_menu.rb b/lib/sidebars/your_work/menus/projects_menu.rb new file mode 100644 index 00000000000..e8b2a1d7869 --- /dev/null +++ b/lib/sidebars/your_work/menus/projects_menu.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +module Sidebars + module YourWork + module Menus + class ProjectsMenu < ::Sidebars::Menu + override :link + def link + dashboard_projects_path + end + + override :title + def title + _('Projects') + end + + override :sprite_icon + def sprite_icon + 'project' + end + + override :render? + def render? + !!context.current_user + end + + override :active_routes + def active_routes + { controller: ['root', 'projects', 'dashboard/projects'] } + end + end + end + end +end diff --git a/lib/sidebars/your_work/menus/snippets_menu.rb b/lib/sidebars/your_work/menus/snippets_menu.rb new file mode 100644 index 00000000000..c7c591f03cd --- /dev/null +++ b/lib/sidebars/your_work/menus/snippets_menu.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +module Sidebars + module YourWork + module Menus + class SnippetsMenu < ::Sidebars::Menu + override :link + def link + dashboard_snippets_path + end + + override :title + def title + _('Snippets') + end + + override :sprite_icon + def sprite_icon + 'snippet' + end + + override :render? + def render? + !!context.current_user + end + + override :active_routes + def active_routes + { controller: :snippets } + end + end + end + end +end diff --git a/lib/sidebars/your_work/menus/todos_menu.rb b/lib/sidebars/your_work/menus/todos_menu.rb new file mode 100644 index 00000000000..d37ffadb579 --- /dev/null +++ b/lib/sidebars/your_work/menus/todos_menu.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +module Sidebars + module YourWork + module Menus + class TodosMenu < ::Sidebars::Menu + include Gitlab::Utils::StrongMemoize + + override :link + def link + dashboard_todos_path + end + + override :title + def title + _('To-Do List') + end + + override :sprite_icon + def sprite_icon + 'todo-done' + end + + override :render? + def render? + !!context.current_user + end + + override :active_routes + def active_routes + { path: 'dashboard/todos#index' } + end + + override :has_pill? + def has_pill? + pill_count > 0 + end + + override :pill_count + def pill_count + context.current_user.todos_pending_count + end + strong_memoize_attr :pill_count + end + end + end +end diff --git a/lib/sidebars/your_work/panel.rb b/lib/sidebars/your_work/panel.rb new file mode 100644 index 00000000000..215a2a2da09 --- /dev/null +++ b/lib/sidebars/your_work/panel.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +module Sidebars + module YourWork + class Panel < ::Sidebars::Panel + override :configure_menus + def configure_menus + add_menus + end + + override :aria_label + def aria_label + _('Your work') + end + + override :render_raw_scope_menu_partial + def render_raw_scope_menu_partial + "shared/nav/your_work_scope_header" + end + + private + + def add_menus + add_menu(Sidebars::YourWork::Menus::ProjectsMenu.new(context)) + add_menu(Sidebars::YourWork::Menus::GroupsMenu.new(context)) + add_menu(Sidebars::YourWork::Menus::IssuesMenu.new(context)) + add_menu(Sidebars::YourWork::Menus::MergeRequestsMenu.new(context)) + add_menu(Sidebars::YourWork::Menus::TodosMenu.new(context)) + add_menu(Sidebars::YourWork::Menus::MilestonesMenu.new(context)) + add_menu(Sidebars::YourWork::Menus::SnippetsMenu.new(context)) + add_menu(Sidebars::YourWork::Menus::ActivityMenu.new(context)) + end + end + end +end |