@redneckz/wildless-cms-uni-blocks 0.14.636 → 0.14.638

package/mobile/src/components/CreditForm/formStateMap.tsx

@@ -0,0 +1,151 @@
+import type { Option } from '../../ui-kit/Select/Option';
+import { type Address } from '../ApplicationLeadForm/getInitialFormState';
+
+export interface FormStateMap {
+  0: {
+    moneyValue?: number;
+    monthsValue?: number;
+    isAnnuity?: boolean;
+    isInsurance?: boolean;
+    isSalaryClient?: boolean;
+    isPensionClient?: boolean;
+    isStateEmployee?: boolean;
+  };
+  1: {
+    surname?: string;
+    name?: string;
+    middleName?: string;
+    sex?: string;
+    birthday?: Date;
+    birthPlace?: string;
+    phone?: string;
+    email?: string;
+    dulSerie?: number;
+    dulNumber?: number;
+    dulIssueDateField?: Date;
+    dulSubdivisionCode?: string;
+    dulIssuedBy?: string;
+    addressRegistration?: Address;
+    participantDateRegistration?: Date;
+    addressFact?: Address;
+    housing?: string;
+  };
+  2: {
+    amountWorkers?: Option;
+    beginDate?: Date;
+    employerActivities?: Option;
+    employerOrganization?: Option;
+    employment?: Option;
+    experience5Years?: string;
+    inn?: number;
+    jobsNumber?: string;
+    lastJobExperience?: string;
+    legalForm?: string;
+    organization?: Option;
+    organizationAddress?: Address;
+    organizationName?: string;
+    organizationPhone?: string;
+    partInBusiness?: number;
+    positionOrganization?: Option;
+  };
+  3: {
+    familyStatus?: Option;
+    dependents?: number;
+    familyMembers?: number;
+    mandatoryIncome?: number;
+    otherPayments?: number;
+    snils?: string;
+    armyIdFlg?: boolean;
+  };
+  4: {
+    disablePeopleFlg?: boolean;
+    bankruptcyFlg?: boolean;
+    shareholderFlg?: boolean;
+    legalEntityName?: string;
+    creditInRshbCd?: Option;
+  };
+  5: {
+    regionRetail?: string;
+    addressRetail?: string;
+    bankEmployeeCode?: string;
+  };
+}
+
+export const formStateMap: FormStateMap = {
+  0: {
+    moneyValue: 0,
+    monthsValue: 0,
+    isAnnuity: false,
+    isInsurance: false,
+    isSalaryClient: false,
+    isPensionClient: false,
+    isStateEmployee: false,
+  },
+  1: {
+    surname: '',
+    name: '',
+    middleName: '',
+    sex: '',
+    birthday: undefined,
+    birthPlace: '',
+    phone: '',
+    email: '',
+    dulSerie: undefined,
+    dulNumber: undefined,
+    dulIssueDateField: undefined,
+    dulSubdivisionCode: '',
+    dulIssuedBy: '',
+    addressRegistration: {
+      fullAddress: '',
+      fiasCode: '',
+    },
+    participantDateRegistration: undefined,
+    addressFact: {
+      fullAddress: '',
+      fiasCode: '',
+    },
+    housing: '',
+  },
+  2: {
+    amountWorkers: { key: '', text: '' },
+    beginDate: undefined,
+    employerActivities: { key: '', text: '' },
+    employerOrganization: { key: '', text: '' },
+    employment: { key: '', text: '' },
+    experience5Years: '',
+    inn: undefined,
+    jobsNumber: '',
+    lastJobExperience: '',
+    legalForm: '',
+    organization: { key: '', text: '' },
+    organizationAddress: {
+      fullAddress: '',
+      fiasCode: '',
+    },
+    organizationName: '',
+    organizationPhone: '',
+    partInBusiness: undefined,
+    positionOrganization: { key: '', text: '' },
+  },
+  3: {
+    familyStatus: { key: '', text: '' },
+    dependents: undefined,
+    familyMembers: undefined,
+    mandatoryIncome: undefined,
+    otherPayments: undefined,
+    snils: '',
+    armyIdFlg: false,
+  },
+  4: {
+    disablePeopleFlg: false,
+    bankruptcyFlg: false,
+    shareholderFlg: false,
+    legalEntityName: '',
+    creditInRshbCd: undefined,
+  },
+  5: {
+    regionRetail: '',
+    addressRetail: '',
+    bankEmployeeCode: '',
+  },
+};

package/mobile/src/components/CreditForm/getInitialFormState.tsx

@@ -1,139 +1,4 @@
-/* eslint-disable max-len, max-lines */
-import type { Option } from '../../ui-kit/Select/Option';
-import { type Address } from '../ApplicationLeadForm/getInitialFormState';
-
-export interface FormStateMap {
-  0: {
-    surname?: string;
-    name?: string;
-    middleName?: string;
-    sex?: string;
-    birthday?: Date;
-    birthPlace?: string;
-    phone?: string;
-    email?: string;
-    dulSerie?: number;
-    dulNumber?: number;
-    dulIssueDateField?: Date;
-    dulSubdivisionCode?: string;
-    dulIssuedBy?: string;
-    addressRegistration?: Address;
-    addressMatch?: boolean;
-    participantDateRegistration?: Date;
-    addressFact?: Address;
-    housing?: string;
-  };
-  1: {
-    amountWorkers?: Option;
-    beginDate?: Date;
-    employerActivities?: Option;
-    employerOrganization?: Option;
-    employment?: Option;
-    experience5Years?: string;
-    inn?: number;
-    jobsNumber?: string;
-    lastJobExperience?: string;
-    legalForm?: string;
-    organization?: Option;
-    organizationAddress?: Address;
-    organizationName?: string;
-    organizationPhone?: string;
-    partInBusiness?: number;
-    positionOrganization?: Option;
-  };
-  2: {
-    familyStatus?: Option;
-    dependents?: number;
-    familyMembers?: number;
-    mandatoryIncome?: number;
-    otherPayments?: number;
-    snils?: string;
-    armyIdFlg?: boolean;
-  };
-  3: {
-    disablePeopleFlg?: boolean;
-    bankruptcyFlg?: boolean;
-    shareholderFlg?: boolean;
-    legalEntityName?: string;
-    creditInRshbCd?: Option;
-  };
-  4: {
-    regionRetail?: string;
-    addressRetail?: string;
-    bankEmployeeCode?: string;
-  };
-}
-
-const formStateMap: FormStateMap = {
-  0: {
-    surname: '',
-    name: '',
-    middleName: '',
-    sex: '',
-    birthday: undefined,
-    birthPlace: '',
-    phone: '',
-    email: '',
-    dulSerie: undefined,
-    dulNumber: undefined,
-    dulIssueDateField: undefined,
-    dulSubdivisionCode: '',
-    dulIssuedBy: '',
-    addressRegistration: {
-      fullAddress: '',
-      fiasCode: '',
-    },
-    addressMatch: false,
-    participantDateRegistration: undefined,
-    addressFact: {
-      fullAddress: '',
-      fiasCode: '',
-    },
-    housing: '',
-  },
-  1: {
-    amountWorkers: { key: '', text: '' },
-    beginDate: undefined,
-    employerActivities: { key: '', text: '' },
-    employerOrganization: { key: '', text: '' },
-    employment: { key: '', text: '' },
-    experience5Years: '',
-    inn: undefined,
-    jobsNumber: '',
-    lastJobExperience: '',
-    legalForm: '',
-    organization: { key: '', text: '' },
-    organizationAddress: {
-      fullAddress: '',
-      fiasCode: '',
-    },
-    organizationName: '',
-    organizationPhone: '',
-    partInBusiness: undefined,
-    positionOrganization: { key: '', text: '' },
-  },
-  2: {
-    familyStatus: { key: '', text: '' },
-    dependents: undefined,
-    familyMembers: undefined,
-    mandatoryIncome: undefined,
-    otherPayments: undefined,
-    snils: '',
-    armyIdFlg: false,
-  },
-  3: {
-    disablePeopleFlg: false,
-    bankruptcyFlg: false,
-    shareholderFlg: false,
-    legalEntityName: '',
-    creditInRshbCd: undefined,
-  },
-  4: {
-    regionRetail: '',
-    addressRetail: '',
-    bankEmployeeCode: '',
-  },
-};
+import { formStateMap, type FormStateMap } from './formStateMap';
 
 export const getInitialFormState = <Step extends keyof FormStateMap>(
   step: Step,

package/mobile/src/components/CreditForm/renderInfo.tsx

@@ -0,0 +1,10 @@
+import { InfoCard } from '../../ui-kit/InfoCard/InfoCard';
+import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+
+export const renderInfo = (inputs: FieldDef[] = []) => {
+  const infoInputs = inputs.filter((_) => _.fieldType === 'info');
+
+  return infoInputs.length
+    ? infoInputs.map(({ text, name }, i) => <InfoCard key={`${name}_${i}`} __html={text} />)
+    : null;
+};

package/mobile/src/components/CreditForm/renderInputs.tsx

@@ -1,6 +1,5 @@
 import { getField } from '../../ui-kit/FormField/getField';
 import { type RenderInputsProps } from './CreditFormContent';
 
-export const renderInputs = ({ field, inputs }: RenderInputsProps) => {
-  return (inputs || [])?.map(getField(field, ''));
-};
+export const renderInputs = ({ field, inputs }: RenderInputsProps) =>
+  (inputs || [])?.map(getField(field, ''));

package/mobile/src/components/CreditForm/renderStep.tsx

@@ -0,0 +1,25 @@
+import { type FormFieldRegisterer, type FormOperatorProps } from '../../hooks/useForm';
+import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
+import { renderTitle } from '../../ui-kit/FormField/renderTitle';
+import { style } from '../../utils/style';
+import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
+import { type FormStateMap } from './formStateMap';
+import { renderInfo } from './renderInfo';
+import { renderInputs } from './renderInputs';
+
+export type CustomSubmit = FormOperatorProps<FormStateMap[keyof FormStateMap]>['onSubmit'];
+
+export interface StepProps {
+  sections?: SectionsProps[];
+  field: FormFieldRegisterer<FormStateMap[keyof FormStateMap]>;
+  registerSubmit?: (submit: CustomSubmit) => void;
+}
+
+export const renderStep = ({ sections, field }: StepProps) =>
+  sections?.map(({ inputs, columns, title }, i) => (
+    <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
+      {renderInfo(inputs)}
+      {renderTitle(title)}
+      {renderInputs({ field, inputs })}
+    </div>
+  ));

package/mobile/src/components/CreditForm/{useCreditFormApi.tsx → useCreditFormAPI.tsx}

@@ -5,17 +5,24 @@ import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FormStateMap } from './formStateMap';
 import { getCreditFormTaskData } from './getCreditFormTaskData';
-import { type FormStateMap } from './getInitialFormState';
 
 type CreditFormApiProps = {
-  inputs: FieldDef[];
   step: number;
+  inputs: FieldDef[];
   onNextStep: () => void;
   saveStep: (value: Record<string, any>) => void;
+  finishForm?: (bool: boolean) => void;
 };
 
-export const useCreditFormApi = ({ inputs, step, onNextStep, saveStep }: CreditFormApiProps) => {
+export const useCreditFormAPI = ({
+  step,
+  inputs,
+  onNextStep,
+  saveStep,
+  finishForm,
+}: CreditFormApiProps) => {
   const [taskId] = useLocalStorage<number>('taskId');
   const [profileId] = useLocalStorage<number>('profileId');
   const [participantId] = useLocalStorage<number>('participantId');
@@ -46,6 +53,10 @@ export const useCreditFormApi = ({ inputs, step, onNextStep, saveStep }: CreditF
 
     onNextStep();
 
+    if (step === 5) {
+      finishForm?.(true);
+    }
+
     return 'OK';
   }, []);
 

package/mobile/src/hooks/useForm.ts

@@ -22,7 +22,7 @@ export interface FormOperatorProps<FormState extends Record<string, any>> {
   field: FormFieldRegisterer<FormState>;
   update: (_: FormState) => void;
   reset: () => void;
-  onSubmit?: (ev: PreventableEvent) => void;
+  onSubmit?: (ev: PreventableEvent) => FormState;
 }
 
 // eslint-disable-next-line max-lines-per-function
@@ -98,6 +98,8 @@ export const useForm = <FormState extends Record<string, any>>(
       resetOnSubmit ? reset() : setDirtyForm(true);
 
       onSubmit && onSubmit(formState, ev);
+
+      return formState;
     },
     [onSubmit, formState],
   );

package/mobile/src/model/InputSectionsType.ts

@@ -0,0 +1,6 @@
+import { type SectionsProps } from '../components/ApplicationForm/ApplicationFormContent';
+
+export interface InputSectionsType {
+  /** @hidden */
+  sections?: SectionsProps[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.636",
+  "version": "0.14.638",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -210,7 +210,7 @@
       "path": "lib/common.css"
     },
     {
-      "limit": "84 kB",
+      "limit": "86 kB",
       "path": "bundle/bundle.umd.min.js"
     }
   ],

package/src/api/RetailAPI/getTaskStatus.ts

@@ -0,0 +1,16 @@
+import { doRequest } from './doRequest';
+
+export enum STATUS_TYPE {
+  process = 'IN_PROCESS',
+  ok = 'OK',
+  fail = 'FAILED',
+  rework = 'REWORK',
+}
+
+interface GetTaskStatusResponse {
+  statusCd: STATUS_TYPE;
+  taskId: number;
+}
+
+export const getTaskStatus = (body: { taskId: number }) =>
+  doRequest<GetTaskStatusResponse>('/user-data/getTaskStatus', 'POST', body);

package/src/api/RetailAPI/sendSignalToProcess.ts

@@ -0,0 +1,19 @@
+import { doRequest } from './doRequest';
+
+export type SignalType =
+  | 'CREATE_APPLICATION_SHORT_SIGNAL'
+  | 'CREATE_APPLICATION_LOAN_V3_SIGNAL'
+  | 'KILL_DRAFT_PROCESS_SIGNAL';
+
+interface SendSignalToProcess {
+  signalType: SignalType;
+  taskId: number;
+}
+
+interface SendSignalToProcessResponse {
+  statusCd: string;
+  taskId: number;
+}
+
+export const sendSignalToProcess = (body: SendSignalToProcess) =>
+  doRequest<SendSignalToProcessResponse>('/public-data/sendSignalToProcess', 'POST', body);

package/src/api/RetailAPI/updateProfileEsia.ts

@@ -14,7 +14,7 @@ export type UpdateProfileEsiaResponse = {
     surname: string;
     name: string;
     midname: string;
-    birthDate: string;
+    birthDate: Date;
     phone: string;
     email: string;
     esiaAccountType: {
@@ -42,11 +42,11 @@ export type UpdateProfileEsiaResponse = {
       value: string;
     };
     city: string;
-    locality: null;
+    locality: string;
     street: string;
     house: string;
-    building: null;
-    block: null;
+    building: string;
+    block: string;
     apartment: string;
   };
   addressFact: {
@@ -58,11 +58,11 @@ export type UpdateProfileEsiaResponse = {
       value: string;
     };
     city: string;
-    locality: null;
+    locality: string;
     street: string;
     house: string;
-    building: null;
-    block: null;
+    building: string;
+    block: string;
     apartment: string;
   };
 };

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -3,6 +3,7 @@
 
 import { type AspectsProps } from '../../model/AspectsProps';
 import { type LabelProps, type TextProps, type TitleProps } from '../../model/HeadlineType';
+import { type InputSectionsType } from '../../model/InputSectionsType';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
 import { type Target } from '../../model/LinkProps';
 import { type NameFieldDef } from '../../ui-kit/FormField/NameFieldDef';
@@ -140,7 +141,8 @@ type additionalParamsType = hideProductDef | showProductDef;
  */
 export type ApplicationFormContent = UniBlockContent &
   TitleProps &
-  AspectsProps & {
+  AspectsProps &
+  InputSectionsType & {
     /** @title Кнопка */
     button?: SubmitButtonProps;
     /**
@@ -154,8 +156,6 @@ export type ApplicationFormContent = UniBlockContent &
       target?: Target;
     };
     typeForm?: TypeFormFieldDef;
-    /** @hidden */
-    sections?: SectionsProps[];
     endpoint?: EndpointType;
     /** @title Дополнительные параметры формы */
     additionalParams?: additionalParamsType;

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.mobile.tsx

@@ -15,8 +15,6 @@ export default {
       <ApplicationLeadForm
         className="col-span-12"
         title="Заголовок"
-        typeForm="CORRUPTION"
-        endpoint="lead"
         sections={[
           {
             columns: 2,

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.tsx

@@ -16,8 +16,6 @@ export default {
       <ApplicationLeadForm
         className="col-span-12"
         title="Заголовок"
-        typeForm="CORRUPTION"
-        endpoint="lead"
         programId="10"
         sections={[
           {

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -24,7 +24,6 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     title,
     programId = '',
     nextStepLink = '/credit-lead',
-    typeForm = '',
     sections = [],
     button,
     ...rest
@@ -34,7 +33,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
 
     const { isLoading } = useInitApplicationLead(nextStepLink);
     const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
-    const initialFormState = getInitialFormState(inputs, leadForm, typeForm);
+    const initialFormState = getInitialFormState(inputs, leadForm);
     const { handleSubmit, responseStatus } = useApplicationLeadApi({
       inputs,
       programId,
@@ -43,7 +42,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     });
 
     if (responseStatus) {
-      const responseTypeDialog = useResponseTypeDialog({ responseType: responseStatus, typeForm });
+      const responseTypeDialog = useResponseTypeDialog({ responseType: responseStatus });
       responseTypeDialog.open();
     }
 

package/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -1,7 +1,7 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { type LabelProps, type TextProps, type TitleProps } from '../../model/HeadlineType';
+import { type InputSectionsType } from '../../model/InputSectionsType';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
-import { type Target } from '../../model/LinkProps';
 import { type NameFieldDef } from '../../ui-kit/FormField/NameFieldDef';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 import { type FormState } from './getInitialFormState';
@@ -113,27 +113,14 @@ export type SectionsProps = TitleProps & {
  * @title Форма заявки настраиваемая
  */
 export type ApplicationLeadFormContent = UniBlockContent &
-  TitleProps & {
+  TitleProps &
+  InputSectionsType & {
     /** @title Кнопка */
     button?: SubmitButtonProps;
-    /**
-     * @title Условия передачи данных
-     * @required ["text", "href"]
-     */
-    link?: TextProps & {
-      /** @title URL (href) */
-      href?: string;
-      /** @default "" */
-      target?: Target;
-    };
     /** @title Номер кредитной программы */
     programId?: string;
     /** @title адресс следующей страницы заявки */
     nextStepLink?: string;
-    typeForm?: TypeFormFieldDef;
-    /** @hidden */
-    sections?: SectionsProps[];
-    endpoint?: EndpointType;
   };
 
 /** @hidden */

package/src/components/ApplicationLeadForm/pasreEsiaProfile.ts

@@ -0,0 +1,69 @@
+import { type UpdateProfileEsiaResponse } from '../../api/RetailAPI/updateProfileEsia';
+import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
+import { type Address, type FormState } from './getInitialFormState';
+
+export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): FormState => {
+  const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
+
+  return {
+    name: profile?.name,
+    surname: profile?.surname,
+    middleName: profile?.midname,
+    birthday: profile?.birthDate,
+    phone: normalizePhone(profile?.phone),
+    email: profile?.email,
+    dulIssueDateField: document?.dulIssueDate,
+    dulIssuedBy: document?.dulIssuedBy,
+    dulNumber: document?.dulNumber,
+    dulSerie: document?.dulSerie,
+    dulSubdivisionCode: document?.dulSubdivisionCode,
+    snils: addInfo?.snils,
+    birthPlace: addInfo?.birthPlace,
+    addressRegistration: buildAddress(addressRegistration),
+    addressFact: buildAddress(addressFact),
+  };
+};
+
+const concatFullAddress = (address: Array<string | undefined>): string => {
+  return address.reduce((acc: string, value) => {
+    if (value) {
+      return acc ? `${acc}, ${value}` : value;
+    }
+
+    return acc;
+  }, '');
+};
+
+const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']): Address => {
+  const {
+    postcode,
+    region,
+    regionCode,
+    locality,
+    city,
+    street,
+    house,
+    building,
+    block,
+    apartment,
+  } = fields;
+
+  const place = locality || city;
+
+  const fullAddress = concatFullAddress([
+    postcode,
+    region,
+    place,
+    street ? `ул ${street}` : undefined,
+    house ? `д ${house}` : undefined,
+    block ? `к ${block}` : undefined,
+    building ? `стр ${building}` : undefined,
+    apartment ? `кв ${apartment}` : undefined,
+  ]);
+
+  return {
+    ...fields,
+    regionCode: regionCode?.key,
+    fullAddress,
+  };
+};