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

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);
   }, []);