@redneckz/wildless-cms-uni-blocks 0.14.951 → 0.14.952

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

@@ -6,16 +6,17 @@ import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
 
 export const parseEsiaProfile = async (
   esiaProfile: EsiaRequestProfileResponse,
-  isDebit: boolean,
+  isDebit = false,
+  isNewMicroservice = false,
 ): Promise<LeadFormState> => {
   checkEsiaData(esiaProfile);
-  const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile);
+  const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile, isNewMicroservice);
 
   const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } =
     esiaProfile;
   let files: File[] = [];
 
-  if (isFullEsiaData) {
+  if (isFullEsiaData && !isNewMicroservice) {
     files = await saveDocuments(esiaAdditionalDocument);
   }
 
@@ -176,8 +177,19 @@ const checkEsiaData = (esiaProfile: EsiaRequestProfileResponse) => {
   }
 };
 
-const checkEsiaAdditionalDocument = (esiaProfile: EsiaRequestProfileResponse) => {
+const checkEsiaAdditionalDocument = (
+  esiaProfile: EsiaRequestProfileResponse,
+  isNewMicroservice: boolean,
+) => {
   const { esiaAdditionalDocument } = esiaProfile;
+  const documents = [
+    esiaAdditionalDocument?.pdfFilePayout,
+    esiaAdditionalDocument?.pdfFileWorkbook,
+    esiaAdditionalDocument?.pdfFileSigPayout,
+    esiaAdditionalDocument?.xmlFilePayout,
+    esiaAdditionalDocument?.xmlFileSigPayout,
+    esiaAdditionalDocument?.xmlFileWorkbook,
+  ];
 
   const data = [
     esiaAdditionalDocument?.inn,
@@ -187,13 +199,7 @@ const checkEsiaAdditionalDocument = (esiaProfile: EsiaRequestProfileResponse) =>
     esiaAdditionalDocument?.workLength?.toString(),
     esiaAdditionalDocument?.workLengthLastJob?.toString(),
     esiaAdditionalDocument?.jobsNumberInFiveYears?.toString(),
-    esiaAdditionalDocument?.pdfFilePayout,
-    esiaAdditionalDocument?.pdfFileWorkbook,
-    esiaAdditionalDocument?.pdfFileSigPayout,
-    esiaAdditionalDocument?.xmlFilePayout,
-    esiaAdditionalDocument?.xmlFileSigPayout,
-    esiaAdditionalDocument?.xmlFileWorkbook,
   ];
 
-  return data.every(Boolean);
+  return data.every(Boolean) && (isNewMicroservice || documents.every(Boolean));
 };

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

@@ -5,6 +5,7 @@ import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { locationNavigator } from '../../external/locationNavigator';
 import { type AspectsProps } from '../../model/AspectsProps';
 import { createDraftTask } from '../../retail/api/createDraftTask';
+import { createParticipant } from '../../retail/api/createParticipant';
 import { createUserProfile } from '../../retail/api/createUserProfile';
 import { createUserTaskDebit } from '../../retail/api/createUserTaskDebit';
 import { getLastTaskStatus } from '../../retail/api/getLastTaskStatus';
@@ -33,6 +34,7 @@ interface ApplicationLeadApiProps extends AspectsProps {
   nextStepLink: string;
   productType: ProductType;
   changeSubmitFormStatus: (status?: boolean) => void;
+  isNewMicroservice: boolean;
 }
 
 // eslint-disable-next-line max-lines-per-function
@@ -42,6 +44,7 @@ export const useApplicationLeadApi = ({
   productType,
   data,
   changeSubmitFormStatus,
+  isNewMicroservice,
 }: ApplicationLeadApiProps) => {
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
   const saveUserData = useSaveUserData();
@@ -63,7 +66,7 @@ export const useApplicationLeadApi = ({
     changeSubmitFormStatus(false);
   };
 
-  const handleSubmit = useCallback(async (formData: LeadFormState) => {
+  const handleSubmitOldMicroservice = useCallback(async (formData: LeadFormState) => {
     try {
       startSending();
       const transformedFormData = transformFormData(formData);
@@ -93,7 +96,11 @@ export const useApplicationLeadApi = ({
         if (productType === 'debitCard') {
           goToNextStep();
         } else {
-          consentBkiDialog.open(transformedFormData.phone, profileId, handleFailSendForm);
+          consentBkiDialog.open({
+            phone: transformedFormData.phone,
+            profileId,
+            onFail: handleFailSendForm,
+          });
         }
       };
       const handleSuccessVerify = async () => {
@@ -133,7 +140,70 @@ export const useApplicationLeadApi = ({
     }
   }, []);
 
-  return { isSending, handleSubmit };
+  const handleSubmitNewMicroservice = useCallback(async (formData: LeadFormState) => {
+    try {
+      startSending();
+      const transformedFormData = transformFormData(formData);
+      const participantId = await createParticipant({
+        phone: formatPhone(transformedFormData.phone as string),
+        email: transformedFormData.email as string,
+      });
+
+      const referalData = leadFormStore.referalData;
+      const marketingInfo = sessionStore.marketingInfo;
+
+      if (!participantId) {
+        throw new Error();
+      }
+
+      const sendCurrentTask = async () => {
+        const taskId = await updateUserDataNewMicroservice({
+          programId,
+          participantId,
+          formData: transformedFormData,
+          referalData,
+          productType,
+          marketingInfo,
+          saveUserData,
+          sendAspects,
+        });
+        verifyPhoneDialog.close();
+
+        consentBkiDialog.open({
+          phone: transformedFormData.phone,
+          taskId,
+          participantId,
+          onFail: handleFailSendForm,
+        });
+      };
+
+      const handleSuccessVerify = async () => {
+        try {
+          await sendCurrentTask();
+        } catch {
+          handleFailSendForm();
+        }
+      };
+
+      const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
+
+      verifyPhoneDialog.open({
+        phone: transformedFormData.phone as string,
+        consents: acceptedConsents,
+        onSuccess: handleSuccessVerify,
+        onFail: handleFailSendForm,
+      });
+    } catch {
+      handleFailSendForm();
+    } finally {
+      endSending();
+    }
+  }, []);
+
+  return {
+    isSending,
+    handleSubmit: isNewMicroservice ? handleSubmitNewMicroservice : handleSubmitOldMicroservice,
+  };
 };
 
 const getAcceptedConsents = (formData: LeadFormState, productType: ProductType): string[] => {
@@ -209,6 +279,62 @@ const updateUserData = async ({
   }
 };
 
+const updateUserDataNewMicroservice = async ({
+  programId,
+  participantId,
+  formData,
+  referalData,
+  productType,
+  marketingInfo,
+  saveUserData,
+  sendAspects,
+}: {
+  programId: string;
+  participantId: number;
+  formData: LeadFormState;
+  referalData: ReferalData | null;
+  productType: ProductType;
+  marketingInfo: MarketingInfo | null;
+  saveUserData: (userData: UserData) => void;
+  sendAspects: (profileId: number, taskId: number) => void;
+}): Promise<number> => {
+  let taskId: number;
+  const transformedConsents = transformConsentsFields(formData, productType);
+
+  try {
+    const creditData = await createDraftTask({
+      participantId,
+      programId,
+    });
+    taskId = creditData.taskId;
+
+    await updateUserTask(
+      getCreditLeadFormTaskData({
+        participantId,
+        taskId,
+        formData,
+        marketingInfo,
+        consents: transformedConsents,
+      }),
+    );
+
+    if (referalData?.referalCode) {
+      await saveReferalInfo({
+        taskId,
+        ...referalData,
+      });
+    }
+
+    sendAspects(participantId, taskId);
+    saveUserData({ participantId, taskId, programId, formData });
+
+    return taskId;
+  } catch (ex) {
+    console.log(ex);
+    throw new Error();
+  }
+};
+
 const transformConsentsFields = (
   formData: LeadFormState,
   productType: ProductType,

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

@@ -19,10 +19,12 @@ type InitApplicationLeadProps = {
   productType: ProductType;
   setEsiaStatus: (status: EsiaStatuses) => void;
   esiaAuthSuccess: boolean;
+  isNewMicroservice: boolean;
 };
 
 export interface ApplicationLeadStore {
   marketingInfo: MarketingInfo | null;
+  isNewMicroservice: boolean | null;
 }
 
 export const useInitApplicationLead = ({
@@ -30,6 +32,7 @@ export const useInitApplicationLead = ({
   productType,
   setEsiaStatus,
   esiaAuthSuccess,
+  isNewMicroservice,
 }: InitApplicationLeadProps): LeadFormState => {
   const leadFormStore = useLeadFormStore();
   const saveForm = useSetter(leadFormStore, 'leadForm');
@@ -53,7 +56,11 @@ export const useInitApplicationLead = ({
       });
 
       if (data) {
-        const parsedData = await parseEsiaProfile(data, productType === 'debitCard');
+        const parsedData = await parseEsiaProfile(
+          data,
+          productType === 'debitCard',
+          isNewMicroservice,
+        );
 
         saveForm((_) => ({
           ..._,
@@ -70,6 +77,7 @@ export const useInitApplicationLead = ({
     leadFormStore.productType = productType;
 
     sessionStore.marketingInfo = getMarketingInfo(queryFromStorage, sessionStore);
+    sessionStore.isNewMicroservice = isNewMicroservice || null;
   }, [queryFromStorage]);
 
   useEffect(() => {

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

@@ -1,12 +1,13 @@
 import { useLocalStore } from '@redneckz/uni-jsx/lib/Store/useLocalStore';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type ReferalData } from '../../retail/model/ReferalData';
+import { type Nullable } from '../../utils/Nullable';
 import { type ProductType } from './ApplicationLeadFormContent';
 
 export interface LeadFormStoreSlice {
   leadForm: LeadFormState;
   taskId: number;
-  profileId: number;
+  profileId: Nullable<number>;
   participantId: number;
   programId: string;
   productType: ProductType;

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

@@ -1,11 +1,12 @@
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
+import { type Nullable } from '../../utils/Nullable';
 import { useLeadFormStore } from './useLeadFormStore';
 
 export interface UserData {
   participantId: number;
   taskId: number;
-  profileId: number;
+  profileId?: Nullable<number>;
   programId: string;
   formData: LeadFormState;
 }

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

@@ -3,8 +3,10 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useInterval } from '../../hooks/useInterval';
 import { type VNode } from '../../model/VNode';
 import { getTaskStatus, STATUS_TYPE } from '../../retail/api/getTaskStatus';
+import { sendMessage, type MessageName } from '../../retail/api/sendMessage';
 import { sendSignalToProcess, type SignalType } from '../../retail/api/sendSignalToProcess';
 import { useRetailFormStore } from '../../retail/hooks/useRetailFormStore';
+import { checkNewMicroservice } from '../../retail/utils/checkNewMicroservice';
 import { FailedStatusContent } from './FailedStatusContent';
 import { PendingStatusContent } from './PendingStatusContent';
 import { ReworkStatusContent } from './ReworkStatusContent';
@@ -14,14 +16,26 @@ const SIGNAL_TYPES: SignalType[] = [
   'CREATE_APPLICATION_LOAN_V3_SIGNAL',
 ];
 
+const MESSAGE_NAMES: MessageName[] = [
+  'CREATE_APPLICATION_SHORT_MESSAGE',
+  // 'CREATE_APPLICATION_LOAN_MESSAGE',
+];
+
 export const CreditFormStatusTracker = JSX(() => {
+  const isNewMicroservice = checkNewMicroservice();
   const [status, setStatus] = useState(STATUS_TYPE.process);
   const { taskId } = useRetailFormStore();
 
   useEffect(() => {
     (async () => {
-      for (const signalType of SIGNAL_TYPES) {
-        await sendSignalToProcess({ signalType, taskId });
+      if (isNewMicroservice) {
+        for (const messageName of MESSAGE_NAMES) {
+          await sendMessage({ messageName, taskId });
+        }
+      } else {
+        for (const signalType of SIGNAL_TYPES) {
+          await sendSignalToProcess({ signalType, taskId });
+        }
       }
     })();
   }, [taskId]);

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

@@ -55,7 +55,7 @@ export const useCreditFormAPI = ({
 
       try {
         const { taskId, profileId, participantId } = retailFormStore;
-        if (taskId && profileId && participantId) {
+        if (taskId) {
           const response = await updateUserTask(
             getCreditFormTaskData({
               participantId,

package/mobile/src/components/Footer/Footer.tsx

@@ -53,11 +53,9 @@ export const Footer = UniBlock<FooterProps>(({ className, footer, ...rest }) =>
               {_?.title}
             </SocialMedia>
           ))}
-          <div className="flex gap-m xl:gap-xs flex-wrap">
-            {otherLinks.map((_, i) => (
-              <Link key={`${_.href}_${i}`} className="text-s font-light" {..._} />
-            ))}
-          </div>
+          {otherLinks.map((_, i) => (
+            <Link key={`${_.href}_${i}`} className="text-s font-light" {..._} />
+          ))}
         </div>
       </div>
       <HorizontalNavigation title={horizontalNavigationTitle} links={relatedEnterprises} />

package/mobile/src/components/Header/DropdownMenu.tsx

@@ -13,7 +13,7 @@ export interface DropdownMenuProps extends ComponentType {
   activeItem?: LinkProps;
   ariaLabel?: string;
   renderDropdownItem?: ({ item, i, activeItem, handlers }: renderDropdownItemProps) => void;
-  handlers?: Record<string, (ev: PreventableEventWithTarget) => void>;
+  handlers?: Record<string, (ev?: PreventableEventWithTarget) => void>;
   onItemClick?: () => void;
 }
 
@@ -21,7 +21,7 @@ export type renderDropdownItemProps = {
   item?: LinkProps;
   i?: number;
   activeItem?: LinkProps;
-  handlers?: Record<string, (ev: PreventableEventWithTarget) => void>;
+  handlers?: Record<string, (ev?: PreventableEventWithTarget) => void>;
   closeDropdown?: () => void;
 };
 

package/mobile/src/components/Header/HeaderQuickActionsMenu.tsx

@@ -83,15 +83,15 @@ const renderQuickActionsDropdown = ({
 }: renderDropdownItemProps) => {
   const quickActionsMapping = {
     call: {
-      handler: (ev: PreventableEventWithTarget) => {
-        handlers?.call(ev);
+      handler: () => {
+        handlers?.call();
         closeDropdown();
       },
       text: 'Заказать звонок',
     },
     chat: {
-      handler: (ev: PreventableEventWithTarget) => {
-        handlers?.chat(ev);
+      handler: () => {
+        handlers?.chat();
         closeDropdown();
       },
       text: 'Написать в чат',
@@ -117,14 +117,12 @@ export const useHandlers = () => {
   const handleCallClick = useCallback(() => {
     phoneCallRequestDialog.open({ onClose: () => phoneCallRequestDialog.close() });
   }, []);
-  const aspects = useAspects();
 
-  const handleChatClick = useCallback((ev: PreventableEventWithTarget) => {
-    console.log('chat click');
+  const aspects = useAspects();
 
+  const handleChatClick = useCallback((ev?: PreventableEventWithTarget) => {
     const openChatBot = aspects[CHAT_BOT_ASPECT_NAME];
-    console.log(openChatBot);
-    if (openChatBot) {
+    if (openChatBot && ev) {
       openChatBot(ev).finally();
     }
   }, []);

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

@@ -1,6 +1,8 @@
 import { getCalcData } from '../../components/CreditForm/getCalcData';
+import { type Nullable } from '../../utils/Nullable';
 import { type Participant, type UpdateUserTaskBody } from '../api/updateUserTask';
 import { type LeadFormState } from '../model/LeadFormState';
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { getCalculatorData } from './getCalculatorData';
 import { getDeliveryCreditData } from './getDeliveryCreditData';
 import { getEmploymentData } from './getEmploymentData';
@@ -8,9 +10,9 @@ import { getFamilyStatusAndIncomeData } from './getFamilyStatusAndIncomeData';
 import { getPersonalInfoData } from './getPersonalInfoData';
 
 type getCreditFormTaskDataProps = {
-  participantId: number;
+  participantId: Nullable<number>;
   taskId: number;
-  profileId: number;
+  profileId: Nullable<number>;
   formData: LeadFormState;
   step?: number;
 };
@@ -21,33 +23,45 @@ export const getCreditFormTaskData = ({
   profileId,
   formData,
   step = 0,
-}: getCreditFormTaskDataProps): UpdateUserTaskBody => ({
-  sendToBank: true,
-  taskKind: 'UNITED',
-  task: {
-    id: taskId,
-    authorizedAgentId: formData?.bankEmployeeCode,
-    participants: [
-      {
-        id: participantId,
-        profile: {
-          id: profileId,
-        },
-        roleCd: {
-          key: 'BORROWER',
-          value: 'Заемщик',
-        },
-        ...getCurrentStepData(step, formData),
+}: getCreditFormTaskDataProps): UpdateUserTaskBody => {
+  const isNewMicroservice = checkNewMicroservice();
+
+  const participantInfo = {
+    id: participantId,
+    ...(!isNewMicroservice && {
+      profile: {
+        id: profileId,
       },
-    ],
-    ...getCalcData(formData),
-    ...getDeliveryCreditData(formData),
-    esiaAccountTypeCd: {
-      key: formData?.esiaAccountTypeCd?.key,
-    } as UpdateUserTaskBody['task']['esiaAccountTypeCd'],
-    files: formData?.files,
-  },
-});
+    }),
+    roleCd: {
+      key: 'BORROWER',
+      value: 'Заемщик',
+    },
+    ...getCurrentStepData(step, formData),
+  };
+
+  return {
+    sendToBank: true,
+    taskKind: 'UNITED',
+    task: {
+      id: taskId,
+      authorizedAgentId: formData?.bankEmployeeCode,
+      ...(isNewMicroservice
+        ? {
+            participant: participantInfo,
+          }
+        : {
+            participants: [participantInfo],
+          }),
+      ...getCalcData(formData),
+      ...getDeliveryCreditData(formData),
+      esiaAccountTypeCd: {
+        key: formData?.esiaAccountTypeCd?.key,
+      } as UpdateUserTaskBody['task']['esiaAccountTypeCd'],
+      files: formData?.files,
+    },
+  };
+};
 
 const getCurrentStepData = (step: number, formData: LeadFormState): Partial<Participant> => {
   switch (step) {

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

@@ -53,10 +53,10 @@ export const getParticipantAddresses = (fields: Record<string, Address | undefin
       return [
         ...acc,
         {
+          ...address,
           addressType: {
             key: fieldsNamesToAddressKeysMap[key],
           },
-          ...address,
         },
       ];
     }

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

@@ -1 +1,2 @@
-export const API_BASE_URI = '/light-api-cash/v1';
+export const RETAIL_API_BASE_URI = '/light-api-cash/v1';
+export const NEW_RETAIL_API_BASE_URI = '/api/credit-application';

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

@@ -1,10 +1,18 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { doRequest } from './doRequest';
 
 export type CapchaTextType = {
   captchaText: string;
+  phoneNumber?: string;
 };
 
-export const checkCaptcha = (body: CapchaTextType) =>
-  doRequest('/sms/checkCaptcha', 'POST', body)
+export const checkCaptcha = async (body: CapchaTextType) => {
+  const isNewMicroservice = checkNewMicroservice();
+
+  return await doRequest(`${isNewMicroservice ? '/user-data' : ''}/sms/checkCaptcha`, 'POST', {
+    captchaText: body.captchaText,
+    ...(isNewMicroservice && { phoneNumber: body?.phoneNumber }),
+  })
     .then((res) => res.text())
     .then((text) => text !== 'ERROR');
+};

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

@@ -1,3 +1,4 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { doRequest } from './doRequest';
 
 export type CheckCodeBody = {
@@ -5,6 +6,7 @@ export type CheckCodeBody = {
   smsCodesSetName: {
     key: 'AUTHENTICATION' | 'SEND_TASK';
   };
+  phoneNumber?: string;
 };
 
 export type CheckCodeResponse = {
@@ -13,5 +15,12 @@ export type CheckCodeResponse = {
   refresh_token: string;
 };
 
-export const checkCode = async (body: CheckCodeBody) =>
-  await doRequest('/sms/checkCode', 'POST', body);
+export const checkCode = async (body: CheckCodeBody) => {
+  const isNewMicroservice = checkNewMicroservice();
+
+  return await doRequest(`${isNewMicroservice ? '/user-data' : ''}/sms/checkCode`, 'POST', {
+    smsText: body.smsText,
+    smsCodesSetName: isNewMicroservice ? body.smsCodesSetName.key : body.smsCodesSetName,
+    ...(isNewMicroservice && { phoneNumber: body?.phoneNumber }),
+  });
+};

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

@@ -1,6 +1,13 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { doRequest } from './doRequest';
 
-export const createCaptcha = (phoneNumber: string) =>
-  doRequest(`/sms/createCaptcha?phoneNumber=${encodeURIComponent(phoneNumber)}`, 'GET').then(
-    async (res) => (res ? res.blob() : new Blob()),
-  );
+export const createCaptcha = async (phoneNumber: string) => {
+  const isNewMicroservice = checkNewMicroservice();
+
+  return await doRequest(
+    `${isNewMicroservice ? '/user-data' : ''}/sms/createCaptcha?phoneNumber=${encodeURIComponent(
+      phoneNumber,
+    )}`,
+    'GET',
+  ).then(async (res) => (res ? res.blob() : new Blob()));
+};

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

@@ -1,7 +1,8 @@
 import { fetchRetailJSON } from './doRequest';
 
 export type CreateDraftTaskBody = {
-  profileId: number;
+  profileId?: number;
+  participantId?: number;
   programId: string;
 };
 

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

@@ -0,0 +1,17 @@
+import { fetchRetailJSON } from './doRequest';
+
+interface CreateParticipantType {
+  phone: string;
+  email: string;
+}
+
+interface CreateParticipantResponseType {
+  participantId: number;
+}
+
+export const createParticipant = (body: CreateParticipantType) =>
+  fetchRetailJSON<CreateParticipantResponseType>(
+    '/public-data/createParticipant',
+    'POST',
+    body,
+  ).then((res) => res?.participantId || null);