diff --git a/app/components/component-xpub-formbuilder/src/components/atoms/Columns.js b/app/components/component-xpub-formbuilder/src/components/atoms/Columns.js index c550c32179e502b0db3baa9697b1162f11bf9dd9..f2f4e3d85877d1374ad5eb6d1d987eaf7dcee64d 100644 --- a/app/components/component-xpub-formbuilder/src/components/atoms/Columns.js +++ b/app/components/component-xpub-formbuilder/src/components/atoms/Columns.js @@ -6,6 +6,7 @@ const Columns = styled.div` grid-template-areas: 'form details'; grid-template-columns: minmax(200px, 70ch) minmax(200px, 60ch); justify-content: center; + overflow-y: scroll; ` const Form = styled.div` diff --git a/app/components/component-xpub-submit/src/components/FormTemplate.js b/app/components/component-xpub-submit/src/components/FormTemplate.js index 9440974a71c56b9f92dadf9df7424490a6a70712..e979a9148a9e360fb6bd502747243a7acc5b8b35 100644 --- a/app/components/component-xpub-submit/src/components/FormTemplate.js +++ b/app/components/component-xpub-submit/src/components/FormTemplate.js @@ -104,18 +104,21 @@ const createMarkup = encodedHtml => ({ const composeValidate = (vld = [], valueField = {}) => value => { const validator = vld || [] + if (validator.length === 0) return undefined const errors = [] - validator.map(validatorFn => { - const error = - validatorFn === 'required' - ? validators[validatorFn](value) - : validators[validatorFn](valueField[validatorFn])(value) - if (error) { - errors.push(error) - } - return validatorFn - }) + validator + .map(v => v.value) + .map(validatorFn => { + const error = + validatorFn === 'required' + ? validators[validatorFn](value) + : validators[validatorFn](valueField[validatorFn])(value) + if (error) { + errors.push(error) + } + return validatorFn + }) return errors.length > 0 ? errors[0] : undefined } diff --git a/app/components/component-xpub-submit/src/components/Submit.js b/app/components/component-xpub-submit/src/components/Submit.js index b11a1578f2afc404b10bc25e8c9c464bc86e1d12..824e222681b4badebe6baf939a6b24aac498422f 100644 --- a/app/components/component-xpub-submit/src/components/Submit.js +++ b/app/components/component-xpub-submit/src/components/Submit.js @@ -9,12 +9,13 @@ import { Columns, SubmissionVersion } from './atoms/Columns' import FormTemplate from './FormTemplate' const Wrapper = styled.div` - font-family: ${th('fontInterface')}; - line-height: 1.3; - margin: auto; - max-width: 60em; + overflow-y: scroll; + // font-family: ${th('fontInterface')}; + // line-height: 1.3; + // margin: auto; + // max-width: 60em; - overflow: ${({ confirming }) => confirming && 'hidden'}; + // overflow: ${({ confirming }) => confirming && 'hidden'}; ` const SubmittedVersionColumns = props => ( diff --git a/app/storage/forms/submit.json b/app/storage/forms/submit.json index dbcfd834efe3081455884f9536f1347685ed27a9..b5c51c7ea4bb8046bead97f893cc617da1095295 100644 --- a/app/storage/forms/submit.json +++ b/app/storage/forms/submit.json @@ -298,7 +298,16 @@ "id": "1591345370930", "component": "TextField", "name": "submission.humanMRIother", - "order": "24" + "order": "24", + "validate": [ + { + "value": "minChars", + "label": "minimum Characters" + } + ], + "validateValue": { + "minChars": "10" + } }, { "title": "Which processing packages did you use for your study?",