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/filtered_search/filtered_search_manager.js | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/filtered_search/filtered_search_manager.js')
-rw-r--r-- | app/assets/javascripts/filtered_search/filtered_search_manager.js | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js index 108cc8d3a78..3e4a9880134 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js @@ -3,7 +3,7 @@ import recentSearchesStorageKeys from 'ee_else_ce/filtered_search/recent_searche import { getParameterByName, getUrlParamsArray } from '~/lib/utils/common_utils'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; import { visitUrl } from '../lib/utils/url_utility'; -import Flash from '../flash'; +import { deprecatedCreateFlash as Flash } from '../flash'; import FilteredSearchContainer from './container'; import RecentSearchesRoot from './recent_searches_root'; import RecentSearchesStore from './stores/recent_searches_store'; @@ -29,6 +29,7 @@ export default class FilteredSearchManager { isGroup = false, isGroupAncestor = true, isGroupDecendent = false, + useDefaultState = false, filteredSearchTokenKeys = IssuableFilteredSearchTokenKeys, stateFiltersSelector = '.issues-state-filters', placeholder = __('Search or filter results...'), @@ -37,6 +38,7 @@ export default class FilteredSearchManager { this.isGroup = isGroup; this.isGroupAncestor = isGroupAncestor; this.isGroupDecendent = isGroupDecendent; + this.useDefaultState = useDefaultState; this.states = ['opened', 'closed', 'merged', 'all']; this.page = page; @@ -724,8 +726,13 @@ export default class FilteredSearchManager { search(state = null) { const paths = []; const { tokens, searchToken } = this.getSearchTokens(); - const currentState = state || getParameterByName('state') || 'opened'; - paths.push(`state=${currentState}`); + let currentState = state || getParameterByName('state'); + if (!currentState && this.useDefaultState) { + currentState = 'opened'; + } + if (this.states.includes(currentState)) { + paths.push(`state=${currentState}`); + } tokens.forEach(token => { const condition = this.filteredSearchTokenKeys.searchByConditionKeyValue( @@ -743,7 +750,7 @@ export default class FilteredSearchManager { let tokenPath = ''; if (condition) { - tokenPath = condition.url; + tokenPath = condition.replacementUrl || condition.url; } else { let tokenValue = token.value; |