Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-05 04:45:47 +01:00
Code Issues Packages Projects Releases Activity

routes refactoring

Browse Source
This commit is contained in:
zadam
2022-12-18 16:12:29 +01:00
parent 6def541e78
commit 2df7d99a91
3 changed files with 195 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/public/app/services/server.js
View File

@@ -103,17 +103,24 @@ async function call(method, url, data, headers = {}) {
return resp.body;
}
async function reportError(method, url, status, response) {
async function reportError(method, url, statusCode, response) {
const toastService = (await import("./toast.js")).default;
if ([400, 404].includes(status) && response && typeof response === 'object') {
toastService.showError(response.message);
throw new ValidationError(response);
if (typeof response === 'string') {
try {
response = JSON.parse(response);
}
catch (e) { throw e;}
}
const message = "Error when calling " + method + " " + url + ": " + status + " - " + response;
toastService.showError(message);
toastService.throwError(message);
if ([400, 404].includes(statusCode) && response && typeof response === 'object') {
toastService.showError(response.message);
throw new ValidationError(response);
} else {
const message = "Error when calling " + method + " " + url + ": " + statusCode + " - " + response;
toastService.showError(message);
toastService.throwError(message);
}
}
function ajax(url, method, data, headers) {
@@ -137,8 +144,8 @@ function ajax(url, method, data, headers) {
headers: respHeaders
});
},
error: async (jqXhr, status) => {
await reportError(method, url, status, jqXhr.responseText);
error: async jqXhr => {
await reportError(method, url, jqXhr.status, jqXhr.responseText);
rej(jqXhr.responseText);
}