Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/issues_list/components/issuables_list_app.vue')
-rw-r--r--app/assets/javascripts/issues_list/components/issuables_list_app.vue18
1 files changed, 11 insertions, 7 deletions
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();