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
This commit is contained in:
commit
27c4d339e5
4 changed files with 17 additions and 5 deletions
|
@ -17,7 +17,7 @@ export default {
|
||||||
this.filteredSearch.handleInputPlaceholder();
|
this.filteredSearch.handleInputPlaceholder();
|
||||||
this.filteredSearch.toggleClearSearchButton();
|
this.filteredSearch.toggleClearSearchButton();
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
destroyed() {
|
||||||
this.filteredSearch.cleanup();
|
this.filteredSearch.cleanup();
|
||||||
FilteredSearchContainer.container = document;
|
FilteredSearchContainer.container = document;
|
||||||
this.store.path = '';
|
this.store.path = '';
|
||||||
|
|
|
@ -65,8 +65,15 @@ require('./empty_state');
|
||||||
},
|
},
|
||||||
filter: {
|
filter: {
|
||||||
handler() {
|
handler() {
|
||||||
this.page = 1;
|
if (this.$el.tagName) {
|
||||||
this.loadIssues(true);
|
this.page = 1;
|
||||||
|
this.filterLoading = true;
|
||||||
|
|
||||||
|
this.loadIssues(true)
|
||||||
|
.then(() => {
|
||||||
|
this.filterLoading = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
deep: true,
|
deep: true,
|
||||||
},
|
},
|
||||||
|
@ -140,14 +147,14 @@ require('./empty_state');
|
||||||
:image="blankStateImage"
|
:image="blankStateImage"
|
||||||
:issue-link-base="issueLinkBase"
|
:issue-link-base="issueLinkBase"
|
||||||
:root-path="rootPath"
|
:root-path="rootPath"
|
||||||
v-if="!loading && showList"></modal-list>
|
v-if="!loading && showList && !filterLoading"></modal-list>
|
||||||
<empty-state
|
<empty-state
|
||||||
v-if="showEmptyState"
|
v-if="showEmptyState"
|
||||||
:image="blankStateImage"
|
:image="blankStateImage"
|
||||||
:new-issue-path="newIssuePath"></empty-state>
|
:new-issue-path="newIssuePath"></empty-state>
|
||||||
<section
|
<section
|
||||||
class="add-issues-list text-center"
|
class="add-issues-list text-center"
|
||||||
v-if="loading">
|
v-if="loading || filterLoading">
|
||||||
<div class="add-issues-list-loading">
|
<div class="add-issues-list-loading">
|
||||||
<i class="fa fa-spinner fa-spin"></i>
|
<i class="fa fa-spinner fa-spin"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
searchTerm: '',
|
searchTerm: '',
|
||||||
loading: false,
|
loading: false,
|
||||||
loadingNewPage: false,
|
loadingNewPage: false,
|
||||||
|
filterLoading: false,
|
||||||
page: 1,
|
page: 1,
|
||||||
perPage: 50,
|
perPage: 50,
|
||||||
filter: {
|
filter: {
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Shows loading icon in issue boards modal when changing filters
|
||||||
|
merge_request:
|
||||||
|
author:
|
Loading…
Reference in a new issue