@redneckz/wildless-cms-uni-blocks 0.14.691 → 0.14.692

package/mobile/lib/ui-kit/FormField/Fields/InnField.js

@@ -4,8 +4,10 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl.js';
 import { validatorObj } from '../getObjectValidator.js';
 import { getValidation } from '../getValidation.js';
+import { getAddressFromDaDataItem } from './AddressField.js';
 export const InnField = JSX(({ field, input }) => {
     const onDaDataChange = useCallback((item) => {
+        field?.('organizationAddress')?.onChange?.(getAddressFromDaDataItem(item.data?.address));
         field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
         field?.('legalForm')?.onChange?.(item.data?.opf?.short);
     }, []);

package/mobile/lib/ui-kit/FormField/Fields/InnField.js.map

@@ -1 +1 @@
-{"version":3,"file":"InnField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/InnField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACjE,MAAM,cAAc,GAAG,WAAW,CAAC,CAAC,IAAsB,EAAE,EAAE;QAC5D,KAAK,EAAE,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACzE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,KAAC,YAAY,IACX,KAAK,EAAC,oBAAK,EACX,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,EAAE,KACT,KAAK,KACL,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,EAClE,cAAc,EAAE,cAAc,GAC9B,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"InnField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/InnField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACjE,MAAM,cAAc,GAAG,WAAW,CAAC,CAAC,IAAsB,EAAE,EAAE;QAC5D,KAAK,EAAE,CAAC,qBAAqB,CAAC,EAAE,QAAQ,EAAE,CACxC,wBAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,OAA2B,CAAC,CACjE,CAAC;QACF,KAAK,EAAE,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACzE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,KAAC,YAAY,IACX,KAAK,EAAC,oBAAK,EACX,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,EAAE,KACT,KAAK,KACL,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,EAClE,cAAc,EAAE,cAAc,GAC9B,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/src/api/dadataHints/dadataHintsType.ts

@@ -10,12 +10,14 @@ export interface DaDataSuggestion {
 
 type DaDataGender = 'MALE' | 'FEMALE' | 'UNKNOWN';
 
+type DaDataQC = '0' | '1';
+
 interface DaDataFio {
   surname: Nullable<string>;
   name: Nullable<string>;
   patronymic: Nullable<string>;
   gender: DaDataGender;
-  qc: '0' | '1';
+  qc: DaDataQC;
   source: null;
 }
 
@@ -30,6 +32,10 @@ interface DaDataPassportFms {
 }
 
 interface DaDataOrganization {
+  address: {
+    data: DaDataAddress;
+    value: string;
+  };
   inn: string;
   name: {
     short_with_opf: string;
@@ -52,6 +58,7 @@ export interface DaDataAddress {
   settlement_with_type: Nullable<string>;
   street: Nullable<string>;
   fias_code: string;
+  qc: DaDataQC;
   qc_complete: Nullable<string>;
   qc_house: Nullable<string>;
 }

package/mobile/src/components/CreditCardForm/getFourthStepData.ts

@@ -37,7 +37,7 @@ export const getFourthStepData = (formData: FormState): Partial<Participant> =>
       rentalIncome,
       retirementIncome,
     }),
-    snils: snils?.replaceAll(' ', ''),
+    snils: snils?.replaceAll(' ', '').replaceAll('-', ''),
     armyIdFlg,
   };
 };

package/mobile/src/components/CreditForm/getThirdStepData.ts

@@ -39,7 +39,7 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
       rentalIncome,
       retirementIncome,
     }),
-    snils: snils?.replaceAll(' ', ''),
+    snils: snils?.replaceAll(' ', '').replaceAll('-', ''),
     armyIdFlg,
   };
 };

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

@@ -71,7 +71,7 @@ export const ConsentBkiDialog = JSX<ConsentBkiDialogProps>(
             onChange={handleConfirmChange}
           />
           <Button disabled={!confirmStatus} type="button" onClick={handleSubmit}>
-            Продолжить
+            Далее
           </Button>
         </div>
       </Dialog>

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

@@ -1,7 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { getLink } from '../../api/RetailAPI/getLink';
+import { type FormState } from '../../components/ApplicationLeadForm/getInitialFormState';
 import { locationNavigator } from '../../external/locationNavigator';
+import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
 import { Img } from '../Img/Img';
@@ -12,6 +14,7 @@ export interface EsiaLoginDialogProps {
 
 export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
   const navigator = locationNavigator();
+  const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
   const handleAuth = useCallback(async () => {
     const resp = await getLink({
       redirectUri: navigator.href,
@@ -22,8 +25,17 @@ export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
     }
   }, []);
 
+  const handleClose = useCallback(() => {
+    if (leadForm !== null) {
+      const leadFormCopy = { ...leadForm };
+      Reflect.deleteProperty(leadFormCopy, 'esiaAccountTypeCd');
+      setLeadForm(leadFormCopy);
+    }
+    onClose?.();
+  }, []);
+
   return (
-    <Dialog className="my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg" onClose={onClose}>
+    <Dialog className="my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg" onClose={handleClose}>
       <div className="flex flex-col gap-lg items-center rounded-md">
         <div className="flex items-center justify-around w-full">
           <ul className="list-disc">
@@ -37,7 +49,7 @@ export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
           <Button type="button" onClick={handleAuth}>
             Заполнить через Госуслуги
           </Button>
-          <Button type="button" version="secondary" onClick={onClose}>
+          <Button type="button" version="secondary" onClick={handleClose}>
             Пропустить
           </Button>
         </div>

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

@@ -12,23 +12,7 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
   const fieldValue = field(fieldName).value;
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
-    field?.(fieldName)?.onChange?.({
-      apartment: item?.data?.flat,
-      city: item?.data?.city,
-      district: item?.data?.area_with_type,
-      fullAddress: item?.value,
-      fiasCode: item?.data?.fias_id,
-      house: item?.data?.house,
-      locality: item?.data?.settlement_with_type,
-      okatoRegionCode: item?.data?.okato,
-      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,
-      qc: item?.data?.qc,
-      qcComplete: item?.data?.qc_complete,
-      qcHouse: item?.data?.qc_house,
-    });
+    field?.(fieldName)?.onChange?.(getAddressFromDaDataItem(item));
   }, []);
 
   const onChange = useCallback((value: string) => {
@@ -63,3 +47,21 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
     />
   );
 });
+
+export const getAddressFromDaDataItem = (item?: DaDataSuggestion) => ({
+  apartment: item?.data?.flat,
+  city: item?.data?.city,
+  district: item?.data?.area_with_type,
+  fullAddress: item?.value,
+  fiasCode: item?.data?.fias_id,
+  house: item?.data?.house,
+  locality: item?.data?.settlement_with_type,
+  okatoRegionCode: item?.data?.okato,
+  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,
+  qc: item?.data?.qc,
+  qcComplete: item?.data?.qc_complete,
+  qcHouse: item?.data?.qc_house,
+});

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

@@ -5,7 +5,13 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const CURRENCY_TYPES: RadioButtonItem[] = [{ id: 'rub', text: 'Рубль' }];
+export enum CurrencyCode {
+  'rub' = '810',
+  'dollar' = '840',
+  'euro' = '978',
+}
+
+export const CURRENCY_TYPES: RadioButtonItem[] = [{ id: CurrencyCode.rub, text: 'Рубль' }];
 
 export const CurrencyField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value, onChange } = field('currency');

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

@@ -5,9 +5,13 @@ import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
+import { getAddressFromDaDataItem } from './AddressField';
 
 export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    field?.('organizationAddress')?.onChange?.(
+      getAddressFromDaDataItem(item.data?.address as DaDataSuggestion),
+    );
     field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
     field?.('legalForm')?.onChange?.(item.data?.opf?.short);
   }, []);

package/package.json

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

package/src/api/dadataHints/dadataHintsType.ts

@@ -10,12 +10,14 @@ export interface DaDataSuggestion {
 
 type DaDataGender = 'MALE' | 'FEMALE' | 'UNKNOWN';
 
+type DaDataQC = '0' | '1';
+
 interface DaDataFio {
   surname: Nullable<string>;
   name: Nullable<string>;
   patronymic: Nullable<string>;
   gender: DaDataGender;
-  qc: '0' | '1';
+  qc: DaDataQC;
   source: null;
 }
 
@@ -30,6 +32,10 @@ interface DaDataPassportFms {
 }
 
 interface DaDataOrganization {
+  address: {
+    data: DaDataAddress;
+    value: string;
+  };
   inn: string;
   name: {
     short_with_opf: string;
@@ -52,6 +58,7 @@ export interface DaDataAddress {
   settlement_with_type: Nullable<string>;
   street: Nullable<string>;
   fias_code: string;
+  qc: DaDataQC;
   qc_complete: Nullable<string>;
   qc_house: Nullable<string>;
 }

package/src/components/CreditCardForm/getFourthStepData.ts

@@ -37,7 +37,7 @@ export const getFourthStepData = (formData: FormState): Partial<Participant> =>
       rentalIncome,
       retirementIncome,
     }),
-    snils: snils?.replaceAll(' ', ''),
+    snils: snils?.replaceAll(' ', '').replaceAll('-', ''),
     armyIdFlg,
   };
 };

package/src/components/CreditForm/getThirdStepData.ts

@@ -39,7 +39,7 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
       rentalIncome,
       retirementIncome,
     }),
-    snils: snils?.replaceAll(' ', ''),
+    snils: snils?.replaceAll(' ', '').replaceAll('-', ''),
     armyIdFlg,
   };
 };

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

@@ -71,7 +71,7 @@ export const ConsentBkiDialog = JSX<ConsentBkiDialogProps>(
             onChange={handleConfirmChange}
           />
           <Button disabled={!confirmStatus} type="button" onClick={handleSubmit}>
-            Продолжить
+            Далее
           </Button>
         </div>
       </Dialog>

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

@@ -1,7 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { getLink } from '../../api/RetailAPI/getLink';
+import { type FormState } from '../../components/ApplicationLeadForm/getInitialFormState';
 import { locationNavigator } from '../../external/locationNavigator';
+import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
 import { Img } from '../Img/Img';
@@ -12,6 +14,7 @@ export interface EsiaLoginDialogProps {
 
 export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
   const navigator = locationNavigator();
+  const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
   const handleAuth = useCallback(async () => {
     const resp = await getLink({
       redirectUri: navigator.href,
@@ -22,8 +25,17 @@ export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
     }
   }, []);
 
+  const handleClose = useCallback(() => {
+    if (leadForm !== null) {
+      const leadFormCopy = { ...leadForm };
+      Reflect.deleteProperty(leadFormCopy, 'esiaAccountTypeCd');
+      setLeadForm(leadFormCopy);
+    }
+    onClose?.();
+  }, []);
+
   return (
-    <Dialog className="my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg" onClose={onClose}>
+    <Dialog className="my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg" onClose={handleClose}>
       <div className="flex flex-col gap-lg items-center rounded-md">
         <div className="flex items-center justify-around w-full">
           <ul className="list-disc">
@@ -37,7 +49,7 @@ export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
           <Button type="button" onClick={handleAuth}>
             Заполнить через Госуслуги
           </Button>
-          <Button type="button" version="secondary" onClick={onClose}>
+          <Button type="button" version="secondary" onClick={handleClose}>
             Пропустить
           </Button>
         </div>

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

@@ -12,23 +12,7 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
   const fieldValue = field(fieldName).value;
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
-    field?.(fieldName)?.onChange?.({
-      apartment: item?.data?.flat,
-      city: item?.data?.city,
-      district: item?.data?.area_with_type,
-      fullAddress: item?.value,
-      fiasCode: item?.data?.fias_id,
-      house: item?.data?.house,
-      locality: item?.data?.settlement_with_type,
-      okatoRegionCode: item?.data?.okato,
-      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,
-      qc: item?.data?.qc,
-      qcComplete: item?.data?.qc_complete,
-      qcHouse: item?.data?.qc_house,
-    });
+    field?.(fieldName)?.onChange?.(getAddressFromDaDataItem(item));
   }, []);
 
   const onChange = useCallback((value: string) => {
@@ -63,3 +47,21 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
     />
   );
 });
+
+export const getAddressFromDaDataItem = (item?: DaDataSuggestion) => ({
+  apartment: item?.data?.flat,
+  city: item?.data?.city,
+  district: item?.data?.area_with_type,
+  fullAddress: item?.value,
+  fiasCode: item?.data?.fias_id,
+  house: item?.data?.house,
+  locality: item?.data?.settlement_with_type,
+  okatoRegionCode: item?.data?.okato,
+  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,
+  qc: item?.data?.qc,
+  qcComplete: item?.data?.qc_complete,
+  qcHouse: item?.data?.qc_house,
+});

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

@@ -5,7 +5,13 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const CURRENCY_TYPES: RadioButtonItem[] = [{ id: 'rub', text: 'Рубль' }];
+export enum CurrencyCode {
+  'rub' = '810',
+  'dollar' = '840',
+  'euro' = '978',
+}
+
+export const CURRENCY_TYPES: RadioButtonItem[] = [{ id: CurrencyCode.rub, text: 'Рубль' }];
 
 export const CurrencyField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value, onChange } = field('currency');

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

@@ -5,9 +5,13 @@ import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
+import { getAddressFromDaDataItem } from './AddressField';
 
 export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    field?.('organizationAddress')?.onChange?.(
+      getAddressFromDaDataItem(item.data?.address as DaDataSuggestion),
+    );
     field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
     field?.('legalForm')?.onChange?.(item.data?.opf?.short);
   }, []);