@redneckz/wildless-cms-uni-blocks 0.14.705 → 0.14.707

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

@@ -52,7 +52,7 @@ export const getAddressFromDaDataItem = (item?: DaDataSuggestion) => ({
   apartment: item?.data?.flat,
   city: item?.data?.city,
   district: item?.data?.area_with_type,
-  fullAddress: item?.value,
+  fullAddress: item?.unrestricted_value,
   fiasCode: item?.data?.fias_id,
   house: item?.data?.house,
   locality: item?.data?.settlement_with_type,
@@ -60,7 +60,7 @@ export const getAddressFromDaDataItem = (item?: DaDataSuggestion) => ({
   postcode: item?.data?.postal_code,
   region: item?.data?.region,
   regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
-  street: item?.data?.house,
+  street: item?.data?.street,
   qc: item?.data?.qc,
   qcComplete: item?.data?.qc_complete,
   qcHouse: item?.data?.qc_house,

package/package.json

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

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/AddressField.tsx

@@ -52,7 +52,7 @@ export const getAddressFromDaDataItem = (item?: DaDataSuggestion) => ({
   apartment: item?.data?.flat,
   city: item?.data?.city,
   district: item?.data?.area_with_type,
-  fullAddress: item?.value,
+  fullAddress: item?.unrestricted_value,
   fiasCode: item?.data?.fias_id,
   house: item?.data?.house,
   locality: item?.data?.settlement_with_type,
@@ -60,7 +60,7 @@ export const getAddressFromDaDataItem = (item?: DaDataSuggestion) => ({
   postcode: item?.data?.postal_code,
   region: item?.data?.region,
   regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
-  street: item?.data?.house,
+  street: item?.data?.street,
   qc: item?.data?.qc,
   qcComplete: item?.data?.qc_complete,
   qcHouse: item?.data?.qc_house,