diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-28 21:08:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-28 21:08:52 +0300 |
commit | 3e49ae159acbb703f005f5014772072cd90ef97b (patch) | |
tree | a65e942c5e207461419c4a266ebe6952733c8520 /app/assets/javascripts/monitoring | |
parent | 77d49e6a73b3a1e142ec865d05dc3dd9a708ab6a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring')
-rw-r--r-- | app/assets/javascripts/monitoring/components/variables/dropdown_field.vue | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/app/assets/javascripts/monitoring/components/variables/dropdown_field.vue b/app/assets/javascripts/monitoring/components/variables/dropdown_field.vue index 5563a27301d..4e48292c48d 100644 --- a/app/assets/javascripts/monitoring/components/variables/dropdown_field.vue +++ b/app/assets/javascripts/monitoring/components/variables/dropdown_field.vue @@ -1,11 +1,11 @@ <script> -import { GlFormGroup, GlDeprecatedDropdown, GlDeprecatedDropdownItem } from '@gitlab/ui'; +import { GlFormGroup, GlDropdown, GlDropdownItem } from '@gitlab/ui'; export default { components: { GlFormGroup, - GlDeprecatedDropdown, - GlDeprecatedDropdownItem, + GlDropdown, + GlDropdownItem, }, props: { name: { @@ -41,16 +41,13 @@ export default { </script> <template> <gl-form-group :label="label"> - <gl-deprecated-dropdown - toggle-class="dropdown-menu-toggle" - :text="text || s__('Metrics|Select a value')" - > - <gl-deprecated-dropdown-item + <gl-dropdown toggle-class="dropdown-menu-toggle" :text="text || s__('Metrics|Select a value')"> + <gl-dropdown-item v-for="val in options.values" :key="val.value" @click="onUpdate(val.value)" - >{{ val.text }}</gl-deprecated-dropdown-item + >{{ val.text }}</gl-dropdown-item > - </gl-deprecated-dropdown> + </gl-dropdown> </gl-form-group> </template> |