diff options
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue index 46ccb9470e5..35ac9ef8565 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue @@ -1,5 +1,6 @@ <script> import { GlLabel } from '@gitlab/ui'; +import { sortBy } from 'lodash'; import { mapState } from 'vuex'; import { isScopedLabel } from '~/lib/utils/common_utils'; @@ -23,6 +24,9 @@ export default { 'labelsFilterBasePath', 'labelsFilterParam', ]), + sortedSelectedLabels() { + return sortBy(this.selectedLabels, (label) => (isScopedLabel(label) ? 0 : 1)); + }, }, methods: { labelFilterUrl(label) { @@ -47,7 +51,7 @@ export default { <span v-if="!selectedLabels.length" class="text-secondary"> <slot></slot> </span> - <template v-for="label in selectedLabels" v-else> + <template v-for="label in sortedSelectedLabels" v-else> <gl-label :key="label.id" data-qa-selector="selected_label_content" |