Merge branch '10488-add-operations-dropdown' into 'master'

Resolve "Update 'speedometer' button on Gitlab.com header to be a dropdown menu that lists dashboards"

Closes #10488

See merge request gitlab-org/gitlab-ee!10519

ee/app/controllers/operations_controller.rb

@@ -3,6 +3,8 @@
 class OperationsController < ApplicationController
   before_action :authorize_read_operations_dashboard!
 
+  before_action :dashboard_feature_flag, only: [:environments]
+
   respond_to :json, only: [:list]
 
   POLLING_INTERVAL = 120_000
@@ -10,6 +12,14 @@ class OperationsController < ApplicationController
   def index
   end
 
+  def environments
+    render :index
+  end
+
+  def dashboard_feature_flag
+    push_frontend_feature_flag(:environments_dashboard)
+  end
+
   def list
     Gitlab::PollingInterval.set_header(response, interval: POLLING_INTERVAL)
     projects = load_projects(current_user)

ee/app/views/dashboard/operations/_nav_link.html.haml

 - if can?(current_user, :read_operations_dashboard)
-  = nav_link(controller: 'operations') do
-    = link_to operations_path, title: _('Operations'), aria: { label: _('Operations') } do
+  %li.dropdown
+    %button#js-dashboards-menu.btn-link{ type: 'button', data: { toggle: 'dropdown' }, 'aria-label': _('Operations Dashboard'), 'aria-haspopup': true, 'aria-expanded': false }
       = sprite_icon('dashboard', size: 18)
+    .dropdown-menu{ 'aria-labelledby': "js-dashboards-menu" }
+      .dropdown-bold-header
+        = _('Dashboards')
+      - if Feature.enabled?('environments_dashboard')
+        = link_to operations_environments_path, class: 'dropdown-item', title: _('Environments'), aria: { label: _('Environments') } do
+          = _('Environments')
+      = link_to operations_path, class: 'dropdown-item', title: _('Operations'), aria: { label: _('Operations') } do
+        = _('Operations')

ee/config/routes/operations.rb

 # frozen_string_literal: true
 
 get 'operations' => 'operations#index'
+get 'operations/environments' => 'operations#environments'
 get 'operations/list' => 'operations#list'
 post 'operations' => 'operations#create', as: :add_operations_project
 delete 'operations' => 'operations#destroy', as: :remove_operations_project

ee/spec/features/operations_nav_link_spec.rb

+require 'spec_helper'
+
+describe 'Operations dropdown navbar EE' do
+  let(:user) { create(:user) }
+  let(:project) { create(:project) }
+
+  before do
+    project.add_maintainer(user)
+    sign_in(user)
+
+    stub_licensed_features(operations_dashboard: true)
+    stub_feature_flags(environments_dashboard: true)
+
+    visit project_issues_path(project)
+  end
+
+  it 'should have a `Operations` link' do
+    expect(page).to have_link('Operations', href: operations_path)
+  end
+
+  it 'should have a `Environments` link' do
+    expect(page).to have_link('Environments', href: operations_environments_path)
+  end
+end

locale/gitlab.pot

@@ -3305,6 +3305,9 @@ msgstr ""
 msgid "DashboardProjects|Personal"
 msgstr ""
 
+msgid "Dashboards"
+msgstr ""
+
 msgid "Data is still calculating..."
 msgstr ""