@redneckz/wildless-cms-uni-blocks 0.14.793 → 0.14.795

package/mobile/lib/retail/model/LeadFormState.d.ts

@@ -98,7 +98,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
     annualRevenue?: string;
     serviceDirection?: string;
     desiredMeetingDate?: string;
-    inn?: number;
+    inn?: string;
     legalForm?: string;
     organizationName?: string;
     generalSeniority?: string;
@@ -126,20 +126,20 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
     familyMembers?: string;
     children?: string;
     dependents?: string;
-    totalIncome?: number;
+    totalIncome?: string;
     expenses?: number;
     snils?: string;
     conscription?: Option;
     armyIdFlg?: boolean;
     addressRegistration?: Address;
     participantDateRegistration?: Date | string;
-    retirementIncome?: number;
-    otherIncome?: number;
-    mandatoryPayments?: number;
-    additionalIncome?: number;
-    otherPayments?: number;
-    rentalIncome?: number;
-    wages?: number;
+    retirementIncome?: string;
+    otherIncome?: string;
+    mandatoryPayments?: string;
+    additionalIncome?: string;
+    otherPayments?: string;
+    rentalIncome?: string;
+    wages?: string;
     creditInRshbCd?: Option;
     bankruptcyFlg?: boolean;
     shareholderFlg?: boolean;

package/mobile/src/components/ApplicationLeadForm/pasreEsiaProfile.ts

@@ -3,7 +3,8 @@ import { type Address, type LeadFormState } from '../../retail/model/LeadFormSta
 import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
 
 export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): LeadFormState => {
-  const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
+  const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } =
+    esiaProfile;
 
   return {
     name: profile?.name,
@@ -22,6 +23,15 @@ export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): LeadFo
     addressRegistration: buildAddress(addressRegistration),
     addressFact: buildAddress(addressFact),
     esiaAccountTypeCd: profile?.esiaAccountType,
+    inn: esiaAdditionalDocument?.inn,
+    wages: esiaAdditionalDocument?.averageMonthlyIncome
+      ? Math.floor(esiaAdditionalDocument.averageMonthlyIncome)?.toString()
+      : undefined,
+    beginDate: esiaAdditionalDocument?.startWorkDate,
+    experience5Years: getYearFromMonth(esiaAdditionalDocument?.workLengthInFiveYears)?.toString(),
+    generalSeniority: getYearFromMonth(esiaAdditionalDocument?.workLength)?.toString(),
+    lastJobExperience: getYearFromMonth(esiaAdditionalDocument?.workLengthLastJob)?.toString(),
+    jobsNumber: esiaAdditionalDocument?.jobsNumberInFiveYears?.toString(),
   };
 };
 
@@ -68,3 +78,5 @@ const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']):
     fullAddress,
   };
 };
+
+const getYearFromMonth = (month?: number) => (month ? Math.floor(month / 12) : null);

package/mobile/src/hooks/useAspects/aspects/getAspectsWithInclude.tsx

@@ -4,8 +4,5 @@ import { type AspectsAttribute } from '../useAspects';
 export const getAspectsWithInclude = (data?: AspectsDef[], include?: string): AspectsDef[] =>
   data?.map(({ aspectName, params }: AspectsAttribute) => ({
     aspectName,
-    params:
-      aspectName === 'mindboxEvent' || aspectName === 'snowplowEvent'
-        ? { ...params, eventJson: include }
-        : params,
+    params: aspectName === 'snowplowEvent' ? { ...params, eventJSON: include } : params,
   })) as AspectsDef[];

package/mobile/src/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -43,5 +43,5 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
   };
 };
 
-export const countIncomeAverage = (wages?: number, retirementIncome?: number) =>
-  Number(wages ?? 0) + Number(retirementIncome ?? 0);
+export const countIncomeAverage = (wages?: string, retirementIncome?: string) =>
+  (Number(wages ?? 0) + Number(retirementIncome ?? 0)).toString();

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

@@ -64,7 +64,7 @@ export const getParticipantAddresses = (fields: Record<string, Address | undefin
     return acc;
   }, []);
 
-export const getParticipantIncomes = (fields: Record<string, number | undefined>): any[] =>
+export const getParticipantIncomes = (fields: Record<string, string | undefined>): any[] =>
   Object.entries(fields).reduce((acc: any[], [key, value]) => {
     if (key in fieldsNamesToIncomeKeysMap) {
       return [

package/mobile/src/retail/api/getOrganizationFromInn.ts

@@ -0,0 +1,11 @@
+import { getDaDataHints } from './dadataHints/dadataHints';
+import { type DaDataSuggestion } from './dadataHints/dadataHintsType';
+
+export const getOrganizationFromInn = async (inn: string): Promise<DaDataSuggestion> => {
+  const res = await getDaDataHints({
+    url: 'suggest/party',
+    query: inn,
+  });
+
+  return res?.[0];
+};

package/mobile/src/retail/api/updateProfileEsia.ts

@@ -65,6 +65,17 @@ export type UpdateProfileEsiaResponse = {
     block: string;
     apartment: string;
   };
+  esiaAdditionalDocument: {
+    averageMonthlyIncome: number;
+    inn: string;
+    jobsNumberInFiveYears: string;
+    startWorkDate: string;
+    workLength: number;
+    workLengthInFiveYears: number;
+    workLengthLastJob: number;
+    pdfFileWorkbook: string;
+    pdfFilePayout: string;
+  };
 };
 
 export const updateProfileEsia = (body: UpdateProfileEsiaBody) =>

package/mobile/src/retail/api/updateUserTask.ts

@@ -34,7 +34,7 @@ type ParticipantIncome = {
       | 'WAGES'
       | 'RETIREMENT_INCOME';
   };
-  value: number;
+  value: string;
 };
 
 export type PaymentType = {
@@ -74,7 +74,7 @@ export type Participant = {
   maritalStatusCd?: Option;
   militaryStatusCd?: Option;
   organizationActivityTypeCd?: Option;
-  organizationInn?: number;
+  organizationInn?: string;
   organizationKindCd?: Option;
   organizationName?: string;
   organizationTypeCd?: Option;

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

@@ -1,19 +1,35 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
+import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
   const store = useRetailFormStore();
+  const esiaAccountTypeCd = field?.('esiaAccountTypeCd')?.value;
+  const inn = field?.('inn')?.value;
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
     updateOrganizationFields(store, field, item);
   }, []);
 
+  useEffect(() => {
+    if (!esiaAccountTypeCd || !inn) {
+      return;
+    }
+    (async () => {
+      const organization = await getOrganizationFromInn(inn as string);
+      if (organization) {
+        field?.('organizationName')?.onChange?.(organization.data?.name?.short_with_opf);
+        updateOrganizationFields(store, field, organization);
+      }
+    })();
+  }, []);
+
   return (
     <DaDataInputControl
       label="ИНН"

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

@@ -110,7 +110,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   annualRevenue?: string;
   serviceDirection?: string;
   desiredMeetingDate?: string;
-  inn?: number;
+  inn?: string;
   legalForm?: string;
   organizationName?: string;
   generalSeniority?: string;
@@ -138,20 +138,20 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   familyMembers?: string;
   children?: string;
   dependents?: string;
-  totalIncome?: number;
+  totalIncome?: string;
   expenses?: number;
   snils?: string;
   conscription?: Option;
   armyIdFlg?: boolean;
   addressRegistration?: Address;
   participantDateRegistration?: Date | string;
-  retirementIncome?: number;
-  otherIncome?: number;
-  mandatoryPayments?: number;
-  additionalIncome?: number;
-  otherPayments?: number;
-  rentalIncome?: number;
-  wages?: number;
+  retirementIncome?: string;
+  otherIncome?: string;
+  mandatoryPayments?: string;
+  additionalIncome?: string;
+  otherPayments?: string;
+  rentalIncome?: string;
+  wages?: string;
   creditInRshbCd?: Option;
   bankruptcyFlg?: boolean;
   shareholderFlg?: boolean;

package/package.json

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

package/src/components/ApplicationLeadForm/pasreEsiaProfile.ts

@@ -3,7 +3,8 @@ import { type Address, type LeadFormState } from '../../retail/model/LeadFormSta
 import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
 
 export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): LeadFormState => {
-  const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
+  const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } =
+    esiaProfile;
 
   return {
     name: profile?.name,
@@ -22,6 +23,15 @@ export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): LeadFo
     addressRegistration: buildAddress(addressRegistration),
     addressFact: buildAddress(addressFact),
     esiaAccountTypeCd: profile?.esiaAccountType,
+    inn: esiaAdditionalDocument?.inn,
+    wages: esiaAdditionalDocument?.averageMonthlyIncome
+      ? Math.floor(esiaAdditionalDocument.averageMonthlyIncome)?.toString()
+      : undefined,
+    beginDate: esiaAdditionalDocument?.startWorkDate,
+    experience5Years: getYearFromMonth(esiaAdditionalDocument?.workLengthInFiveYears)?.toString(),
+    generalSeniority: getYearFromMonth(esiaAdditionalDocument?.workLength)?.toString(),
+    lastJobExperience: getYearFromMonth(esiaAdditionalDocument?.workLengthLastJob)?.toString(),
+    jobsNumber: esiaAdditionalDocument?.jobsNumberInFiveYears?.toString(),
   };
 };
 
@@ -68,3 +78,5 @@ const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']):
     fullAddress,
   };
 };
+
+const getYearFromMonth = (month?: number) => (month ? Math.floor(month / 12) : null);

package/src/hooks/useAspects/aspects/getAspectsWithInclude.tsx

@@ -4,8 +4,5 @@ import { type AspectsAttribute } from '../useAspects';
 export const getAspectsWithInclude = (data?: AspectsDef[], include?: string): AspectsDef[] =>
   data?.map(({ aspectName, params }: AspectsAttribute) => ({
     aspectName,
-    params:
-      aspectName === 'mindboxEvent' || aspectName === 'snowplowEvent'
-        ? { ...params, eventJson: include }
-        : params,
+    params: aspectName === 'snowplowEvent' ? { ...params, eventJSON: include } : params,
   })) as AspectsDef[];

package/src/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -43,5 +43,5 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
   };
 };
 
-export const countIncomeAverage = (wages?: number, retirementIncome?: number) =>
-  Number(wages ?? 0) + Number(retirementIncome ?? 0);
+export const countIncomeAverage = (wages?: string, retirementIncome?: string) =>
+  (Number(wages ?? 0) + Number(retirementIncome ?? 0)).toString();

package/src/retail/adaptors/utils.ts

@@ -64,7 +64,7 @@ export const getParticipantAddresses = (fields: Record<string, Address | undefin
     return acc;
   }, []);
 
-export const getParticipantIncomes = (fields: Record<string, number | undefined>): any[] =>
+export const getParticipantIncomes = (fields: Record<string, string | undefined>): any[] =>
   Object.entries(fields).reduce((acc: any[], [key, value]) => {
     if (key in fieldsNamesToIncomeKeysMap) {
       return [

package/src/retail/api/getOrganizationFromInn.ts

@@ -0,0 +1,11 @@
+import { getDaDataHints } from './dadataHints/dadataHints';
+import { type DaDataSuggestion } from './dadataHints/dadataHintsType';
+
+export const getOrganizationFromInn = async (inn: string): Promise<DaDataSuggestion> => {
+  const res = await getDaDataHints({
+    url: 'suggest/party',
+    query: inn,
+  });
+
+  return res?.[0];
+};

package/src/retail/api/updateProfileEsia.ts

@@ -65,6 +65,17 @@ export type UpdateProfileEsiaResponse = {
     block: string;
     apartment: string;
   };
+  esiaAdditionalDocument: {
+    averageMonthlyIncome: number;
+    inn: string;
+    jobsNumberInFiveYears: string;
+    startWorkDate: string;
+    workLength: number;
+    workLengthInFiveYears: number;
+    workLengthLastJob: number;
+    pdfFileWorkbook: string;
+    pdfFilePayout: string;
+  };
 };
 
 export const updateProfileEsia = (body: UpdateProfileEsiaBody) =>

package/src/retail/api/updateUserTask.ts

@@ -34,7 +34,7 @@ type ParticipantIncome = {
       | 'WAGES'
       | 'RETIREMENT_INCOME';
   };
-  value: number;
+  value: string;
 };
 
 export type PaymentType = {
@@ -74,7 +74,7 @@ export type Participant = {
   maritalStatusCd?: Option;
   militaryStatusCd?: Option;
   organizationActivityTypeCd?: Option;
-  organizationInn?: number;
+  organizationInn?: string;
   organizationKindCd?: Option;
   organizationName?: string;
   organizationTypeCd?: Option;

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

@@ -1,19 +1,35 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
+import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
   const store = useRetailFormStore();
+  const esiaAccountTypeCd = field?.('esiaAccountTypeCd')?.value;
+  const inn = field?.('inn')?.value;
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
     updateOrganizationFields(store, field, item);
   }, []);
 
+  useEffect(() => {
+    if (!esiaAccountTypeCd || !inn) {
+      return;
+    }
+    (async () => {
+      const organization = await getOrganizationFromInn(inn as string);
+      if (organization) {
+        field?.('organizationName')?.onChange?.(organization.data?.name?.short_with_opf);
+        updateOrganizationFields(store, field, organization);
+      }
+    })();
+  }, []);
+
   return (
     <DaDataInputControl
       label="ИНН"

package/src/retail/model/LeadFormState.ts

@@ -110,7 +110,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   annualRevenue?: string;
   serviceDirection?: string;
   desiredMeetingDate?: string;
-  inn?: number;
+  inn?: string;
   legalForm?: string;
   organizationName?: string;
   generalSeniority?: string;
@@ -138,20 +138,20 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   familyMembers?: string;
   children?: string;
   dependents?: string;
-  totalIncome?: number;
+  totalIncome?: string;
   expenses?: number;
   snils?: string;
   conscription?: Option;
   armyIdFlg?: boolean;
   addressRegistration?: Address;
   participantDateRegistration?: Date | string;
-  retirementIncome?: number;
-  otherIncome?: number;
-  mandatoryPayments?: number;
-  additionalIncome?: number;
-  otherPayments?: number;
-  rentalIncome?: number;
-  wages?: number;
+  retirementIncome?: string;
+  otherIncome?: string;
+  mandatoryPayments?: string;
+  additionalIncome?: string;
+  otherPayments?: string;
+  rentalIncome?: string;
+  wages?: string;
   creditInRshbCd?: Option;
   bankruptcyFlg?: boolean;
   shareholderFlg?: boolean;