Commit c3339b33 authored by Phil Hughes's avatar Phil Hughes

Resets modal filters when closing

parent 7e253790
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
required: true, required: true,
}, },
}, },
destroyed() {
ModalStore.setDefaultFilter();
},
components: { components: {
'user-filter': gl.issueBoards.ModalFilterUser, 'user-filter': gl.issueBoards.ModalFilterUser,
'milestone-filter': gl.issueBoards.ModalFilterMilestone, 'milestone-filter': gl.issueBoards.ModalFilterMilestone,
......
...@@ -74,6 +74,8 @@ ...@@ -74,6 +74,8 @@
this.loadIssues(true); this.loadIssues(true);
}, 500), }, 500),
loadIssues(clearIssues = false) { loadIssues(clearIssues = false) {
if (!this.showAddIssuesModal) return;
const data = Object.assign({}, this.filter, { const data = Object.assign({}, this.filter, {
search: this.searchTerm, search: this.searchTerm,
page: this.page, page: this.page,
......
...@@ -17,12 +17,17 @@ ...@@ -17,12 +17,17 @@
loadingNewPage: false, loadingNewPage: false,
page: 1, page: 1,
perPage: 50, perPage: 50,
filter: { };
this.setDefaultFilter();
}
setDefaultFilter() {
this.store.filter = {
author_id: '', author_id: '',
assignee_id: '', assignee_id: '',
milestone_title: '', milestone_title: '',
label_name: [], label_name: [],
},
}; };
} }
......
...@@ -16,6 +16,32 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do ...@@ -16,6 +16,32 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
login_as(user) login_as(user)
end end
it 'restores filters when closing' do
visit_board
page.within('.add-issues-modal') do
click_button 'Milestone'
wait_for_ajax
click_link 'Upcoming'
wait_for_vue_resource
expect(page).to have_selector('.card', count: 0)
click_button 'Cancel'
end
click_button('Add issues')
page.within('.add-issues-modal') do
wait_for_vue_resource
expect(page).to have_selector('.card', count: 1)
end
end
context 'author' do context 'author' do
let!(:issue) { create(:issue, project: project, author: user2) } let!(:issue) { create(:issue, project: project, author: user2) }
......
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