From 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 17 Nov 2022 11:33:21 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-6-stable-ee --- lib/sidebars/groups/menus/observability_menu.rb | 38 ++++++++++++++++++---- lib/sidebars/groups/menus/settings_menu.rb | 4 +++ lib/sidebars/projects/menus/deployments_menu.rb | 2 +- lib/sidebars/projects/menus/infrastructure_menu.rb | 10 +++++- lib/sidebars/projects/menus/monitor_menu.rb | 15 --------- 5 files changed, 46 insertions(+), 23 deletions(-) (limited to 'lib/sidebars') diff --git a/lib/sidebars/groups/menus/observability_menu.rb b/lib/sidebars/groups/menus/observability_menu.rb index b479ff3c492..656142375af 100644 --- a/lib/sidebars/groups/menus/observability_menu.rb +++ b/lib/sidebars/groups/menus/observability_menu.rb @@ -4,9 +4,11 @@ module Sidebars module Groups module Menus class ObservabilityMenu < ::Sidebars::Menu - override :link - def link - group_observability_index_path(context.group) + override :configure_menu_items + def configure_menu_items + add_item(dashboards_menu_item) + add_item(explore_menu_item) + add_item(manage_menu_item) end override :title @@ -24,9 +26,33 @@ module Sidebars can?(context.current_user, :read_observability, context.group) end - override :active_routes - def active_routes - { controller: :observability, path: 'groups#observability' } + private + + def dashboards_menu_item + ::Sidebars::MenuItem.new( + title: _('Dashboards'), + link: group_observability_dashboards_path(context.group), + active_routes: { path: 'groups/observability#dashboards' }, + item_id: :dashboards + ) + end + + def explore_menu_item + ::Sidebars::MenuItem.new( + title: _('Explore'), + link: group_observability_explore_path(context.group), + active_routes: { path: 'groups/observability#explore' }, + item_id: :explore + ) + end + + def manage_menu_item + ::Sidebars::MenuItem.new( + title: _('Manage Dashboards'), + link: group_observability_manage_path(context.group), + active_routes: { path: 'groups/observability#manage' }, + item_id: :manage + ) end end end diff --git a/lib/sidebars/groups/menus/settings_menu.rb b/lib/sidebars/groups/menus/settings_menu.rb index df170670aab..ede195a8e59 100644 --- a/lib/sidebars/groups/menus/settings_menu.rb +++ b/lib/sidebars/groups/menus/settings_menu.rb @@ -20,6 +20,10 @@ module Sidebars # Push Rules are the only group setting that can also be edited by maintainers. # Create an empty sub-menu here and EE adds Repository menu item (with only Push Rules). return true + elsif Gitlab.ee? && can?(context.current_user, :read_billing, context.group) + # Billing is the only group setting that is visible to auditors. + # Create an empty sub-menu here and EE adds Settings menu item (with only Billing). + return true end false diff --git a/lib/sidebars/projects/menus/deployments_menu.rb b/lib/sidebars/projects/menus/deployments_menu.rb index 24e58e71023..9904d533f47 100644 --- a/lib/sidebars/projects/menus/deployments_menu.rb +++ b/lib/sidebars/projects/menus/deployments_menu.rb @@ -6,8 +6,8 @@ module Sidebars class DeploymentsMenu < ::Sidebars::Menu override :configure_menu_items def configure_menu_items - add_item(feature_flags_menu_item) add_item(environments_menu_item) + add_item(feature_flags_menu_item) add_item(releases_menu_item) true diff --git a/lib/sidebars/projects/menus/infrastructure_menu.rb b/lib/sidebars/projects/menus/infrastructure_menu.rb index 2181d89262b..a8ac3d10f83 100644 --- a/lib/sidebars/projects/menus/infrastructure_menu.rb +++ b/lib/sidebars/projects/menus/infrastructure_menu.rb @@ -6,7 +6,7 @@ module Sidebars class InfrastructureMenu < ::Sidebars::Menu override :configure_menu_items def configure_menu_items - return false unless context.project.feature_available?(:operations, context.current_user) + return false unless feature_enabled? add_item(kubernetes_menu_item) add_item(terraform_menu_item) @@ -34,6 +34,14 @@ module Sidebars private + def feature_enabled? + if ::Feature.enabled?(:split_operations_visibility_permissions, context.project) + context.project.feature_available?(:infrastructure, context.current_user) + else + context.project.feature_available?(:operations, context.current_user) + end + end + def kubernetes_menu_item unless can?(context.current_user, :read_cluster, context.project) return ::Sidebars::NilMenuItem.new(item_id: :kubernetes) diff --git a/lib/sidebars/projects/menus/monitor_menu.rb b/lib/sidebars/projects/menus/monitor_menu.rb index ecd062f333e..035634702db 100644 --- a/lib/sidebars/projects/menus/monitor_menu.rb +++ b/lib/sidebars/projects/menus/monitor_menu.rb @@ -12,7 +12,6 @@ module Sidebars add_item(error_tracking_menu_item) add_item(alert_management_menu_item) add_item(incidents_menu_item) - add_item(product_analytics_menu_item) true end @@ -101,20 +100,6 @@ module Sidebars item_id: :incidents ) end - - def product_analytics_menu_item - if Feature.disabled?(:product_analytics, context.project) || - !can?(context.current_user, :read_product_analytics, context.project) - return ::Sidebars::NilMenuItem.new(item_id: :product_analytics) - end - - ::Sidebars::MenuItem.new( - title: _('Product Analytics'), - link: project_product_analytics_path(context.project), - active_routes: { controller: :product_analytics }, - item_id: :product_analytics - ) - end end end end -- cgit v1.2.3