Merge branch '62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard' into 'master'
Resolve "Target area for dropdown list items is too small on Metrics Dashboard" Closes #62300 See merge request gitlab-org/gitlab-ce!29458
This commit is contained in:
commit
4c26b2f204
3 changed files with 10 additions and 13 deletions
|
@ -1,12 +1,5 @@
|
|||
<script>
|
||||
import {
|
||||
GlButton,
|
||||
GlDropdown,
|
||||
GlDropdownItem,
|
||||
GlModal,
|
||||
GlModalDirective,
|
||||
GlLink,
|
||||
} from '@gitlab/ui';
|
||||
import { GlButton, GlDropdown, GlDropdownItem, GlModal, GlModalDirective } from '@gitlab/ui';
|
||||
import _ from 'underscore';
|
||||
import { mapActions, mapState } from 'vuex';
|
||||
import { s__ } from '~/locale';
|
||||
|
@ -31,7 +24,6 @@ export default {
|
|||
GlButton,
|
||||
GlDropdown,
|
||||
GlDropdownItem,
|
||||
GlLink,
|
||||
GlModal,
|
||||
},
|
||||
directives: {
|
||||
|
@ -255,7 +247,9 @@ export default {
|
|||
v-for="(value, key) in timeWindows"
|
||||
:key="key"
|
||||
:active="activeTimeWindow(key)"
|
||||
><gl-link :href="setTimeWindowParameter(key)">{{ value }}</gl-link></gl-dropdown-item
|
||||
:href="setTimeWindowParameter(key)"
|
||||
active-class="active"
|
||||
>{{ value }}</gl-dropdown-item
|
||||
>
|
||||
</gl-dropdown>
|
||||
</div>
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Enlarge metrics time-window dropdown links
|
||||
merge_request: 29458
|
||||
author:
|
||||
type: fixed
|
|
@ -314,9 +314,7 @@ describe('Dashboard', () => {
|
|||
});
|
||||
|
||||
setTimeout(() => {
|
||||
const selectedTimeWindow = component.$el.querySelector(
|
||||
'.js-time-window-dropdown [active="true"]',
|
||||
);
|
||||
const selectedTimeWindow = component.$el.querySelector('.js-time-window-dropdown .active');
|
||||
|
||||
expect(selectedTimeWindow.textContent.trim()).toEqual('30 minutes');
|
||||
done();
|
||||
|
|
Loading…
Reference in a new issue