From e4d1f5d356ad492c95dd74098a2c0b665ccd5961 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Tue, 23 Apr 2019 23:35:39 +1000
Subject: [PATCH] Fix Metrics environments dropdown

Also bring back EE dashboard component
---
 app/assets/javascripts/monitoring/components/dashboard.vue | 1 +
 app/assets/javascripts/monitoring/monitoring_bundle.js     | 2 +-
 changelogs/unreleased/60687-enviro-dropdown.yml            | 5 +++++
 spec/javascripts/monitoring/dashboard_spec.js              | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/60687-enviro-dropdown.yml

diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue
index f2bd4150b6d..00547abd7bc 100644
--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -221,6 +221,7 @@ export default {
           <gl-dropdown-item
             v-for="environment in store.environmentsData"
             :key="environment.id"
+            :href="environment.metrics_path"
             :active="environment.name === currentEnvironmentName"
             active-class="is-active"
             >{{ environment.name }}</gl-dropdown-item
diff --git a/app/assets/javascripts/monitoring/monitoring_bundle.js b/app/assets/javascripts/monitoring/monitoring_bundle.js
index ed794779ff2..08dc57d545c 100644
--- a/app/assets/javascripts/monitoring/monitoring_bundle.js
+++ b/app/assets/javascripts/monitoring/monitoring_bundle.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import { parseBoolean } from '~/lib/utils/common_utils';
-import Dashboard from './components/dashboard.vue';
+import Dashboard from 'ee_else_ce/monitoring/components/dashboard.vue';
 
 export default (props = {}) => {
   const el = document.getElementById('prometheus-graphs');
diff --git a/changelogs/unreleased/60687-enviro-dropdown.yml b/changelogs/unreleased/60687-enviro-dropdown.yml
new file mode 100644
index 00000000000..1fc5a7dd6f5
--- /dev/null
+++ b/changelogs/unreleased/60687-enviro-dropdown.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Metrics Environments dropdown
+merge_request:
+author:
+type: fixed
diff --git a/spec/javascripts/monitoring/dashboard_spec.js b/spec/javascripts/monitoring/dashboard_spec.js
index ce2c6c43c0f..16dc0084a10 100644
--- a/spec/javascripts/monitoring/dashboard_spec.js
+++ b/spec/javascripts/monitoring/dashboard_spec.js
@@ -175,7 +175,7 @@ describe('Dashboard', () => {
 
       setTimeout(() => {
         const dropdownItems = component.$el.querySelectorAll(
-          '.js-environments-dropdown .dropdown-item[active="true"]',
+          '.js-environments-dropdown .dropdown-item.is-active',
         );
 
         expect(dropdownItems.length).toEqual(1);