From 728ba298b03d20538681b7392f10d2c2ef05d378 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Wed, 24 Apr 2019 23:13:32 +0000 Subject: [PATCH] Merge branch '60687-enviro-dropdown' into 'master' Fix Metrics environments dropdown Closes #60687 See merge request gitlab-org/gitlab-ce!27586 (cherry picked from commit 0f863c68bb8bc5054a22e0c553a933c83bea4df6) e4d1f5d3 Fix Metrics environments dropdown --- 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 { {{ environment.name }} { 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); -- GitLab