scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7551 from rekonder/aj_SCI_10697

Browse source 
Fix loading full view for global search results [SCI-10697]
This commit is contained in:
aignatov-bio 2024-05-14 11:41:13 +02:00 committed by GitHub
parent cb35d5f16b 7fdc1358a8
commit 65a78f6213
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/javascript/vue/global_search/groups/search_mixin.js
View file

@ -112,8 +112,10 @@ export default {
loadData() {
if (this.query.length < 2) return;
if (this.loading && this.page) return;
if (this.loading && this.page && !(this.selected && !this.fullDataLoaded)) return;
const fullView = this.selected;
const currentPage = this.page;
this.loading = true;
axios.get(this.searchUrl, {
params: {
@ -121,21 +123,26 @@ export default {
sort: this.sort,
filters: this.filters,
group: this.group,
preview: !this.selected,
page: this.page
preview: !fullView,
page: currentPage
}
})
.then((response) => {
if (this.selected) this.fullDataLoaded = true;
this.results = this.results.concat(response.data.data);
this.total = response.data.meta.total;
this.disabled = response.data.meta.disabled;
this.loading = false;
this.page = response.data.meta.next_page;
if (this.selected === fullView && this.page === currentPage) {
this.results = this.results.concat(response.data.data);
this.total = response.data.meta.total;
this.disabled = response.data.meta.disabled;
this.loading = false;
this.page = response.data.meta.next_page;
}
})
.finally(() => {
this.loading = false;
this.$emit('updated');
if (this.selected === fullView) {
this.loading = false;
this.$emit('updated');
}
});
}
}