fix loading indicator on alias list

This commit is contained in:
ngxson
2020-07-16 20:18:11 +02:00
parent 7c5e58934c
commit f4eafdfb51
+11 -8
View File
@@ -223,7 +223,7 @@
</div>
</div>
<div v-if="hasLoadMoreAlias" class="text-secondary mx-auto text-center">
<div v-if="isLoadingAlias" class="text-secondary mx-auto text-center">
<img
src="/images/loading-three-dots.svg"
style="width: 80px; margin: 20px;"
@@ -267,7 +267,7 @@ export default {
isFetchingAlias: true,
searchString: "",
aliasArray: [], // array of existing alias
hasLoadMoreAlias: true,
isLoadingAlias: true,
};
},
async mounted() {
@@ -307,11 +307,14 @@ export default {
async loadAlias() {
this.aliasArray = [];
this.hasLoadMoreAlias = true;
let currentPage = 0;
this.aliasArray = await this.fetchAlias(currentPage, this.searchString);
this.hasLoadMoreAlias = this.aliasArray.length > 0;
this.isLoadingAlias = true;
this.aliasArray = await this.fetchAlias(
currentPage,
this.searchString
);
this.isLoadingAlias = false;
let allAliasesAreLoaded = false;
@@ -326,12 +329,12 @@ export default {
if (bottomOfWindow) {
currentPage += 1;
that.hasLoadMoreAlias = true;
that.isLoadingAlias = true;
let newAliases = await that.fetchAlias(
currentPage,
that.searchString
);
that.hasLoadMoreAlias = false;
that.isLoadingAlias = false;
allAliasesAreLoaded = newAliases.length === 0;
that.aliasArray = mergeAliases(that.aliasArray, newAliases);