diff options
Diffstat (limited to 'lib/sidebars/groups/menus')
| -rw-r--r-- | lib/sidebars/groups/menus/observability_menu.rb | 20 | ||||
| -rw-r--r-- | lib/sidebars/groups/menus/settings_menu.rb | 17 |
2 files changed, 31 insertions, 6 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) |