@redneckz/wildless-cms-uni-blocks 0.14.888 → 0.14.890

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -6,6 +6,7 @@ import { useAspects } from '../../hooks/useAspects/useAspects';
 import { useForm, type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 import { type SectionsProps } from '../../model/InputSectionsType';
+import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/VerifyPhoneDialog';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { getConsentDataProcessing } from '../../ui-kit/FormField/getConsentDataProcessing';
@@ -38,6 +39,7 @@ type renderSectionsType = {
 const API = LeadServiceAPI();
 
 export const ApplicationForm = UniBlock<ApplicationFormProps>(
+  // eslint-disable-next-line max-lines-per-function
   ({
     className,
     title,
@@ -66,14 +68,41 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
     const responseTypeDialog = useDialog(ResponseTypeDialog);
     const aspects = useAspects();
 
+    const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
+
     const handleSubmit = useCallback(
       async (formData: FormState, ev: PreventableEventWithTarget) => {
         const formatData = getFormatData({ ...formData, ...additionalParams });
-        const ok = Boolean(await API.send(formatData, router, endpoint === 'lead'));
 
-        responseTypeDialog.open({ ok, typeForm });
-        if (ok) {
-          handleAspects({ aspectsAttributes: data, aspects, ev });
+        if (endpoint === 'initcorporatelead') {
+          const { phone } = formatData;
+
+          const response = await API.sendCode({ phone: String(phone) });
+
+          if (!response) {
+            responseTypeDialog.open({ ok: Boolean(response), typeForm });
+
+            return;
+          }
+
+          verifyPhoneDialog.open({
+            phone,
+            withDescription: false,
+            formatData,
+            reqId: String(response),
+            isRetail: false,
+            onSuccess: () => {
+              verifyPhoneDialog.close();
+              responseTypeDialog.open({ ok: true, typeForm });
+            },
+          });
+        } else {
+          const ok = Boolean(await API.send(formatData, router, endpoint === 'lead'));
+
+          responseTypeDialog.open({ ok, typeForm });
+          if (ok) {
+            handleAspects({ aspectsAttributes: data, aspects, ev });
+          }
         }
       },
       [typeForm],

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -41,7 +41,7 @@ export type FieldDef = Required &
   };
 
 /** @hidden */
-export type EndpointType = 'lead' | 'sendcorporatelead';
+export type EndpointType = 'lead' | 'sendcorporatelead' | 'initcorporatelead';
 
 /**
  * @title Секция полей ввода

package/src/components/DebitForm/DebitFormProgress.tsx

@@ -1,5 +1,4 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { ProgressBar } from '../../ui-kit/ProgressBar/ProgressBar';
 
 export interface DebitFormProgressProps {
@@ -10,17 +9,13 @@ export interface DebitFormProgressProps {
 
 export const DebitFormProgress = JSX<DebitFormProgressProps>(
   ({ step = 1, totalSteps = 2, stepsTitles = [] }) => {
-    const progress = useMemo(() => (step / totalSteps) * 100, [step, totalSteps]);
+    const isFinalStep = step === totalSteps;
+    const progress = isFinalStep ? 100 : 85;
 
     return (
       <div className="py-lg px-5xl bg-white col-span-12">
-        <div>
-          <span className="font-bold mr-s">
-            Шаг {step} из {totalSteps}.
-          </span>
-          {stepsTitles[step] || null}
-          <ProgressBar step={progress} showPercentage={false} />
-        </div>
+        {stepsTitles[step] || null}
+        <ProgressBar step={progress} showPercentage={false} />
       </div>
     );
   },

package/src/components/DebitForm/PendingStatusContent.tsx

@@ -2,5 +2,5 @@ import { JSX } from '@redneckz/uni-jsx';
 import { DebitFormStatus } from './DebitFormStatus';
 
 export const PendingStatusContent = JSX(() => (
-  <DebitFormStatus title="Подождите немного" description="Банк проверяет вашу заявку" />
+  <DebitFormStatus title="Не закрывайте заявку" description="Идёт проверка данных" />
 ));

package/src/retail/api/checkCode.ts

@@ -1,10 +1,14 @@
+import { LeadServiceAPI, type LeadRequest } from '../../api/LeadServiceAPI';
 import { fetchRetailJSON } from './doRequest';
+const API = LeadServiceAPI();
 
 export type CheckCodeBody = {
   smsText: string;
   smsCodesSetName: {
     key: 'AUTHENTICATION' | 'SEND_TASK';
   };
+  reqId?: string;
+  body?: LeadRequest;
 };
 
 export type CheckCodeResponse = {
@@ -13,8 +17,32 @@ export type CheckCodeResponse = {
   refresh_token: string;
 };
 
-export const checkCode = async (body: CheckCodeBody) =>
-  fetchRetailJSON<CheckCodeResponse>('/sms/checkCode', 'POST', body).then(saveToken);
+type RetailBody = {
+  smsText: string;
+  smsCodesSetName: {
+    key: 'AUTHENTICATION' | 'SEND_TASK';
+  };
+};
+
+export type MainBody = {
+  code: string;
+  reqId: string;
+  body: LeadRequest;
+};
+
+type TransformedBody = RetailBody | MainBody;
+
+export const checkCode = async (body: CheckCodeBody, isRetail: boolean) => {
+  const transformedBody = transformBody(body, isRetail);
+
+  return isRetail
+    ? fetchRetailJSON<CheckCodeResponse>('/sms/checkCode', 'POST', transformedBody).then(saveToken)
+    : fetchMain(transformedBody as MainBody).then((res) => {
+        if (res === null) {
+          throw new Error('Неверный код');
+        }
+      });
+};
 
 export const saveToken = (data: CheckCodeResponse | null) => {
   if (data?.access_token && data?.refresh_token) {
@@ -22,3 +50,20 @@ export const saveToken = (data: CheckCodeResponse | null) => {
     globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
   }
 };
+
+const fetchMain = (body: MainBody) => API.checkCode(body);
+
+const transformBody = (
+  { smsText, smsCodesSetName, body, reqId }: CheckCodeBody,
+  isRetail: boolean,
+): TransformedBody => {
+  if (isRetail) {
+    return { smsText, smsCodesSetName };
+  }
+
+  if (!reqId || !body) {
+    throw new Error('Произошла ошибка, попробуйте позднее');
+  }
+
+  return { code: smsText, reqId, body };
+};

package/src/retail/api/sendCode.ts

@@ -1,4 +1,6 @@
+import { LeadServiceAPI } from '../../api/LeadServiceAPI';
 import { doRequest } from './doRequest';
+const API = LeadServiceAPI();
 
 export type SendCodeBody = {
   phoneNumber: string;
@@ -7,7 +9,13 @@ export type SendCodeBody = {
   };
 };
 
-export const sendCode = (body: SendCodeBody) =>
+export const sendCode = (body: SendCodeBody, isRetail: boolean) => {
+  return isRetail ? fetchRetail(body) : fetchMain(body);
+};
+
+const fetchRetail = (body: SendCodeBody) =>
   doRequest('/sms/sendCode', 'POST', body)
     .then((res) => res.text())
     .then((text) => text === 'OK');
+
+const fetchMain = (body: SendCodeBody) => API.sendCode({ phone: body.phoneNumber });

package/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx

@@ -1,8 +1,8 @@
 /* eslint-disable max-lines-per-function */
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-
 import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
+import { type LeadRequest } from '../../../api/LeadServiceAPI';
 import { Headline } from '../../../components/Headline/Headline';
 import type { OnCloseProps } from '../../../model/OnCloseProps';
 import { Button } from '../../../ui-kit/Button/Button';
@@ -32,10 +32,22 @@ export interface VerifyPhoneDialogProps extends OnCloseProps {
   withDescription?: boolean;
   consents?: string[];
   onSuccess?: (smsCode?: string) => void;
+  formatData?: LeadRequest;
+  reqId?: string;
+  isRetail?: boolean;
 }
 
 export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
-  ({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop }) => {
+  ({
+    phone,
+    withDescription = true,
+    consents,
+    onSuccess = noop,
+    onClose = noop,
+    formatData,
+    reqId,
+    isRetail = true,
+  }) => {
     const [values, setValues] = useState(Array(CODE_LENGTH).fill(''));
     const sessionStore = useSessionStore<SmsCodeStore>();
 
@@ -48,7 +60,13 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
       isSubmitButtonDisabled,
       setTimeNextReq,
       setErrorText,
-    } = useVerifyPhoneDialogSubmit({ values, onSuccess });
+    } = useVerifyPhoneDialogSubmit({
+      values,
+      onSuccess,
+      formatData,
+      reqId,
+      isRetail,
+    });
 
     const captchaDialog = useDialog(CaptchaDialog);
 
@@ -57,10 +75,13 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
     const restartTimer = useCountDownTimer({ seconds: timeNextReq, onTick: setTimeNextReq });
 
     const handleSendCode = useCallback(async () => {
-      const isSuccessSendCode = await sendCode({
-        phoneNumber,
-        smsCodesSetName: { key: 'AUTHENTICATION' },
-      });
+      const isSuccessSendCode = await sendCode(
+        {
+          phoneNumber,
+          smsCodesSetName: { key: 'AUTHENTICATION' },
+        },
+        isRetail,
+      );
 
       if (isSuccessSendCode) {
         setTimeNextReq(TIME_TO_RESEND);
@@ -76,7 +97,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
     }, [phoneNumber, restartTimer, onClose]);
 
     useEffect(() => {
-      if (!sessionStore.smsCode?.sendTime) {
+      if (!sessionStore.smsCode?.sendTime && isRetail) {
         handleSendCode();
       }
     }, []);

package/src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx

@@ -1,13 +1,18 @@
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
+import { type LeadRequest } from '../../../api/LeadServiceAPI';
 import { checkCode } from '../../api/checkCode';
 
 export const TIME_TO_RESEND = 180;
+export const TIME_TO_MAIN_EXPIRE = 600;
 
 type useVerifyPhoneDialogSubmitProps = {
   values: string[];
   onSuccess?: (smsCode?: string) => void;
+  formatData?: LeadRequest;
+  reqId?: string;
+  isRetail?: boolean;
 };
 
 export interface SmsCodeStore {
@@ -20,6 +25,9 @@ export interface SmsCodeStore {
 export const useVerifyPhoneDialogSubmit = ({
   values,
   onSuccess,
+  formatData,
+  reqId,
+  isRetail = true,
 }: useVerifyPhoneDialogSubmitProps) => {
   const sessionStore = useSessionStore<SmsCodeStore>();
   const attempts = sessionStore.smsCode?.attempts || 0;
@@ -41,10 +49,15 @@ export const useVerifyPhoneDialogSubmit = ({
         attempts: attempts + 1,
       };
       startLoading();
-      await checkCode({
-        smsText: values.join(''),
-        smsCodesSetName: { key: 'AUTHENTICATION' },
-      });
+      await checkCode(
+        {
+          smsText: values.join(''),
+          smsCodesSetName: { key: 'AUTHENTICATION' },
+          body: isRetail ? undefined : formatData,
+          reqId: isRetail ? undefined : reqId,
+        },
+        isRetail,
+      );
       setTimeNextReq(0);
       resetError();
       sessionStore.smsCode = null;
@@ -57,7 +70,7 @@ export const useVerifyPhoneDialogSubmit = ({
   }, [values, attempts]);
 
   useEffect(() => {
-    if (isTimeExpired) {
+    if (isTimeExpired && isRetail) {
       setErrorText('Код просрочен');
     } else if (attempts > 2) {
       setErrorText('Исчерпан лимит ввода смс-кода');

package/src/retail/utils/mockLocalStorage.ts

@@ -13,15 +13,21 @@ export const mockLocalStorage = async () => {
     globalThis.localStorage.getItem('profileId') ??
     (await createUserProfile({ profile: { phone: PHONE } }));
 
-  await sendCode({
-    phoneNumber: PHONE,
-    smsCodesSetName: { key: 'AUTHENTICATION' },
-  });
-
-  await checkCode({
-    smsCodesSetName: { key: 'AUTHENTICATION' },
-    smsText: '1234',
-  });
+  await sendCode(
+    {
+      phoneNumber: PHONE,
+      smsCodesSetName: { key: 'AUTHENTICATION' },
+    },
+    true,
+  );
+
+  await checkCode(
+    {
+      smsCodesSetName: { key: 'AUTHENTICATION' },
+      smsText: '1234',
+    },
+    true,
+  );
 
   const task = {
     taskId: globalThis.localStorage.getItem('taskId'),