Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 9 Pull requests Projects Releases 8 Packages Wiki Activity Actions

#23-cleanup-&-enhancements #24

Merged
jkeffects merged 5 commits from #23-cleanup-&-enhancements into main 2025-01-03 14:21:56 +00:00
Conversation 0 Commits 5 Files changed 204 +11 -4
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6154518cbd - Show all commits

7
src/components/Pagination.vue
View file

@ -96,6 +96,10 @@ watch(searchString, async () => {
}, 600);
});
watch(() => props.totalCount, async () => {
currentPage.value = 0;
});
const emit = defineEmits({
submit(id: number) {
return typeof id == "number";
@ -151,7 +155,8 @@ const loadPage = (newPage: number | ".") => {
if (pageEnd > entryCount.value) pageEnd = entryCount.value;
let loadedElementCount = filterData(props.items, searchString.value, pageStart, pageEnd).length;
if (loadedElementCount < props.maxEntriesPerPage)
console.log(loadedElementCount, props.maxEntriesPerPage, pageStart, pageEnd)
if (loadedElementCount < props.maxEntriesPerPage && (pageEnd != props.totalCount || loadedElementCount == 0))
emit("loadData", pageStart, props.maxEntriesPerPage, searchString.value);
currentPage.value = newPage;

8
src/stores/admin/queryBuilder.ts
View file

@ -32,8 +32,10 @@ export const useQueryBuilderStore = defineStore("queryBuilder", {
},
sendQuery(offset = 0, count = 25, query?: DynamicQueryStructure | string) {
this.queryError = "";
this.data = [];
this.totalLength = 0;
if (offset == 0) {
this.data = [];
this.totalLength = 0;
}
let queryToSend = query ?? this.query;
if (queryToSend == undefined || queryToSend == "" || (typeof queryToSend != "string" && queryToSend.table == ""))
return;
@ -44,7 +46,7 @@ export const useQueryBuilderStore = defineStore("queryBuilder", {
})
.then((result) => {
if (result.data.stats == "success") {
this.data = result.data.rows;
this.data = [...this.data, ...result.data.rows];
this.totalLength = result.data.total;
this.loadingData = "fetched";
} else {