tomas/pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always show list errors if there is no filter

Browse Source
This commit is contained in:
Gani Georgiev
2023-12-03 20:50:23 +02:00
parent 70f1647a4c
commit 4d27278c60
34 changed files with 82 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/components/logs/LogsChart.svelte
+6 -2
View File
@@ -36,9 +36,13 @@
export async function load() {
isLoading = true;
const normalizedFilter = [presets, CommonHelper.normalizeLogsFilter(filter)]
.filter(Boolean)
.join("&&");
return ApiClient.logs
.getStats({
filter: [presets, CommonHelper.normalizeLogsFilter(filter)].filter(Boolean).join("&&"),
filter: normalizedFilter,
})
.then((result) => {
resetData();
@@ -55,7 +59,7 @@
if (!err?.isAbort) {
resetData();
console.warn(err);
ApiClient.error(err, err?.status != 400); // silence filter errors
ApiClient.error(err, !normalizedFilter || err?.status != 400); // silence filter errors
}
})
.finally(() => {
ui/src/components/logs/LogsList.svelte
+6 -2
View File
@@ -37,11 +37,15 @@
export async function load(page = 1, breakTasks = true) {
isLoading = true;
const normalizedFilter = [presets, CommonHelper.normalizeLogsFilter(filter)]
.filter(Boolean)
.join("&&");
return ApiClient.logs
.getList(page, perPage, {
sort: sort,
skipTotal: 1,
filter: [presets, CommonHelper.normalizeLogsFilter(filter)].filter(Boolean).join("&&"),
filter: normalizedFilter,
})
.then(async (result) => {
if (page <= 1) {
@@ -83,7 +87,7 @@
isLoading = false;
console.warn(err);
clearList();
ApiClient.error(err, err?.status != 400); // silence filter errors
ApiClient.error(err, !normalizedFilter || err?.status != 400); // silence filter errors
}
});
}