@redneckz/wildless-cms-uni-blocks 0.14.641 → 0.14.643

package/bundle/api/dadataHints/dadataHintsType.d.ts

@@ -45,6 +45,8 @@ export interface DaDataAddress {
     settlement_with_type: Nullable<string>;
     street: Nullable<string>;
     fias_code: string;
+    qc_complete: Nullable<string>;
+    qc_house: Nullable<string>;
 }
 declare type DaDataResponseItem = Partial<DaDataFio & DaDataEmail & DaDataPassportFms & DaDataOrganization & DaDataAddress>;
 export interface ListRequestOption {

package/bundle/bundle.umd.js

@@ -1451,6 +1451,8 @@
     const snilsValidator = (errorMsg) => validator(snilsValidate)(errorMsg);
     const emailValidate = (email) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test(email);
     const emailValidator = (errorMsg) => validator((_) => emailValidate(_))(errorMsg);
+    const addressDaDataValidate = (address) => Boolean(address.qc === '0' && address.qcComplete === '0' && address.qcHouse === '2');
+    const addressDaDataValidator = () => validator(addressDaDataValidate)('Укажите регион, город/населенный пункт, улицу, дом, квартиру');
 
     const validatorObj = {
         typeForm: defaultValidator(),
@@ -1487,7 +1489,7 @@
         experience5Years: jobNumberValidator('Укажите общий стаж за последние 5 лет'),
         jobsNumber: jobNumberValidator('Укажите количество мест работы за последние 5 лет'),
         beginDate: defaultValidator('Укажите дату заключения трудового договора'),
-        addressFact: defaultValidator(),
+        addressFact: addressDaDataValidator(),
         partnerComments: defaultValidator(),
         collectionCount: defaultValidator(),
         comment: defaultValidator(),
@@ -1516,8 +1518,8 @@
         conscription: defaultValidator(),
         armyIdFlg: agreementValidator,
         sex: defaultValidator('Укажите свой пол'),
-        addressRegistration: defaultValidator('Необходимо выбрать адрес'),
-        organizationAddress: defaultValidator('Необходимо выбрать адрес'),
+        addressRegistration: addressDaDataValidator(),
+        organizationAddress: addressDaDataValidator(),
         participantDateRegistration: defaultValidator('Укажите дату регистрации'),
         retirementIncome: defaultValidator(),
         otherIncome: defaultValidator(),
@@ -1707,6 +1709,8 @@
         return (jsx(InputControl, { label: "\u0410\u0434\u0440\u0435\u0441", disabled: value, ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), value: fieldValue.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
     });
 
+    const calculateIsRequired = (field, initialRequired) => (field?.('employment')?.value?.key === 'RETIREE' ? false : initialRequired);
+
     const AddressField = JSX(({ field, input }) => {
         const fieldName = input?.name || 'addressRegistration';
         const fieldValue = field(fieldName).value;
@@ -1724,6 +1728,9 @@
                 region: item?.data?.region,
                 regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
                 street: item?.data?.house,
+                qc: item?.data?.qc,
+                qcComplete: item?.data?.qc_complete,
+                qcHouse: item?.data?.qc_house,
             });
         }, []);
         const onChange = useCallback((value) => {
@@ -1732,7 +1739,9 @@
                 fullAddress: value,
             });
         }, []);
-        return (jsx(InputControl, { label: "\u0410\u0434\u0440\u0435\u0441", ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), value: fieldValue.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
+        return (jsx(InputControl, { label: "\u0410\u0434\u0440\u0435\u0441", ...getValidation(field(fieldName), validatorObj[fieldName], input?.name === 'organizationAddress'
+                ? calculateIsRequired(field, input?.required)
+                : input?.required), value: fieldValue.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
     });
 
     const SVG = JSX(({ className, viewBox, fill = 'none', width, height, paths, ...commonOptions }) => {
@@ -2149,7 +2158,7 @@
 
     const DatePickerControl = JSX(({ className, label, error, errors, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(DatePicker, { label: getRequiredLabel({ label, errors }), valid: Boolean(!error), ...rest }), renderErrorText(error)] })));
 
-    const BeginDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u043D\u0430\u0447\u0430\u043B\u0430 \u0440\u0430\u0431\u043E\u0442\u044B \u043D\u0430 \u0442\u0435\u043A\u0443\u0449\u0435\u043C \u043C\u0435\u0441\u0442\u0435", ...getValidation(field('beginDate'), validatorObj.beginDate, input?.required), ...input })));
+    const BeginDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u043D\u0430\u0447\u0430\u043B\u0430 \u0440\u0430\u0431\u043E\u0442\u044B \u043D\u0430 \u0442\u0435\u043A\u0443\u0449\u0435\u043C \u043C\u0435\u0441\u0442\u0435", ...getValidation(field('beginDate'), validatorObj.beginDate, calculateIsRequired(field, input?.required)), ...input })));
 
     const BirthdayField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...getValidation(field('birthday'), validatorObj.birthday, input?.required) })));
 
@@ -2308,7 +2317,7 @@
 
     const ExpensesField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0440\u0430\u0441\u0445\u043E\u0434\u044B \u0432 \u043C\u0435\u0441\u044F\u0446", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", ...getValidation(field('expenses'), validatorObj.expenses, input?.required), ...input })));
 
-    const Experience5YearsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0421\u0442\u0430\u0436", placeholder: "\u0417\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 5 \u043B\u0435\u0442", type: "number", inputLength: 2, ...getValidation(field('experience5Years'), validatorObj.experience5Years, input?.required), ...input })));
+    const Experience5YearsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0421\u0442\u0430\u0436", placeholder: "\u0417\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 5 \u043B\u0435\u0442", type: "number", inputLength: 2, ...getValidation(field('experience5Years'), validatorObj.experience5Years, calculateIsRequired(field, input?.required)), ...input })));
 
     const FamilyMembersField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0447\u043B\u0435\u043D\u043E\u0432 \u0441\u0435\u043C\u044C\u0438", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", inputLength: 2, ...getValidation(field('familyMembers'), validatorObj.familyMembers, input?.required), ...input })));
 
@@ -2334,7 +2343,7 @@
 
     const FullNameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0424\u0418\u041E", ...getValidation(field('fullName'), validatorObj.fullName, input?.required), ...input })));
 
-    const GeneralSeniorityField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u0449\u0438\u0439 \u0441\u0442\u0430\u0436", type: "number", inputLength: 2, placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", ...getValidation(field('generalSeniority'), validatorObj.generalSeniority, input?.required), ...input })));
+    const GeneralSeniorityField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u0449\u0438\u0439 \u0441\u0442\u0430\u0436", type: "number", inputLength: 2, placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", ...getValidation(field('generalSeniority'), validatorObj.generalSeniority, calculateIsRequired(field, input?.required)), ...input })));
 
     const HousingField = JSX(({ field, input }) => {
         const { data: housing } = useLeadFormData('HOUSE_TYPE');
@@ -2346,20 +2355,20 @@
             field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
             field?.('legalForm')?.onChange?.(item.data?.opf?.short);
         }, []);
-        return (jsx(InputControl, { label: "\u0418\u041D\u041D", type: "number", inputLength: 12, ...input, ...getValidation(field('inn'), validatorObj.inn, input?.required), onDaDataChange: onDaDataChange }));
+        return (jsx(InputControl, { label: "\u0418\u041D\u041D", type: "number", inputLength: 12, ...input, ...getValidation(field('inn'), validatorObj.inn, calculateIsRequired(field, input?.required)), onDaDataChange: onDaDataChange }));
     });
 
     const IsClientField = JSX(({ field }) => (jsx(CheckboxWithError, { ...field('isClient'), text: '\u042F\u0432\u043B\u044F\u044E\u0441\u044C \u043A\u043B\u0438\u0435\u043D\u0442\u043E\u043C \u0431\u0430\u043D\u043A\u0430 \u0410\u041E "\u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A"' })));
 
-    const JobsNumberField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043C\u0435\u0441\u0442 \u0440\u0430\u0431\u043E\u0442\u044B \u0437\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 5 \u043B\u0435\u0442", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043C\u0435\u0441\u0442", type: "number", inputLength: 2, ...getValidation(field('jobsNumber'), validatorObj.jobsNumber, input?.required), ...input })));
+    const JobsNumberField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043C\u0435\u0441\u0442 \u0440\u0430\u0431\u043E\u0442\u044B \u0437\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 5 \u043B\u0435\u0442", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043C\u0435\u0441\u0442", type: "number", inputLength: 2, ...getValidation(field('jobsNumber'), validatorObj.jobsNumber, calculateIsRequired(field, input?.required)), ...input })));
 
-    const LastJobExperienceField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0421\u0442\u0430\u0436 \u043D\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u043C \u0440\u0430\u0431\u043E\u0447\u0435\u043C \u043C\u0435\u0441\u0442\u0435", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", type: "number", inputLength: 2, ...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required), ...input })));
+    const LastJobExperienceField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0421\u0442\u0430\u0436 \u043D\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u043C \u0440\u0430\u0431\u043E\u0447\u0435\u043C \u043C\u0435\u0441\u0442\u0435", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", type: "number", inputLength: 2, ...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, calculateIsRequired(field, input?.required)), ...input })));
 
     const LegalEntityNameField = JSX(({ field, input }) => {
         return (jsx(InputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u044E\u0440\u0438\u0434\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043B\u0438\u0446\u0430", ...input, ...getValidation(field('legalEntityName'), validatorObj.legalEntityName, input?.required) }));
     });
 
-    const LegalFormField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u041F\u0424", placeholder: "\u041E\u041E\u041E, \u041F\u0410\u041E  \u0438 \u0434\u0440.", ...getValidation(field('legalForm'), validatorObj.legalForm, input?.required), ...input })));
+    const LegalFormField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u041F\u0424", placeholder: "\u041E\u041E\u041E, \u041F\u0410\u041E  \u0438 \u0434\u0440.", ...getValidation(field('legalForm'), validatorObj.legalForm, calculateIsRequired(field, input?.required)), ...input })));
 
     const OUT_SERVICE_BASE_URL = `${API_BASE_URI}/outservice`;
     const EMPTY_REGIONS = [];
@@ -2403,7 +2412,7 @@
             field?.('inn')?.onChange?.(item.data?.inn);
             field?.('legalForm')?.onChange?.(item.data?.opf?.short);
         }, []);
-        return (jsx(InputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", ...input, ...getValidation(field('organizationName'), validatorObj.organizationName, input?.required), onDaDataChange: onDaDataChange }));
+        return (jsx(InputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", ...input, ...getValidation(field('organizationName'), validatorObj.organizationName, calculateIsRequired(field, input?.required)), onDaDataChange: onDaDataChange }));
     });
 
     const OtherIncomeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0418\u043D\u044B\u0435 \u0434\u043E\u0445\u043E\u0434\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", ...getValidation(field('otherIncome'), validatorObj.otherIncome, input?.required), ...input })));
@@ -2415,7 +2424,7 @@
     const MAX_PART = 100;
     const PartInBusinessField = JSX(({ field, input }) => {
         const partInBusinessField = {
-            ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, input?.required),
+            ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, calculateIsRequired(field, input?.required)),
         };
         const handleChange = (value) => partInBusinessField?.onChange &&
             partInBusinessField?.onChange(String(Number(value) > MAX_PART ? MAX_PART : Number(value) || ''));
@@ -2453,7 +2462,9 @@
 
     const InputPhoneControl = JSX(({ className, label, error, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(PhoneInput, { "aria-label": label, label: getRequiredLabel({ label, errors: rest?.errors }), valid: Boolean(!error), placeholder: "+7 (___) ___-__-__", ...rest }), renderErrorText(error)] })));
 
-    const PhoneField = JSX(({ field, input }) => (jsx(InputPhoneControl, { label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D", ...getValidation(field(input?.name || 'phone'), validatorObj.phone, input?.required), ...input })));
+    const PhoneField = JSX(({ field, input }) => (jsx(InputPhoneControl, { label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D", ...getValidation(field(input?.name || 'phone'), validatorObj.phone, input?.name === 'organizationPhone'
+            ? calculateIsRequired(field, input?.required)
+            : input?.required), ...input })));
 
     const PositionOrganizationField = JSX(({ field, input }) => {
         const { data: positionOrganization } = useLeadFormData('POSITION');
@@ -3338,10 +3349,10 @@
         return (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto ", children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md space-x-m", children: [jsx(Img, { image: { icon: statusIcon, iconVersion: 'normal' }, width: "136", height: "136" }), jsx(Headline, { className: "w-full", title: responseOK ? 'Ваша заявка отправлена' : 'Не удалось отправить заявку', description: responseOK ? responseOKDescription : 'Пожалуйста, повторите позднее', headlineVersion: "XS", isEmbedded: true }), jsx(Button, { type: "button", onClick: handleClose, children: "\u0425\u043E\u0440\u043E\u0448\u043E" })] }) }));
     });
 
-    const useResponseTypeDialog = (props) => {
+    const useResponseTypeDialog = (initialProps) => {
         const { open, close } = useDialogManager();
         return {
-            open: (options = {}) => open(jsx(ResponseTypeDialog, { ...props }), options),
+            open: (props, options = {}) => open(jsx(ResponseTypeDialog, { ...initialProps, ...props }), options),
             close,
         };
     };
@@ -3435,6 +3446,7 @@
         const inputs = (sections?.flatMap((_) => _?.inputs) || []);
         const initialFormState = getInitialFormState$2(inputs, typeForm);
         const [responseType, setResponseType] = useState('');
+        const responseTypeDialog = useResponseTypeDialog({ typeForm });
         const handleSubmit = useCallback(async (formData, ev) => {
             const inputsFiltered = getFilteredInputs(inputs, formData);
             const feedbackValidator = objectValidator(getObjectValidator(inputsFiltered));
@@ -3445,8 +3457,7 @@
             const status = (await API.send(formatData, endpoint === 'lead')) ? 'OK' : 'Fail';
             setResponseType(status);
             if (status) {
-                const responseTypeDialog = useResponseTypeDialog({ responseType: status, typeForm });
-                responseTypeDialog.open();
+                responseTypeDialog.open({ responseType: status });
             }
             if (status === 'OK' && data) {
                 const aspects = useAspects();
@@ -5881,7 +5892,7 @@
     })(STATUS_TYPE || (STATUS_TYPE = {}));
     const getTaskStatus = (body) => doRequest('/user-data/getTaskStatus', 'POST', body);
 
-    const sendSignalToProcess = (body) => doRequest('/public-data/sendSignalToProcess', 'POST', body);
+    const sendSignalToProcess = (body) => doRequest('/user-data/sendSignalToProcess', 'POST', body);
 
     const CreditFormStatus = JSX(({ title, description: dsc, infoCard, sectionInfoTitle, sectionInfo, sectionAdditionalTitle, sectionInfoAdditional, buttonText, interval, ...props }) => (jsxs(BlockWrapper, { ...props, children: [jsxs("div", { className: "flex flex-col md:flex-row items-center", children: [jsx(Headline, { headlineVersion: "M", title: title, description: dsc, align: "text-left", padding: "p-xl", className: "w-full" }), interval ? jsx(TimerCircle, { interval: interval }) : null] }), jsx(SectionInfo, { title: sectionInfoTitle, items: sectionInfo }), jsx(SectionInfo, { title: sectionAdditionalTitle, items: sectionInfoAdditional, countColumns: true }), infoCard?.__html ? (jsx(InfoCard, { __html: infoCard?.__html, icon: infoCard?.icon, link: {
                     text: infoCard?.link?.text,
@@ -6240,7 +6251,7 @@
         const [profileId] = useLocalStorage('profileId');
         const [participantId] = useLocalStorage('participantId');
         const handleSubmit = useCallback(async (formData) => {
-            const feedbackValidator = objectValidator(getObjectValidator(inputs));
+            const feedbackValidator = objectValidator(getObjectValidator(calculateInputs(formData, inputs, step)));
             if (!isValidationSuccess(feedbackValidator(formData))) {
                 return console.warn('validation fail');
             }
@@ -6269,6 +6280,7 @@
             handleSubmit,
         };
     };
+    const calculateInputs = (formData, inputs, step) => step === 2 && 'employment' in formData && formData?.employment?.key === 'RETIREE' ? [] : inputs;
 
     const CreditFormStep = JSX(({ step, sections, onPrevStep, onNextStep, inputs, renderStep = renderStep$1, isFormFinished, finishForm, }) => {
         const [localStorageData, saveStep] = useLocalStorage('leadForm');
@@ -6470,6 +6482,10 @@
                 columns: 1,
                 inputs: [{ fieldType: 'common', name: 'snils', required: true }],
             },
+            {
+                columns: 1,
+                inputs: [{ fieldType: 'common', name: 'conscription', required: true }],
+            },
             {
                 columns: 2,
                 inputs: [{ fieldType: 'common', name: 'armyIdFlg' }],
@@ -8819,7 +8835,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.640";
+    const packageVersion = "0.14.642";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;