From c27f3b029e8d9f885175fddba129c1b0a0da4d29 Mon Sep 17 00:00:00 2001 From: Audrey Hamelers <hamelers@ebi.ac.uk> Date: Thu, 14 Mar 2019 15:03:02 +0000 Subject: [PATCH] file label error big fix --- app/components/preview-files/FileThumbnails.jsx | 4 ++-- app/components/submission-wizard/SubmitSections.jsx | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/components/preview-files/FileThumbnails.jsx b/app/components/preview-files/FileThumbnails.jsx index 7c0a7eb99..ae12a8a10 100755 --- a/app/components/preview-files/FileThumbnails.jsx +++ b/app/components/preview-files/FileThumbnails.jsx @@ -132,7 +132,7 @@ const FileThumbnails = ({ files }) => ( </Icon> )} </Bold> - {` ${file.type}`} + {file.type && ` ${file.type}`} </span> {file.type !== 'manuscript' && ( <span> @@ -144,7 +144,7 @@ const FileThumbnails = ({ files }) => ( </Icon> )} </Bold> - {` ${file.label}`} + {file.label && ` ${file.label}`} </span> )} </FileInfo> diff --git a/app/components/submission-wizard/SubmitSections.jsx b/app/components/submission-wizard/SubmitSections.jsx index 4c770e80c..4a87f7793 100644 --- a/app/components/submission-wizard/SubmitSections.jsx +++ b/app/components/submission-wizard/SubmitSections.jsx @@ -129,7 +129,10 @@ const submitSections = ( error: files && files - .filter(file => !file.type || SubmissionTypes.includes(file.type)) + .filter( + file => + !file.type || SubmissionTypes.some(s => s.value === file.type), + ) .some(file => !file.label || !file.type) ? ( <ErrorMessage> <Icon color="currentColor" size={2}> -- GitLab