Commit e83e4dbd authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'add-issues-modal-filtered-search-takes-search-param' into 'master'

Fixed search param being used in the add issues modal

See merge request !10114
parents ed808a9f 536efa47
...@@ -14,6 +14,8 @@ export default { ...@@ -14,6 +14,8 @@ export default {
this.filteredSearch = new FilteredSearchBoards(this.store); this.filteredSearch = new FilteredSearchBoards(this.store);
this.filteredSearch.removeTokens(); this.filteredSearch.removeTokens();
this.filteredSearch.handleInputPlaceholder();
this.filteredSearch.toggleClearSearchButton();
}, },
beforeDestroy() { beforeDestroy() {
this.filteredSearch.cleanup(); this.filteredSearch.cleanup();
......
...@@ -28,6 +28,8 @@ export default class FilteredSearchBoards extends gl.FilteredSearchManager { ...@@ -28,6 +28,8 @@ export default class FilteredSearchBoards extends gl.FilteredSearchManager {
[].forEach.call(tokens, (el) => { [].forEach.call(tokens, (el) => {
el.parentNode.removeChild(el); el.parentNode.removeChild(el);
}); });
this.filteredSearchInput.value = '';
} }
updateTokens() { updateTokens() {
......
...@@ -23,6 +23,20 @@ describe 'Issue Boards add issue modal', :feature, :js do ...@@ -23,6 +23,20 @@ describe 'Issue Boards add issue modal', :feature, :js do
wait_for_vue_resource wait_for_vue_resource
end end
it 'resets filtered search state' do
visit namespace_project_board_path(project.namespace, project, board, search: 'testing')
wait_for_vue_resource
click_button('Add issues')
page.within('.add-issues-modal') do
expect(find('.form-control').value).to eq('')
expect(page).to have_selector('.clear-search', visible: false)
expect(find('.form-control')[:placeholder]).to eq('Search or filter results...')
end
end
context 'modal interaction' do context 'modal interaction' do
it 'opens modal' do it 'opens modal' do
click_button('Add issues') click_button('Add issues')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment