Merge pull request #875 from jessopb/publisherrors

Rudimentary dropdown file errors
This commit is contained in:
Shawn K 2019-01-22 14:11:24 -06:00 committed by GitHub
commit 5d337a09bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 26 deletions

View file

@ -5,9 +5,12 @@ import View from './view';
import siteConfig from '@config/siteConfig.json';
import createCanonicalLink from '@globalutils/createCanonicalLink';
const { assetDefaults: { thumbnail: defaultThumbnail } } = siteConfig;
const {
assetDefaults: { thumbnail: defaultThumbnail },
} = siteConfig;
const mapStateToProps = ({ show, publish: { file, thumbnail, fileError, isUpdate } }) => {
const mapStateToProps = ({ show, publish: { file, thumbnail, error, isUpdate } }) => {
const fileError = error.file;
const obj = { file, thumbnail, fileError, isUpdate };
let asset, name, claimId, fileExt, outpoint, sourceUrl;
if (isUpdate) {
@ -28,14 +31,17 @@ const mapStateToProps = ({ show, publish: { file, thumbnail, fileError, isUpdate
const mapDispatchToProps = dispatch => {
return {
selectFile: (file) => {
selectFile: file => {
dispatch(selectFile(file));
},
setFileError: (value) => {
setFileError: value => {
dispatch(clearFile());
dispatch(updateError('file', value));
},
};
};
export default connect(mapStateToProps, mapDispatchToProps)(View);
export default connect(
mapStateToProps,
mapDispatchToProps
)(View);

View file

@ -1,13 +1,10 @@
import siteConfig from '@config/siteConfig.json';
const {
publishing: {
maxSizeImage = 10000000,
maxSizeGif = 50000000,
maxSizeVideo = 50000000,
}
publishing: { maxSizeImage = 10000000, maxSizeGif = 50000000, maxSizeVideo = 50000000 },
} = siteConfig;
// TODO: central constants location
const SIZE_MB = 1000000;
export function validateFile(file) {
if (!file) {
@ -36,6 +33,9 @@ export function validateFile (file) {
}
break;
default:
throw new Error(file.type + ' is not a supported file type. Only, .jpeg, .png, .gif, and .mp4 files are currently supported.');
throw new Error(
file.type +
' is not a supported file type. Only, .jpeg, .png, .gif, and .mp4 files are currently supported.'
);
}
}

View file

@ -14,29 +14,29 @@ const parsePublishApiRequestFiles = ({file, thumbnail}, isUpdate) => {
}
return {};
}
throw new Error('no file with key of [file] found in request');
throw new Error('No file with key of [file] found in request');
}
if (!file.path) {
throw new Error('no file path found');
throw new Error('No file path found');
}
if (!file.type) {
throw new Error('no file type found');
throw new Error('No file type found');
}
if (!file.size) {
throw new Error('no file size found');
throw new Error('No file size found');
}
// validate the file name
if (!file.name) {
throw new Error('no file name found');
throw new Error('No file name found');
}
if (file.name.indexOf('.') < 0) {
throw new Error('no file extension found in file name');
throw new Error('No file extension found in file name');
}
if (file.name.indexOf('.') === 0) {
throw new Error('file name cannot start with "."');
throw new Error('File name cannot start with "."');
}
if (/'/.test(file.name)) {
throw new Error('apostrophes are not allowed in the file name');
throw new Error('Apostrophes are not allowed in the file name');
}
// validate the file