@redneckz/wildless-cms-uni-blocks 0.14.724 → 0.14.726

package/mobile/src/ui-kit/FormField/NameFieldDef.ts

@@ -1,22 +1,82 @@
-export type NameFieldDef =
-  | 'surname'
-  | 'name'
-  | 'middleName'
-  | 'education'
-  | 'housing'
-  | 'employment'
+type NameFieldConsentDef =
+  | 'processPersonalDataFlg'
+  | 'consentProviderFlg'
+  | 'consentInformFlg'
+  | 'consentPfrFlg'
+  | 'consentOthersFlg';
+
+type NameFieldCreditCardDef =
+  | 'addressCourier'
+  | 'paymentSystem'
+  | 'currency'
+  | 'cardCategory'
+  | 'codeWord'
+  | 'confirmationIncome'
+  | 'methodObtain'
+  | 'deliveryDate';
+
+type NameFieldRetailDef =
   | 'organization'
-  | 'organizationPhone'
   | 'organizationAddress'
+  | 'organizationPhone'
+  | 'organizationName'
+  | 'legalForm'
+  | 'generalSeniority'
+  | 'lastJobExperience'
+  | 'experience5Years'
+  | 'jobsNumber'
+  | 'beginDate'
+  | 'addressFact'
+  | 'addressRegistration'
+  | 'addressRetail'
+  | 'addressMatch'
+  | 'sex'
+  | 'limitedBirthday'
+  | 'birthPlace'
+  | 'education'
+  | 'housing'
   | 'amountWorkers'
+  | 'employment'
   | 'employerActivities'
   | 'employerOrganization'
   | 'positionOrganization'
+  | 'familyStatus'
+  | 'familyMembers'
+  | 'children'
+  | 'dependents'
+  | 'totalIncome'
+  | 'expenses'
+  | 'snils'
+  | 'conscription'
+  | 'armyIdFlg'
   | 'dulSerie'
   | 'dulNumber'
   | 'dulIssueDateField'
   | 'dulSubdivisionCode'
   | 'dulIssuedBy'
+  | 'participantDateRegistration'
+  | 'retirementIncome'
+  | 'rentalIncome'
+  | 'otherIncome'
+  | 'otherPayments'
+  | 'additionalIncome'
+  | 'wages'
+  | 'mandatoryPayments'
+  | 'incomeAverage'
+  | 'disablePeopleFlg'
+  | 'bankruptcyFlg'
+  | 'shareholderFlg'
+  | 'legalEntityName'
+  | 'creditInRshbCd'
+  | 'bankEmployeeCode'
+  | 'partInBusiness'
+  | 'regionRetail'
+  | 'calculator';
+
+type NameFieldApplicationDef =
+  | 'surname'
+  | 'name'
+  | 'middleName'
   | 'email'
   | 'phone'
   | 'fullName'
@@ -27,11 +87,7 @@ export type NameFieldDef =
   | 'typeForm'
   | 'registrationDate'
   | 'birthday'
-  | 'limitedBirthday'
-  | 'birthPlace'
-  | 'sex'
   | 'isClient'
-  | 'consentToReceiveMaterials'
   | 'acquiringType'
   | 'onlineCheckout'
   | 'posTerminal'
@@ -50,54 +106,11 @@ export type NameFieldDef =
   | 'product'
   | 'localities'
   | 'partnerComments'
-  | 'consentDataProcessing'
-  | 'consentInformFlg'
-  | 'consentOthersFlg'
-  | 'consentPfrFlg'
-  | 'consentProviderFlg'
-  | 'processPersonalDataFlg'
-  | 'legalForm'
-  | 'organizationName'
-  | 'generalSeniority'
-  | 'lastJobExperience'
-  | 'experience5Years'
-  | 'jobsNumber'
-  | 'beginDate'
-  | 'addressFact'
-  | 'familyStatus'
-  | 'children'
-  | 'familyMembers'
-  | 'dependents'
-  | 'totalIncome'
-  | 'expenses'
-  | 'snils'
-  | 'conscription'
-  | 'armyIdFlg'
-  | 'addressRegistration'
-  | 'participantDateRegistration'
-  | 'retirementIncome'
-  | 'otherIncome'
-  | 'mandatoryPayments'
-  | 'additionalIncome'
-  | 'otherPayments'
-  | 'rentalIncome'
-  | 'wages'
-  | 'creditInRshbCd'
-  | 'disablePeopleFlg'
-  | 'bankruptcyFlg'
-  | 'shareholderFlg'
-  | 'legalEntityName'
-  | 'bankEmployeeCode'
-  | 'partInBusiness'
-  | 'regionRetail'
-  | 'addressRetail'
-  | 'addressMatch'
-  | 'addressCourier'
-  | 'deliveryDate'
-  | 'methodObtain'
-  | 'paymentSystem'
-  | 'currency'
-  | 'cardCategory'
-  | 'codeWord'
-  | 'calculator'
-  | 'confirmationIncome';
+  | 'consentToReceiveMaterials'
+  | 'consentDataProcessing';
+
+export type NameFieldDef =
+  | NameFieldApplicationDef
+  | NameFieldRetailDef
+  | NameFieldCreditCardDef
+  | NameFieldConsentDef;

package/mobile/src/ui-kit/FormField/SelectField.tsx

@@ -1,4 +1,4 @@
-import { type LeadProps } from '../../api/RetailAPI/model/LeadFormData';
+import { type DictionaryItem } from '../../services/retail/model/LeadFormData';
 import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type Option } from '../Select/Option';
@@ -8,7 +8,7 @@ import { validatorObj } from './getObjectValidator';
 import { getValidation } from './getValidation';
 
 export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
-  source?: LeadProps[];
+  source?: DictionaryItem[];
   label: string;
   fieldName: string;
   placeholder?: string;
@@ -28,7 +28,7 @@ export const SelectField = UniBlock<SelectFieldProps>(
     ...rest
   }) => {
     const leadOptions: Option[] =
-      source?.map((_: LeadProps) => ({
+      source?.map((_: DictionaryItem) => ({
         key: _.key || '',
         text: _.value,
       })) || [];

package/mobile/src/ui-kit/FormField/getField.tsx

@@ -6,96 +6,40 @@ import {
   type TypeFormFieldDef,
 } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type VNode } from '../../model/VNode';
 import { InputControl } from '../Input/InputControl';
 import { type CustomFieldProps } from './CustomFieldProps';
 import { AcquiringField } from './Fields/AcquiringField';
 import { AddressBranchField } from './Fields/AddressBranchField';
-import { AddressFactField } from './Fields/AddressFactField';
-import { AddressField } from './Fields/AddressField';
-import { AddressMatchField } from './Fields/AddressMatchField';
-import { AddressRetailField } from './Fields/AddressRetailField';
 import { AmountField } from './Fields/AmountField';
-import { AmountWorkersField } from './Fields/AmountWorkersField';
 import { AnnualRevenueField } from './Fields/AnnualRevenueField';
-import { ArmyIdFlgField } from './Fields/ArmyIdFlgField';
-import { BankEmpoleeCodeField } from './Fields/BankEmployeeCodeField';
 import { BankEmpoleeField } from './Fields/BankEmpoleeField';
-import { BankruptcyFlgField } from './Fields/BankruptcyFlgField';
-import { BeginDateField } from './Fields/BeginDateField';
 import { BirthdayField } from './Fields/BirthdayField';
-import { BirthPlaceField } from './Fields/BirthPlaceField';
-import { CardCategoryField } from './Fields/CardCategoryField';
-import { ChildrenField } from './Fields/ChildrenField';
-import { CodeWordField } from './Fields/CodeWordField';
 import { CollectionCountField } from './Fields/CollectionCountField';
 import { CommentField } from './Fields/CommentField';
-import { ConfirmationIncomeField } from './Fields/ConfirmationIncomeField';
-import { ConscriptionField } from './Fields/ConscriptionField';
-import { ConsentField } from './Fields/ConsentField';
-import { CreditCalcField } from './Fields/CreditCalcField';
-import { CreditInRshbCdField } from './Fields/CreditInRshbCdField';
-import { CurrencyField } from './Fields/CurrencyField';
-import { DeliveryDateFiels } from './Fields/DeliveryDateFiels';
-import { DependentsField } from './Fields/DependentsField';
+import { ConsentToReceiveMaterialsField } from './Fields/consentToReceiveMaterialsField';
 import { DesiredMeetingDateField } from './Fields/DesiredMeetingDateField';
-import { DisablePeopleFlgField } from './Fields/DisablePeopleFlgField';
-import { DulIssueDateField } from './Fields/DulIssueDateField';
-import { DulIssuedByField } from './Fields/DulIssuedByField';
-import { DulNumberField } from './Fields/DulNumberField';
-import { DulSerieField } from './Fields/DulSerieField';
-import { DulSubdivisionCodeField } from './Fields/DulSubdivisionCodeField';
-import { EducationField } from './Fields/EducationField';
 import { EmailField } from './Fields/EmailField';
-import { EmployerActivitiesField } from './Fields/EmployerActivitiesField';
-import { EmployerOrganizationField } from './Fields/EmployerOrganizationField';
-import { EmploymentField } from './Fields/EmploymentField';
-import { ExpensesField } from './Fields/ExpensesField';
-import { Experience5YearsField } from './Fields/Experience5YearsField';
-import { FamilyMembersField } from './Fields/FamilyMembersField';
-import { FamilyStatusField } from './Fields/FamilyStatusField';
 import { FeedbackMethodField } from './Fields/FeedbackMethodField';
 import { FullNameField } from './Fields/FullNameField';
-import { GeneralSeniorityField } from './Fields/GeneralSeniorityField';
-import { HousingField } from './Fields/HousingField';
 import { InnField } from './Fields/InnField';
 import { IsClientField } from './Fields/IsClientField';
-import { JobsNumberField } from './Fields/JobsNumberField';
-import { LastJobExperienceField } from './Fields/LastJobExperienceField';
-import { LegalEntityNameField } from './Fields/LegalEntityNameField';
-import { LegalFormField } from './Fields/LegalFormField';
-import { LimitedBirthdayField } from './Fields/LimitedBirthdayField';
 import { LocalitiesField } from './Fields/LocalitiesField';
-import { MandatoryPaymentsField } from './Fields/MandatoryPaymentsField';
-import { MethodObtainField } from './Fields/MethodObtainField';
 import { MiddleNameField } from './Fields/MiddleNameField';
 import { NameField } from './Fields/NameField';
 import { OnlineCheckoutField } from './Fields/OnlineCheckoutField';
-import { OrganizationField } from './Fields/OrganizationField';
-import { OrganizationNameField } from './Fields/OrganizationNameField';
-import { OtherIncomeField } from './Fields/OtherIncomeField';
-import { ParticipantDateRegistrationField } from './Fields/ParticipantDateRegistrationField';
-import { PartInBusinessField } from './Fields/PartInBusinessField';
 import { PartnerCommentsField } from './Fields/PartnerCommentsField';
-import { PaymentSystemField } from './Fields/PaymentSystemField';
 import { PhoneField } from './Fields/PhoneField';
-import { PositionOrganizationField } from './Fields/PositionOrganizationField';
 import { PosTerminalField } from './Fields/PosTerminalField';
 import { ProductField } from './Fields/ProductField';
 import { RegionField } from './Fields/RegionField';
 import { RegionPremiumField } from './Fields/RegionPremiumField';
-import { RegionRetailField } from './Fields/RegionRetailField';
-import { RetirementIncomeField } from './Fields/RetirementIncomeField';
 import { SecondaryPhoneField } from './Fields/SecondaryPhoneField';
 import { ServiceDirectionField } from './Fields/ServiceDirectionField';
-import { SexField } from './Fields/SexField';
-import { ShareholderFlgField } from './Fields/ShareholderFlgField';
-import { SnilsField } from './Fields/SnilsField';
 import { SurnameField } from './Fields/SurnameField';
 import { TermField } from './Fields/TermField';
-import { TotalIncomeField } from './Fields/TotalIncomeField';
 import { UltraPremiumField } from './Fields/UltraPremiumField';
 import { VedField } from './Fields/VedField';
-import { WagesField } from './Fields/WagesField';
 import { getPremium } from './getPremium';
 import { isRenderField } from './isRenderField';
 
@@ -133,7 +77,9 @@ const InputsMap = {
     ) : (
       <RegionField {...props} />
     ),
-  consentToReceiveMaterials: (props: CustomFieldProps) => <ConsentField {...props} />,
+  consentToReceiveMaterials: (props: CustomFieldProps) => (
+    <ConsentToReceiveMaterialsField {...props} />
+  ),
 
   surname: (props: CustomFieldProps) => <SurnameField {...props} />,
   name: (props: CustomFieldProps) => <NameField {...props} />,
@@ -145,86 +91,16 @@ const InputsMap = {
   comment: (props: CustomFieldProps) => <CommentField {...props} />,
 };
 
-const InputsRetailMap = {
-  processPersonalDataFlg: (props: CustomFieldProps) => <ConsentField {...props} />,
-  consentProviderFlg: (props: CustomFieldProps) => <ConsentField {...props} />,
-  consentOthersFlg: (props: CustomFieldProps) => <ConsentField {...props} />,
-  consentInformFlg: (props: CustomFieldProps) => <ConsentField {...props} />,
-  consentPfrFlg: (props: CustomFieldProps) => <ConsentField {...props} />,
-  organizationPhone: (props: CustomFieldProps) => <PhoneField {...props} />,
-  legalForm: (props: CustomFieldProps) => <LegalFormField {...props} />,
-  organizationName: (props: CustomFieldProps) => <OrganizationNameField {...props} />,
-  generalSeniority: (props: CustomFieldProps) => <GeneralSeniorityField {...props} />,
-  lastJobExperience: (props: CustomFieldProps) => <LastJobExperienceField {...props} />,
-  experience5Years: (props: CustomFieldProps) => <Experience5YearsField {...props} />,
-  jobsNumber: (props: CustomFieldProps) => <JobsNumberField {...props} />,
-  beginDate: (props: CustomFieldProps) => <BeginDateField {...props} />,
-  addressFact: (props: CustomFieldProps) => <AddressFactField {...props} />,
-  organizationAddress: (props: CustomFieldProps) => <AddressField {...props} />,
-  sex: (props: CustomFieldProps) => <SexField {...props} />,
-  limitedBirthday: (props: CustomFieldProps) => <LimitedBirthdayField {...props} />,
-  birthPlace: (props: CustomFieldProps) => <BirthPlaceField {...props} />,
-  education: (props: CustomFieldProps) => <EducationField {...props} />,
-  housing: (props: CustomFieldProps) => <HousingField {...props} />,
-  employment: (props: CustomFieldProps) => <EmploymentField {...props} />,
-  organization: (props: CustomFieldProps) => <OrganizationField {...props} />,
-  amountWorkers: (props: CustomFieldProps) => <AmountWorkersField {...props} />,
-  employerActivities: (props: CustomFieldProps) => <EmployerActivitiesField {...props} />,
-  employerOrganization: (props: CustomFieldProps) => <EmployerOrganizationField {...props} />,
-  positionOrganization: (props: CustomFieldProps) => <PositionOrganizationField {...props} />,
-  familyStatus: (props: CustomFieldProps) => <FamilyStatusField {...props} />,
-  children: (props: CustomFieldProps) => <ChildrenField {...props} />,
-  familyMembers: (props: CustomFieldProps) => <FamilyMembersField {...props} />,
-  dependents: (props: CustomFieldProps) => <DependentsField {...props} />,
-  totalIncome: (props: CustomFieldProps) => <TotalIncomeField {...props} />,
-  expenses: (props: CustomFieldProps) => <ExpensesField {...props} />,
-  snils: (props: CustomFieldProps) => <SnilsField {...props} />,
-  conscription: (props: CustomFieldProps) => <ConscriptionField {...props} />,
-  armyIdFlg: (props: CustomFieldProps) => <ArmyIdFlgField {...props} />,
-  dulSerie: (props: CustomFieldProps) => <DulSerieField {...props} />,
-  dulNumber: (props: CustomFieldProps) => <DulNumberField {...props} />,
-  dulIssueDateField: (props: CustomFieldProps) => <DulIssueDateField {...props} />,
-  dulSubdivisionCode: (props: CustomFieldProps) => <DulSubdivisionCodeField {...props} />,
-  dulIssuedBy: (props: CustomFieldProps) => <DulIssuedByField {...props} />,
-  addressRegistration: (props: CustomFieldProps) => <AddressField {...props} />,
-  addressCourier: (props: CustomFieldProps) => <AddressField {...props} />,
-  participantDateRegistration: (props: CustomFieldProps) => (
-    <ParticipantDateRegistrationField {...props} />
-  ),
-  retirementIncome: (props: CustomFieldProps) => <RetirementIncomeField {...props} />,
-  otherIncome: (props: CustomFieldProps) => <OtherIncomeField {...props} />,
-  wages: (props: CustomFieldProps) => <WagesField {...props} />,
-  mandatoryPayments: (props: CustomFieldProps) => <MandatoryPaymentsField {...props} />,
-  disablePeopleFlg: (props: CustomFieldProps) => <DisablePeopleFlgField {...props} />,
-  bankruptcyFlg: (props: CustomFieldProps) => <BankruptcyFlgField {...props} />,
-  shareholderFlg: (props: CustomFieldProps) => <ShareholderFlgField {...props} />,
-  legalEntityName: (props: CustomFieldProps) => <LegalEntityNameField {...props} />,
-  creditInRshbCd: (props: CustomFieldProps) => <CreditInRshbCdField {...props} />,
-  bankEmployeeCode: (props: CustomFieldProps) => <BankEmpoleeCodeField {...props} />,
-  partInBusiness: (props: CustomFieldProps) => <PartInBusinessField {...props} />,
-  regionRetail: (props: CustomFieldProps) => <RegionRetailField {...props} />,
-  addressRetail: (props: CustomFieldProps) => <AddressRetailField {...props} />,
-  addressMatch: (props: CustomFieldProps) => <AddressMatchField {...props} />,
-  calculator: (props: CustomFieldProps) => <CreditCalcField {...props} />,
-};
-
-const InputRetailCardMap = {
-  paymentSystem: (props: CustomFieldProps) => <PaymentSystemField {...props} />,
-  currency: (props: CustomFieldProps) => <CurrencyField {...props} />,
-  cardCategory: (props: CustomFieldProps) => <CardCategoryField {...props} />,
-  codeWord: (props: CustomFieldProps) => <CodeWordField {...props} />,
-  confirmationIncome: (props: CustomFieldProps) => <ConfirmationIncomeField {...props} />,
-  methodObtain: (props: CustomFieldProps) => <MethodObtainField {...props} />,
-  deliveryDate: (props: CustomFieldProps) => <DeliveryDateFiels {...props} />,
-};
-
 export const getField =
-  (field: FormFieldRegisterer<any>, params?: Record<string, any>) =>
+  (
+    field: FormFieldRegisterer<any>,
+    params?: Record<string, any>,
+    externalInputs: Record<string, VNode> = {},
+  ) =>
   (input: FieldDef, i: number) => {
     const resultInputsMap = {
       ...InputsMap,
-      ...InputsRetailMap,
-      ...InputRetailCardMap,
+      ...externalInputs,
     };
 
     return isRenderField({ input, field }) ? (

package/mobile/src/ui-kit/FormField/getNamesFromInput.tsx

@@ -1,4 +1,4 @@
-import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
+import { type FieldDef } from '../../services/retail/model/RetailFormContent';
 
 export const getNamesFromInput = (inputs: FieldDef[]) =>
   Object.values(inputs.filter((_) => _))?.map((_) => _.name);

package/mobile/src/ui-kit/FormField/getObjectValidator.tsx

@@ -1,4 +1,4 @@
-import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
+import { type FieldDef } from '../../services/retail/model/RetailFormContent';
 import { type Validator } from '../../validation/validator';
 import { getNamesFromInput } from './getNamesFromInput';
 import {
@@ -20,74 +20,64 @@ import {
   snilsValidator,
 } from './validators';
 
-export const validatorObj: Record<string, Validator> = {
-  typeForm: defaultValidator(),
-  surname: nameValidator('Укажите свою фамилию'),
-  name: nameValidator('Укажите своё имя'),
-  middleName: nameValidator('Укажите своё отчество'),
-  region: defaultSelectValidator(),
-  addressBranch: defaultSelectValidator(),
-  phone: phoneValidator('Укажите номер телефона'),
-  secondaryPhone: phoneValidator('Укажите номер телефона'),
+const validatorConsentsObj: Record<string, Validator> = {
+  processPersonalDataFlg: agreementValidator,
+  consentProviderFlg: agreementValidator,
+  consentInformFlg: agreementValidator,
+  consentPfrFlg: agreementValidator,
+  consentOthersFlg: agreementValidator,
+};
+
+const validatorCreditCardObj: Record<string, Validator> = {
+  addressCourier: addressDaDataValidator(),
+  paymentSystem: defaultValidator('Укажите тип платежной системы'),
+  currency: defaultValidator('Укажите валюту'),
+  cardCategory: defaultValidator('Укажите категорию карты'),
+  codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
+  confirmationIncome: defaultSelectValidator(),
+  methodObtain: defaultValidator(),
+  deliveryDate: defaultValidator('Укажите дату доставки'),
+};
+
+const validatorRetailObj: Record<string, Validator> = {
+  organization: defaultSelectValidator('Выберите тип организации'),
+  organizationAddress: addressOrganizationValidator(),
   organizationPhone: phoneValidator('Укажите номер телефона'),
-  birthday: defaultValidator('Укажите дату рождения'),
+  organizationName: defaultValidator('Укажите наименование организации'),
+  legalForm: defaultValidator('Укажите ОПФ'),
+  generalSeniority: jobNumberValidator('Укажите количество лет стажа'),
+  lastJobExperience: jobNumberValidator('Укажите стаж на последнем месте работы'),
+  experience5Years: jobNumberValidator('Укажите общий стаж за последние 5 лет'),
+  jobsNumber: jobNumberValidator('Укажите количество мест работы за последние 5 лет'),
+  beginDate: defaultValidator('Укажите дату заключения трудового договора'),
+  addressFact: addressDaDataValidator(),
+  addressRegistration: addressDaDataValidator(),
+  addressRetail: defaultSelectValidator('Выберите адрес банка'),
+  addressMatch: defaultValidator(),
+  sex: defaultValidator('Укажите свой пол'),
   limitedBirthday: limitedBirthdayValidator(),
   birthPlace: defaultValidator('Укажите место рождения'),
   education: defaultSelectValidator('Выберите ваше образование'),
   housing: defaultSelectValidator('Выберите тип жилья'),
-  employment: defaultSelectValidator('Выберите информацию о трудоустройстве'),
-  organization: defaultSelectValidator('Выберите тип организации'),
   amountWorkers: defaultSelectValidator('Выберите информацию о количестве сотрудников'),
+  employment: defaultSelectValidator('Выберите информацию о трудоустройстве'),
   employerActivities: defaultSelectValidator('Выберите вид деятельности организации'),
   employerOrganization: defaultSelectValidator('Выберите вид организации'),
   positionOrganization: defaultSelectValidator('Выберите вашу должность'),
-  dulSerie: serieValidator('Укажите серию паспорта'),
-  dulNumber: numberValidator('Укажите номер паспорта'),
-  dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
-  dulSubdivisionCode: numberValidator('Укажите код подразделения'),
-  dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
-  email: emailValidator('Укажите электронную почту'),
-  fullName: defaultValidator(),
-  inn: innValidator('Укажите ИНН'),
-  legalForm: defaultValidator('Укажите ОПФ'),
-  organizationName: defaultValidator('Укажите наименование организации'),
-  generalSeniority: jobNumberValidator('Укажите количество лет стажа'),
-  lastJobExperience: jobNumberValidator('Укажите стаж на последнем месте работы'),
-  experience5Years: jobNumberValidator('Укажите общий стаж за последние 5 лет'),
-  jobsNumber: jobNumberValidator('Укажите количество мест работы за последние 5 лет'),
-  beginDate: defaultValidator('Укажите дату заключения трудового договора'),
-  addressFact: addressDaDataValidator(),
-  partnerComments: defaultValidator(),
-  collectionCount: defaultValidator(),
-  comment: defaultValidator(),
-  acquiringType: defaultSelectValidator(),
-  feedbackMethod: defaultSelectValidator(),
-  serviceType: defaultSelectValidator(),
-  serviceDirection: defaultSelectValidator(),
-  regionRetail: defaultSelectValidator('Выберите регион'),
-  meetingDay: defaultValidator(),
-  product: defaultValidator(),
-  localities: defaultValidator(),
-  consentDataProcessing: agreementValidator,
-  annualRevenue: defaultValidator(),
-  consentToReceiveMaterials: agreementValidator,
-  processPersonalDataFlg: agreementValidator,
-  consentProviderFlg: agreementValidator,
-  consentPfrFlg: agreementValidator,
-  consentOthersFlg: agreementValidator,
-  consentInformFlg: agreementValidator,
   familyStatus: defaultSelectValidator('Выберите семейное положение'),
-  children: lengthStringValidator(2, 'Укажите количество детей'),
   familyMembers: lengthStringValidator(2, 'Укажите количество членов семьи'),
+  children: lengthStringValidator(2, 'Укажите количество детей'),
   dependents: lengthStringValidator(2, 'Укажите количество иждивенцев'),
   totalIncome: lengthStringValidator(19, 'Укажите среднемесячный доход от основной зарплаты'),
   expenses: lengthStringValidator(10, 'Укажите сумму обязательных выплат'),
   snils: snilsValidator('Некорректный номер СНИЛС'),
   conscription: defaultValidator(),
   armyIdFlg: agreementValidator,
-  sex: defaultValidator('Укажите свой пол'),
-  addressRegistration: addressDaDataValidator(),
-  organizationAddress: addressOrganizationValidator(),
+  dulSerie: serieValidator('Укажите серию паспорта'),
+  dulNumber: numberValidator('Укажите номер паспорта'),
+  dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
+  dulSubdivisionCode: numberValidator('Укажите код подразделения'),
+  dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),
   retirementIncome: defaultValidator(),
   otherIncome: defaultValidator(),
@@ -99,15 +89,39 @@ export const validatorObj: Record<string, Validator> = {
   legalEntityName: defaultValidator(),
   bankEmployeeCode: defaultValidator(),
   partInBusiness: defaultValidator(),
-  addressRetail: defaultSelectValidator('Выберите адрес банка'),
-  addressMatch: defaultValidator(),
-  codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
-  confirmationIncome: defaultSelectValidator(),
-  deliveryDate: defaultValidator('Укажите дату доставки'),
-  addressCourier: addressDaDataValidator(),
-  cardCategory: defaultValidator('Укажите категорию карты'),
-  paymentSystem: defaultValidator('Укажите тип платежной системы'),
-  currency: defaultValidator('Укажите валюту'),
+  regionRetail: defaultSelectValidator('Выберите регион'),
+};
+
+export const validatorObj: Record<string, Validator> = {
+  fullName: defaultValidator(),
+  addressBranch: defaultSelectValidator(),
+  desiredMeetingDate: defaultValidator(),
+  product: defaultValidator(),
+  localities: defaultValidator(),
+  partnerComments: defaultValidator(),
+  collectionCount: defaultValidator(),
+  acquiringType: defaultSelectValidator(),
+  serviceType: defaultSelectValidator(),
+  annualRevenue: defaultValidator(),
+  feedbackMethod: defaultSelectValidator(),
+  serviceDirection: defaultSelectValidator(),
+  secondaryPhone: phoneValidator('Укажите номер телефона'),
+  region: defaultSelectValidator(),
+
+  surname: nameValidator('Укажите свою фамилию'),
+  name: nameValidator('Укажите своё имя'),
+  middleName: nameValidator('Укажите своё отчество'),
+  birthday: defaultValidator('Укажите дату рождения'),
+  phone: phoneValidator('Укажите номер телефона'),
+  email: emailValidator('Укажите электронную почту'),
+  inn: innValidator('Укажите ИНН'),
+  comment: defaultValidator(),
+  typeForm: defaultValidator(),
+  consentToReceiveMaterials: agreementValidator,
+  consentDataProcessing: agreementValidator,
+  ...validatorConsentsObj,
+  ...validatorRetailObj,
+  ...validatorCreditCardObj,
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {

package/mobile/src/ui-kit/FormField/getPremium.tsx

@@ -1,3 +1,3 @@
-import { type TypeFormFieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
+import { type TypeFormFieldDef } from '../../services/retail/model/RetailFormContent';
 
 export const getPremium = (typeForm: TypeFormFieldDef = ''): boolean => typeForm === 'ULTRASERVICE';

package/mobile/src/ui-kit/FormField/updateOrganizationFields.ts

@@ -1,12 +1,12 @@
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
+import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type CreditFormDictionarySlice } from '../../hooks/useRetailFormStore';
 import {
   getEmployeesNumberOption,
   getOrganizationActivityType,
   getOrganizationKind,
   getOrganizationType,
-} from '../../api/RetailAPI/utils/getOrganizationParams';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
-import { type CreditFormDictionarySlice } from '../../hooks/useRetailFormStore';
+} from '../../services/retail/utils/getOrganizationParams';
 import { getAddressFromDaDataItem } from './Fields/AddressField';
 
 export const updateOrganizationFields = (

package/mobile/src/ui-kit/FormField/validators.ts

@@ -1,5 +1,4 @@
-import { type Address } from '../../components/ApplicationLeadForm/LeadFormState';
-import { pattern } from '../../validation/pattern';
+import { type Address } from '../../services/retail/model/LeadFormState';
 import { required } from '../../validation/required';
 import { validator } from '../../validation/validator';
 
@@ -40,8 +39,13 @@ export const numberValidator = (errorMsg: string) =>
 export const innValidator = (errorMsg: string) =>
   validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(errorMsg);
 
-export const phoneValidator = (errorMsg: string) =>
-  pattern(/^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/)(errorMsg);
+const phoneValidate = (email: string) =>
+  /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
+
+export const phoneValidator = (errorMsg: string) => validator(phoneValidate)(errorMsg);
+
+export const phoneOptionalValidator = (errorMsg: string) =>
+  validator((_: string) => !_ || phoneValidate(_))(errorMsg);
 
 export const agreementValidator = validator((_) => typeof _ === 'boolean' && _)(
   'Согласие обязательно',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.724",
+  "version": "0.14.726",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -111,14 +111,12 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
 );
 
 const getFilteredInputs = (inputs: FieldDef[], data: FormState) =>
-  inputs
-    .filter((_) => (_?.name === 'secondaryPhone' ? Boolean(data.secondaryPhone) : _))
-    .filter(
-      (input) =>
-        !input?.condition ||
-        input?.condition.values.find((_) => {
-          const dataValue = data?.[input?.condition?.name ?? ''];
+  inputs.filter(
+    (input) =>
+      !input?.condition ||
+      input?.condition.values.find((_) => {
+        const dataValue = data?.[input?.condition?.name ?? ''];
 
-          return _ === (dataValue?.key ?? dataValue);
-        }),
-    );
+        return _ === (dataValue?.key ?? dataValue);
+      }),
+  );