maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak image upload validation experience (#18675)

Browse source 
* Restore file control when image upload is invalid

* Tweak invalid file type message when type empty
This commit is contained in:
Joshua Wehner 2022-11-04 11:06:16 +01:00 • committed by GitHub
parent 4446441ede
commit 14ddbc49ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/article-form/components/ArticleCoverImage.jsx
View file

@ -78,6 +78,8 @@ export const ArticleCoverImage = ({ onMainImageUrlChange, mainImage }) => {
successCb: onImageUploadSuccess, successCb: onImageUploadSuccess,
failureCb: onUploadError, failureCb: onUploadError,
}); });
} else {
setUploadingImage(false);
} }
}; };

4
app/javascript/packs/validateFileInputs.js
View file

@ -101,7 +101,9 @@ function handleFileTypeError(
if (fileTypeErrorHandler) { if (fileTypeErrorHandler) {
fileTypeErrorHandler(); fileTypeErrorHandler();
} else { } else {
const errorMessage = `Invalid file format (${fileType}). Only ${permittedFileTypes.join( const fileTypeBracketed =
fileType && fileType.length !== 0 ? ` (${fileType})` : '';
const errorMessage = `Invalid file format${fileTypeBracketed}. Only ${permittedFileTypes.join(
', ', ', ',
)} files are permitted.`; )} files are permitted.`;
addErrorMessage(errorMessage); addErrorMessage(errorMessage);