@redneckz/wildless-cms-uni-blocks 0.14.699 → 0.14.701

package/src/api/RetailAPI/updateUserTask.ts

@@ -41,18 +41,23 @@ export type PaymentType = {
   value: string;
 };
 
+export type PaymentSystem = {
+  name: string;
+  type: string;
+};
+
 export type Participant = {
   birthDate?: string;
   id: number;
   midname?: string;
   name?: string;
   surname?: string;
-  profile?: {
+  profile: {
     id: number;
   };
   armyIdFlg?: boolean;
   birthPlace?: string;
-  childrenDependents?: number;
+  childrenDependents?: string;
   genderCd?: Option;
   dulIssueDate?: string;
   dulIssuedBy?: string;
@@ -63,13 +68,13 @@ export type Participant = {
   employeesNumberCd?: Option;
   employmentContractDate?: string;
   employmentTypeCd?: Option;
-  generalSeniority?: number;
+  generalSeniority?: string;
   homeMatchFlg?: boolean;
   houseTypeCd?: Option;
   incomeCertificateCd?: Option;
   initiateBankruptcyFlg?: boolean;
-  jobsNumber?: number;
-  lastWorkDuration?: number;
+  jobsNumber?: string;
+  lastWorkDuration?: string;
   maritalStatusCd?: Option;
   militaryStatusCd?: Option;
   organizationActivityTypeCd?: Option;
@@ -77,7 +82,7 @@ export type Participant = {
   organizationKindCd?: Option;
   organizationName?: string;
   organizationTypeCd?: Option;
-  otherDependents?: number;
+  otherDependents?: string;
   ownershipShare?: string;
   opf?: string;
   participantAddresses?: ParticipantAddress[];
@@ -89,14 +94,14 @@ export type Participant = {
   seniority?: string;
   seniorityInterruptionsFlg?: boolean;
   snils?: string;
-  totalDependents?: number;
+  totalDependents?: string;
   bankruptcyFlg?: boolean;
   shareholderFlg?: boolean;
   nameLegalEntity?: string;
   creditInRshbCd?: Option;
   participantContacts?: Array<{
     contactTypeCd: {
-      key: 'EMAIL' | 'MAIN_PHONE';
+      key: 'EMAIL' | 'MAIN_PHONE' | 'ORGANIZATION_PHONE';
     };
     value: string;
   }>;
@@ -105,7 +110,7 @@ export type Participant = {
     value: string;
   };
   currencyCode?: { key: string };
-  paymentSystemTypeCd?: string;
+  paymentSystemTypeCd?: PaymentSystem;
   classCard?: Option;
   codeWord?: string;
 };

package/src/components/ApplicationLeadForm/LeadFormState.ts

@@ -1,4 +1,4 @@
-import { type PaymentType } from '../../api/RetailAPI/updateUserTask';
+import { type PaymentSystem, type PaymentType } from '../../api/RetailAPI/updateUserTask';
 import { type Option } from '../../ui-kit/Select/Option';
 
 export interface FormConsents {
@@ -84,9 +84,9 @@ export interface LeadFormState extends FormConsents, FormStateDeliveryType {
   legalForm?: string;
   organizationName?: string;
   generalSeniority?: string;
-  lastJobExperience?: number;
-  experience5Years?: number;
-  jobsNumber?: number;
+  lastJobExperience?: string;
+  experience5Years?: string;
+  jobsNumber?: string;
   organizationAddress?: Address;
   beginDate?: Date | string;
   addressFact?: Address;
@@ -105,9 +105,9 @@ export interface LeadFormState extends FormConsents, FormStateDeliveryType {
   consentAssignmentClaimsFlg?: boolean;
   consentCollectionFlg?: boolean;
   familyStatus?: Option;
-  children?: number;
-  familyMembers?: number;
-  dependents?: number;
+  children?: string;
+  familyMembers?: string;
+  dependents?: string;
   totalIncome?: number;
   expenses?: number;
   snils?: string;
@@ -132,7 +132,7 @@ export interface LeadFormState extends FormConsents, FormStateDeliveryType {
   addressMatch?: boolean;
   confirmationIncome?: Option;
   currency?: string;
-  paymentSystem?: string;
+  paymentSystem?: PaymentSystem;
   cardCategory?: Option;
   codeWord?: string;
   esiaAccountTypeCd?: Option;

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -42,7 +42,7 @@ const initialFormState = {
   addressRegistration: '',
   participantDateRegistration: undefined,
   currency: '',
-  paymentSystem: '',
+  paymentSystem: { name: '', type: '' },
   cardCategory: { key: '', text: '' },
   codeWord: '',
   addressRetail: { key: '', text: '' },

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -1,12 +1,14 @@
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { createDraftTask } from '../../api/RetailAPI/createDraftTask';
 import { createUserProfile } from '../../api/RetailAPI/createUserProfile';
+import { getLastTaskStatus } from '../../api/RetailAPI/getLastTaskStatus';
+import { getTaskById } from '../../api/RetailAPI/getTaskById';
 import { updateUserProfile } from '../../api/RetailAPI/updateUserProfile';
 import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
 import { getUpdateUserProfileData } from '../../api/RetailAPI/utils/getUpdateUserProfile';
-import { useSetter } from '../../hooks/useSetter';
 import { useConsentBkiDialog } from '../../ui-kit/ConsentBkiDialog/useConsentBkiDialog';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
+import { useDraftDialog } from '../../ui-kit/DraftDialog/useDraftDialog';
 import { useEsiaLoginDialog } from '../../ui-kit/EsiaLoginDialog/useEsiaLoginDialog';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { VerifyPhoneDialog } from '../../ui-kit/VerifyPhoneDialog/VerifyPhoneDialog';
@@ -17,7 +19,7 @@ import { type FieldDef } from './ApplicationLeadFormContent';
 import { CONSENTS } from './consents';
 import { getLeadFormTaskData } from './getLeadFormTaskData';
 import { type LeadFormState } from './LeadFormState';
-import { useLeadFormStore } from './useLeadFormStore';
+import { useSaveUserData, type UserData } from './useSaveUserData';
 
 interface ApplicationLeadApiProps {
   inputs: FieldDef[];
@@ -25,37 +27,19 @@ interface ApplicationLeadApiProps {
   nextStepLink: string;
 }
 
-interface UserData {
-  participantId: number;
-  taskId: number;
-  profileId: number;
-  programId: string;
-}
-
 export const useApplicationLeadApi = ({
   inputs,
   programId,
   nextStepLink,
 }: ApplicationLeadApiProps) => {
   const [responseStatus, setResponseStatus] = useState<'OK' | 'Fail' | ''>('');
-  const leadFormStore = useLeadFormStore();
-  const saveForm = useSetter(leadFormStore, 'leadForm');
+  const saveUserData = useSaveUserData();
 
   const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
   const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
+  const draftDialog = useDraftDialog();
 
-  const saveUserData = useCallback(
-    ({ participantId, taskId, profileId, programId: programNumber }: UserData) => {
-      leadFormStore.participantId = participantId;
-      leadFormStore.taskId = taskId;
-      leadFormStore.profileId = profileId;
-      leadFormStore.programId = programNumber;
-    },
-    [],
-  );
-
-  // eslint-disable-next-line consistent-return
   const handleSubmit = useCallback(async (formData: LeadFormState) => {
     const feedbackValidator = objectValidator(getObjectValidator(inputs));
     if (!isValidationSuccess(feedbackValidator(formData))) {
@@ -68,17 +52,34 @@ export const useApplicationLeadApi = ({
       });
 
       if (profileId && formData?.phone) {
+        const sendCurrentTask = async () => {
+          await updateUserData({
+            programId,
+            profileId,
+            formData,
+            saveUserData,
+          });
+          verifyPhoneDialog.close();
+          consentBkiDialog.open(formData.phone, profileId);
+        };
         const handleSuccessVerify = async () => {
           try {
-            await updateUserData({
-              programId,
+            const lastTaskId = await getLastTaskStatus({
               profileId,
-              formData,
-              saveUserData,
-              saveForm,
+              programId,
             });
-            verifyPhoneDialog.close();
-            consentBkiDialog.open(formData.phone, profileId);
+
+            if (lastTaskId) {
+              const task = await getTaskById({ taskId: lastTaskId });
+              verifyPhoneDialog.close();
+              draftDialog.open({
+                task,
+                isFromLead: true,
+                onClose: sendCurrentTask,
+              });
+            } else {
+              await sendCurrentTask();
+            }
           } catch {
             setResponseStatus('Fail');
           }
@@ -110,13 +111,11 @@ const updateUserData = async ({
   profileId,
   formData,
   saveUserData,
-  saveForm,
 }: {
   programId: string;
   profileId: number;
   formData: LeadFormState;
   saveUserData: (userData: UserData) => void;
-  saveForm: (formData: LeadFormState) => void;
 }) => {
   const transformedForm = transformOtherConsentsField(formData);
 
@@ -140,8 +139,7 @@ const updateUserData = async ({
     console.log(ex);
   }
 
-  saveUserData({ participantId, taskId, profileId, programId });
-  saveForm(formData);
+  saveUserData({ participantId, taskId, profileId, programId, formData });
 };
 
 const transformOtherConsentsField = (formData: LeadFormState): LeadFormState => {

package/src/components/ApplicationLeadForm/useSaveUserData.ts

@@ -0,0 +1,29 @@
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useSetter } from '../../hooks/useSetter';
+import { type LeadFormState } from './LeadFormState';
+import { useLeadFormStore } from './useLeadFormStore';
+
+export interface UserData {
+  participantId: number;
+  taskId: number;
+  profileId: number;
+  programId: string;
+  formData: LeadFormState;
+}
+export const useSaveUserData = () => {
+  const leadFormStore = useLeadFormStore();
+  const saveForm = useSetter(leadFormStore, 'leadForm');
+
+  const saveUserData = useCallback(
+    ({ participantId, taskId, profileId, formData, programId: programNumber }: UserData) => {
+      leadFormStore.participantId = participantId;
+      leadFormStore.taskId = taskId;
+      leadFormStore.profileId = profileId;
+      leadFormStore.programId = programNumber;
+      saveForm(formData);
+    },
+    [],
+  );
+
+  return saveUserData;
+};

package/src/components/CreditCardForm/formStateMap.tsx

@@ -2,7 +2,7 @@ import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
 export const formStateMap: Partial<LeadFormState>[] = [
   {
-    paymentSystem: '',
+    paymentSystem: { name: '', type: '' },
     currency: '810',
     codeWord: '',
   },

package/src/components/GrantSupport/GrantSupport.tsx

@@ -26,7 +26,7 @@ export const GrantSupport = UniBlock<GrantSupportProps>(
 
     return (
       <BlockWrapper className={className} defaultPadding="p-6xl" {...rest}>
-        <div className="container max-w-[978px] space-y-m">
+        <div className="container space-y-m">
           {title ? <Heading headingType="h3" title={title} className="@xl:text-center" /> : null}
           {regions ? (
             <SelectControl

package/src/ui-kit/ApplicationFormLayout/ApplicationFormLayout.tsx

@@ -11,7 +11,7 @@ export const ApplicationFormLayout = JSX<ApplicationFormProps>((props) => {
 
   return (
     <BlockWrapper className={className} defaultPadding="p-6xl" {...rest}>
-      <div className="container max-w-[978px] space-y-lg">
+      <div className="container space-y-lg">
         {title ? <Heading headingType="h3" title={title} className="@xl:text-center" /> : null}
         {children}
       </div>

package/src/ui-kit/DraftDialog/DraftActionButton.tsx

@@ -0,0 +1,32 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { noop } from '../../utils/noop';
+import { Heading } from '../Heading/Heading';
+import { Img } from '../Img/Img';
+import { Paragraph } from '../Paragraph/Paragraph';
+
+export interface DraftActionButtonProps {
+  title: string;
+  icon: string;
+  description?: string;
+  onClick?: () => void;
+}
+
+export const DraftActionButton = JSX<DraftActionButtonProps>(
+  ({ title, icon, description, onClick = noop }) => (
+    <button
+      className="flex gap-lg items-center border border-gray rounded-md cursor-pointer p-4 hover:border-green"
+      type="button"
+      onClick={onClick}
+    >
+      <Img image={{ src: icon }} width="78" height="78" />
+      <div>
+        <Heading className="text-left" title={title} headingType="h5" />
+        {description ? (
+          <Paragraph color="text-secondary-text" size="text-m">
+            {description}
+          </Paragraph>
+        ) : null}
+      </div>
+    </button>
+  ),
+);

package/src/ui-kit/DraftDialog/DraftDialog.tsx

@@ -0,0 +1,91 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type Task } from '../../api/RetailAPI/draftTasksKZO';
+import { useLeadFormStore } from '../../components/ApplicationLeadForm/useLeadFormStore';
+import { locationNavigator } from '../../external/locationNavigator';
+import { useSetter } from '../../hooks/useSetter';
+import { noop } from '../../utils/noop';
+import { Button } from '../Button/Button';
+import { Dialog } from '../DialogManager/Dialog';
+import { Heading } from '../Heading/Heading';
+import { DraftActionButton } from './DraftActionButton';
+import { parseDraftTask } from './parseDraftTask';
+import { creditCodesToProgrammIdMap, creditProgramCodeToProductIdMap } from './utils';
+
+export interface DraftDialogProps {
+  task: Task;
+  isFromLead?: boolean;
+  onClose?: () => void;
+}
+
+export const DraftDialog = JSX<DraftDialogProps>(function ({
+  task,
+  isFromLead = false,
+  onClose = noop,
+}) {
+  const leadFormStore = useLeadFormStore();
+  const saveForm = useSetter(leadFormStore, 'leadForm');
+  const navigator = locationNavigator();
+
+  const { participants, creditProgram, id: taskId } = task;
+
+  const programmId: string = creditProgramCodeToProductIdMap[creditProgram.code];
+  const isCredit = Boolean(creditCodesToProgrammIdMap[creditProgram.code]);
+  const nextStepLink = isCredit ? '/credit-lead' : '/credit-card-lead';
+
+  const { name, midname, id: participantId, profile } = participants[0];
+
+  const handleGoToDraft = useCallback(() => {
+    const taskFromDraft = parseDraftTask(task);
+    leadFormStore.participantId = participantId;
+    leadFormStore.taskId = taskId;
+    leadFormStore.profileId = profile?.id;
+    leadFormStore.programId = programmId;
+    saveForm(taskFromDraft);
+    navigator.assign(nextStepLink);
+  }, []);
+
+  const handleGoToNewTask = useCallback(() => {
+    navigator.assign(isCredit ? '/natural/loans/all-goals' : '/natural/creditcards/svoya');
+  }, []);
+
+  const handleGoToMainPage = useCallback(() => {
+    navigator.assign('/');
+  }, []);
+
+  const appeal = name && midname ? `${name} ${midname}, ` : '';
+
+  return (
+    <Dialog
+      className="my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg py-0 px-5xl"
+      onClose={onClose}
+    >
+      <div className="flex flex-col gap-lg">
+        <Heading
+          className="whitespace-pre-wrap"
+          title={`${appeal}мы нашли черновик вашей заявки.\nПродолжите заполнение?`}
+          headingType="h5"
+        />
+        <DraftActionButton
+          title="Перейти к черновику"
+          icon="api/v1/wcms-file-storage/72d06937-5d8b-4996-9503-52389b93919e/file.svg"
+          description="Продолжайте заполнять заявку из черновика"
+          onClick={handleGoToDraft}
+        />
+        <DraftActionButton
+          title={isFromLead ? 'Продолжить заполнение текущей заявки' : 'Заполнить новую заявку'}
+          icon="api/v1/wcms-file-storage/796c3e8d-341a-480b-b52f-3aa5784ed623/file.svg"
+          onClick={isFromLead ? onClose : handleGoToNewTask}
+        />
+        <Button
+          type="button"
+          version="secondary"
+          className="w-full text-h5"
+          onClick={handleGoToMainPage}
+        >
+          Вернуться на главную
+        </Button>
+      </div>
+    </Dialog>
+  );
+});

package/src/ui-kit/DraftDialog/EmptyDraftDialog.tsx

@@ -0,0 +1,47 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { locationNavigator } from '../../external/locationNavigator';
+import { noop } from '../../utils/noop';
+import { Button } from '../Button/Button';
+import { Dialog } from '../DialogManager/Dialog';
+import { Heading } from '../Heading/Heading';
+import { Paragraph } from '../Paragraph/Paragraph';
+
+export interface EmptyDraftDialogProps {
+  onClose?: () => void;
+}
+
+export const EmptyDraftDialog = JSX<EmptyDraftDialogProps>(function ({ onClose = noop }) {
+  const navigator = locationNavigator();
+
+  const handleGoNewTask = useCallback(() => {
+    navigator.assign('/natural/loans/all-goals');
+  }, []);
+
+  const handleGoMainPage = useCallback(() => {
+    navigator.assign('/');
+  }, []);
+
+  return (
+    <Dialog
+      className="my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg py-0 px-5xl"
+      onClose={onClose}
+    >
+      <div className="flex flex-col gap-lg">
+        <Heading className="text-center" title="Заявки не найдены" headingType="h3" />
+        <Paragraph size="text-l" align="text-center">
+          По данному номеру не найдено незавершенных заявок. Вы можете заполнить новую заявку или
+          вернуться на главную страницу
+        </Paragraph>
+
+        <Button type="button" className="w-full" onClick={handleGoNewTask}>
+          Заполнить новую заявку
+        </Button>
+
+        <Button type="button" version="secondary" className="w-full" onClick={handleGoMainPage}>
+          Вернуться на главную
+        </Button>
+      </div>
+    </Dialog>
+  );
+});

package/src/ui-kit/DraftDialog/parseDraftTask.ts

@@ -0,0 +1,123 @@
+/* eslint-disable max-lines-per-function */
+import { type Task } from '../../api/RetailAPI/draftTasksKZO';
+import { type LeadFormState } from '../../components/ApplicationLeadForm/LeadFormState';
+import {
+  getParticipantAddresses,
+  getParticipantContacts,
+  getParticipantGender,
+  getParticipantIncomes,
+  getSelectValue,
+} from './utils';
+
+export const parseDraftTask = (task: Task): LeadFormState => {
+  const participant = task.participants[0];
+
+  const { loanAmount: moneyValue, creditPeriod: monthsValue, paymentTypeCd } = task;
+
+  const {
+    currencyCode: currency,
+    paymentSystemTypeCd: paymentSystem,
+    classCard: cardCategory,
+    codeWord,
+    birthDate: limitedBirthday,
+    midname: middleName,
+    name,
+    surname,
+    birthPlace,
+    dulIssueDate: dulIssueDateField,
+    dulIssuedBy,
+    dulNumber,
+    dulSerie,
+    dulSubdivisionCode,
+    educationLevelCd: education,
+    registrationDate: participantDateRegistration,
+    houseTypeCd: housing,
+    genderCd,
+    participantContacts = [],
+    participantAddresses = [],
+    employmentContractDate: beginDate,
+    employmentTypeCd: employment,
+    organizationName,
+    organizationInn: inn,
+    organizationActivityTypeCd: employerActivities,
+    organizationTypeCd: organization,
+    organizationKindCd: employerOrganization,
+    employeesNumberCd: amountWorkers,
+    opf: legalForm,
+    seniority: generalSeniority,
+    generalSeniority: experience5Years,
+    jobsNumber,
+    lastWorkDuration: lastJobExperience,
+    positionCd: positionOrganization,
+    maritalStatusCd: familyStatus,
+    childrenDependents: children,
+    totalDependents: familyMembers,
+    otherDependents: dependents,
+    militaryStatusCd: conscription,
+    participantIncomes,
+    snils,
+    armyIdFlg,
+    bankruptcyFlg,
+    shareholderFlg,
+    nameLegalEntity: legalEntityName,
+    creditInRshbCd,
+    payrollCardRshbFlg: isInsurance,
+    consentInsuranceFlg: isSalaryClient,
+  } = participant;
+
+  return {
+    currency: currency?.key,
+    paymentSystem,
+    cardCategory: getSelectValue(cardCategory),
+    codeWord,
+    limitedBirthday,
+    middleName,
+    name,
+    surname,
+    birthPlace,
+    dulIssueDateField,
+    dulIssuedBy,
+    dulNumber,
+    dulSerie,
+    dulSubdivisionCode,
+    education: getSelectValue(education),
+    participantDateRegistration,
+    housing: getSelectValue(housing),
+    beginDate,
+    employment: getSelectValue(employment),
+    organizationName,
+    inn,
+    employerActivities: getSelectValue(employerActivities),
+    organization: getSelectValue(organization),
+    employerOrganization: getSelectValue(employerOrganization),
+    amountWorkers: getSelectValue(amountWorkers),
+    legalForm,
+    generalSeniority: generalSeniority?.toString(),
+    experience5Years: experience5Years?.toString(),
+    jobsNumber: jobsNumber?.toString(),
+    lastJobExperience: lastJobExperience?.toString(),
+    positionOrganization: getSelectValue(positionOrganization),
+    familyStatus: getSelectValue(familyStatus),
+    children: children?.toString(),
+    familyMembers: familyMembers?.toString(),
+    dependents: dependents?.toString(),
+    conscription: getSelectValue(conscription),
+    snils,
+    armyIdFlg,
+    bankruptcyFlg,
+    shareholderFlg,
+    legalEntityName,
+    creditInRshbCd: getSelectValue(creditInRshbCd),
+    calculator: {
+      isInsurance,
+      isSalaryClient,
+      moneyValue,
+      monthsValue,
+      isAnnuity: paymentTypeCd?.key === 'ANNUITY',
+    },
+    ...getParticipantIncomes(participantIncomes),
+    ...getParticipantAddresses(participantAddresses),
+    ...getParticipantContacts(participantContacts),
+    ...getParticipantGender(genderCd),
+  };
+};

package/src/ui-kit/DraftDialog/useDraftDialog.tsx

@@ -0,0 +1,21 @@
+import { type Task } from '../../api/RetailAPI/draftTasksKZO';
+import { useDialog } from '../DialogManager/useDialog';
+import { DraftDialog } from './DraftDialog';
+import { EmptyDraftDialog } from './EmptyDraftDialog';
+
+type useDraftDialogOpenProps = {
+  task?: Task;
+  isFromLead?: boolean;
+  onClose?: () => void;
+};
+
+export const useDraftDialog = () => {
+  const { open: openDraftDialog } = useDialog(DraftDialog);
+  const { open: openEmptyDraftDialog } = useDialog(EmptyDraftDialog);
+
+  return {
+    open: ({ task, isFromLead, onClose }: useDraftDialogOpenProps) => {
+      task ? openDraftDialog({ task, isFromLead, onClose }) : openEmptyDraftDialog({});
+    },
+  };
+};