diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/assets/javascripts/logs/components/log_simple_filters.vue | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/logs/components/log_simple_filters.vue')
-rw-r--r-- | app/assets/javascripts/logs/components/log_simple_filters.vue | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/app/assets/javascripts/logs/components/log_simple_filters.vue b/app/assets/javascripts/logs/components/log_simple_filters.vue index 21fe1695624..2e1270b5428 100644 --- a/app/assets/javascripts/logs/components/log_simple_filters.vue +++ b/app/assets/javascripts/logs/components/log_simple_filters.vue @@ -1,14 +1,19 @@ <script> -import { s__ } from '~/locale'; import { mapActions, mapState } from 'vuex'; -import { GlIcon, GlDropdown, GlDropdownHeader, GlDropdownItem } from '@gitlab/ui'; +import { + GlIcon, + GlDeprecatedDropdown, + GlDeprecatedDropdownHeader, + GlDeprecatedDropdownItem, +} from '@gitlab/ui'; +import { s__ } from '~/locale'; export default { components: { GlIcon, - GlDropdown, - GlDropdownHeader, - GlDropdownItem, + GlDeprecatedDropdown, + GlDeprecatedDropdownHeader, + GlDeprecatedDropdownItem, }, props: { disabled: { @@ -39,22 +44,22 @@ export default { </script> <template> <div> - <gl-dropdown + <gl-deprecated-dropdown ref="podsDropdown" :text="podDropdownText" :disabled="disabled" class="mb-2 gl-h-32 pr-2 d-flex d-md-block flex-grow-0 qa-pods-dropdown" > - <gl-dropdown-header class="text-center"> + <gl-deprecated-dropdown-header class="text-center"> {{ s__('Environments|Select pod') }} - </gl-dropdown-header> + </gl-deprecated-dropdown-header> - <gl-dropdown-item v-if="!pods.options.length" disabled> + <gl-deprecated-dropdown-item v-if="!pods.options.length" disabled> <span ref="noPodsMsg" class="text-muted"> {{ s__('Environments|No pods to display') }} </span> - </gl-dropdown-item> - <gl-dropdown-item + </gl-deprecated-dropdown-item> + <gl-deprecated-dropdown-item v-for="podName in pods.options" :key="podName" class="text-nowrap" @@ -67,7 +72,7 @@ export default { /> <div class="flex-grow-1">{{ podName }}</div> </div> - </gl-dropdown-item> - </gl-dropdown> + </gl-deprecated-dropdown-item> + </gl-deprecated-dropdown> </div> </template> |