@redneckz/wildless-cms-uni-blocks 0.14.825 → 0.14.826

package/bundle/bundle.umd.js

@@ -2452,6 +2452,14 @@
         return true;
     };
     const limitedBirthdayValidator = (params) => validator(limitedBirthdayValidate(params))(params.errorMessage);
+    const passportValidator = (birthDate) => validator((_) => {
+        if (_ && birthDate) {
+            return (_.getTime() >=
+                new Date(birthDate?.getFullYear() + 14, birthDate?.getMonth(), birthDate?.getDate()).getTime());
+        }
+        return false;
+    })('Укажите дату выдачи паспорта');
+    const deliveryDateValidator = (errorMsg) => validator((_) => _?.getTime() >= new Date().getTime())(errorMsg);
     const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
     const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
     const snilsValidate = (snils) => {
@@ -2506,7 +2514,7 @@
         codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
         confirmationIncome: defaultSelectValidator(),
         methodObtain: defaultValidator(),
-        deliveryDate: defaultValidator('Укажите дату доставки'),
+        deliveryDate: deliveryDateValidator('Укажите дату доставки'),
     };
     const validatorRetailObj = {
         organization: defaultSelectValidator('Выберите тип организации'),
@@ -2543,7 +2551,6 @@
         armyIdFlg: agreementValidator,
         dulSerie: serieValidator('Укажите серию паспорта'),
         dulNumber: numberValidator('Укажите номер паспорта'),
-        dulIssueDate: defaultValidator('Укажите дату выдачи паспорта'),
         dulSubdivisionCode: numberValidator('Укажите код подразделения'),
         dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
         participantDateRegistration: defaultValidator('Укажите дату регистрации'),
@@ -4451,7 +4458,7 @@
 
     const DulIssueDateField = JSX(({ field, input }) => {
         const birthDate = field('limitedBirthday')?.value;
-        const startDulIssueDate = useMemo(() => new Date(birthDate.getFullYear() + 14, birthDate.getMonth(), birthDate.getDate()), [birthDate]);
+        const startDulIssueDate = useMemo(() => new Date(birthDate?.getFullYear() + 14, birthDate?.getMonth(), birthDate?.getDate()), [birthDate]);
         return (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0432\u044B\u0434\u0430\u0447\u0438", ...field(input?.name ?? ''), disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? ''), minDate: startDulIssueDate }));
     });
 
@@ -4899,7 +4906,6 @@
         addressRetail: AddressRetailField,
         addressMatch: AddressMatchField,
         sex: SexField,
-        limitedBirthday: LimitedBirthdayField,
         birthPlace: BirthPlaceField,
         education: EducationField,
         housing: HousingField,
@@ -4938,6 +4944,7 @@
         calculator: CreditCalcField,
         confirmationIncome: ConfirmationIncomeField,
         inn: DaDataInnField,
+        ...InputsApplicationLeadMap,
     };
     const InputRetailCardMap = {
         addressCourier: (props) => (jsx(AddressCourierField, { ...props, source: DELIVERY_CITIES_REF })),
@@ -7803,6 +7810,12 @@
     });
     const getValue = (field) => (name) => field(name)?.value;
 
+    const getRetailFormValidator = ({ formState, inputs, step, productType, }) => getFormValidator(calculateInputs((_) => formState[_])(inputs, step), {
+        ...validatorObj,
+        limitedBirthday: getLimitedBirthdayValidation(productType),
+        dulIssueDate: passportValidator(formState.limitedBirthday),
+    })(formState);
+
     const StepsNavigationButtons$2 = JSX(({ step, isSending, onPrevStep }) => {
         const isFirstStep = step === 0;
         const isFinalStep = step === 5;
@@ -8121,15 +8134,14 @@
     };
 
     const PRODUCT_TYPE$2 = 'creditCard';
-    const extendedValidatorObj$2 = {
-        ...validatorObj,
-        limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE$2),
-    };
     const CreditCardFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
         const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs || []), [sections]);
-        const formValidator = useCallback((formState) => 
-        // TODO Слишком сложно
-        getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj$2)(formState), [inputs]);
+        const formValidator = useCallback((formState) => getRetailFormValidator({
+            formState,
+            inputs,
+            step,
+            productType: PRODUCT_TYPE$2,
+        }), [inputs]);
         const [initialState, onSubmit, isSending] = useCreditCardFormAPI({
             step,
             onNextStep,
@@ -8944,17 +8956,16 @@
     };
 
     const PRODUCT_TYPE$1 = 'credit';
-    const extendedValidatorObj$1 = {
-        ...validatorObj,
-        limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE$1),
-    };
     const CreditFormStep = JSX(({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
         const { programId } = useRetailFormStore();
         const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
         const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs ?? []), [sections]);
-        const formValidator = useCallback((formState) => 
-        // TODO Слишком сложно
-        getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj$1)(formState), [inputs]);
+        const formValidator = useCallback((formState) => getRetailFormValidator({
+            formState,
+            inputs,
+            step,
+            productType: PRODUCT_TYPE$1,
+        }), [inputs]);
         const [initialState, onSubmit, isSending] = useCreditFormAPI({
             step,
             onNextStep,
@@ -9265,15 +9276,14 @@
     };
 
     const PRODUCT_TYPE = 'debitCard';
-    const extendedValidatorObj = {
-        ...validatorObj,
-        limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
-    };
     const DebitFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
         const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs ?? []), [sections]);
-        const formValidator = useCallback((formState) => 
-        // TODO Слишком сложно
-        getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj)(formState), [inputs]);
+        const formValidator = useCallback((formState) => getRetailFormValidator({
+            formState,
+            inputs,
+            step,
+            productType: PRODUCT_TYPE,
+        }), [inputs]);
         const [initialState, onSubmit, isSending] = useDebitFormAPI({
             step,
             onNextStep,
@@ -11630,7 +11640,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.824";
+    const packageVersion = "0.14.825";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;