From a36bb3fcaf84de9ea0d73dc0c5c352843d8f05be Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Fri, 6 Dec 2024 12:07:06 +0100 Subject: [PATCH] - enabled codice fiscale always; - updated cf validation; --- src/helpers/validators.js | 2 ++ src/pages/AddCompany/index.js | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/helpers/validators.js b/src/helpers/validators.js index 3a05435..388f318 100644 --- a/src/helpers/validators.js +++ b/src/helpers/validators.js @@ -4,6 +4,7 @@ import CodiceFiscale from 'codice-fiscale-js'; export const isPIVA = (v) => { const regexp = new RegExp(/^[0-9]{11}$/); + //console.log('isPIVA', !isEmpty(match(regexp, String(v)))) return !isEmpty(match(regexp, String(v))); } @@ -11,6 +12,7 @@ export const isPIVA = (v) => { export const isCodiceFiscale = (v) => { //const regexp = new RegExp(/^(?:[A-Z][AEIOU][AEIOUX]|[AEIOU]X{2}|[B-DF-HJ-NP-TV-Z]{2}[A-Z]){2}(?:[\dLMNP-V]{2}(?:[A-EHLMPR-T](?:[04LQ][1-9MNP-V]|[15MR][\dLMNP-V]|[26NS][0-8LMNP-U])|[DHPS][37PT][0L]|[ACELMRT][37PT][01LM]|[AC-EHLMPR-T][26NS][9V])|(?:[02468LNQSU][048LQU]|[13579MPRTV][26NS])B[26NS][9V])(?:[A-MZ][1-9MNP-V][\dLMNP-V]{2}|[A-M][0L](?:[1-9MNP-V][\dLMNP-V]|[0L][1-9MNP-V]))[A-Z]$/, 'i') //return !isEmpty(match(regexp, v)); + //console.log('isCodiceFiscale', CodiceFiscale.check(v)) return CodiceFiscale.check(v); } diff --git a/src/pages/AddCompany/index.js b/src/pages/AddCompany/index.js index 5987042..9a80617 100644 --- a/src/pages/AddCompany/index.js +++ b/src/pages/AddCompany/index.js @@ -19,7 +19,7 @@ import BlockingOverlay from '../../components/BlockingOverlay'; import CompanyService from '../../service/company-service'; // tools -import { isPIVA, isEmail, isEmailPEC } from '../../helpers/validators'; +import { isPIVA, isEmail, isEmailPEC, isCodiceFiscale } from '../../helpers/validators'; import set404FromErrorResponse from '../../helpers/set404FromErrorResponse'; //const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID; @@ -218,12 +218,16 @@ const AddCompany = () => { isCodiceFiscale(value) || isPIVA(value) + } + }} /> {/*{APP_EVALUATION_FLOW_ID === '1' ?