@redneckz/wildless-cms-uni-blocks 0.14.739 → 0.14.741

package/bundle/bundle.umd.js

@@ -2563,7 +2563,7 @@
     const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
     const defaultValidator = (errorMsg) => required(errorMsg ?? ERROR_MESSAGE);
     const defaultSelectValidator = (errorMsg) => validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_MESSAGE);
-    const jobNumberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 0 && _.length <= 2)(errorMsg ?? ERROR_MESSAGE);
+    const jobNumberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
     const nameValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
     const lengthStringValidator = (inputLength, errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(errorMsg ?? ERROR_MESSAGE);
     const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
@@ -6808,33 +6808,6 @@
         return (jsx("div", { className: "py-lg px-5xl bg-white col-span-12", children: jsxs("div", { children: [jsxs("span", { className: "font-bold mr-s", children: ["\u0428\u0430\u0433 ", step + 1, " \u0438\u0437 ", totalSteps, "."] }), stepsTitles[step] || null, jsx(ProgressBar, { step: progress, showPercentage: false })] }) }));
     });
 
-    const calculateInputs = (getValue) => (inputs, step) => inputs
-        .filter((_) => _)
-        .map((_) => {
-        if ([
-            checkIsRetiree(step, getValue),
-            checkBusinessOwner(_, getValue),
-            checkConsentPfrFlg(_, getValue),
-            checkAddressFillFromESIA(_, getValue),
-            checkAddressFact(_, getValue),
-            checkCondition(_, getValue),
-        ].some(Boolean)) {
-            return { ..._, required: false };
-        }
-        return _;
-    });
-    const checkIsRetiree = (step, getValue) => step === 2 && getValue('employment')?.key === 'RETIREE';
-    const checkBusinessOwner = ({ name }, getValue) => name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
-    const checkAddressFillFromESIA = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
-    const checkAddressFact = ({ name }, getValue) => name === 'addressFact' && getValue('addressMatch');
-    const checkCondition = ({ condition }, getValue) => condition?.name &&
-        condition?.values?.some((_) => {
-            const dataValue = getValue(condition?.name);
-            return _ !== (dataValue?.key ?? dataValue);
-        });
-    const checkConsentPfrFlg = ({ name }, getValue) => name === 'snils' && isSnilsRequired(getValue);
-    const isSnilsRequired = (getValue) => getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';
-
     var STATUS_TYPE;
     (function (STATUS_TYPE) {
         STATUS_TYPE["process"] = "IN_PROCESS";
@@ -6992,6 +6965,33 @@
         return statusesMap[status] || jsx(ReworkStatusContent$1, {});
     };
 
+    const calculateInputs = (getValue) => (inputs, step) => inputs
+        .filter((_) => _)
+        .map((_) => {
+        if ([
+            checkIsRetiree(step, getValue),
+            checkBusinessOwner(_, getValue),
+            checkConsentPfrFlg(_, getValue),
+            checkAddressFillFromESIA(_, getValue),
+            checkAddressFact(_, getValue),
+            checkCondition(_, getValue),
+        ].some(Boolean)) {
+            return { ..._, required: false };
+        }
+        return _;
+    });
+    const checkIsRetiree = (step, getValue) => step === 2 && getValue('employment')?.key === 'RETIREE';
+    const checkBusinessOwner = ({ name }, getValue) => name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
+    const checkAddressFillFromESIA = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
+    const checkAddressFact = ({ name }, getValue) => name === 'addressFact' && getValue('addressMatch');
+    const checkCondition = ({ condition }, getValue) => condition?.name &&
+        condition?.values?.some((_) => {
+            const dataValue = getValue(condition?.name);
+            return _ !== (dataValue?.key ?? dataValue);
+        });
+    const checkConsentPfrFlg = ({ name }, getValue) => name === 'snils' && isSnilsRequired(getValue);
+    const isSnilsRequired = (getValue) => getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';
+
     const InputsMap = { ...InputsRetailMap, ...InputRetailCardMap };
     const renderInputs$1 = ({ field, inputs, params }) => inputs.map(getField(field, params, InputsMap));
 
@@ -7298,10 +7298,7 @@
                     }));
                     resetForm(response);
                 }
-                onNextStep();
-                if (isFinalStep) {
-                    onFinish?.();
-                }
+                isFinalStep ? onFinish?.() : onNextStep();
             }
             catch (ex) {
                 // Do nothing
@@ -7313,7 +7310,7 @@
         return [initialState, handleSubmit, isSending];
     };
 
-    const CreditCardFormStep = JSX(({ step, sections, isFormFinished, onPrevStep, onNextStep, onFinish }) => {
+    const CreditCardFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
         const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs || []), [sections]);
         const formValidator = useCallback((formState) => 
         // TODO Слишком сложно
@@ -7327,7 +7324,7 @@
             formValidator,
             onSubmit,
         });
-        return isFormFinished ? (jsx(CreditCardFormStatusTracker, {})) : (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep$2({ sections, field, step }), jsx(StepsNavigationButtons$1, { isSending: isSending, step: step, onPrevStep: onPrevStep })] }));
+        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep$2({ sections, field, step }), jsx(StepsNavigationButtons$1, { isSending: isSending, step: step, onPrevStep: onPrevStep })] }));
     });
 
     const PERSONAL_INFO_CONTENT = [
@@ -7731,7 +7728,7 @@
         }, []);
         const sections = stepsSectionsMap$1[step];
         const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
-        return (jsx(BlockWrapper, { className: className, ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: TITLES, step: step, totalSteps: STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditCardFormStep, { step: step, sections: sections, isFormFinished: isFormFinished, onNextStep: handleNextStep, onPrevStep: handlePrevStep, onFinish: handleFinish }, String(step)) })] }) }));
+        return (jsx(BlockWrapper, { className: className, ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: TITLES, step: step, totalSteps: STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: isFormFinished ? (jsx(CreditCardFormStatusTracker, {})) : (jsx(CreditCardFormStep, { step: step, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, onFinish: handleFinish }, String(step))) })] }) }));
     });
 
     const CreditFormProgress = JSX(({ step = 1, totalSteps = 5, stepsTitles = [] }) => {
@@ -8105,7 +8102,7 @@
         return [initialState, handleSubmit, isSending];
     };
 
-    const CreditFormStep = JSX(({ step, sections, isFormFinished, programsSource, onPrevStep, onNextStep, onFinish }) => {
+    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]);
@@ -8121,7 +8118,7 @@
             formValidator,
             onSubmit,
         });
-        return isFormFinished ? (jsx(CreditFormStatusTracker, {})) : (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep$1({ sections, field, step, params: { calcData } }), jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
+        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep$1({ sections, field, step, params: { calcData } }), jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
     });
 
     const stepsSectionsMap = [
@@ -8156,7 +8153,7 @@
         const sections = stepsSectionsMap[step];
         const isStartStep = step === 0;
         const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
-        return (jsx(BlockWrapper, { className: className, ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isStartStep || isFormFinished ? null : (jsx(CreditFormProgress, { stepsTitles: STEP_TITLES, step: step, totalSteps: STEPS })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditFormStep, { step: step, sections: sections, isFormFinished: isFormFinished, programsSource: programsSource, onNextStep: handleNextStep, onPrevStep: handlePrevStep, onFinish: handleFinish }, String(step)) })] }) }));
+        return (jsx(BlockWrapper, { className: className, ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isStartStep || isFormFinished ? null : (jsx(CreditFormProgress, { stepsTitles: STEP_TITLES, step: step, totalSteps: STEPS })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: isFormFinished ? (jsx(CreditFormStatusTracker, {})) : (jsx(CreditFormStep, { step: step, sections: sections, programsSource: programsSource, onNextStep: handleNextStep, onPrevStep: handlePrevStep, onFinish: handleFinish }, String(step))) })] }) }));
     });
 
     const isRateRow = (rateRow) => typeof rateRow?.minMonths === 'number' && typeof rateRow?.maxMonths === 'number';
@@ -10433,7 +10430,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.738";
+    const packageVersion = "0.14.740";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;