@redneckz/wildless-cms-uni-blocks 0.14.865 → 0.14.867

package/src/retail/api/checkCode.ts

@@ -17,7 +17,7 @@ export const checkCode = async (body: CheckCodeBody) =>
   fetchRetailJSON<CheckCodeResponse>('/sms/checkCode', 'POST', body).then(saveToken);
 
 export const saveToken = (data: CheckCodeResponse | null) => {
-  if (data) {
+  if (data?.access_token && data?.refresh_token) {
     globalThis.sessionStorage.setItem('accessToken', data.access_token);
     globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
   }

package/src/retail/api/createUserTaskDebit.ts

@@ -1,5 +1,6 @@
+import { type Nullable } from '../../utils/Nullable';
 import { fetchRetailJSON } from './doRequest';
-import { type Participant } from './updateUserTask';
+import { type MarketingInfo, type Participant } from './updateUserTask';
 
 export type CreateUserTaskDebitBody = {
   task: {
@@ -8,6 +9,7 @@ export type CreateUserTaskDebitBody = {
       code: string;
     };
     participants: Participant[];
+    marketingInfo?: Nullable<MarketingInfo>;
   };
 };
 

package/src/retail/api/updateUserTask.ts

@@ -125,13 +125,14 @@ export type MarketingInfo = {
   utm_source?: Nullable<string>;
   utm_content?: Nullable<string>;
   utm_term?: Nullable<string>;
+  bannerId?: Nullable<string>;
 };
 
 export type UpdateUserTaskBody = {
   sendToBank: boolean;
   taskKind: 'SHORT' | 'FULL' | 'UNITED';
   task: {
-    taskSource: string;
+    taskSource?: string;
     id: number;
     office?: {
       id: string;
@@ -149,7 +150,7 @@ export type UpdateUserTaskBody = {
     loanAmount?: number;
     creditPeriod?: number;
     paymentTypeCd?: PaymentType;
-    marketingInfo?: MarketingInfo;
+    marketingInfo?: Nullable<MarketingInfo>;
     files?: File[];
   };
 };

package/src/retail/api/updateUserTaskDebit.ts

@@ -4,7 +4,7 @@ import { type MarketingInfo, type Participant } from './updateUserTask';
 
 export type UpdateUserTaskDebitBody = {
   task: {
-    taskSource: string;
+    taskSource?: string;
     id: number;
     office?: {
       id: string;

package/src/retail/components/DraftDialog/DraftDialog.tsx

@@ -46,13 +46,12 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
   const { id: participantId, profile } = participants[0];
 
   const handleGoToDraft = useCallback(() => {
-    const [taskFromDraft, isTaskWithReferalCode] = parseDraftTask(task);
+    const taskFromDraft = parseDraftTask(task);
     retailFormStore.participantId = participantId ?? null;
     retailFormStore.taskId = taskId;
     retailFormStore.profileId = profile?.id ?? null;
     retailFormStore.programId = programmId;
     retailFormStore.leadForm = taskFromDraft;
-    retailFormStore.referalData = { isTaskWithReferalCode };
 
     if (profile?.id) {
       sendAspects(profile.id, taskId);

package/src/retail/components/DraftDialog/parseDraftTask.ts

@@ -11,14 +11,13 @@ import {
   INCOME_CERTIFICATE,
 } from './utils';
 
-export const parseDraftTask = (task: Task): [LeadFormState, boolean] => {
+export const parseDraftTask = (task: Task): LeadFormState => {
   const participant = task.participants[0];
   const {
     classCard: cardCategory,
     codeWord,
     paymentSystemTypeCd: paymentSystem,
     currencyCode: currency,
-    taskSource,
   } = task;
 
   const { loanAmount: moneyValue, creditPeriod: monthsValue, paymentTypeCd } = task;
@@ -72,7 +71,7 @@ export const parseDraftTask = (task: Task): [LeadFormState, boolean] => {
     profile,
   } = participant;
 
-  const taskFromDraft = {
+  return {
     currency: currency?.key,
     paymentSystem: getSelectValue(paymentSystem),
     cardCategory: getSelectValue(cardCategory),
@@ -129,6 +128,4 @@ export const parseDraftTask = (task: Task): [LeadFormState, boolean] => {
     ...getParticipantContacts(participantContacts),
     ...getParticipantGender(genderCd),
   };
-
-  return [taskFromDraft, taskSource === 'ReferalSF'];
 };

package/src/retail/components/Fields/DaDataInnField.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
-import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { useRetailFormStore, type CreditFormStoreSlice } from '../../hooks/useRetailFormStore';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
@@ -19,11 +19,7 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
   }, []);
 
   useEffect(() => {
-    if (
-      !esiaAccountTypeCd ||
-      !inn ||
-      !(employerActivities && employerOrganization && organization && amountWorkers)
-    ) {
+    if (!esiaAccountTypeCd || !inn || !isDictionariesAlreadyLoad(store as CreditFormStoreSlice)) {
       return;
     }
     (async () => {
@@ -46,3 +42,15 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
     />
   );
 });
+
+const isDictionariesAlreadyLoad = (store: CreditFormStoreSlice) => {
+  const { employerActivities, employerOrganization, organization, amountWorkers, productType } =
+    store;
+
+  return [
+    employerOrganization,
+    organization,
+    amountWorkers,
+    productType === 'creditCard' ? employerActivities : true,
+  ].every(Boolean);
+};

package/src/retail/components/Fields/InitiateBankruptcyFlgField.tsx

@@ -0,0 +1,10 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { CheckboxWithError } from '../../../ui-kit/Checkbox/CheckboxWithError';
+import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+
+export const InitiateBankruptcyFlgField = JSX<CustomFieldProps>(({ field, input }) => (
+  <CheckboxWithError
+    text="Я планирую в ближайшее время инициировать дело о банкротстве в отношении себя"
+    {...field(input?.name ?? '')}
+  />
+));

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

@@ -2,6 +2,7 @@
 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 { Headline } from '../../../components/Headline/Headline';
 import type { OnCloseProps } from '../../../model/OnCloseProps';
 import { Button } from '../../../ui-kit/Button/Button';
@@ -20,26 +21,27 @@ import { InputCode } from './InputCode';
 import { SubmitButton } from './SubmitButton';
 import { useVerifyPhoneDialogSubmit } from './useVerifyPhoneDialogSubmit';
 
+export const TIME_TO_RESEND = 180;
+const CODE_LENGTH = 4;
+
 export interface VerifyPhoneDialogProps extends OnCloseProps {
   phone: string;
-  code?: boolean;
   withDescription?: boolean;
-  codeLength?: number;
   consents?: string[];
   onSuccess?: (smsCode?: string) => void;
 }
 
+export interface SmsCodeStore {
+  smsCode: {
+    sendTime?: number;
+    attempts?: number;
+  };
+}
+
 export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
-  ({
-    phone,
-    code = true,
-    withDescription = true,
-    codeLength = 4,
-    consents,
-    onSuccess = noop,
-    onClose = noop,
-  }) => {
-    const [values, setValues] = useState(Array(codeLength).fill(''));
+  ({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop }) => {
+    const [values, setValues] = useState(Array(CODE_LENGTH).fill(''));
+    const sessionStore = useSessionStore<SmsCodeStore>();
 
     const {
       handleSubmit,
@@ -49,8 +51,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
       timeNextReq,
       isSubmitButtonDisabled,
       setTimeNextReq,
-      setIsTimerStarted,
-      setAttempts,
+      setErrorText,
     } = useVerifyPhoneDialogSubmit({ values, onSuccess });
 
     const captchaDialog = useDialog(CaptchaDialog);
@@ -66,17 +67,22 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
       });
 
       if (isSuccessSendCode) {
-        setAttempts(0);
-        setTimeNextReq(180);
-        restartTimer(180);
-        setIsTimerStarted(true);
+        setTimeNextReq(TIME_TO_RESEND);
+        restartTimer(TIME_TO_RESEND);
+        setErrorText('');
+        sessionStore.smsCode = {
+          sendTime: Date.now(),
+          attempts: 0,
+        };
       } else {
         captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
       }
     }, [phoneNumber, restartTimer, onClose]);
 
     useEffect(() => {
-      handleSendCode();
+      if (!sessionStore.smsCode?.sendTime) {
+        handleSendCode();
+      }
     }, []);
 
     return (
@@ -93,14 +99,12 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
             isEmbedded={true}
             as="h6"
           />
-          {code ? (
-            <InputCode
-              values={values}
-              setValues={setValues}
-              errorText={errorText}
-              hasError={hasError}
-            />
-          ) : null}
+          <InputCode
+            values={values}
+            setValues={setValues}
+            errorText={errorText}
+            hasError={hasError}
+          />
           {renderText(timeNextReq, handleSendCode)}
 
           {withDescription ? (

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

@@ -1,6 +1,8 @@
 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 { checkCode } from '../../api/checkCode';
+import { TIME_TO_RESEND, type SmsCodeStore } from './VerifyPhoneDialog';
 
 type useVerifyPhoneDialogSubmitProps = {
   values: string[];
@@ -11,28 +13,33 @@ export const useVerifyPhoneDialogSubmit = ({
   values,
   onSuccess,
 }: useVerifyPhoneDialogSubmitProps) => {
+  const sessionStore = useSessionStore<SmsCodeStore>();
+  const attempts = sessionStore.smsCode?.attempts || 0;
+  const timer = Math.max(getTimer(sessionStore.smsCode?.sendTime || Date.now()), 0);
+
   const [errorText, setErrorText] = useState('');
   const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
-  const [timeNextReq, setTimeNextReq] = useState(0);
-  const [isTimerStarted, setIsTimerStarted] = useState(false);
-  const [attempts, setAttempts] = useState(0);
+  const [timeNextReq, setTimeNextReq] = useState(timer);
 
   const resetError = useCallback(() => setErrorText(''), []);
 
-  const isTimeExpired = Boolean(timeNextReq === 0 && isTimerStarted);
+  const isTimeExpired = Boolean(timeNextReq === 0 && sessionStore.smsCode?.sendTime);
   const isSubmitButtonDisabled = attempts > 2 || isTimeExpired || !values.every(Boolean);
 
   const handleSubmit = useCallback(async () => {
     try {
-      setIsTimerStarted(false);
-      setTimeNextReq(0);
-      setAttempts((_) => _ + 1);
+      sessionStore.smsCode = {
+        ...sessionStore.smsCode,
+        attempts: attempts + 1,
+      };
       startLoading();
       await checkCode({
         smsText: values.join(''),
         smsCodesSetName: { key: 'AUTHENTICATION' },
       });
+      setTimeNextReq(0);
       resetError();
+      sessionStore.smsCode = null;
       await onSuccess?.(values.join(''));
     } catch {
       setErrorText(attempts > 1 ? 'Исчерпан лимит ввода смс-кода' : 'Неверный код');
@@ -42,7 +49,11 @@ export const useVerifyPhoneDialogSubmit = ({
   }, [values, attempts]);
 
   useEffect(() => {
-    setErrorText(isTimeExpired ? 'Код просрочен' : '');
+    if (isTimeExpired) {
+      setErrorText('Код просрочен');
+    } else if (attempts > 2) {
+      setErrorText('Исчерпан лимит ввода смс-кода');
+    }
   }, [isTimeExpired]);
 
   return {
@@ -53,7 +64,8 @@ export const useVerifyPhoneDialogSubmit = ({
     timeNextReq,
     isSubmitButtonDisabled,
     setTimeNextReq,
-    setIsTimerStarted,
-    setAttempts,
+    setErrorText,
   };
 };
+
+const getTimer = (sendTime: number) => TIME_TO_RESEND - Math.floor((Date.now() - sendTime) / 1000);