@redneckz/wildless-cms-uni-blocks 0.14.654 → 0.14.656

package/mobile/bundle/bundle.umd.js

@@ -3553,7 +3553,7 @@
         const [responseType, setResponseType] = useState('');
         const responseTypeDialog = useResponseTypeDialog({ typeForm });
         const handleSubmit = useCallback(async (formData, ev) => {
-            const inputsFiltered = getFilteredInputs(inputs, formData);
+            const inputsFiltered = getFilteredInputs$1(inputs, formData);
             const feedbackValidator = objectValidator(getObjectValidator(inputsFiltered));
             if (!isValidationSuccess(feedbackValidator(formData))) {
                 return console.warn('validation fail');
@@ -3580,7 +3580,7 @@
         }, [responseType]);
         return (jsxs(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: [jsxs("form", { onSubmit: onSubmit, children: [sections.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), (_?.inputs || [])?.map(getField(field, typeForm))] }, `section-${i}`))), renderAgreementSubmit(fieldName ? field('consentDataProcessing') : undefined, link, button)] }), isContacts ? renderContacts() : null] }));
     });
-    const getFilteredInputs = (inputs, data) => inputs
+    const getFilteredInputs$1 = (inputs, data) => inputs
         .filter((_) => (_?.name === 'secondaryPhone' ? Boolean(data.secondaryPhone) : _))
         .filter((input) => !input?.condition ||
         input?.condition.values.find((_) => {
@@ -6123,11 +6123,6 @@
                 fiasCode: '',
             },
             housing: '',
-            methodObtain: 'office',
-            addressCourier: {
-                fullAddress: '',
-                fiasCode: '',
-            },
         },
         2: {
             amountWorkers: { key: '', text: '' },
@@ -6154,6 +6149,7 @@
             familyStatus: { key: '', text: '' },
             dependents: undefined,
             familyMembers: undefined,
+            confirmationIncome: { key: '', text: '' },
             mandatoryIncome: undefined,
             otherPayments: undefined,
             snils: '',
@@ -6172,11 +6168,11 @@
                 fullAddress: '',
                 fiasCode: '',
             },
-            bankEmployeeCode: '',
-            addressCoutier: {
+            addressCourier: {
                 fullAddress: '',
                 fiasCode: '',
             },
+            bankEmployeeCode: '',
             methodObtain: 'office',
             deliveryDate: undefined,
         },
@@ -6198,6 +6194,9 @@
             localStorageData.beginDate = localStorageData?.beginDate
                 ? new Date(localStorageData.beginDate)
                 : undefined;
+            localStorageData.deliveryDate = localStorageData?.deliveryDate
+                ? new Date(localStorageData.deliveryDate)
+                : undefined;
         }
         return {
             ...formStateMap$1[step],
@@ -6205,24 +6204,25 @@
         };
     };
 
-    const renderInfo$2 = (inputs = []) => {
+    const getFilteredInputs = (inputs, data) => inputs
+        .filter((_) => _)
+        .filter((input) => !input?.condition ||
+        input?.condition.values.find((_) => {
+            const dataValue = data?.[input?.condition?.name ?? ''];
+            return _ === (dataValue?.key ?? dataValue);
+        }));
+
+    const renderInfo$2 = (state, inputs = []) => {
         const infoInputs = inputs.filter((_) => _.fieldType === 'info');
-        return infoInputs.length
-            ? infoInputs.map(({ text, name }, i) => jsx(InfoCard, { __html: text }, `${name}_${i}`))
+        const filteredInputs = getFilteredInputs(infoInputs, state);
+        return filteredInputs.length
+            ? filteredInputs.map(({ text, name }, i) => jsx(InfoCard, { __html: text }, `${name}_${i}`))
             : null;
     };
 
     const renderInputs$1 = ({ field, inputs }) => (inputs || [])?.map(getField(field, ''));
 
-    const renderLastStep = ({ sections, field, methodObtain }) => sections
-        ?.filter(({ type }) => type === methodObtain || !type)
-        .map(({ inputs, columns, title }, i) => (jsxs("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: [renderInfo$2(inputs), renderTitle(title), renderInputs$1({ field, inputs })] }, `section-${i}`)));
-    const renderStep$1 = ({ sections, field, isLastStep, methodObtain }) => {
-        if (isLastStep) {
-            return renderLastStep({ sections, field, methodObtain });
-        }
-        return sections?.map(({ inputs, columns, title }, i) => (jsxs("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: [renderInfo$2(inputs), renderTitle(title), renderInputs$1({ field, inputs })] }, `section-${i}`)));
-    };
+    const renderStep$1 = ({ sections, field, userInputParams }) => sections?.map(({ inputs, columns, title }, i) => (jsxs("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: [renderInfo$2(userInputParams, inputs), renderTitle(title), renderInputs$1({ field, inputs })] }, `section-${i}`)));
 
     const StepsNavigationButtons$1 = JSX(({ step, onPrevStep }) => {
         const isFirstStep = step === 0;
@@ -6367,7 +6367,8 @@
         const [profileId] = useLocalStorage('profileId');
         const [participantId] = useLocalStorage('participantId');
         const handleSubmit = useCallback(async (formData) => {
-            const feedbackValidator = objectValidator(getObjectValidator(calculateInputs$1(formData, inputs, step)));
+            const inputsFiltered = getFilteredInputs(inputs, formData);
+            const feedbackValidator = objectValidator(getObjectValidator(calculateInputs$1(formData, inputsFiltered, step)));
             if (!isValidationSuccess(feedbackValidator(formData))) {
                 return console.warn('validation fail');
             }
@@ -6412,18 +6413,16 @@
             saveStep,
             finishForm,
         });
-        const [state, { field, onSubmit }] = useForm(initialState, {
+        const [userInputParams, { field, onSubmit }] = useForm(initialState, {
             onSubmit: (formData, ev) => {
                 handleSubmit({ ...formData, ...customSubmit.current?.(ev) });
             },
         });
-        const methodObtain = 'methodObtain' in state ? state.methodObtain : undefined;
         return isFormFinished ? (jsx(CreditCardFormStatusTracker, {})) : (jsxs("form", { onSubmit: onSubmit, className: "space-y-m", children: [renderStep$1({
                     sections,
                     field,
                     registerSubmit,
-                    methodObtain,
-                    isLastStep: step === 5,
+                    userInputParams: userInputParams,
                 }), jsx(StepsNavigationButtons$1, { step: step, onPrevStep: onPrevStep })] }));
     });
 
@@ -6682,56 +6681,83 @@
                 inputs: [{ fieldType: 'common', name: 'methodObtain' }],
             },
             {
-                type: 'courier',
                 title: 'Адрес',
                 columns: 1,
                 inputs: [],
             },
             {
-                type: 'courier',
-                inputs: [{ fieldType: 'common', name: 'addressCourier', dadata: true }],
-            },
-            {
-                type: 'courier',
-                inputs: [{ fieldType: 'common', name: 'deliveryDate' }],
-            },
-            {
-                type: 'courier',
-                inputs: [{ fieldType: 'common', name: 'comment' }],
-            },
-            {
-                type: 'office',
-                title: 'Отделение Банка',
-                columns: 1,
-                inputs: [],
-            },
-            {
-                type: 'office',
-                inputs: [{ fieldType: 'common', name: 'regionRetail', required: true }],
-            },
-            {
-                type: 'office',
-                inputs: [{ fieldType: 'common', name: 'addressRetail', required: true }],
+                inputs: [
+                    {
+                        fieldType: 'common',
+                        name: 'addressCourier',
+                        dadata: true,
+                        condition: {
+                            name: 'methodObtain',
+                            values: ['courier'],
+                        },
+                        required: true,
+                    },
+                    {
+                        fieldType: 'common',
+                        name: 'deliveryDate',
+                        condition: {
+                            name: 'methodObtain',
+                            values: ['courier'],
+                        },
+                        required: true,
+                    },
+                    {
+                        fieldType: 'common',
+                        name: 'comment',
+                        condition: {
+                            name: 'methodObtain',
+                            values: ['courier'],
+                        },
+                    },
+                ],
             },
             {
-                type: 'office',
-                title: 'Код представителя Банка',
-                columns: 1,
-                inputs: [],
+                inputs: [
+                    {
+                        fieldType: 'common',
+                        name: 'regionRetail',
+                        required: true,
+                        condition: {
+                            name: 'methodObtain',
+                            values: ['office'],
+                        },
+                    },
+                    {
+                        fieldType: 'common',
+                        name: 'addressRetail',
+                        required: true,
+                        condition: {
+                            name: 'methodObtain',
+                            values: ['office'],
+                        },
+                    },
+                ],
             },
             {
-                type: 'office',
                 inputs: [
                     {
                         fieldType: 'info',
                         text: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
+                        condition: {
+                            name: 'methodObtain',
+                            values: ['office'],
+                        },
+                    },
+                    {
+                        fieldType: 'common',
+                        name: 'bankEmployeeCode',
+                        condition: {
+                            name: 'methodObtain',
+                            values: ['office'],
+                        },
                     },
                 ],
             },
-            {
-                type: 'office',
-                inputs: [{ fieldType: 'common', name: 'bankEmployeeCode' }],
-            },
         ],
     ];
 
@@ -6769,7 +6795,7 @@
             globalThis.location.href = PORTAL_NATURAL_URL;
             return () => null;
         }
-        const timer = setInterval(async () => {
+        const updateTokenRequest = async () => {
             const res = await doRequest('/auth/refresh', 'POST', {
                 // eslint-disable-next-line camelcase
                 refresh_token: refreshToken,
@@ -6777,14 +6803,21 @@
                 access_token: accessToken,
             });
             if (res instanceof Response) {
-                globalThis.location.href = PORTAL_NATURAL_URL;
+                handleStatus(res.status);
                 return;
             }
-            sessionStorage.setItem('refreshToken', res.refresh_token);
-            sessionStorage.setItem('accessToken', res.access_token);
-        }, UPDATING_INTERVAL);
+            globalThis.sessionStorage.setItem('refreshToken', res.refresh_token);
+            globalThis.sessionStorage.setItem('accessToken', res.access_token);
+        };
+        updateTokenRequest();
+        const timer = setInterval(updateTokenRequest, UPDATING_INTERVAL);
         return () => clearInterval(timer);
     };
+    const handleStatus = (status) => {
+        if (status == 401) {
+            globalThis.location.href = PORTAL_NATURAL_URL;
+        }
+    };
 
     const CreditFormProgress = JSX(({ step = 1, totalSteps = 5, stepsTitles = [] }) => {
         const progress = useMemo(() => (step / totalSteps) * 100, [step, totalSteps]);
@@ -9434,7 +9467,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.653";
+    const packageVersion = "0.14.655";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;