@redneckz/wildless-cms-uni-blocks 0.14.631 → 0.14.633

package/src/components/CalculatorBusinessDeposit/useBusinessDepositParams.ts

@@ -5,7 +5,6 @@ import { useBusinessDepositRates } from './useBusinessDepositRates';
 
 const BUSINESS_MIN_DAYS = 1;
 const BUSINESS_MAX_DAYS = 1095;
-const BUSINESS_RATE_MIN_DAYS = 30; // порог количества дней, при которых ставка не доступна
 const BUSINESS_OPERATING_MIN_DAYS = 90;
 const BUSINESS_OPERATING_MAX_DAYS = 730;
 export const DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS: BusinessDepositCalculatorSourceBookParams =
@@ -26,6 +25,7 @@ export interface BusinessCommonDepositParams {
   isReplenished: boolean;
   isPartialWithdrawal: boolean;
 }
+
 export interface BusinessDepositCalculatorSourceBookParams
   extends BusinessCommonDepositParams,
     RateProps {
@@ -47,7 +47,6 @@ export interface BusinessDepositParams
   income?: number;
   finalSum?: number;
   isDisabledOperatingDeposit?: boolean;
-  isUnavailableByTerm?: boolean;
 }
 
 export const useBusinessDepositParams = (
@@ -62,14 +61,6 @@ export const useBusinessDepositParams = (
 
   const rateRows = useBusinessDepositRates(rateParams);
 
-  if (daysValue <= BUSINESS_RATE_MIN_DAYS) {
-    return {
-      ...DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS,
-      ...userInputParams,
-      isDisabledOperatingDeposit,
-      isUnavailableByTerm: true,
-    };
-  }
   const businessDepositCalculatorSourceBookParams =
     rateRows?.find((_) => {
       return (

package/src/components/CreditForm/CreditFormStep.tsx

@@ -32,6 +32,7 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
 
     const { handleSubmit } = useCreditFormApi({
       inputs,
+      step,
       onNextStep: onNextStep,
       saveStep,
     });

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -44,7 +44,7 @@ export const stepsSectionsMap: SectionsProps[][] = [
       inputs: [],
     },
     {
-      inputs: [{ fieldType: 'common', name: 'participantAddress', required: true, dadata: true }],
+      inputs: [{ fieldType: 'common', name: 'addressRegistration', required: true, dadata: true }],
     },
     {
       columns: 2,
@@ -54,7 +54,7 @@ export const stepsSectionsMap: SectionsProps[][] = [
       title: 'Адрес фактического проживания (место пребывания РФ)',
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'fullAddress', required: true, dadata: true },
+        { fieldType: 'common', name: 'addressFact', required: true, dadata: true },
         { fieldType: 'common', name: 'housing' },
       ],
     },
@@ -104,7 +104,12 @@ export const stepsSectionsMap: SectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'phone', label: 'Телефон работодателя', required: true },
+        {
+          fieldType: 'common',
+          name: 'organizationPhone',
+          label: 'Телефон работодателя',
+          required: true,
+        },
         { fieldType: 'common', name: 'beginDate', required: true },
       ],
     },
@@ -120,7 +125,7 @@ export const stepsSectionsMap: SectionsProps[][] = [
       inputs: [],
     },
     {
-      inputs: [{ fieldType: 'common', name: 'fullAddress', required: true, dadata: true }],
+      inputs: [{ fieldType: 'common', name: 'organizationAddress', required: true, dadata: true }],
     },
   ],
   [

package/src/components/CreditForm/getCreditFormTaskData.ts

@@ -0,0 +1,61 @@
+import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getFirstStepData } from './getFirstStepData';
+import { getFourthStepData } from './getFourthStepData';
+import { getSecondStepData } from './getSecondStepData';
+import { getThirdStepData } from './getThirdStepData';
+
+type getCreditFormTaskDataProps = {
+  participantId: number;
+  taskId: number;
+  profileId: number;
+  formData: FormState;
+  step?: number;
+};
+
+export const getCreditFormTaskData = ({
+  participantId,
+  taskId,
+  profileId,
+  formData,
+  step = 0,
+}: getCreditFormTaskDataProps): UpdateUserTaskBody => {
+  return {
+    sendToBank: true,
+    taskKind: 'UNITED',
+    task: {
+      taskSource: globalThis.location.origin,
+      id: taskId,
+      //TODO: Добавить id офиса
+      authorizedAgentId: formData?.bankEmployeeCode,
+      participants: [
+        {
+          id: participantId,
+          profile: {
+            id: profileId,
+          },
+          roleCd: {
+            key: 'BORROWER',
+            value: 'Заемщик',
+          },
+          ...getCurrentStepData(step, formData),
+        },
+      ],
+    },
+  };
+};
+
+const getCurrentStepData = (step: number, formData: FormState): Partial<Participant> => {
+  switch (step) {
+    case 0:
+      return getFirstStepData(formData);
+    case 1:
+      return getSecondStepData(formData);
+    case 2:
+      return getThirdStepData(formData);
+    case 3:
+      return getFourthStepData(formData);
+    default:
+      return getFirstStepData(formData);
+  }
+};

package/src/components/CreditForm/getFirstStepData.tsx

@@ -0,0 +1,54 @@
+import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { formatDate } from '../../utils/formatDate';
+import { formatPhone } from '../../utils/formatPhone';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getParticipantAddresses, getParticipantContacts } from './utils';
+
+export const getFirstStepData = (formData: FormState): Partial<Participant> => {
+  const {
+    name,
+    surname,
+    middleName,
+    birthday = '',
+    phone = '',
+    email,
+    sex,
+    birthPlace,
+    dulIssueDateField = '',
+    dulIssuedBy,
+    dulNumber,
+    dulSerie,
+    dulSubdivisionCode,
+    education,
+    participantDateRegistration = '',
+    housing,
+    addressRegistration,
+    addressFact,
+  } = formData;
+
+  return {
+    birthDate: formatDate(birthday, true),
+    midname: middleName,
+    name,
+    surname,
+    birthPlace,
+    dulIssueDate: formatDate(dulIssueDateField, true),
+    dulIssuedBy,
+    dulNumber,
+    dulSerie,
+    dulSubdivisionCode,
+    educationLevelCd: education,
+    registrationDate: formatDate(participantDateRegistration, true),
+    houseTypeCd: housing,
+    participantContacts: getParticipantContacts({
+      phone: formatPhone(phone),
+      email,
+    }),
+    participantAddresses: getParticipantAddresses({ addressRegistration, addressFact }),
+    genderCd: sex
+      ? {
+          key: sex === 'male' ? 'MAN' : 'WOMAN',
+        }
+      : undefined,
+  };
+};

package/src/components/CreditForm/getFourthStepData.ts

@@ -0,0 +1,13 @@
+import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+
+export const getFourthStepData = (formData: FormState): Partial<Participant> => {
+  const { bankruptcyFlg, shareholderFlg, legalEntityName, creditInRshbCd } = formData;
+
+  return {
+    bankruptcyFlg,
+    shareholderFlg,
+    nameLegalEntity: legalEntityName,
+    creditInRshbCd,
+  };
+};

package/src/components/CreditForm/getInitialFormState.tsx

@@ -1,7 +1,8 @@
 import type { Option } from '../../ui-kit/Select/Option';
+import { type Address } from '../ApplicationLeadForm/getInitialFormState';
 
 export interface FormStateMap {
-  1: {
+  0: {
     surname?: string;
     name?: string;
     middleName?: string;
@@ -15,30 +16,30 @@ export interface FormStateMap {
     dulIssueDateField?: Date;
     dulSubdivisionCode?: string;
     dulIssuedBy?: string;
-    participantAddress?: string;
+    addressRegistration?: Address;
     participantDateRegistration?: Date;
-    fullAddress?: string;
+    addressFact?: Address;
     housing?: string;
   };
-  2: {
-    employment?: Option;
-    organizationName?: string;
-    inn?: number;
-    legalForm?: string;
-    organization?: Option;
+  1: {
     amountWorkers?: Option;
+    beginDate?: Date;
     employerActivities?: Option;
     employerOrganization?: Option;
-    lastJobExperience?: string;
+    employment?: Option;
     experience5Years?: string;
+    inn?: number;
     jobsNumber?: string;
-    phone?: string;
-    beginDate?: Date;
-    positionOrganization?: Option;
+    lastJobExperience?: string;
+    legalForm?: string;
+    organization?: Option;
+    organizationAddress?: Address;
+    organizationName?: string;
+    organizationPhone?: string;
     partInBusiness?: number;
-    fullAddress?: string;
+    positionOrganization?: Option;
   };
-  3: {
+  2: {
     familyStatus?: Option;
     dependents?: number;
     familyMembers?: number;
@@ -47,14 +48,14 @@ export interface FormStateMap {
     snils?: string;
     armyIdFlg?: boolean;
   };
-  4: {
-    disablePeopleFlg?: string;
-    bankruptcyFlg?: string;
-    shareholderFlg?: string;
+  3: {
+    disablePeopleFlg?: boolean;
+    bankruptcyFlg?: boolean;
+    shareholderFlg?: boolean;
     legalEntityName?: string;
-    creditInRshbCd?: string;
+    creditInRshbCd?: Option;
   };
-  5: {
+  4: {
     regionRetail?: string;
     addressRetail?: string;
     bankEmployeeCode?: string;
@@ -62,7 +63,7 @@ export interface FormStateMap {
 }
 
 const formStateMap: FormStateMap = {
-  1: {
+  0: {
     surname: '',
     name: '',
     middleName: '',
@@ -76,30 +77,39 @@ const formStateMap: FormStateMap = {
     dulIssueDateField: undefined,
     dulSubdivisionCode: '',
     dulIssuedBy: '',
-    participantAddress: '',
+    addressRegistration: {
+      fullAddress: '',
+      fiasCode: '',
+    },
     participantDateRegistration: undefined,
-    fullAddress: '',
+    addressFact: {
+      fullAddress: '',
+      fiasCode: '',
+    },
     housing: '',
   },
-  2: {
-    employment: { key: '', text: '' },
-    organizationName: '',
-    inn: undefined,
-    legalForm: '',
-    organization: { key: '', text: '' },
+  1: {
     amountWorkers: { key: '', text: '' },
+    beginDate: undefined,
     employerActivities: { key: '', text: '' },
     employerOrganization: { key: '', text: '' },
-    lastJobExperience: '',
+    employment: { key: '', text: '' },
     experience5Years: '',
+    inn: undefined,
     jobsNumber: '',
-    phone: '',
-    beginDate: undefined,
-    positionOrganization: { key: '', text: '' },
+    lastJobExperience: '',
+    legalForm: '',
+    organization: { key: '', text: '' },
+    organizationAddress: {
+      fullAddress: '',
+      fiasCode: '',
+    },
+    organizationName: '',
+    organizationPhone: '',
     partInBusiness: undefined,
-    fullAddress: '',
+    positionOrganization: { key: '', text: '' },
   },
-  3: {
+  2: {
     familyStatus: { key: '', text: '' },
     dependents: undefined,
     familyMembers: undefined,
@@ -108,14 +118,14 @@ const formStateMap: FormStateMap = {
     snils: '',
     armyIdFlg: false,
   },
-  4: {
-    disablePeopleFlg: '',
-    bankruptcyFlg: '',
-    shareholderFlg: '',
+  3: {
+    disablePeopleFlg: false,
+    bankruptcyFlg: false,
+    shareholderFlg: false,
     legalEntityName: '',
-    creditInRshbCd: '',
+    creditInRshbCd: undefined,
   },
-  5: {
+  4: {
     regionRetail: '',
     addressRetail: '',
     bankEmployeeCode: '',

package/src/components/CreditForm/getSecondStepData.tsx

@@ -0,0 +1,44 @@
+import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { formatPhone } from '../../utils/formatPhone';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getParticipantAddresses, getParticipantContacts } from './utils';
+
+export const getSecondStepData = (formData: FormState): Partial<Participant> => {
+  const {
+    employment,
+    organizationName,
+    inn,
+    legalForm,
+    organization,
+    amountWorkers,
+    employerActivities,
+    employerOrganization,
+    generalSeniority,
+    lastJobExperience,
+    experience5Years,
+    jobsNumber,
+    organizationPhone,
+    organizationAddress,
+    positionOrganization,
+  } = formData;
+
+  return {
+    employmentTypeCd: employment,
+    organizationName,
+    organizationInn: inn,
+    organizationActivityTypeCd: employerActivities,
+    organizationTypeCd: organization,
+    organizationKindCd: employerOrganization,
+    employeesNumberCd: amountWorkers,
+    opf: legalForm,
+    seniority: generalSeniority,
+    generalSeniority: experience5Years,
+    jobsNumber,
+    lastWorkDuration: lastJobExperience,
+    positionCd: positionOrganization,
+    participantContacts: getParticipantContacts({
+      organizationPhone: organizationPhone && formatPhone(organizationPhone),
+    }),
+    participantAddresses: getParticipantAddresses({ organizationAddress }),
+  };
+};

package/src/components/CreditForm/getThirdStepData.ts

@@ -0,0 +1,27 @@
+import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getParticipantIncomes } from './utils';
+
+export const getThirdStepData = (formData: FormState): Partial<Participant> => {
+  const {
+    familyStatus,
+    dependents,
+    familyMembers,
+    mandatoryIncome,
+    otherPayments,
+    snils,
+    armyIdFlg,
+  } = formData;
+
+  return {
+    maritalStatusCd: familyStatus,
+    totalDependents: familyMembers,
+    otherDependents: dependents,
+    participantIncomes: getParticipantIncomes({
+      mandatoryIncome,
+      otherPayments,
+    }),
+    snils: snils?.replaceAll(' ', ''),
+    armyIdFlg,
+  };
+};

package/src/components/CreditForm/useCreditFormApi.tsx

@@ -1,30 +1,49 @@
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
+import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import { getCreditFormTaskData } from './getCreditFormTaskData';
 import { type FormStateMap } from './getInitialFormState';
 
 type CreditFormApiProps = {
   inputs: FieldDef[];
+  step: number;
   onNextStep: () => void;
   saveStep: (value: Record<string, any>) => void;
 };
 
-export const useCreditFormApi = ({ inputs, onNextStep, saveStep }: CreditFormApiProps) => {
+export const useCreditFormApi = ({ inputs, step, onNextStep, saveStep }: CreditFormApiProps) => {
+  const [taskId] = useLocalStorage<number>('taskId');
+  const [profileId] = useLocalStorage<number>('profileId');
+  const [participantId] = useLocalStorage<number>('participantId');
+
   const handleSubmit = useCallback(async (formData: FormStateMap[keyof FormStateMap]) => {
     const feedbackValidator = objectValidator(getObjectValidator(inputs));
     if (!isValidationSuccess(feedbackValidator(formData))) {
       return console.warn('validation fail');
     }
 
+    saveStep(formData);
+
     try {
-      // TODO: add updateUserTask here
+      if (taskId && profileId && participantId) {
+        await updateUserTask(
+          getCreditFormTaskData({
+            participantId,
+            taskId,
+            profileId,
+            step,
+            formData: formData as any,
+          }),
+        );
+      }
     } catch (ex) {
       return 'Fail';
     }
 
-    saveStep(formData);
     onNextStep();
 
     return 'OK';

package/src/components/CreditForm/utils.ts

@@ -0,0 +1,69 @@
+import { type Address } from '../ApplicationLeadForm/getInitialFormState';
+
+export const fieldsNamesToContactKeysMap = {
+  email: 'EMAIL',
+  phone: 'MAIN_PHONE',
+  organizationPhone: 'ORGANIZATION_PHONE',
+};
+
+export const fieldsNamesToAddressKeysMap = {
+  addressRegistration: 'REGISTRATION',
+  addressFact: 'RESIDENTAL',
+  organizationAddress: 'WORK',
+};
+
+export const fieldsNamesToIncomeKeysMap = {
+  mandatoryIncome: 'INCOME_AVERAGE',
+  otherPayments: 'MANDATORY_PAYMENTS',
+};
+
+export const getParticipantContacts = (fields: Record<string, string | undefined>): any[] =>
+  Object.entries(fields).reduce((acc: any[], [key, value]) => {
+    if (key in fieldsNamesToContactKeysMap) {
+      return [
+        ...acc,
+        {
+          contactTypeCd: {
+            key: fieldsNamesToContactKeysMap[key],
+          },
+          value,
+        },
+      ];
+    }
+
+    return acc;
+  }, []);
+
+export const getParticipantAddresses = (fields: Record<string, Address | undefined>): any[] =>
+  Object.entries(fields).reduce((acc: any[], [key, value]) => {
+    if (key in fieldsNamesToAddressKeysMap) {
+      return [
+        ...acc,
+        {
+          addressType: {
+            key: fieldsNamesToAddressKeysMap[key],
+          },
+          ...value,
+        },
+      ];
+    }
+
+    return acc;
+  }, []);
+
+export const getParticipantIncomes = (fields: Record<string, number | undefined>): any[] =>
+  Object.entries(fields).reduce((acc: any[], [key, value]) => {
+    if (key in fieldsNamesToIncomeKeysMap) {
+      return [
+        ...acc,
+        {
+          incomeTypeCd: {
+            key: fieldsNamesToIncomeKeysMap[key],
+          },
+          value,
+        },
+      ];
+    }
+
+    return acc;
+  }, []);

package/src/ui-kit/Calculator/CalculatorStyle.tsx

@@ -1,5 +1,5 @@
 export const CalculatorStyle = {
-  wrapper: 'flex flex-col justify-between @4xl:flex-row gap-x-4xl gap-y-7 @xl:gap-y-4xl',
+  wrapper: 'flex flex-col justify-between lg:flex-row gap-x-4xl gap-y-7 lg:gap-y-4xl',
   input: 'flex flex-col lg:max-w-80 lg:w-1/2 gap-2xl',
   result: 'flex flex-col gap-y-xl min-w-52',
 };

package/src/ui-kit/Calculator/UnknownRate.tsx

@@ -5,28 +5,18 @@ import { Text } from '../Text/Text';
 
 export interface UnknownRateProps {
   title?: string;
-  isUnavailableByTerm?: boolean;
 }
 
-export const UnknownRate = JSX<UnknownRateProps>(
-  ({ title = 'Ставка', isUnavailableByTerm = false }) => (
-    <div className="space-y-s min-w-96">
-      <Text size="text-l" font="font-light" color="text-secondary-text">
-        {title}
-      </Text>
-      <Icon className="w-10 h-10 @5xl:h-auto @5xl:w-40" name="PercentIcon" />
-      <div className="w-64">
-        {isUnavailableByTerm ? (
-          <Paragraph size="text-xl" font="font-light" color="text-primary-text">
-            Процентная ставка для срока <strong>1-30 дней</strong> устанавливается при обращении в
-            Банк
-          </Paragraph>
-        ) : (
-          <Paragraph size="text-xl" font="font-light" color="text-primary-text">
-            Выберите другую сумму или срок
-          </Paragraph>
-        )}
-      </div>
+export const UnknownRate = JSX<UnknownRateProps>(({ title = 'Ставка' }) => (
+  <div className="space-y-s min-w-96">
+    <Text size="text-l" font="font-light" color="text-secondary-text">
+      {title}
+    </Text>
+    <Icon className="w-10 h-auto lg:w-40" name="PercentIcon" />
+    <div className="w-64">
+      <Paragraph size="text-xl" font="font-light" color="text-primary-text">
+        Выберите другую сумму или срок
+      </Paragraph>
     </div>
-  ),
-);
+  </div>
+));

package/src/ui-kit/Calculator/renderRate.tsx

@@ -4,7 +4,6 @@ import { Rate, type RateProps } from './Rate';
 import { UnknownRate, type UnknownRateProps } from './UnknownRate';
 
 interface RenderRateProps extends RateProps, UnknownRateProps {
-  isUnknownRateShown?: boolean;
   children?: VNode;
 }
 
@@ -13,16 +12,13 @@ export const renderRate = ({
   rate = 0,
   unit = '%',
   fractionDigits = 2,
-  isUnknownRateShown = true,
   color = 'text-secondary-text',
   children,
   ...rest
 }: RenderRateProps) =>
-  isUnknownRateShown && rate === 0 ? (
-    <UnknownRate title={title} {...rest} />
-  ) : (
+  rate ? (
     <div className="flex flex-col">
-      <div className="hidden @xl:block min-w-96">
+      <div className="hidden lg:block min-w-96">
         <Rate
           title={title}
           rate={rate}
@@ -33,7 +29,7 @@ export const renderRate = ({
         />
       </div>
       <CalculatorValue
-        className="@xl:hidden"
+        className="lg:hidden"
         title={title}
         value={rate}
         postfix={unit}
@@ -44,4 +40,6 @@ export const renderRate = ({
       />
       {children}
     </div>
+  ) : (
+    <UnknownRate title={title} {...rest} />
   );