diff --git a/app/components/component-formbuilder/src/components/ComponentProperties.js b/app/components/component-formbuilder/src/components/ComponentProperties.js index f33c10645f8a97354f7c0e78ce1d9b09b8dc0ecd..ca7debe7034cf68188aae47aa03c4cc28bc8127b 100644 --- a/app/components/component-formbuilder/src/components/ComponentProperties.js +++ b/app/components/component-formbuilder/src/components/ComponentProperties.js @@ -41,7 +41,7 @@ const ComponentProperties = ({ {selectedComponent && map(components[selectedComponent], (value, key) => ( <Section key={key}> - <Legend space>{`Field ${key}`}</Legend> + <Legend space>{`Field ${key === 'DoiValidation' ? components[selectedComponent][key].props.label : key}`}</Legend> <ValidatedFieldFormik component={elements[value.component].default} key={`${selectedComponent}-${key}`} diff --git a/app/components/component-submit/src/components/FormTemplate.js b/app/components/component-submit/src/components/FormTemplate.js index d8d84d88b7b5c97ee8cc6487a538d218dc51de4c..1c7b2eb30f71f46ab270f6e24e3577760f427230 100644 --- a/app/components/component-submit/src/components/FormTemplate.js +++ b/app/components/component-submit/src/components/FormTemplate.js @@ -116,6 +116,7 @@ const composeValidate = ( vld = [], valueField = {}, fieldName, + doiValidation = "false", client, ) => value => { const validator = vld || [] @@ -137,7 +138,9 @@ const composeValidate = ( return validatorFn }) - if (errors.length === 0 && fieldName === 'submission.articleURL') { + if (errors.length === 0 && fieldName === 'submission.articleURL' && doiValidation === "true") { + console.log('element.doiValidation') + console.log(doiValidation) return client .query({ query: VALIDATE_DOI, @@ -284,6 +287,7 @@ const FormTemplate = ({ element.validate, element.validateValue, element.name, + element.DoiValidation, client, )} values={values} diff --git a/app/storage/forms-ncrc/submit.json b/app/storage/forms-ncrc/submit.json index d6e5d3f9c311400cb246fd5b2b100e4b0bcf614c..a63634856977e1ec9c27b85e4c0b3f22f7e806b2 100644 --- a/app/storage/forms-ncrc/submit.json +++ b/app/storage/forms-ncrc/submit.json @@ -6,6 +6,7 @@ "component": "TextField", "name": "submission.articleURL", "description": "<p></p>", + "DoiValidation": "true", "validate": [ { "value": "required", @@ -18,6 +19,7 @@ "id": "1617195483503", "component": "TextField", "name": "submission.articleDescription", + "DoiValidation": "false", "validate": [ { "value": "required",