Commit 27c4d339 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Merge branch 'add-issue-modal-loading-indicator' into 'master'

Show loading icon when changing filter in add issues modal

Closes #29615

See merge request !10043
parents 4014deae 6094b306
......@@ -17,7 +17,7 @@ export default {
this.filteredSearch.handleInputPlaceholder();
this.filteredSearch.toggleClearSearchButton();
},
beforeDestroy() {
destroyed() {
this.filteredSearch.cleanup();
FilteredSearchContainer.container = document;
this.store.path = '';
......
......@@ -65,8 +65,15 @@ require('./empty_state');
},
filter: {
handler() {
this.page = 1;
this.loadIssues(true);
if (this.$el.tagName) {
this.page = 1;
this.filterLoading = true;
this.loadIssues(true)
.then(() => {
this.filterLoading = false;
});
}
},
deep: true,
},
......@@ -140,14 +147,14 @@ require('./empty_state');
:image="blankStateImage"
:issue-link-base="issueLinkBase"
:root-path="rootPath"
v-if="!loading && showList"></modal-list>
v-if="!loading && showList && !filterLoading"></modal-list>
<empty-state
v-if="showEmptyState"
:image="blankStateImage"
:new-issue-path="newIssuePath"></empty-state>
<section
class="add-issues-list text-center"
v-if="loading">
v-if="loading || filterLoading">
<div class="add-issues-list-loading">
<i class="fa fa-spinner fa-spin"></i>
</div>
......
......@@ -15,6 +15,7 @@
searchTerm: '',
loading: false,
loadingNewPage: false,
filterLoading: false,
page: 1,
perPage: 50,
filter: {
......
---
title: Shows loading icon in issue boards modal when changing filters
merge_request:
author:
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