Merge branch '60687-enviro-dropdown' into 'master'

Fix Metrics environments dropdown

Closes #60687

See merge request gitlab-org/gitlab-ce!27586
This commit is contained in:
Fatih Acet 2019-04-24 23:13:32 +00:00
commit 0f863c68bb
4 changed files with 8 additions and 2 deletions

View file

@ -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

View file

@ -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');

View file

@ -0,0 +1,5 @@
---
title: Fix Metrics Environments dropdown
merge_request:
author:
type: fixed

View file

@ -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);