@redneckz/wildless-cms-uni-blocks 0.14.822 → 0.14.824

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -1,11 +1,9 @@
 import { useCallback, useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
-import { locationNavigator } from '../../external/locationNavigator';
 import { useSetter } from '../../hooks/useSetter';
-import { updateProfileEsia } from '../../retail/api/updateProfileEsia';
+import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
-import { safeJsonParse } from '../../utils/safeJsonParse';
+import { EsiaStatuses } from './ApplicationLeadForm';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { getInitialFormState } from './getInitialFormState';
 import { parseEsiaProfile } from './parseEsiaProfile';
@@ -15,76 +13,62 @@ type InitApplicationLeadProps = {
   inputs: FieldRetailDef[];
   nextStepLink: string;
   productType: ProductType;
-  setEsiaError: () => void;
+  setEsiaStatus: (status: EsiaStatuses) => void;
+  esiaAuthSuccess: boolean;
 };
 
 export const useInitApplicationLead = ({
   inputs,
-  nextStepLink,
   productType,
-  setEsiaError,
-}: InitApplicationLeadProps): [LeadFormState, { isLoading: boolean }] => {
-  const navigator = locationNavigator();
-  const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
-
+  setEsiaStatus,
+  esiaAuthSuccess,
+}: InitApplicationLeadProps): LeadFormState => {
   const leadFormStore = useLeadFormStore();
   const saveForm = useSetter(leadFormStore, 'leadForm');
 
   const initialFormState = useMemo(
-    () => getInitialFormState(inputs, leadFormStore.leadForm),
+    () => getInitialFormState(inputs, leadFormStore.leadForm, esiaAuthSuccess),
     [inputs, leadFormStore.leadForm],
   );
 
-  const updateEsiaProfile = useCallback(
-    async (profileId: string, code: string, state: string) => {
-      startLoading();
-      try {
-        const data = await updateProfileEsia({
-          profileId,
-          code,
-          state,
-          redirectUri: globalThis.location?.href,
-        });
-
-        if (data && leadFormStore?.taskId) {
-          const parsedData = await parseEsiaProfile(
-            data,
-            leadFormStore.taskId.toString(),
-            productType === 'debitCard',
-          );
+  const requestEsiaProfile = useCallback(async (code: string, state: string) => {
+    setEsiaStatus(EsiaStatuses.Pending);
+    try {
+      const data = await esiaRequestProfile({
+        code,
+        state,
+        redirectUri: globalThis.location?.href,
+        authorize: true,
+      });
 
-          saveForm((_) => ({
-            ..._,
-            ...parsedData,
-          }));
-        }
+      if (data) {
+        const parsedData = await parseEsiaProfile(data, productType === 'debitCard');
 
-        navigator.assign(nextStepLink);
-      } catch {
-        setEsiaError();
-      } finally {
-        endLoading();
+        saveForm((_) => ({
+          ..._,
+          ...parsedData,
+        }));
+        setEsiaStatus(EsiaStatuses.Success);
       }
-    },
-    [nextStepLink],
-  );
+    } catch {
+      setEsiaStatus(EsiaStatuses.Error);
+    }
+  }, []);
 
   useEffect(() => {
     leadFormStore.productType = productType;
-    const profileId: string = <string>(
-      safeJsonParse(globalThis.localStorage?.getItem('profileId') ?? '')
-    );
+
     const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
     const code = params.get('code');
     const state = params.get('state');
 
-    if (profileId && code && state) {
-      updateEsiaProfile(profileId, code, state);
+    if (code && state) {
+      requestEsiaProfile(code, state);
     } else {
       sessionStorage.removeItem('accessToken');
       sessionStorage.removeItem('refreshToken');
     }
   }, []);
 
-  return [initialFormState, { isLoading }];
+  return initialFormState;
 };

package/src/retail/api/checkCode.ts

@@ -16,7 +16,7 @@ export type CheckCodeResponse = {
 export const checkCode = async (body: CheckCodeBody) =>
   fetchRetailJSON<CheckCodeResponse>('/sms/checkCode', 'POST', body).then(saveToken);
 
-const saveToken = (data: CheckCodeResponse | null) => {
+export const saveToken = (data: CheckCodeResponse | null) => {
   if (data) {
     globalThis.sessionStorage.setItem('accessToken', data.access_token);
     globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);

package/src/retail/api/{updateProfileEsia.ts → esiaRequestProfile.ts}

@@ -1,13 +1,14 @@
+import { saveToken, type CheckCodeResponse } from './checkCode';
 import { fetchRetailJSON } from './doRequest';
 
-export type UpdateProfileEsiaBody = {
+export type EsiaRequestProfileBody = {
   code: string;
-  profileId: string;
+  authorize: boolean;
   state: string;
   redirectUri: string;
 };
 
-export type UpdateProfileEsiaResponse = {
+export type EsiaRequestProfileResponse = CheckCodeResponse & {
   profile: {
     id: number;
     esiaId: string;
@@ -75,8 +76,18 @@ export type UpdateProfileEsiaResponse = {
     workLengthLastJob: number;
     pdfFileWorkbook: string;
     pdfFilePayout: string;
+    pdfFileSigPayout: string;
+    pdfFileSigWorkbook: string;
+    xmlFilePayout: string;
+    xmlFileSigPayout: string;
+    xmlFileSigWorkbook: string;
+    xmlFileWorkbook: string;
   };
 };
 
-export const updateProfileEsia = (body: UpdateProfileEsiaBody) =>
-  fetchRetailJSON<UpdateProfileEsiaResponse>('/esia/updateProfileEsia', 'POST', body);
+export const esiaRequestProfile = (body: EsiaRequestProfileBody) =>
+  fetchRetailJSON<EsiaRequestProfileResponse>('/esia/requestProfile', 'POST', body).then((res) => {
+    saveToken(res);
+
+    return res;
+  });

package/src/retail/api/updateUserTask.ts

@@ -52,6 +52,7 @@ export type Participant = {
   surname?: string;
   profile?: {
     id: number;
+    esiaAccountTypeCd?: Option;
   };
   armyIdFlg?: boolean;
   birthPlace?: string;

package/src/retail/api/uploadFile.ts

@@ -5,13 +5,12 @@ export type DocumentCategory = 'CONFIRMING_EMPLOYMENT_DOC' | 'CONFIRMING_INCOME_
 
 export const uploadFile = async (
   file: Blob,
-  taskId: string,
   documentCategory: DocumentCategory,
+  isPDF = false,
 ): Promise<File> => {
   const fd = new FormData();
-  fd.append('taskId', taskId);
   fd.append('documentCategory', documentCategory);
-  fd.append('file', file, 'file.pdf');
+  fd.append('file', file, `file.${isPDF ? 'pdf' : 'xml'}`);
 
   const res = await globalThis
     ?.fetch?.(`/light-api-cash/v1/file`, {

package/src/retail/components/DraftDialog/parseDraftTask.ts

@@ -68,6 +68,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     payrollCardRshbFlg: isInsurance,
     consentInsuranceFlg: isSalaryClient,
     incomeCertificateCd,
+    profile,
   } = participant;
 
   return {
@@ -121,6 +122,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
       monthsValue,
       isAnnuity: paymentTypeCd?.key === 'ANNUITY',
     },
+    esiaAccountTypeCd: profile?.esiaAccountTypeCd,
     ...getParticipantIncomes(participantIncomes),
     ...getParticipantAddresses(participantAddresses),
     ...getParticipantContacts(participantContacts),

package/src/retail/components/Fields/BeginDateField.tsx

@@ -1,11 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 
 export const BeginDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата начала работы на текущем месте"
     {...field(input?.name ?? '')}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/src/retail/components/Fields/ConfirmationIncomeField.tsx

@@ -1,18 +1,29 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { InfoCard } from '../../../ui-kit/InfoCard/InfoCard';
 import { useLeadFormData } from '../../hooks/useLeadFormData';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { SelectField } from './SelectField';
 
 export const ConfirmationIncomeField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data: confirmationIncome } = useLeadFormData('INCOME_CERT_UNITED');
+  const filledByEsia = input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '');
 
   return (
-    <SelectField
-      field={field}
-      source={confirmationIncome}
-      label="Способ подтверждения дохода"
-      fieldName="confirmationIncome"
-      input={input}
-    />
+    <div>
+      {filledByEsia ? (
+        <div className="mb-6">
+          <InfoCard __html="Для выбора иного способа подтверждения дохода, оформите новую заявку на кредит без авторизации на портале Госуслуги" />
+        </div>
+      ) : null}
+      <SelectField
+        field={field}
+        source={confirmationIncome}
+        label="Способ подтверждения дохода"
+        fieldName="confirmationIncome"
+        input={input}
+        disabled={filledByEsia}
+      />
+    </div>
   );
 });

package/src/retail/components/Fields/DaDataInnField.tsx

@@ -4,6 +4,7 @@ import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProp
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
@@ -41,6 +42,7 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
       {...input}
       {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
     />
   );
 });

package/src/retail/components/Fields/DeliveryDateFiels.tsx

@@ -3,5 +3,5 @@ import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl'
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 
 export const DeliveryDateFiels = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} />
+  <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} minDate={new Date()} />
 ));

package/src/retail/components/Fields/DulIssueDateField.tsx

@@ -1,12 +1,22 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 
-export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl
-    label="Дата выдачи"
-    {...field(input?.name ?? '')}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
-  />
-));
+export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => {
+  const birthDate = field('limitedBirthday')?.value as Date;
+  const startDulIssueDate = useMemo(
+    () => new Date(birthDate.getFullYear() + 14, birthDate.getMonth(), birthDate.getDate()),
+    [birthDate],
+  );
+
+  return (
+    <DatePickerControl
+      label="Дата выдачи"
+      {...field(input?.name ?? '')}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      minDate={startDulIssueDate}
+    />
+  );
+});

package/src/retail/components/Fields/Experience5YearsField.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { clamp } from '../../../utils/clamp';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 const MAX_YEARS = 5;
@@ -22,6 +23,7 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
     />
   );
 });

package/src/retail/components/Fields/GeneralSeniorityField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     placeholder="Количество лет"
     {...field(input?.name ?? '')}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/src/retail/components/Fields/JobsNumberField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/src/retail/components/Fields/LastJobExperienceField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/src/retail/components/Fields/MiddleNameField.tsx

@@ -1,14 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
+import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Отчество (Обязательно, при наличии)"
-    maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      if (retailCyrillicPattern.test(value) || value.length === 0) {
+        field('middleName')?.onChange?.(value);
+      }
+    },
+    [field],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Отчество (Обязательно, при наличии)"
+      maxLength={60}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

package/src/retail/components/Fields/NameField.tsx

@@ -1,14 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
+import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const NameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Имя"
-    maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const NameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      if (retailCyrillicPattern.test(value) || value.length === 0) {
+        field('name')?.onChange?.(value);
+      }
+    },
+    [field],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Имя"
+      maxLength={60}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

package/src/retail/components/Fields/OrganizationNameField.tsx

@@ -3,6 +3,7 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
@@ -19,6 +20,7 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
       label="Наименование организации"
       {...input}
       {...field(input?.name ?? '')}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
       onDaDataChange={onDaDataChange}
     />
   );

package/src/retail/components/Fields/SurnameField.tsx

@@ -1,16 +1,30 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
+import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 const FIELD_NAME = 'surname';
 
-export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Фамилия"
-    maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      if (retailCyrillicPattern.test(value) || value.length === 0) {
+        field('surname')?.onChange?.(value);
+      }
+    },
+    [field],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Фамилия"
+      maxLength={60}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

package/src/retail/components/Fields/WagesField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -9,5 +10,6 @@ export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
     isInteger={true}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/src/retail/content.tsx

@@ -139,7 +139,7 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
         label: 'Телефон работодателя',
         required: true,
       },
-      { name: 'beginDate', required: true },
+      { name: 'beginDate', required: true, filledByEsia: true },
     ],
   },
   {
@@ -181,16 +181,22 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
     title: 'Совокупный доход',
   },
   {
+    columns: 1,
     inputs: [
       {
-        name: 'infoCard',
-        label: 'Сумма основного и дополнительных доходов после вычета налога',
+        name: 'confirmationIncome',
+        required: true,
+        filledByEsia: true,
       },
     ],
   },
   {
-    columns: 1,
-    inputs: [{ name: 'confirmationIncome', required: true }],
+    inputs: [
+      {
+        name: 'infoCard',
+        label: 'Сумма основного и дополнительных доходов после вычета налога',
+      },
+    ],
   },
   {
     columns: 1,

package/src/retail/model/NameFieldDef.ts

@@ -86,6 +86,7 @@ type NameFieldRetailDef =
   | 'calculator'
   | 'infoCard'
   | 'deliveryTime'
+  | 'esiaAccountTypeCd'
   | 'comment';
 
 export type NameFieldDef =

package/src/retail/utils/mainFormStateMap.ts

@@ -56,6 +56,7 @@ export const mainFormStateMap: Partial<LeadFormState>[] = [
     mandatoryPayments: undefined,
     snils: '',
     armyIdFlg: false,
+    esiaAccountTypeCd: { key: '', text: '' },
   },
   {
     bankruptcyFlg: false,

package/src/retail/validator/validatorObj.ts

@@ -11,6 +11,7 @@ import {
   codeWordValidator,
   jobNumberValidator,
   lengthStringValidator,
+  nameRetailValidator,
   numberValidator,
   serieValidator,
   snilsValidator,
@@ -86,6 +87,9 @@ const validatorRetailObj: Record<string, Validator> = {
   partInBusiness: defaultValidator(),
   regionRetail: defaultSelectValidator('Выберите регион'),
   latinSurname: defaultValidator('Укажите фамилию'),
+  surname: nameRetailValidator('Укажите свою фамилию на кириллице'),
+  name: nameRetailValidator('Укажите своё имя на кириллице'),
+  middleName: nameRetailValidator('Укажите своё отчество на кириллице'),
 };
 
 export const validatorObj = {

package/src/retail/validator/validators.ts

@@ -12,6 +12,8 @@ export interface LimitedBirthdayValidationParams {
   errorMessage: string;
 }
 
+export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
+
 const addressDaDataValidate = (address: Address) =>
   Boolean(address.region && (address.city || address.locality) && address.house);
 
@@ -27,6 +29,11 @@ export const codeWordValidator = (errorMsg?: string) =>
     errorMsg ?? ERROR_MESSAGE,
   );
 
+export const nameRetailValidator = (errorMsg?: string) =>
+  validator((_) => typeof _ === 'string' && _.length > 1 && retailCyrillicPattern.test(_))(
+    errorMsg ?? ERROR_MESSAGE,
+  );
+
 export const jobNumberValidator = (errorMsg?: string) =>
   validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
 

package/src/ui-kit/DatePicker/DatePickerControl.tsx

@@ -6,7 +6,9 @@ import { type ControlProps } from '../ControlProps';
 import { renderErrorText } from '../Input/renderErrorText';
 import { DatePicker } from './DatePicker';
 
-export interface DatePickerControlProps extends DefaultControlType, ControlProps<Date> {}
+export interface DatePickerControlProps extends DefaultControlType, ControlProps<Date> {
+  minDate?: Date;
+}
 
 export const DatePickerControl = JSX<DatePickerControlProps>(
   ({ className, label, error, errors, ...rest }) => (