@redneckz/wildless-cms-uni-blocks 0.14.596 → 0.14.598

package/mobile/bundle/api/dadataHints/hintsListsOptions.d.ts

@@ -1,27 +1,4 @@
-export declare const NAME_HINTS_LIST_OPTIONS: {
-    url: string;
-    requestData: {
-        parts: string[];
-        gender: string;
-    };
-};
-export declare const SURNAME_HINTS_LIST_OPTIONS: {
-    url: string;
-    requestData: {
-        parts: string[];
-        gender: string;
-    };
-};
-export declare const PATRONYMIC_HINTS_LIST_OPTIONS: {
-    url: string;
-    requestData: {
-        parts: string[];
-        gender: string;
-    };
-};
-export declare const EMAIL_HINTS_LIST_OPTIONS: {
-    url: string;
-};
+import { type DaDataSuggestion } from './dadataHintsType';
 export declare type HintsListOptions = Record<string, HintOption>;
 export declare const hintsListsOptions: HintsListOptions;
 export declare type HintOption = {
@@ -30,4 +7,5 @@ export declare type HintOption = {
         parts?: string[];
         gender?: string;
     };
+    responseItemHandler?: (item?: DaDataSuggestion) => string;
 };

package/mobile/bundle/bundle.umd.js

@@ -1221,15 +1221,22 @@
     const defaultStyle$1 = 'w-full border rounded-md text-primary-text outline-none p-m';
 
     const DEFAULT_HINTS_COUNT = 10;
-    const getResponseHandler = (response) => {
+    const defaultResponseItemHandler = (item) => item?.value || '';
+    const getResponseHandler = (itemHandler) => (response) => {
         const responseData = response?.suggestions || [];
-        return responseData.map((item) => ({
-            ...item,
-            processedValue: item?.value,
-        }));
+        return responseData.map((item) => {
+            const value = itemHandler(item);
+            return {
+                ...item,
+                processedValue: value,
+            };
+        });
     };
     const getDaDataHints = (options) => {
-        const { url, query, requestData = {} } = options;
+        const { url, query, queryPrefix, requestData = {}, responseItemHandler = defaultResponseItemHandler, } = options;
+        const responseHandler = getResponseHandler(responseItemHandler);
+        const queryPrefixValue = queryPrefix ? `${queryPrefix}, ` : '';
+        const combinedQuery = `${queryPrefixValue}${query}`;
         const result = fetch(`/api/v1/suggestions/${url}`, {
             method: 'POST',
             mode: 'cors',
@@ -1239,11 +1246,11 @@
             body: JSON.stringify({
                 count: DEFAULT_HINTS_COUNT,
                 ...requestData,
-                query,
+                query: combinedQuery,
             }),
         })
             .then((response) => response.json())
-            .then(getResponseHandler);
+            .then(responseHandler);
         return result;
     };
 
@@ -1271,11 +1278,33 @@
     const EMAIL_HINTS_LIST_OPTIONS = {
         url: 'suggest/email',
     };
+    const PASSPORT_FMS_HINTS_LIST_OPTIONS = {
+        url: 'suggest/fms_unit',
+    };
+    const PASSPORT_CODE_HINTS_LIST_OPTIONS = {
+        url: 'suggest/fms_unit',
+        responseItemHandler: (item) => item?.data?.code?.replace('-', '') || '',
+    };
+    const ORGANIZATION_NAME_HINTS_LIST_OPTIONS = {
+        url: 'suggest/party',
+    };
+    const ORGANIZATION_INN_HINTS_LIST_OPTIONS = {
+        url: 'suggest/party',
+        responseItemHandler: (item) => item?.data?.inn || '',
+    };
+    const ADDRESS_HINTS_LIST_OPTIONS = {
+        url: 'suggest/address',
+    };
     const hintsListsOptions = {
         name: NAME_HINTS_LIST_OPTIONS,
         surname: SURNAME_HINTS_LIST_OPTIONS,
         middleName: PATRONYMIC_HINTS_LIST_OPTIONS,
         email: EMAIL_HINTS_LIST_OPTIONS,
+        dulSubdivisionCode: PASSPORT_CODE_HINTS_LIST_OPTIONS,
+        dulIssuedBy: PASSPORT_FMS_HINTS_LIST_OPTIONS,
+        organizationName: ORGANIZATION_NAME_HINTS_LIST_OPTIONS,
+        inn: ORGANIZATION_INN_HINTS_LIST_OPTIONS,
+        participantAddress: ADDRESS_HINTS_LIST_OPTIONS,
     };
 
     const debounce = (fn, delay = 600) => {
@@ -1300,9 +1329,9 @@
         close: () => defaultEventBus.emitter.fire('popup', { type: 'close' }),
     });
 
-    const InputPopup = JSX(({ options, onChange }) => (jsx("div", { className: "bg-white text-l max-h-64 overflow-y-auto overflow-x-hidden rounded-md shadow-2xl", role: "list", children: options?.map((item, key) => (jsx("div", { className: "flex px-m py-s cursor-pointer hover:bg-main-divider pr-5xl relative", role: "listitem", onMouseDown: () => onChange(item.processedValue), children: jsx("span", { className: "min-h-6", children: item.processedValue }) }, key.toString()))) })));
+    const InputPopup = JSX(({ options, onChange }) => (jsx("div", { className: "bg-white text-l max-h-64 overflow-y-auto overflow-x-hidden rounded-md shadow-2xl", role: "list", children: options?.map((item, key) => (jsx("div", { className: "flex px-m py-s cursor-pointer hover:bg-main-divider pr-5xl relative", role: "listitem", onMouseDown: () => onChange(item), children: jsx("span", { className: "min-h-6", children: item.processedValue }) }, key.toString()))) })));
 
-    function useInputPopup({ isOpen, value, name, onChange }) {
+    function useInputPopup({ isOpen, value, name, onChange, onDaDataChange, daDataQueryPrefix, }) {
         const prevInputValue = useRef(value);
         const currentInputValue = useRef(value);
         const [hintsList, setHintsList] = useState([]);
@@ -1314,8 +1343,9 @@
         }, [value]);
         const handleChange = useCallback((option) => {
             close();
-            currentInputValue.current = option;
-            onChange && onChange(option);
+            currentInputValue.current = option.processedValue;
+            onChange && onChange(option.processedValue);
+            onDaDataChange && onDaDataChange(option);
         }, [close, onChange]);
         const inputRef = useRef(null);
         const getHintsList = useMemo(() => async (searchValue) => {
@@ -1324,15 +1354,17 @@
             }
             const result = await getDaDataHints({
                 url: defaultHintsListOptions.url,
+                responseItemHandler: defaultHintsListOptions.responseItemHandler,
                 requestData: {
                     ...defaultHintsListOptions?.requestData,
                 },
                 query: searchValue,
+                queryPrefix: daDataQueryPrefix,
             });
             if (result?.length) {
                 setHintsList(result);
             }
-        }, []);
+        }, [daDataQueryPrefix]);
         const debouncedGetHintsList = useMemo(() => debounce(getHintsList, 300), [getHintsList]);
         useEffect(() => {
             if (!isOpen || !inputRef.current || currentInputValue.current === value) {
@@ -1354,14 +1386,16 @@
         return inputRef;
     }
 
-    const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onBlur, isTextarea, type, name = '', dadata = false, }) => {
+    const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, dadata = false, }) => {
         const [isOpen, { setFalse: close, setTrue: open }] = useBool();
         const popupRef = useOutsideClick(close);
         const inputRef = useInputPopup({
             isOpen: isOpen && dadata,
             name,
             value,
+            daDataQueryPrefix,
             onChange,
+            onDaDataChange,
         });
         return (jsxs("div", { className: style('shrink-0 w-full', className), ref: popupRef, onBlur: close, onFocus: open, children: [jsx("div", { ref: inputRef, children: jsx(Input, { type: type || 'text', "aria-label": label, label: getRequiredLabel({ label, errors }), valid: Boolean(!error), value: value, onChange: onChange, onBlur: onBlur, isTextarea: isTextarea, placeholder: getPlaceholder(placeholder, errors, label) }) }), renderErrorText(error)] }));
     });
@@ -1978,13 +2012,24 @@
 
     const DulIssueDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0432\u044B\u0434\u0430\u0447\u0438", ...getValidation(field('dulIssueDateField'), validatorObj.dulIssueDateField, input?.required) })));
 
-    const DulIssuedBy = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u0435\u043C \u0432\u044B\u0434\u0430\u043D", ...getValidation(field('dulIssuedBy'), validatorObj.dulIssuedBy, input?.required) })));
+    const DulIssuedByField = JSX(({ field, input }) => {
+        const { value: dulSubdivisionCode, onChange: changeDulSubdivisionCode } = field('dulSubdivisionCode');
+        const onDaDataChange = useCallback((item) => {
+            changeDulSubdivisionCode?.(item?.data?.code?.replace('-', ''));
+        }, []);
+        return (jsx(InputControl, { label: "\u041A\u0435\u043C \u0432\u044B\u0434\u0430\u043D", ...input, ...getValidation(field('dulIssuedBy'), validatorObj.dulIssuedBy, input?.required), onDaDataChange: onDaDataChange, daDataQueryPrefix: dulSubdivisionCode }));
+    });
 
     const DulNumberField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041D\u043E\u043C\u0435\u0440 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430", type: "number", ...getValidation(field('dulNumber'), validatorObj.dulNumber, input?.required) })));
 
     const DulSerieField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0421\u0435\u0440\u0438\u044F \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430", type: "number", ...getValidation(field('dulSerie'), validatorObj.dulSerie, input?.required) })));
 
-    const DulSubdivisionCode = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u0434 \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F", type: "number", ...getValidation(field('dulSubdivisionCode'), validatorObj.dulSubdivisionCode, input?.required) })));
+    const DulSubdivisionCodeField = JSX(({ field, input }) => {
+        const onDaDataChange = useCallback((item) => {
+            field?.('dulIssuedBy')?.onChange?.(item?.data?.name);
+        }, []);
+        return (jsx(InputControl, { label: "\u041A\u043E\u0434 \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F", type: "number", ...input, ...getValidation(field('dulSubdivisionCode'), validatorObj.dulSubdivisionCode, input?.required), onDaDataChange: onDaDataChange }));
+    });
 
     const EducationField = JSX(({ field, input }) => {
         const { data: education } = useLeadFormData('EDUCATION_LEVEL');
@@ -2035,7 +2080,13 @@
         return (jsx(SelectField, { field: field, source: housing, label: "\u0422\u0438\u043F \u0436\u0438\u043B\u044C\u044F", fieldName: "housing", input: input }));
     });
 
-    const InnField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0418\u041D\u041D", type: "number", ...getValidation(field('inn'), validatorObj.inn, input?.required) })));
+    const InnField = JSX(({ field, input }) => {
+        const onDaDataChange = useCallback((item) => {
+            field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
+            field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+        }, []);
+        return (jsx(InputControl, { label: "\u0418\u041D\u041D", type: "number", ...input, ...getValidation(field('inn'), validatorObj.inn, input?.required), onDaDataChange: onDaDataChange }));
+    });
 
     const IsClientField = JSX(({ field }) => (jsx(CheckboxWithError, { ...field('isClient'), text: '\u042F\u0432\u043B\u044F\u044E\u0441\u044C \u043A\u043B\u0438\u0435\u043D\u0442\u043E\u043C \u0431\u0430\u043D\u043A\u0430 \u0410\u041E "\u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A"' })));
 
@@ -2080,7 +2131,13 @@
         return (jsx(SelectField, { field: field, source: organization, label: "\u0422\u0438\u043F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", fieldName: "organization", input: input }));
     });
 
-    const OrganizationNameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", ...getValidation(field('organizationName'), validatorObj.organizationName, input?.required), ...input })));
+    const OrganizationNameField = JSX(({ field, input }) => {
+        const onDaDataChange = useCallback((item) => {
+            field?.('inn')?.onChange?.(item.data?.inn);
+            field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+        }, []);
+        return (jsx(InputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", ...input, ...getValidation(field('organizationName'), validatorObj.organizationName, input?.required), onDaDataChange: onDaDataChange }));
+    });
 
     const ParticipantAddressField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0410\u0434\u0440\u0435\u0441", ...getValidation(field('participantAddress'), validatorObj.participantAddress, input?.required), ...input })));
 
@@ -2166,9 +2223,7 @@
         { id: 'male', text: 'Мужской' },
         { id: 'female', text: 'Женский' },
     ];
-    const SexField = JSX(({ field, input }) => {
-        return (jsx("div", { children: jsx(RadioButtonGroupControl, { label: "\u041F\u043E\u043B", orientation: "horizontal", items: SEX_TYPES, ...getValidation(field('sex'), validatorObj.sex, input?.required) }) }));
-    });
+    const SexField = JSX(({ field, input }) => (jsx(RadioButtonGroupControl, { label: "\u041F\u043E\u043B", orientation: "horizontal", items: SEX_TYPES, ...getValidation(field('sex'), validatorObj.sex, input?.required) })));
 
     const isPlaceholder = (_) => _ === '_';
     const isDigit = (_) => /\d/.test(_);
@@ -2315,8 +2370,8 @@
             dulSerie: jsx(DulSerieField, { field: field, input: input }),
             dulNumber: jsx(DulNumberField, { field: field, input: input }),
             dulIssueDateField: jsx(DulIssueDateField, { field: field, input: input }),
-            dulSubdivisionCode: jsx(DulSubdivisionCode, { field: field, input: input }),
-            dulIssuedBy: jsx(DulIssuedBy, { field: field, input: input }),
+            dulSubdivisionCode: jsx(DulSubdivisionCodeField, { field: field, input: input }),
+            dulIssuedBy: jsx(DulIssuedByField, { field: field, input: input }),
             participantAddress: jsx(ParticipantAddressField, { field: field, input: input }),
             participantDateRegistration: jsx(ParticipantDateRegistrationField, { field: field, input: input }),
         };
@@ -4718,7 +4773,7 @@
             page: rest.options?.page,
             normalize: (content) => ({ ...content, period: getPeriod(content) }),
         });
-        const rateRows = blocksWithProps.map(([, _]) => _?.paramsSource?.rateRows);
+        const rateRows = blocksWithProps.map(([, _]) => _?.paramsSource?.rows?.[0]?.rates);
         const months = getMonths(rateRows);
         return (jsxs(BlockWrapper, { className: style('space-y-2xs', className), defaultPadding: "p-0", version: "transparent", ...rest, children: [jsx(FiltrationForm, { filtrationSchema: filtrationSchema, resetButton: resetButton, field: field, reset: reset, children: jsxs("div", { className: "@4xl:max-w-xs space-y-lg", children: [jsx(CurrencyInput, { label: sumInput?.title, min: DEFAULT_MIN_SUM, max: DEFAULT_MAX_SUM, ...field('sum', {
                                     parse: (min) => ({ min: Number(min), max: DEFAULT_MAX_SUM }),
@@ -7128,7 +7183,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.595";
+    const packageVersion = "0.14.597";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;