From 5f0c5dcc8892dcfd57e4c663b90521c5b27334c7 Mon Sep 17 00:00:00 2001
From: Ion Riciu <Ion.Riciu@endava.com>
Date: Mon, 12 Apr 2021 11:47:52 +0300
Subject: [PATCH] fix: doi validation functionality
---
.../src/components/ComponentProperties.js | 2 +-
.../component-submit/src/components/FormTemplate.js | 6 +++++-
app/storage/forms-ncrc/submit.json | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/components/component-formbuilder/src/components/ComponentProperties.js b/app/components/component-formbuilder/src/components/ComponentProperties.js
index f33c10645f..ca7debe703 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 d8d84d88b7..1c7b2eb30f 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 d6e5d3f9c3..a636348569 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",
--
GitLab