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 { ...@@ -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'); ...@@ -65,8 +65,15 @@ require('./empty_state');
}, },
filter: { filter: {
handler() { handler() {
if (this.$el.tagName) {
this.page = 1; this.page = 1;
this.loadIssues(true); this.filterLoading = true;
this.loadIssues(true)
.then(() => {
this.filterLoading = false;
});
}
}, },
deep: true, deep: true,
}, },
...@@ -140,14 +147,14 @@ require('./empty_state'); ...@@ -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 @@ ...@@ -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: {
......
---
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