mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-06-23 02:51:34 +00:00
Improved page load error dialog
We now show a more user friendly message
This commit is contained in:
parent
99e56c4b1d
commit
176d5ad2b6
1 changed files with 48 additions and 38 deletions
|
|
@ -40,21 +40,6 @@ class ErrorHandlerHelper {
|
||||||
_showAlert(statusText, statusCode, location, responseHTML)
|
_showAlert(statusText, statusCode, location, responseHTML)
|
||||||
{
|
{
|
||||||
const httpStatusToText = {
|
const httpStatusToText = {
|
||||||
'200': 'OK',
|
|
||||||
'201': 'Created',
|
|
||||||
'202': 'Accepted',
|
|
||||||
'203': 'Non-Authoritative Information',
|
|
||||||
'204': 'No Content',
|
|
||||||
'205': 'Reset Content',
|
|
||||||
'206': 'Partial Content',
|
|
||||||
'300': 'Multiple Choices',
|
|
||||||
'301': 'Moved Permanently',
|
|
||||||
'302': 'Found',
|
|
||||||
'303': 'See Other',
|
|
||||||
'304': 'Not Modified',
|
|
||||||
'305': 'Use Proxy',
|
|
||||||
'306': 'Unused',
|
|
||||||
'307': 'Temporary Redirect',
|
|
||||||
'400': 'Bad Request',
|
'400': 'Bad Request',
|
||||||
'401': 'Unauthorized',
|
'401': 'Unauthorized',
|
||||||
'402': 'Payment Required',
|
'402': 'Payment Required',
|
||||||
|
|
@ -83,42 +68,67 @@ class ErrorHandlerHelper {
|
||||||
'505': 'HTTP Version Not Supported',
|
'505': 'HTTP Version Not Supported',
|
||||||
};
|
};
|
||||||
|
|
||||||
//If the statusText is empty, we use the status code as text
|
const userFriendlyMessages = {
|
||||||
if (!statusText) {
|
'400': 'The request was invalid or malformed.',
|
||||||
statusText = httpStatusToText[statusCode];
|
'401': 'You need to log in to access this resource.',
|
||||||
}
|
'403': 'You don\'t have permission to access this resource.',
|
||||||
|
'404': 'The requested page or resource could not be found.',
|
||||||
//Create error text
|
'408': 'The request timed out. Please check your connection and try again.',
|
||||||
const title = statusText + ' (Status ' + statusCode + ')';
|
'409': 'There was a conflict with the current state of the resource.',
|
||||||
|
'429': 'Too many requests sent. Please wait a moment and try again.',
|
||||||
let trimString = function (string, length) {
|
'500': 'An internal server error occurred. This is not your fault.',
|
||||||
return string.length > length ?
|
'502': 'The server received an invalid response from an upstream service.',
|
||||||
string.substring(0, length) + '...' :
|
'503': 'The service is temporarily unavailable. Please try again later.',
|
||||||
string;
|
'504': 'The server did not respond in time. Please try again later.',
|
||||||
};
|
};
|
||||||
|
|
||||||
const short_location = trimString(location, 50);
|
if (!statusText) {
|
||||||
|
statusText = httpStatusToText[String(statusCode)] ?? 'Unknown Error';
|
||||||
|
}
|
||||||
|
|
||||||
let url = location;
|
const title = `${statusText} <small class="text-muted fs-6">(HTTP ${statusCode})</small>`;
|
||||||
let msg = `Error calling <a href="${url}">${short_location}</a>.<br>`;
|
const friendlyMsg = userFriendlyMessages[String(statusCode)]
|
||||||
msg += '<b>Try to reload the page or contact the administrator if this error persists.</b>';
|
?? 'An unexpected error occurred. Please try again or contact the administrator.';
|
||||||
msg += '<br><br><a class="btn btn-outline-secondary mb-2" data-bs-toggle="collapse" href="#iframe_div">View details</a>';
|
|
||||||
msg += "<div class=\"collapse\" id='iframe_div'><iframe height='512' width='100%' id='error-iframe'></iframe></div>";
|
const short_location = location.length > 80
|
||||||
|
? location.substring(0, 80) + '…'
|
||||||
|
: location;
|
||||||
|
|
||||||
|
const msg = `
|
||||||
|
<p class="mb-3">${friendlyMsg}</p>
|
||||||
|
<p class="text-muted small mb-3">If this error keeps happening, please contact your administrator.</p>
|
||||||
|
<button class="btn btn-sm btn-outline-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#swal-error-details" aria-expanded="false">
|
||||||
|
<i class="fas fa-code me-1"></i>Technical details
|
||||||
|
</button>
|
||||||
|
<div class="collapse mt-2" id="swal-error-details">
|
||||||
|
<iframe height="400" width="100%" id="error-iframe" style="border:1px solid var(--bs-border-color);border-radius:var(--bs-border-radius);"></iframe>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
const footer = `<span class="text-muted small">Error while loading: <a href="${location}" class="text-muted text-decoration-none" style="opacity:0.7;">${short_location}</a></span>`;
|
||||||
|
|
||||||
Swal.fire({
|
Swal.fire({
|
||||||
|
icon: 'error',
|
||||||
title: title,
|
title: title,
|
||||||
html: msg,
|
html: msg,
|
||||||
width: '800px',
|
footer: footer,
|
||||||
|
width: '90%',
|
||||||
|
confirmButtonText: '<i class="fas fa-rotate-right me-1"></i>Reload page',
|
||||||
|
showCancelButton: true,
|
||||||
|
cancelButtonText: 'Close',
|
||||||
|
showCloseButton: true,
|
||||||
|
reverseButtons: true,
|
||||||
didOpen: () => {
|
didOpen: () => {
|
||||||
var dstFrame = document.getElementById('error-iframe');
|
const dstFrame = document.getElementById('error-iframe');
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
var dstDoc = dstFrame.contentDocument || dstFrame.contentWindow.document;
|
const dstDoc = dstFrame.contentDocument || dstFrame.contentWindow.document;
|
||||||
dstDoc.write(responseHTML);
|
dstDoc.write(responseHTML);
|
||||||
dstDoc.close();
|
dstDoc.close();
|
||||||
},
|
},
|
||||||
}).then(() => {
|
}).then((result) => {
|
||||||
//Remove blur
|
|
||||||
$('#content').removeClass('loading-content');
|
$('#content').removeClass('loading-content');
|
||||||
|
if (result.isConfirmed) {
|
||||||
|
window.location.reload();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue