@redneckz/wildless-cms-uni-blocks 0.14.817 → 0.14.818

package/src/components/ApplicationLeadForm/parseEsiaProfile.ts

@@ -5,58 +5,19 @@ import { uploadFile, type DocumentCategory } from '../../retail/api/uploadFile';
 import { type Address, type File, type LeadFormState } from '../../retail/model/LeadFormState';
 import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
 
-type Document = {
-  file: string;
-  category: DocumentCategory;
-  isPDF: boolean;
-};
-
 export const parseEsiaProfile = async (
   esiaProfile: EsiaRequestProfileResponse,
   isDebit: boolean,
 ): Promise<LeadFormState> => {
-  isDebit ? checkEsiaDataForDebit(esiaProfile) : checkEsiaDataForCredit(esiaProfile);
+  checkEsiaData(esiaProfile);
+  const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile);
 
   const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } =
     esiaProfile;
   let files: File[] = [];
 
-  if (!isDebit) {
-    files = await saveDocuments([
-      {
-        file: esiaAdditionalDocument.pdfFileWorkbook,
-        category: 'CONFIRMING_INCOME_DOC',
-        isPDF: true,
-      },
-      {
-        file: esiaAdditionalDocument.pdfFilePayout,
-        category: 'CONFIRMING_EMPLOYMENT_DOC',
-        isPDF: true,
-      },
-      {
-        file: esiaAdditionalDocument.pdfFileSigPayout,
-        category: 'CONFIRMING_EMPLOYMENT_DOC',
-        isPDF: true,
-      },
-      {
-        file: esiaAdditionalDocument.xmlFilePayout,
-        category: 'CONFIRMING_EMPLOYMENT_DOC',
-        isPDF: false,
-      },
-      {
-        file: esiaAdditionalDocument.xmlFileSigPayout,
-        category: 'CONFIRMING_EMPLOYMENT_DOC',
-        isPDF: false,
-      },
-      {
-        file: esiaAdditionalDocument.xmlFileWorkbook,
-        category: 'CONFIRMING_INCOME_DOC',
-        isPDF: false,
-      },
-      //TODO: После тестирования добавить документы снизу
-      // {file: esiaAdditionalDocument.pdfFileSigWorkbook, category: 'CONFIRMING_INCOME_DOC', isPDF: true},
-      // {file: esiaAdditionalDocument.xmlFileSigWorkbook, category: 'CONFIRMING_INCOME_DOC', isPDF: false},
-    ]);
+  if (isFullEsiaData) {
+    files = await saveDocuments(esiaAdditionalDocument);
   }
 
   const mainData = {
@@ -74,12 +35,12 @@ export const parseEsiaProfile = async (
     birthPlace: addInfo.birthPlace,
     addressRegistration: buildAddress(addressRegistration),
     addressFact: buildAddress(addressFact),
-    esiaAccountTypeCd: profile.esiaAccountType,
+    esiaAccountTypeCd: isDebit ? profile.esiaAccountType : { key: '' },
   };
 
   return {
     ...mainData,
-    ...(!isDebit && {
+    ...(isFullEsiaData && {
       snils: addInfo.snils,
       inn: esiaAdditionalDocument.inn,
       wages: Math.floor(esiaAdditionalDocument.averageMonthlyIncome)?.toString(),
@@ -88,6 +49,9 @@ export const parseEsiaProfile = async (
       generalSeniority: getYearFromMonth(esiaAdditionalDocument.workLength).toString(),
       lastJobExperience: getYearFromMonth(esiaAdditionalDocument.workLengthLastJob).toString(),
       jobsNumber: esiaAdditionalDocument.jobsNumberInFiveYears.toString(),
+      esiaAccountTypeCd: profile.esiaAccountType,
+      confirmationIncome: { key: 'SFR_CERTIFICATE', text: 'Запрос Банком доходов из СФР' },
+      employment: { key: 'WORK', text: 'Работаю' },
       files,
     }),
   };
@@ -139,23 +103,67 @@ const buildAddress = (fields: EsiaRequestProfileResponse['addressRegistration'])
 
 const getYearFromMonth = (month: number) => Math.floor(month / 12);
 
-const saveDocuments = async (documents: Document[]): Promise<File[]> => {
+const saveDocuments = async (
+  esiaAdditionalDocument: EsiaRequestProfileResponse['esiaAdditionalDocument'],
+): Promise<File[]> => {
   const files: File[] = [];
+  const documents = [
+    {
+      file: esiaAdditionalDocument.pdfFileWorkbook,
+      category: 'CONFIRMING_INCOME_DOC',
+      isPDF: true,
+    },
+    {
+      file: esiaAdditionalDocument.pdfFilePayout,
+      category: 'CONFIRMING_EMPLOYMENT_DOC',
+      isPDF: true,
+    },
+    {
+      file: esiaAdditionalDocument.pdfFileSigPayout,
+      category: 'CONFIRMING_EMPLOYMENT_DOC',
+      isPDF: true,
+    },
+    {
+      file: esiaAdditionalDocument.xmlFilePayout,
+      category: 'CONFIRMING_EMPLOYMENT_DOC',
+      isPDF: false,
+    },
+    {
+      file: esiaAdditionalDocument.xmlFileSigPayout,
+      category: 'CONFIRMING_EMPLOYMENT_DOC',
+      isPDF: false,
+    },
+    {
+      file: esiaAdditionalDocument.xmlFileWorkbook,
+      category: 'CONFIRMING_INCOME_DOC',
+      isPDF: false,
+    },
+    {
+      file: esiaAdditionalDocument.pdfFileSigWorkbook,
+      category: 'CONFIRMING_INCOME_DOC',
+      isPDF: true,
+    },
+    {
+      file: esiaAdditionalDocument.xmlFileSigWorkbook,
+      category: 'CONFIRMING_INCOME_DOC',
+      isPDF: false,
+    },
+  ];
 
   for (const doc of documents) {
     const contentType = doc.isPDF ? 'data:application/pdf;base64' : 'data:application/xml;base64';
 
     await fetch(`${contentType},${doc.file}`)
       .then((res) => res.blob())
-      .then((value) => uploadFile(value, doc.category, doc.isPDF))
+      .then((value) => uploadFile(value, doc.category as DocumentCategory, doc.isPDF))
       .then((file) => files.push(file));
   }
 
   return files;
 };
 
-const checkEsiaDataForCredit = (esiaProfile: EsiaRequestProfileResponse) => {
-  const { profile, document, addressRegistration, esiaAdditionalDocument } = esiaProfile;
+const checkEsiaData = (esiaProfile: EsiaRequestProfileResponse) => {
+  const { profile, document, addressRegistration } = esiaProfile;
 
   const data = [
     profile.name,
@@ -163,7 +171,6 @@ const checkEsiaDataForCredit = (esiaProfile: EsiaRequestProfileResponse) => {
     profile.midname,
     profile.birthDate,
     profile.phone,
-    profile.email,
     document.dulIssueDate,
     document.dulIssuedBy,
     document.dulNumber,
@@ -171,6 +178,17 @@ const checkEsiaDataForCredit = (esiaProfile: EsiaRequestProfileResponse) => {
     document.dulSubdivisionCode,
     addressRegistration,
     profile.esiaAccountType,
+  ];
+
+  if (!data.every((_) => Boolean(_))) {
+    throw new Error();
+  }
+};
+
+const checkEsiaAdditionalDocument = (esiaProfile: EsiaRequestProfileResponse) => {
+  const { esiaAdditionalDocument } = esiaProfile;
+
+  const data = [
     esiaAdditionalDocument.inn,
     esiaAdditionalDocument.averageMonthlyIncome.toString(),
     esiaAdditionalDocument.startWorkDate,
@@ -184,36 +202,9 @@ const checkEsiaDataForCredit = (esiaProfile: EsiaRequestProfileResponse) => {
     esiaAdditionalDocument.xmlFilePayout,
     esiaAdditionalDocument.xmlFileSigPayout,
     esiaAdditionalDocument.xmlFileWorkbook,
-    //TODO: После тестирования добавить документы снизу
-    // esiaAdditionalDocument.pdfFileSigWorkbook,
-    // esiaAdditionalDocument.xmlFileSigWorkbook
-  ];
-
-  if (!data.every((_) => Boolean(_))) {
-    throw new Error();
-  }
-};
-
-const checkEsiaDataForDebit = (esiaProfile: EsiaRequestProfileResponse) => {
-  const { profile, document, addressRegistration } = esiaProfile;
-
-  const data = [
-    profile.name,
-    profile.surname,
-    profile.midname,
-    profile.birthDate,
-    profile.phone,
-    profile.email,
-    document.dulIssueDate,
-    document.dulIssuedBy,
-    document.dulNumber,
-    document.dulSerie,
-    document.dulSubdivisionCode,
-    addressRegistration,
-    profile.esiaAccountType,
+    esiaAdditionalDocument.pdfFileSigWorkbook,
+    esiaAdditionalDocument.xmlFileSigWorkbook,
   ];
 
-  if (!data.every((_) => Boolean(_))) {
-    throw new Error();
-  }
+  return data.every((_) => Boolean(_));
 };

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -27,7 +27,6 @@ interface ApplicationLeadApiProps extends AspectsProps {
   programId: string;
   nextStepLink: string;
   productType: ProductType;
-  esiaAuthSuccess: boolean;
 }
 
 // eslint-disable-next-line max-lines-per-function

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useSetter } from '../../hooks/useSetter';
 import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
+import { EsiaStatuses } from './ApplicationLeadForm';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { getInitialFormState } from './getInitialFormState';
 import { parseEsiaProfile } from './parseEsiaProfile';
@@ -13,20 +13,16 @@ type InitApplicationLeadProps = {
   inputs: FieldRetailDef[];
   nextStepLink: string;
   productType: ProductType;
-  setEsiaError: () => void;
-  setEsiaAuthSuccess: () => void;
+  setEsiaStatus: (status: EsiaStatuses) => void;
   esiaAuthSuccess: boolean;
 };
 
 export const useInitApplicationLead = ({
   inputs,
   productType,
-  setEsiaError,
-  setEsiaAuthSuccess,
+  setEsiaStatus,
   esiaAuthSuccess,
-}: InitApplicationLeadProps): [LeadFormState, { isLoading: boolean }] => {
-  const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
-
+}: InitApplicationLeadProps): LeadFormState => {
   const leadFormStore = useLeadFormStore();
   const saveForm = useSetter(leadFormStore, 'leadForm');
 
@@ -36,7 +32,7 @@ export const useInitApplicationLead = ({
   );
 
   const requestEsiaProfile = useCallback(async (code: string, state: string) => {
-    startLoading();
+    setEsiaStatus(EsiaStatuses.Pending);
     try {
       const data = await esiaRequestProfile({
         code,
@@ -52,12 +48,10 @@ export const useInitApplicationLead = ({
           ..._,
           ...parsedData,
         }));
-        setEsiaAuthSuccess();
+        setEsiaStatus(EsiaStatuses.Success);
       }
     } catch {
-      setEsiaError();
-    } finally {
-      endLoading();
+      setEsiaStatus(EsiaStatuses.Error);
     }
   }, []);
 
@@ -76,5 +70,5 @@ export const useInitApplicationLead = ({
     }
   }, []);
 
-  return [initialFormState, { isLoading }];
+  return initialFormState;
 };

package/src/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -19,13 +19,12 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     snils,
     armyIdFlg,
     conscription,
-    esiaAccountTypeCd,
   } = formData;
 
   return {
     maritalStatusCd: familyStatus,
     totalDependents: familyMembers,
-    incomeCertificateCd: esiaAccountTypeCd?.key ? { key: 'SFR_CERTIFICATE' } : confirmationIncome,
+    incomeCertificateCd: confirmationIncome,
     otherDependents: dependents,
     childrenDependents: children,
     militaryStatusCd: conscription,

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/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/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/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,23 +181,20 @@ 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,
-        condition: {
-          name: 'esiaAccountTypeCd',
-          values: [''],
-        },
+        name: 'infoCard',
+        label: 'Сумма основного и дополнительных доходов после вычета налога',
       },
     ],
   },