Make time window links take up full dropdown width
This commit is contained in:
parent
d7f5027643
commit
a6e3042491
3 changed files with 10 additions and 13 deletions
|
@ -1,12 +1,5 @@
|
||||||
<script>
|
<script>
|
||||||
import {
|
import { GlButton, GlDropdown, GlDropdownItem, GlModal, GlModalDirective } from '@gitlab/ui';
|
||||||
GlButton,
|
|
||||||
GlDropdown,
|
|
||||||
GlDropdownItem,
|
|
||||||
GlModal,
|
|
||||||
GlModalDirective,
|
|
||||||
GlLink,
|
|
||||||
} from '@gitlab/ui';
|
|
||||||
import _ from 'underscore';
|
import _ from 'underscore';
|
||||||
import { mapActions, mapState } from 'vuex';
|
import { mapActions, mapState } from 'vuex';
|
||||||
import { s__ } from '~/locale';
|
import { s__ } from '~/locale';
|
||||||
|
@ -31,7 +24,6 @@ export default {
|
||||||
GlButton,
|
GlButton,
|
||||||
GlDropdown,
|
GlDropdown,
|
||||||
GlDropdownItem,
|
GlDropdownItem,
|
||||||
GlLink,
|
|
||||||
GlModal,
|
GlModal,
|
||||||
},
|
},
|
||||||
directives: {
|
directives: {
|
||||||
|
@ -255,7 +247,9 @@ export default {
|
||||||
v-for="(value, key) in timeWindows"
|
v-for="(value, key) in timeWindows"
|
||||||
:key="key"
|
:key="key"
|
||||||
:active="activeTimeWindow(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>
|
</gl-dropdown>
|
||||||
</div>
|
</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(() => {
|
setTimeout(() => {
|
||||||
const selectedTimeWindow = component.$el.querySelector(
|
const selectedTimeWindow = component.$el.querySelector('.js-time-window-dropdown .active');
|
||||||
'.js-time-window-dropdown [active="true"]',
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(selectedTimeWindow.textContent.trim()).toEqual('30 minutes');
|
expect(selectedTimeWindow.textContent.trim()).toEqual('30 minutes');
|
||||||
done();
|
done();
|
||||||
|
|
Loading…
Reference in a new issue