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

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

@@ -7,7 +7,7 @@ import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 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()),
+    () => new Date(birthDate?.getFullYear() + 14, birthDate?.getMonth(), birthDate?.getDate()),
     [birthDate],
   );
 

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

@@ -2,7 +2,6 @@ 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;
@@ -23,7 +22,6 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
     />
   );
 });

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

@@ -1,6 +1,5 @@
 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 }) => (
@@ -11,6 +10,5 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     placeholder="Количество лет"
     {...field(input?.name ?? '')}
     {...input}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

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

@@ -1,6 +1,5 @@
 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 }) => (
@@ -11,6 +10,5 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

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

@@ -1,6 +1,5 @@
 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 }) => (
@@ -11,6 +10,5 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

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

@@ -3,7 +3,6 @@ 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';
 
@@ -20,7 +19,6 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
       label="Наименование организации"
       {...input}
       {...field(input?.name ?? '')}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
       onDaDataChange={onDaDataChange}
     />
   );

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

@@ -1,6 +1,5 @@
 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 }) => (
@@ -10,6 +9,5 @@ export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
     isInteger={true}
     {...field(input?.name ?? '')}
     {...input}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/mobile/src/retail/content.tsx

@@ -139,7 +139,7 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
         label: 'Телефон работодателя',
         required: true,
       },
-      { name: 'beginDate', required: true, filledByEsia: true },
+      { name: 'beginDate', required: true },
     ],
   },
   {
@@ -180,16 +180,6 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
   {
     title: 'Совокупный доход',
   },
-  {
-    columns: 1,
-    inputs: [
-      {
-        name: 'confirmationIncome',
-        required: true,
-        filledByEsia: true,
-      },
-    ],
-  },
   {
     inputs: [
       {
@@ -198,6 +188,10 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
       },
     ],
   },
+  {
+    columns: 1,
+    inputs: [{ name: 'confirmationIncome', required: true }],
+  },
   {
     columns: 1,
     inputs: [{ name: 'wages', required: true, filledByEsia: true }],

package/mobile/src/retail/inputs.tsx

@@ -108,7 +108,6 @@ export const InputsRetailMap = {
   addressRetail: AddressRetailField,
   addressMatch: AddressMatchField,
   sex: SexField,
-  limitedBirthday: LimitedBirthdayField,
   birthPlace: BirthPlaceField,
   education: EducationField,
   housing: HousingField,
@@ -147,6 +146,7 @@ export const InputsRetailMap = {
   calculator: CreditCalcField,
   confirmationIncome: ConfirmationIncomeField,
   inn: DaDataInnField,
+  ...InputsApplicationLeadMap,
 };
 
 export const InputRetailCardMap = {

package/mobile/src/retail/model/NameFieldDef.ts

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

package/mobile/src/retail/utils/mainFormStateMap.ts

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

package/mobile/src/retail/validator/getRetailFormValidator.ts

@@ -0,0 +1,27 @@
+import { type ProductType } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
+import { type LeadFormState } from '../model/LeadFormState';
+import { type FieldRetailDef } from '../model/RetailFormContent';
+import { calculateInputs } from '../utils/calculateInputs';
+import { getLimitedBirthdayValidation } from './getLimitedBirthdayValidation';
+import { validatorObj } from './validatorObj';
+import { passportValidator } from './validators';
+
+type getRetailFormValidatorProps = {
+  formState: LeadFormState;
+  inputs: FieldRetailDef[];
+  step: number;
+  productType: ProductType;
+};
+
+export const getRetailFormValidator = ({
+  formState,
+  inputs,
+  step,
+  productType,
+}: getRetailFormValidatorProps) =>
+  getFormValidator(calculateInputs((_) => formState[_])(inputs, step), {
+    ...validatorObj,
+    limitedBirthday: getLimitedBirthdayValidation(productType),
+    dulIssueDate: passportValidator(formState.limitedBirthday as Date),
+  })(formState);

package/mobile/src/retail/validator/validatorObj.ts

@@ -9,6 +9,7 @@ import {
   addressDaDataValidator,
   addressOrganizationValidator,
   codeWordValidator,
+  deliveryDateValidator,
   jobNumberValidator,
   lengthStringValidator,
   nameRetailValidator,
@@ -34,7 +35,7 @@ const validatorCreditCardObj: Record<string, Validator> = {
   codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
   confirmationIncome: defaultSelectValidator(),
   methodObtain: defaultValidator(),
-  deliveryDate: defaultValidator('Укажите дату доставки'),
+  deliveryDate: deliveryDateValidator('Укажите дату доставки'),
 };
 
 const validatorRetailObj: Record<string, Validator> = {
@@ -72,7 +73,6 @@ const validatorRetailObj: Record<string, Validator> = {
   armyIdFlg: agreementValidator,
   dulSerie: serieValidator('Укажите серию паспорта'),
   dulNumber: numberValidator('Укажите номер паспорта'),
-  dulIssueDate: defaultValidator('Укажите дату выдачи паспорта'),
   dulSubdivisionCode: numberValidator('Укажите код подразделения'),
   dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),

package/mobile/src/retail/validator/validators.ts

@@ -66,6 +66,25 @@ const limitedBirthdayValidate =
 export const limitedBirthdayValidator = (params: LimitedBirthdayValidationParams) =>
   validator(limitedBirthdayValidate(params))(params.errorMessage);
 
+export const passportValidator = (birthDate?: Date) =>
+  validator((_) => {
+    if (_ && birthDate) {
+      return (
+        _.getTime() >=
+        new Date(
+          birthDate?.getFullYear() + 14,
+          birthDate?.getMonth(),
+          birthDate?.getDate(),
+        ).getTime()
+      );
+    }
+
+    return false;
+  })('Укажите дату выдачи паспорта');
+
+export const deliveryDateValidator = (errorMsg: string) =>
+  validator((_) => _?.getTime() >= new Date().getTime())(errorMsg);
+
 export const numberValidator = (errorMsg: string) =>
   validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
 

package/mobile/src/ui-kit/FormField/Fields/PhoneField.tsx

@@ -1,17 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { isEsiaAuthorize } from '../../../retail/utils/isEsiaAuthorize';
 import { InputPhoneControl } from '../../Input/InputPhoneControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
 export const PhoneField = JSX<CustomFieldProps>(({ field, input }) => {
   const fieldName = input?.name || 'phone';
 
-  return (
-    <InputPhoneControl
-      label="Телефон"
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
-      {...field(fieldName)}
-      {...input}
-    />
-  );
+  return <InputPhoneControl label="Телефон" {...field(fieldName)} {...input} />;
 });

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

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type BaseFieldDef } from './BaseFieldDef';
 
@@ -12,5 +11,5 @@ export function shouldRenderField<F extends BaseFieldDef>({
   const { condition } = input;
   const { value } = field(condition?.name || '');
 
-  return !condition || condition?.values?.includes(value?.key ?? value);
+  return !condition || condition?.values?.find((_) => _ === (value?.key ?? value));
 }

package/package.json

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

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -1,6 +1,6 @@
-/* eslint-disable max-lines-per-function */
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useForm } from '../../hooks/useForm/useForm';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
@@ -18,7 +18,6 @@ import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { getApplicationFormData } from './applicationFormData';
 import { type ApplicationLeadFormContent, type ProductType } from './ApplicationLeadFormContent';
-import { EsiaLoginBanner } from './EsiaLoginBanner';
 import { renderInputs } from './renderInputs';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useApplicationLeadApi } from './useApplicationLeadApi';
@@ -26,12 +25,6 @@ import { useInitApplicationLead } from './useInitApplicationLead';
 
 interface ApplicationLeadFormProps extends ApplicationLeadFormContent, UniBlockProps {}
 
-export enum EsiaStatuses {
-  Success = 'SUCCESS',
-  Error = 'ERROR',
-  Pending = 'PENDING',
-}
-
 export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   ({
     className,
@@ -43,8 +36,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     data,
     ...rest
   }) => {
-    const [esiaStatus, setEsiaStatus] = useState<EsiaStatuses>();
-    const leadForm = useRef<HTMLFormElement | null>(null);
+    const [esiaError, { setTrue: setEsiaError }] = useBool(false);
     const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
     const inputs = useMemo(() => getInputs(applicationFormData), [applicationFormData]);
 
@@ -54,21 +46,21 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       [inputs, extendedValidatorObj],
     );
 
-    const initialFormState = useInitApplicationLead({
+    const [initialFormState, { isLoading }] = useInitApplicationLead({
       inputs,
       nextStepLink,
       productType,
-      setEsiaStatus,
-      esiaAuthSuccess: esiaStatus === EsiaStatuses.Success,
+      setEsiaError,
     });
     const { isSending, ok, handleSubmit } = useApplicationLeadApi({
       programId,
       nextStepLink,
       productType,
+      esiaError,
       data,
     });
 
-    const [, { field, onSubmit, reset }] = useForm(initialFormState, {
+    const [, { field, onSubmit }] = useForm(initialFormState, {
       formValidator,
       onSubmit: handleSubmit,
     });
@@ -80,27 +72,14 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       }
     }, [ok]);
 
-    useEffect(() => {
-      if (esiaStatus && leadForm?.current) {
-        leadForm.current.scrollIntoView({
-          block: 'start',
-        });
-      }
-
-      if (esiaStatus === EsiaStatuses.Success) {
-        reset();
-      }
-    }, [leadForm?.current, esiaStatus]);
-
     return (
       <ApplicationFormLayout
         className={style('container space-y-m', className)}
         title={title}
         {...rest}
       >
-        {!esiaStatus ? <EsiaLoginBanner /> : null}
-        <form onSubmit={onSubmit} className="space-y-m relative" ref={leadForm}>
-          {esiaStatus === EsiaStatuses.Pending ? <Loader blur={false} /> : null}
+        <form onSubmit={onSubmit} className="space-y-m relative">
+          {isLoading ? <Loader blur={false} /> : null}
           {applicationFormData.map((_, i) => (
             <div
               key={`section-${i}`}
@@ -111,7 +90,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
             </div>
           ))}
           {renderSubmitButton(button, isSending)}
-          {esiaStatus === EsiaStatuses.Error ? (
+          {esiaError ? (
             <Text size="text-m" font="font-medium" color="text-error">
               Использовать Госуслуги для оформления заявки невозможно, необходимо заполнить поля
               вручную.

package/src/components/ApplicationLeadForm/applicationFormData.tsx

@@ -3,6 +3,32 @@ import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { productTypeToConsentsMap } from './consents';
 
+export const applicationFormData: SectionsRetailProps[] = [
+  {
+    columns: 2,
+    inputs: [
+      { name: 'surname', required: true, dadata: true },
+      { name: 'name', required: true, dadata: true },
+      { name: 'middleName', dadata: true },
+      { name: 'limitedBirthday', required: true },
+      { name: 'phone', required: true },
+      { name: 'email', required: true, dadata: true },
+    ],
+  },
+  {
+    inputs: [
+      { name: 'processPersonalDataFlg', required: true },
+      { name: 'consentProviderFlg', required: true },
+      { name: 'consentOthersFlg', required: true },
+      { name: 'consentInformFlg' },
+      { name: 'consentPfrFlg' },
+      { name: 'consentInformMaterialsFlg' },
+      { name: 'consentPhotoFlg' },
+      { name: 'consentFATCA' },
+    ],
+  },
+];
+
 export const getApplicationFormData = (productType: ProductType): SectionsRetailProps[] => {
   const currentProductConsents = productTypeToConsentsMap[productType];
   const allConsents: FieldRetailDef[] = [
@@ -20,11 +46,11 @@ export const getApplicationFormData = (productType: ProductType): SectionsRetail
     {
       columns: 2,
       inputs: [
-        { name: 'surname', required: true, dadata: true, filledByEsia: true },
-        { name: 'name', required: true, dadata: true, filledByEsia: true },
-        { name: 'middleName', dadata: true, filledByEsia: true },
-        { name: 'limitedBirthday', required: true, filledByEsia: true },
-        { name: 'phone', required: true, filledByEsia: true },
+        { name: 'surname', required: true, dadata: true },
+        { name: 'name', required: true, dadata: true },
+        { name: 'middleName', dadata: true },
+        { name: 'limitedBirthday', required: true },
+        { name: 'phone', required: true },
         { name: 'email', required: true, dadata: true },
       ],
     },

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -21,16 +21,9 @@ const initialFormState = {
 export const getInitialFormState = (
   inputs: FieldRetailDef[],
   savedForm: LeadFormState | null,
-  esiaAuthSuccess: boolean,
 ): LeadFormState => {
   if (savedForm) {
-    return {
-      ...savedForm,
-      limitedBirthday: new Date(savedForm?.limitedBirthday || 0),
-      ...(!esiaAuthSuccess && {
-        esiaAccountTypeCd: { key: '' },
-      }),
-    };
+    return { ...savedForm, limitedBirthday: new Date(savedForm?.limitedBirthday || 0) };
   }
 
   const formState = Object.fromEntries(inputs.map((_) => [_.name, initialFormState[_.name || '']]));