1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-29 23:22:34 +01:00

File Uploads: Added basic validation response formatting

Tested via app-level validation file limit, and then also with nginx
file post limit.
For #4996
This commit is contained in:
Dan Brown 2024-05-18 21:18:15 +01:00
parent 5651d2c43d
commit 72c5141dec
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 34 additions and 4 deletions

View File

@ -181,10 +181,7 @@ export class Dropzone extends Component {
if (this.readyState === XMLHttpRequest.DONE && this.status === 200) {
upload.markSuccess(component.successMessage);
} else if (this.readyState === XMLHttpRequest.DONE && this.status >= 400) {
const content = this.responseText;
const data = content.startsWith('{') ? JSON.parse(content) : {message: content};
const message = data?.message || data?.error || content;
upload.markError(message);
upload.markError(window.$http.formatErrorResponseText(this.responseText));
}
},
});

View File

@ -207,3 +207,32 @@ async function performDelete(url, data = null) {
}
export {performDelete as delete};
/**
* Parse the response text for an error response to a user
* presentable string. Handles a range of errors responses including
* validation responses & server response text.
* @param {String} text
* @returns {String}
*/
export function formatErrorResponseText(text) {
const data = text.startsWith('{') ? JSON.parse(text) : {message: text};
if (!data) {
return text;
}
if (data.message || data.error) {
return data.message || data.error;
}
const values = Object.values(data);
const isValidation = values.every(val => {
return Array.isArray(val) || val.every(x => typeof x === 'string');
});
if (isValidation) {
return values.flat().join(' ');
}
return text;
}

View File

@ -321,6 +321,10 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
background-color: var(--color-primary);
transition: width ease-in-out 240ms;
}
.dropzone-file-item-label {
line-height: 1.2;
margin-bottom: .2rem;
}
.dropzone-file-item-label,
.dropzone-file-item-status {
align-items: center;