diff options
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/filtered_search_bar')
3 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js index d7a84798e47..5d7f4ae2a01 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js @@ -1,4 +1,4 @@ -import { __ } from '~/locale'; +import { __, s__ } from '~/locale'; export const DEBOUNCE_DELAY = 500; export const MAX_RECENT_TOKENS_SIZE = 3; @@ -46,11 +46,13 @@ export const SortDirection = { export const FILTERED_SEARCH_LABELS = 'labels'; export const FILTERED_SEARCH_TERM = 'filtered-search-term'; -export const TOKEN_TITLE_AUTHOR = __('Author'); export const TOKEN_TITLE_ASSIGNEE = __('Assignee'); -export const TOKEN_TITLE_MILESTONE = __('Milestone'); +export const TOKEN_TITLE_AUTHOR = __('Author'); +export const TOKEN_TITLE_CONFIDENTIAL = __('Confidential'); +export const TOKEN_TITLE_CONTACT = s__('Crm|Contact'); export const TOKEN_TITLE_LABEL = __('Label'); -export const TOKEN_TITLE_TYPE = __('Type'); -export const TOKEN_TITLE_RELEASE = __('Release'); +export const TOKEN_TITLE_MILESTONE = __('Milestone'); export const TOKEN_TITLE_MY_REACTION = __('My-Reaction'); -export const TOKEN_TITLE_CONFIDENTIAL = __('Confidential'); +export const TOKEN_TITLE_ORGANIZATION = s__('Crm|Organization'); +export const TOKEN_TITLE_RELEASE = __('Release'); +export const TOKEN_TITLE_TYPE = __('Type'); diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue index c3a0a97a7ba..6a4ff07c999 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue @@ -168,7 +168,7 @@ export default { if (data || operator) { this.searchKey = data; - if (!this.suggestionsLoading && !this.activeTokenValue) { + if (!this.activeTokenValue) { let search = this.searchTerm ? this.searchTerm : data; if (search.startsWith('"') && search.endsWith('"')) { diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue index 6f24955814c..178c57a5666 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue @@ -43,9 +43,7 @@ export default { }, methods: { getActiveLabel(labels, data) { - return labels.find( - (label) => this.getLabelName(label).toLowerCase() === stripQuotes(data).toLowerCase(), - ); + return labels.find((label) => this.getLabelName(label) === stripQuotes(data)); }, /** * There's an inconsistency between private and public API @@ -128,7 +126,7 @@ export default { <div class="gl-display-flex gl-align-items-center"> <span :style="{ backgroundColor: label.color }" - class="gl-display-inline-block mr-2 p-2" + class="gl-display-inline-block gl-mr-3 gl-p-3" ></span> <div>{{ getLabelName(label) }}</div> </div> |