diff --git a/ee/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb b/ee/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb index 3b053425063ca75fb47da209a12d4becfbbf77d5..4af0857b88aa567ed6d53afbdc7c25bfc1785cb5 100644 --- a/ee/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb +++ b/ee/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb @@ -31,8 +31,6 @@ allow(project).to receive(:licensed_feature_available?).and_return true # Needed to show Container Registry items allow(::Gitlab.config.registry).to receive(:enabled).and_return(true) - # This feature flag removes the monitor metrics menu item, so turn it off - stub_feature_flags(remove_monitor_metrics: false) # Iterations are only available in non-personal projects allow(project).to receive(:personal?).and_return(false) end diff --git a/lib/sidebars/projects/menus/monitor_menu.rb b/lib/sidebars/projects/menus/monitor_menu.rb index f1fc9f70ef8ba8d50388ef925d63184cedc65f62..a74448d0bdc4e2cf87fbb23203b6bc3356bf655f 100644 --- a/lib/sidebars/projects/menus/monitor_menu.rb +++ b/lib/sidebars/projects/menus/monitor_menu.rb @@ -8,7 +8,6 @@ class MonitorMenu < ::Sidebars::Menu def configure_menu_items return false unless feature_enabled? - add_item(metrics_dashboard_menu_item) add_item(error_tracking_menu_item) add_item(alert_management_menu_item) add_item(incidents_menu_item) @@ -49,23 +48,6 @@ def feature_enabled? context.project.feature_available?(:monitor, context.current_user) end - def metrics_dashboard_menu_item - return ::Sidebars::NilMenuItem.new(item_id: :metrics) if Feature.enabled?(:remove_monitor_metrics) - - unless can?(context.current_user, :metrics_dashboard, context.project) - return ::Sidebars::NilMenuItem.new(item_id: :metrics) - end - - ::Sidebars::MenuItem.new( - title: _('Metrics'), - link: project_metrics_dashboard_path(context.project), - super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::MonitorMenu, - active_routes: { path: 'metrics_dashboard#show' }, - container_html_options: { class: 'shortcuts-metrics' }, - item_id: :metrics - ) - end - def error_tracking_menu_item unless can?(context.current_user, :read_sentry_issue, context.project) return ::Sidebars::NilMenuItem.new(item_id: :error_tracking) diff --git a/lib/sidebars/projects/super_sidebar_menus/monitor_menu.rb b/lib/sidebars/projects/super_sidebar_menus/monitor_menu.rb index fb56f6f379249772ddff1ce829e1e3802f17d174..6e64ac01ffae298c49c94dc2329d749ae0fed830 100644 --- a/lib/sidebars/projects/super_sidebar_menus/monitor_menu.rb +++ b/lib/sidebars/projects/super_sidebar_menus/monitor_menu.rb @@ -17,7 +17,6 @@ def sprite_icon override :configure_menu_items def configure_menu_items [ - :metrics, :error_tracking, :alert_management, :incidents, diff --git a/spec/features/monitor_sidebar_link_spec.rb b/spec/features/monitor_sidebar_link_spec.rb index 6a1413c04f6f5721a55110ef738d293039a5731e..6e464cb8752a679cd67475996504dfdab35b14b9 100644 --- a/spec/features/monitor_sidebar_link_spec.rb +++ b/spec/features/monitor_sidebar_link_spec.rb @@ -11,7 +11,6 @@ before do project.add_role(user, role) if role sign_in(user) - stub_feature_flags(remove_monitor_metrics: false) end shared_examples 'shows Monitor menu based on the access level' do @@ -53,7 +52,6 @@ expect(page).to have_link('Incidents', href: project_incidents_path(project)) expect(page).to have_link('Environments', href: project_environments_path(project)) - expect(page).not_to have_link('Metrics', href: project_metrics_dashboard_path(project)) expect(page).not_to have_link('Alerts', href: project_alert_management_index_path(project)) expect(page).not_to have_link('Error Tracking', href: project_error_tracking_index_path(project)) expect(page).not_to have_link('Kubernetes', href: project_clusters_path(project)) @@ -85,7 +83,6 @@ expect(page).to have_link('Incidents', href: project_incidents_path(project)) expect(page).to have_link('Environments', href: project_environments_path(project)) - expect(page).not_to have_link('Metrics', href: project_metrics_dashboard_path(project)) expect(page).not_to have_link('Alerts', href: project_alert_management_index_path(project)) expect(page).not_to have_link('Error Tracking', href: project_error_tracking_index_path(project)) expect(page).not_to have_link('Kubernetes', href: project_clusters_path(project)) @@ -99,7 +96,6 @@ it 'has the correct `Monitor` menu items' do visit project_issues_path(project) - expect(page).to have_link('Metrics', href: project_metrics_dashboard_path(project)) expect(page).to have_link('Incidents', href: project_incidents_path(project)) expect(page).to have_link('Environments', href: project_environments_path(project)) expect(page).to have_link('Error Tracking', href: project_error_tracking_index_path(project)) @@ -116,7 +112,6 @@ it 'has the correct `Monitor` menu items' do visit project_issues_path(project) - expect(page).to have_link('Metrics', href: project_metrics_dashboard_path(project)) expect(page).to have_link('Alerts', href: project_alert_management_index_path(project)) expect(page).to have_link('Incidents', href: project_incidents_path(project)) expect(page).to have_link('Environments', href: project_environments_path(project)) @@ -132,7 +127,6 @@ it 'has the correct `Monitor` menu items' do visit project_issues_path(project) - expect(page).to have_link('Metrics', href: project_metrics_dashboard_path(project)) expect(page).to have_link('Alerts', href: project_alert_management_index_path(project)) expect(page).to have_link('Incidents', href: project_incidents_path(project)) expect(page).to have_link('Environments', href: project_environments_path(project)) diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb index 532dd7d0a843a970ed5124764a9f23fce6824c9c..31f4e9dcf950a2c3c1d48ea3d394fada2d7e27ad 100644 --- a/spec/features/projects/navbar_spec.rb +++ b/spec/features/projects/navbar_spec.rb @@ -20,7 +20,6 @@ stub_config(registry: { enabled: false }) stub_feature_flags(harbor_registry_integration: false) stub_feature_flags(ml_experiment_tracking: false) - stub_feature_flags(remove_monitor_metrics: false) insert_package_nav(_('Deployments')) insert_infrastructure_registry_nav insert_infrastructure_google_cloud_nav diff --git a/spec/features/projects/settings/monitor_settings_spec.rb b/spec/features/projects/settings/monitor_settings_spec.rb index 1367ffb0009f2af5062d4be9faa2d7105199d4bb..89fee1cdb49d4e466d323af5965294094023631b 100644 --- a/spec/features/projects/settings/monitor_settings_spec.rb +++ b/spec/features/projects/settings/monitor_settings_spec.rb @@ -19,8 +19,8 @@ visit project_path(project) wait_for_requests - expect(page).to have_selector('.sidebar-sub-level-items a[aria-label="Monitor"]', - text: 'Monitor', visible: :hidden) + expect(page).to have_selector('.sidebar-sub-level-items a[aria-label="Error Tracking"]', + text: 'Error Tracking', visible: :hidden) end end diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb index 1d4ab242308d425012116c635112168a9d563714..e90e540ae323676e2971189345b6eb76f742b884 100644 --- a/spec/features/projects/user_uses_shortcuts_spec.rb +++ b/spec/features/projects/user_uses_shortcuts_spec.rb @@ -9,7 +9,6 @@ before do sign_in(user) - stub_feature_flags(remove_monitor_metrics: false) visit(project_path(project)) @@ -183,16 +182,6 @@ def close_modal end end - context 'when navigating to the Monitor pages' do - it 'redirects to the Metrics page' do - find('body').native.send_key('g') - find('body').native.send_key('l') - - expect(page).to have_active_navigation('Monitor') - expect(page).to have_active_sub_navigation('Metrics') - end - end - context 'when navigating to the Infrastructure pages' do it 'redirects to the Kubernetes page' do find('body').native.send_key('g') diff --git a/spec/lib/sidebars/projects/menus/monitor_menu_spec.rb b/spec/lib/sidebars/projects/menus/monitor_menu_spec.rb index aa1e67085cd9a8a4b0bd40aedc3fb98b74038ca7..8bb7e8c85183c48b4aa9e41aeca1a383256c44c1 100644 --- a/spec/lib/sidebars/projects/menus/monitor_menu_spec.rb +++ b/spec/lib/sidebars/projects/menus/monitor_menu_spec.rb @@ -57,10 +57,6 @@ end context 'Menu items' do - before do - stub_feature_flags(remove_monitor_metrics: false) - end - subject { described_class.new(context).renderable_items.index { |e| e.item_id == item_id } } shared_examples 'access rights checks' do @@ -73,12 +69,6 @@ end end - describe 'Metrics Dashboard' do - let(:item_id) { :metrics } - - it_behaves_like 'access rights checks' - end - describe 'Error Tracking' do let(:item_id) { :error_tracking } diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/monitor_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/monitor_menu_spec.rb index 9344bbc76dbeb1eb37e2b8ee31b8f33c45c14d1c..e59062c7eaf12044ca5818b7443c5c55d17315e1 100644 --- a/spec/lib/sidebars/projects/super_sidebar_menus/monitor_menu_spec.rb +++ b/spec/lib/sidebars/projects/super_sidebar_menus/monitor_menu_spec.rb @@ -15,7 +15,6 @@ it 'defines list of NilMenuItem placeholders' do expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem]) expect(items.map(&:item_id)).to eq([ - :metrics, :error_tracking, :alert_management, :incidents, diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb index 7b8395948161206aed8cb9b34921b52868249f30..efb4d244c109bfd5fde18a11f16d3185a981fdd5 100644 --- a/spec/support/shared_contexts/navbar_structure_context.rb +++ b/spec/support/shared_contexts/navbar_structure_context.rb @@ -82,7 +82,6 @@ { nav_item: _('Monitor'), nav_sub_items: [ - _('Metrics'), _('Error Tracking'), _('Alerts'), _('Incidents') diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb index 94ea9043857126c9a6246ffff7701690fced43b7..3ec731c8eb726e862152db8bb12cf5b2bb22a525 100644 --- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb @@ -382,34 +382,12 @@ end describe 'Monitor' do - before do - stub_feature_flags(remove_monitor_metrics: false) - end - it 'top level navigation link is visible for user with permissions' do render expect(rendered).to have_link('Monitor') end - describe 'Metrics Dashboard' do - it 'has a link to the metrics dashboard page' do - render - - expect(rendered).to have_link('Metrics', href: project_metrics_dashboard_path(project)) - end - - describe 'when the user does not have access' do - let(:user) { nil } - - it 'does not have a link to the metrics page' do - render - - expect(rendered).not_to have_link('Metrics') - end - end - end - describe 'Error Tracking' do it 'has a link to the error tracking page' do render