@redneckz/wildless-cms-uni-blocks 0.14.704 → 0.14.706

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

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
-import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { CreditFormStatus } from './CreditFormStatus';
+import { type StatusInfoState } from './useCreditFormAPI';
 
 export const PendingStatusContent = JSX(
   ({ handleExpireTimer }: { handleExpireTimer: () => void }) => {
-    const [leadForm] = useLocalStorage<LeadFormState>('leadForm');
+    const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
 
     return (
       <CreditFormStatus
@@ -25,15 +25,15 @@ export const PendingStatusContent = JSX(
           },
           {
             label: 'Сумма',
-            description: `${leadForm?.calculator?.moneyValue?.toLocaleString() ?? '0'} ₽`,
+            description: `${statusInfo?.calculator?.moneyValue?.toLocaleString() ?? '0'} ₽`,
           },
           {
             label: 'Срок кредита',
-            description: `${leadForm?.calculator?.monthsValue ?? '0'} мес`,
+            description: `${statusInfo?.calculator?.monthsValue ?? '0'} мес`,
           },
           {
             label: 'Тип платежа',
-            description: leadForm?.calculator?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
+            description: statusInfo?.calculator?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
           },
         ]}
       />

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

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { CreditFormStatus } from './CreditFormStatus';
+import { type StatusInfoState } from './useCreditFormAPI';
 
 export const ReworkStatusContent = JSX(() => {
-  const [leadForm] = useLocalStorage<Record<string, any>>('leadForm');
+  const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
 
   return (
     <CreditFormStatus
@@ -13,11 +14,11 @@ export const ReworkStatusContent = JSX(() => {
       sectionInfoAdditional={[
         {
           label: 'Регион',
-          description: leadForm?.regionRetail?.text,
+          description: statusInfo?.regionRetail,
         },
         {
           label: 'Адрес',
-          description: leadForm?.addressRetail?.text,
+          description: statusInfo?.addressRetail,
         },
       ]}
       sectionInfo={[

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

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { CreditFormStatus } from './CreditFormStatus';
+import { type StatusInfoState } from './useCreditFormAPI';
 
 export const SuccessStatusContent = JSX(() => {
-  const [leadForm] = useLocalStorage<Record<string, any>>('leadForm');
+  const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
 
   return (
     <CreditFormStatus
@@ -24,11 +25,11 @@ export const SuccessStatusContent = JSX(() => {
         },
         {
           label: 'Срок кредита',
-          description: leadForm?.monthsValue + ' мес',
+          description: statusInfo?.calculator?.monthsValue + ' мес',
         },
         {
           label: 'Тип платежа',
-          description: leadForm?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
+          description: statusInfo?.calculator?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
         },
       ]}
       buttonText="Вернуться на главную"

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

@@ -76,7 +76,7 @@ export const formStateMap: Partial<LeadFormState>[] = [
     creditInRshbCd: undefined,
   },
   {
-    regionRetail: '',
+    regionRetail: { key: '', text: '' },
     addressRetail: undefined,
     bankEmployeeCode: undefined,
   },

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

@@ -17,6 +17,17 @@ type CreditFormApiProps = {
   finishForm?: (bool: boolean) => void;
 };
 
+export type StatusInfoState = {
+  regionRetail?: string;
+  addressRetail?: string;
+  cardCategory?: string;
+  calculator?: {
+    monthsValue?: number;
+    moneyValue?: number;
+    isAnnuity?: boolean;
+  };
+};
+
 export const useCreditFormAPI = ({
   step,
   inputs,
@@ -28,6 +39,8 @@ export const useCreditFormAPI = ({
   const [taskId] = useLocalStorage<number>('taskId');
   const [profileId] = useLocalStorage<number>('profileId');
   const [participantId] = useLocalStorage<number>('participantId');
+  const [, setStatusInfo] = useLocalStorage('statusInfo');
+  const [leadForm] = useLocalStorage<LeadFormState>('leadForm');
 
   const handleSubmit = useCallback(async (formData: LeadFormState) => {
     const feedbackValidator = objectValidator(
@@ -51,7 +64,7 @@ export const useCreditFormAPI = ({
             formData: formData as any,
           }),
         );
-        resetForm(isFinalStep, response);
+        resetForm({ isFinalStep, response, leadForm, setStatusInfo });
       }
     } catch (ex) {
       return 'Fail';
@@ -71,8 +84,34 @@ export const useCreditFormAPI = ({
   };
 };
 
-const resetForm = (isFinalStep: boolean, response: Response) => {
-  if (isFinalStep && response.ok) {
+const resetForm = ({
+  isFinalStep,
+  response,
+  leadForm,
+  setStatusInfo,
+}: {
+  isFinalStep: boolean;
+  response: Response;
+  leadForm: LeadFormState | null;
+  setStatusInfo: (statusInfo: StatusInfoState) => void;
+}) => {
+  if (isFinalStep && response.ok && leadForm !== null) {
+    const regionRetail = leadForm?.regionRetail?.text;
+    const addressRetail = leadForm?.addressRetail?.text;
+    const cardCategory = leadForm?.cardCategory?.text;
+    const calculator = {
+      monthsValue: leadForm?.calculator?.monthsValue,
+      moneyValue: leadForm?.calculator?.moneyValue,
+      isAnnuity: leadForm?.calculator?.isAnnuity,
+    };
+
+    setStatusInfo({
+      regionRetail,
+      addressRetail,
+      cardCategory,
+      calculator,
+    });
+
     globalThis.localStorage.removeItem('leadForm');
   }
 };

package/mobile/src/ui-kit/FormField/Fields/SnilsField.tsx

@@ -7,6 +7,7 @@ import { getValidation } from '../getValidation';
 export const SnilsField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputSnilsControl
     label="СНИЛС"
+    maxLength={14}
     {...getValidation(field('snils'), validatorObj.snils, input?.required)}
     {...input}
   />

package/mobile/src/ui-kit/Input/InputSnilsControl.tsx

@@ -16,6 +16,7 @@ export const InputSnilsControl = JSX<InputProps>(
         onChange={onChange}
         onBlur={onBlur}
         placeholder="___-___-___ __"
+        {...rest}
       />
       {renderErrorText(error)}
     </div>

package/mobile/src/ui-kit/SnilsInput/SnilsInput.tsx

@@ -4,9 +4,12 @@ import { normalizeWithMask } from '../../utils/normalizeWithMask';
 import { Input } from '../Input/Input';
 import { type InputProps } from '../Input/InputProps';
 
-export const SnilsInput = JSX<InputProps>(({ children, onChange, ...inputProps }) => {
+export const SnilsInput = JSX<InputProps>(({ children, onChange, maxLength, ...inputProps }) => {
   const handleChange = useCallback(
-    (v: string) => onChange && onChange(normalizeWithMask(v, '___-___-___ __')),
+    (v: string) =>
+      maxLength
+        ? v.length <= maxLength && onChange?.(normalizeWithMask(v, '___-___-___ __'))
+        : onChange?.(normalizeWithMask(v, '___-___-___ __')),
     [onChange],
   );
   const handleBlur = useCallback((v: string) => {

package/mobile/src/utils/normalizeWithMask.ts

@@ -1,6 +1,6 @@
 export function normalizeWithMask(value: string, pattern: string): string {
   const valueNumbers = value.replace(/\D/g, '');
-  if (valueNumbers === '' || value?.length === pattern.length) {
+  if (valueNumbers === '' || valueNumbers.length === pattern.length) {
     return value;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.704",
+  "version": "0.14.706",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/api/RetailAPI/sendCode.ts

@@ -21,4 +21,4 @@ const isErrorResult = (
 ): res is SendCodeErrorResult =>
   Boolean(res) &&
   typeof res !== 'string' &&
-  Boolean(res?.errorMessage.startsWith(`Too many request for phoneNumber [${phoneNumber}]`));
+  Boolean(res?.errorMessage?.startsWith(`Too many request for phoneNumber [${phoneNumber}]`));

package/src/components/ApplicationLeadForm/LeadFormState.ts

@@ -11,7 +11,7 @@ export interface FormConsents {
 }
 
 export type FormStateDeliveryType = {
-  regionRetail?: string;
+  regionRetail?: Option;
   bankEmployeeCode?: number;
   methodObtain?: 'office' | 'courier';
   deliveryDate?: Date | string;

package/src/components/CreditCardForm/PendingStatusContent.tsx

@@ -1,10 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
+import { type StatusInfoState } from './useCreditCardFormAPI';
 
 export const PendingStatusContent = JSX(
   ({ handleExpireTimer }: { handleExpireTimer: () => void }) => {
-    const [leadForm] = useLocalStorage<Record<string, any>>('leadForm');
+    const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
 
     return (
       <CreditCardFormStatus
@@ -20,7 +21,7 @@ export const PendingStatusContent = JSX(
           },
           {
             label: 'Категория',
-            description: leadForm?.cardCategory?.text,
+            description: statusInfo?.cardCategory,
           },
         ]}
       />

package/src/components/CreditCardForm/ReworkStatusContent.tsx

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
+import { type StatusInfoState } from './useCreditCardFormAPI';
 
 export const ReworkStatusContent = JSX(() => {
-  const [leadForm] = useLocalStorage<Record<string, any>>('leadForm');
+  const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
 
   return (
     <CreditCardFormStatus
@@ -13,11 +14,11 @@ export const ReworkStatusContent = JSX(() => {
       sectionInfoAdditional={[
         {
           label: 'Регион',
-          description: leadForm?.regionRetail?.text,
+          description: statusInfo?.regionRetail,
         },
         {
           label: 'Адрес',
-          description: leadForm?.addressRetail?.text,
+          description: statusInfo?.addressRetail,
         },
       ]}
       sectionInfo={[

package/src/components/CreditCardForm/SuccessStatusContent.tsx

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
+import { type StatusInfoState } from './useCreditCardFormAPI';
 
 export const SuccessStatusContent = JSX(() => {
-  const [leadForm] = useLocalStorage<Record<string, any>>('leadForm');
+  const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
 
   return (
     <CreditCardFormStatus
@@ -24,11 +25,11 @@ export const SuccessStatusContent = JSX(() => {
         },
         {
           label: 'Срок кредита',
-          description: leadForm?.monthsValue + ' мес',
+          description: statusInfo?.calculator?.monthsValue + ' мес',
         },
         {
           label: 'Тип платежа',
-          description: leadForm?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
+          description: statusInfo?.calculator?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
         },
       ]}
       buttonText="Вернуться на главную"

package/src/components/CreditCardForm/formStateMap.tsx

@@ -75,7 +75,7 @@ export const formStateMap: Partial<LeadFormState>[] = [
     creditInRshbCd: undefined,
   },
   {
-    regionRetail: '',
+    regionRetail: { key: '', text: '' },
     addressRetail: {
       key: '',
       text: '',

package/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -17,6 +17,17 @@ type CreditCardFormApiProps = {
   finishForm?: (bool: boolean) => void;
 };
 
+export type StatusInfoState = {
+  regionRetail?: string;
+  addressRetail?: string;
+  cardCategory?: string;
+  calculator?: {
+    monthsValue?: number;
+    moneyValue?: number;
+    isAnnuity?: boolean;
+  };
+};
+
 export const useCreditCardFormAPI = ({
   step,
   inputs,
@@ -28,6 +39,8 @@ export const useCreditCardFormAPI = ({
   const [taskId] = useLocalStorage<number>('taskId');
   const [profileId] = useLocalStorage<number>('profileId');
   const [participantId] = useLocalStorage<number>('participantId');
+  const [, setStatusInfo] = useLocalStorage('statusInfo');
+  const [leadForm] = useLocalStorage<LeadFormState>('leadForm');
 
   const handleSubmit = useCallback(async (formData: LeadFormState) => {
     const feedbackValidator = objectValidator(
@@ -51,7 +64,7 @@ export const useCreditCardFormAPI = ({
             formData: formData as any,
           }),
         );
-        resetForm(isFinalStep, response);
+        resetForm({ isFinalStep, response, leadForm, setStatusInfo });
       }
     } catch (ex) {
       return 'Fail';
@@ -71,8 +84,29 @@ export const useCreditCardFormAPI = ({
   };
 };
 
-const resetForm = (isFinalStep: boolean, response: Response) => {
-  if (isFinalStep && response.ok) {
+const resetForm = ({
+  isFinalStep,
+  response,
+  leadForm,
+  setStatusInfo,
+}: {
+  isFinalStep: boolean;
+  response: Response;
+  leadForm: LeadFormState | null;
+  setStatusInfo: (statusInfo: StatusInfoState) => void;
+}) => {
+  if (isFinalStep && response.ok && leadForm) {
+    const regionRetail = leadForm?.regionRetail?.text;
+    const addressRetail = leadForm?.addressRetail?.text;
+    const cardCategory = leadForm?.cardCategory?.text;
+    const calculator = {
+      monthsValue: leadForm?.calculator?.monthsValue,
+      moneyValue: leadForm?.calculator?.moneyValue,
+      isAnnuity: leadForm?.calculator?.isAnnuity,
+    };
+
+    setStatusInfo({ regionRetail, addressRetail, cardCategory, calculator });
+
     globalThis.localStorage.removeItem('leadForm');
   }
 };

package/src/components/CreditForm/PendingStatusContent.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
-import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { CreditFormStatus } from './CreditFormStatus';
+import { type StatusInfoState } from './useCreditFormAPI';
 
 export const PendingStatusContent = JSX(
   ({ handleExpireTimer }: { handleExpireTimer: () => void }) => {
-    const [leadForm] = useLocalStorage<LeadFormState>('leadForm');
+    const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
 
     return (
       <CreditFormStatus
@@ -25,15 +25,15 @@ export const PendingStatusContent = JSX(
           },
           {
             label: 'Сумма',
-            description: `${leadForm?.calculator?.moneyValue?.toLocaleString() ?? '0'} ₽`,
+            description: `${statusInfo?.calculator?.moneyValue?.toLocaleString() ?? '0'} ₽`,
           },
           {
             label: 'Срок кредита',
-            description: `${leadForm?.calculator?.monthsValue ?? '0'} мес`,
+            description: `${statusInfo?.calculator?.monthsValue ?? '0'} мес`,
           },
           {
             label: 'Тип платежа',
-            description: leadForm?.calculator?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
+            description: statusInfo?.calculator?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
           },
         ]}
       />

package/src/components/CreditForm/ReworkStatusContent.tsx

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { CreditFormStatus } from './CreditFormStatus';
+import { type StatusInfoState } from './useCreditFormAPI';
 
 export const ReworkStatusContent = JSX(() => {
-  const [leadForm] = useLocalStorage<Record<string, any>>('leadForm');
+  const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
 
   return (
     <CreditFormStatus
@@ -13,11 +14,11 @@ export const ReworkStatusContent = JSX(() => {
       sectionInfoAdditional={[
         {
           label: 'Регион',
-          description: leadForm?.regionRetail?.text,
+          description: statusInfo?.regionRetail,
         },
         {
           label: 'Адрес',
-          description: leadForm?.addressRetail?.text,
+          description: statusInfo?.addressRetail,
         },
       ]}
       sectionInfo={[

package/src/components/CreditForm/SuccessStatusContent.tsx

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { CreditFormStatus } from './CreditFormStatus';
+import { type StatusInfoState } from './useCreditFormAPI';
 
 export const SuccessStatusContent = JSX(() => {
-  const [leadForm] = useLocalStorage<Record<string, any>>('leadForm');
+  const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
 
   return (
     <CreditFormStatus
@@ -24,11 +25,11 @@ export const SuccessStatusContent = JSX(() => {
         },
         {
           label: 'Срок кредита',
-          description: leadForm?.monthsValue + ' мес',
+          description: statusInfo?.calculator?.monthsValue + ' мес',
         },
         {
           label: 'Тип платежа',
-          description: leadForm?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
+          description: statusInfo?.calculator?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
         },
       ]}
       buttonText="Вернуться на главную"

package/src/components/CreditForm/formStateMap.tsx

@@ -76,7 +76,7 @@ export const formStateMap: Partial<LeadFormState>[] = [
     creditInRshbCd: undefined,
   },
   {
-    regionRetail: '',
+    regionRetail: { key: '', text: '' },
     addressRetail: undefined,
     bankEmployeeCode: undefined,
   },

package/src/components/CreditForm/useCreditFormAPI.tsx

@@ -17,6 +17,17 @@ type CreditFormApiProps = {
   finishForm?: (bool: boolean) => void;
 };
 
+export type StatusInfoState = {
+  regionRetail?: string;
+  addressRetail?: string;
+  cardCategory?: string;
+  calculator?: {
+    monthsValue?: number;
+    moneyValue?: number;
+    isAnnuity?: boolean;
+  };
+};
+
 export const useCreditFormAPI = ({
   step,
   inputs,
@@ -28,6 +39,8 @@ export const useCreditFormAPI = ({
   const [taskId] = useLocalStorage<number>('taskId');
   const [profileId] = useLocalStorage<number>('profileId');
   const [participantId] = useLocalStorage<number>('participantId');
+  const [, setStatusInfo] = useLocalStorage('statusInfo');
+  const [leadForm] = useLocalStorage<LeadFormState>('leadForm');
 
   const handleSubmit = useCallback(async (formData: LeadFormState) => {
     const feedbackValidator = objectValidator(
@@ -51,7 +64,7 @@ export const useCreditFormAPI = ({
             formData: formData as any,
           }),
         );
-        resetForm(isFinalStep, response);
+        resetForm({ isFinalStep, response, leadForm, setStatusInfo });
       }
     } catch (ex) {
       return 'Fail';
@@ -71,8 +84,34 @@ export const useCreditFormAPI = ({
   };
 };
 
-const resetForm = (isFinalStep: boolean, response: Response) => {
-  if (isFinalStep && response.ok) {
+const resetForm = ({
+  isFinalStep,
+  response,
+  leadForm,
+  setStatusInfo,
+}: {
+  isFinalStep: boolean;
+  response: Response;
+  leadForm: LeadFormState | null;
+  setStatusInfo: (statusInfo: StatusInfoState) => void;
+}) => {
+  if (isFinalStep && response.ok && leadForm !== null) {
+    const regionRetail = leadForm?.regionRetail?.text;
+    const addressRetail = leadForm?.addressRetail?.text;
+    const cardCategory = leadForm?.cardCategory?.text;
+    const calculator = {
+      monthsValue: leadForm?.calculator?.monthsValue,
+      moneyValue: leadForm?.calculator?.moneyValue,
+      isAnnuity: leadForm?.calculator?.isAnnuity,
+    };
+
+    setStatusInfo({
+      regionRetail,
+      addressRetail,
+      cardCategory,
+      calculator,
+    });
+
     globalThis.localStorage.removeItem('leadForm');
   }
 };

package/src/ui-kit/FormField/Fields/SnilsField.tsx

@@ -7,6 +7,7 @@ import { getValidation } from '../getValidation';
 export const SnilsField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputSnilsControl
     label="СНИЛС"
+    maxLength={14}
     {...getValidation(field('snils'), validatorObj.snils, input?.required)}
     {...input}
   />

package/src/ui-kit/Input/InputSnilsControl.tsx

@@ -16,6 +16,7 @@ export const InputSnilsControl = JSX<InputProps>(
         onChange={onChange}
         onBlur={onBlur}
         placeholder="___-___-___ __"
+        {...rest}
       />
       {renderErrorText(error)}
     </div>

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

@@ -4,9 +4,12 @@ import { normalizeWithMask } from '../../utils/normalizeWithMask';
 import { Input } from '../Input/Input';
 import { type InputProps } from '../Input/InputProps';
 
-export const SnilsInput = JSX<InputProps>(({ children, onChange, ...inputProps }) => {
+export const SnilsInput = JSX<InputProps>(({ children, onChange, maxLength, ...inputProps }) => {
   const handleChange = useCallback(
-    (v: string) => onChange && onChange(normalizeWithMask(v, '___-___-___ __')),
+    (v: string) =>
+      maxLength
+        ? v.length <= maxLength && onChange?.(normalizeWithMask(v, '___-___-___ __'))
+        : onChange?.(normalizeWithMask(v, '___-___-___ __')),
     [onChange],
   );
   const handleBlur = useCallback((v: string) => {

package/src/utils/normalizeWithMask.ts

@@ -1,6 +1,6 @@
 export function normalizeWithMask(value: string, pattern: string): string {
   const valueNumbers = value.replace(/\D/g, '');
-  if (valueNumbers === '' || value?.length === pattern.length) {
+  if (valueNumbers === '' || valueNumbers.length === pattern.length) {
     return value;
   }