diff options
Diffstat (limited to 'app/assets/javascripts/issues_list/components')
3 files changed, 19 insertions, 16 deletions
diff --git a/app/assets/javascripts/issues_list/components/issuable.vue b/app/assets/javascripts/issues_list/components/issuable.vue index 3965fd6b0c7..b7af6e098e1 100644 --- a/app/assets/javascripts/issues_list/components/issuable.vue +++ b/app/assets/javascripts/issues_list/components/issuable.vue @@ -5,7 +5,7 @@ */ // TODO: need to move this component to graphql - https://gitlab.com/gitlab-org/gitlab/-/issues/221246 -import { escape, isNumber } from 'lodash'; +import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg'; import { GlLink, GlTooltipDirective as GlTooltip, @@ -14,7 +14,8 @@ import { GlIcon, GlSafeHtmlDirective as SafeHtml, } from '@gitlab/ui'; -import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg'; +import { escape, isNumber } from 'lodash'; +import { isScopedLabel } from '~/lib/utils/common_utils'; import { dateInWords, formatDate, @@ -23,13 +24,11 @@ import { timeFor, newDateAsLocaleTime, } from '~/lib/utils/datetime_utility'; +import { convertToCamelCase } from '~/lib/utils/text_utility'; +import { mergeUrlParams } from '~/lib/utils/url_utility'; import { sprintf, __ } from '~/locale'; import initUserPopovers from '~/user_popovers'; -import { mergeUrlParams } from '~/lib/utils/url_utility'; import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue'; -import { isScopedLabel } from '~/lib/utils/common_utils'; - -import { convertToCamelCase } from '~/lib/utils/text_utility'; export default { i18n: { @@ -414,7 +413,7 @@ export default { v-if="meta.visible" :key="meta.key" v-gl-tooltip - class="gl-display-none gl-display-sm-flex gl-align-items-center gl-ml-3" + class="gl-display-none gl-sm-display-flex gl-align-items-center gl-ml-3" :class="meta.class" :data-testid="meta.dataTestId" :title="meta.title" diff --git a/app/assets/javascripts/issues_list/components/issuables_list_app.vue b/app/assets/javascripts/issues_list/components/issuables_list_app.vue index eda8bc2b61f..0b413ce0b06 100644 --- a/app/assets/javascripts/issues_list/components/issuables_list_app.vue +++ b/app/assets/javascripts/issues_list/components/issuables_list_app.vue @@ -1,11 +1,11 @@ <script> -import { toNumber, omit } from 'lodash'; import { GlEmptyState, GlPagination, GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlSafeHtmlDirective as SafeHtml, } from '@gitlab/ui'; +import { toNumber, omit } from 'lodash'; import { deprecatedCreateFlash as flash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { @@ -14,9 +14,9 @@ import { historyPushState, getParameterByName, } from '~/lib/utils/common_utils'; +import { setUrlParams } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import initManualOrdering from '~/manual_ordering'; -import Issuable from './issuable.vue'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import { sortOrderMap, @@ -26,9 +26,9 @@ import { PAGE_SIZE_MANUAL, LOADING_LIST_ITEMS_LENGTH, } from '../constants'; -import { setUrlParams } from '~/lib/utils/url_utility'; import issueableEventHub from '../eventhub'; import { emptyStateHelper } from '../service_desk_helper'; +import Issuable from './issuable.vue'; export default { LOADING_LIST_ITEMS_LENGTH, @@ -333,15 +333,19 @@ export default { this.fetchIssuables(); }, handleFilter(filters) { - let search = null; + const searchTokens = []; filters.forEach((filter) => { - if (typeof filter === 'string') { - search = filter; + if (filter.type === 'filtered-search-term') { + if (filter.value.data) { + searchTokens.push(filter.value.data); + } } }); - this.filters.search = search; + if (searchTokens.length) { + this.filters.search = searchTokens.join(' '); + } this.page = 1; this.refetchIssuables(); diff --git a/app/assets/javascripts/issues_list/components/jira_issues_list_root.vue b/app/assets/javascripts/issues_list/components/jira_issues_list_root.vue index 61781c576c0..7396cfe27b3 100644 --- a/app/assets/javascripts/issues_list/components/jira_issues_list_root.vue +++ b/app/assets/javascripts/issues_list/components/jira_issues_list_root.vue @@ -1,14 +1,14 @@ <script> import { GlAlert, GlLabel } from '@gitlab/ui'; import { last } from 'lodash'; -import { n__ } from '~/locale'; -import getIssuesListDetailsQuery from '../queries/get_issues_list_details.query.graphql'; import { calculateJiraImportLabel, isInProgress, setFinishedAlertHideMap, shouldShowFinishedAlert, } from '~/jira_import/utils/jira_import_utils'; +import { n__ } from '~/locale'; +import getIssuesListDetailsQuery from '../queries/get_issues_list_details.query.graphql'; export default { name: 'JiraIssuesList', |