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

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

@@ -8,9 +8,9 @@ export interface DaDataSuggestion {
   processedValue: string;
 }
 
-export type DaDataGender = 'MALE' | 'FEMALE' | 'UNKNOWN';
+type DaDataGender = 'MALE' | 'FEMALE' | 'UNKNOWN';
 
-export interface DaDataFio {
+interface DaDataFio {
   surname: Nullable<string>;
   name: Nullable<string>;
   patronymic: Nullable<string>;
@@ -19,15 +19,32 @@ export interface DaDataFio {
   source: null;
 }
 
-export interface DaDataEmail {
+interface DaDataEmail {
   domain: Nullable<string>;
   local: string;
 }
 
-export type DaDataResponseItem = DaDataFio | DaDataEmail;
+interface DaDataPassportFms {
+  code: string;
+  name: string;
+}
+
+interface DaDataOrganization {
+  inn: string;
+  name: {
+    short_with_opf: string;
+  };
+  opf: {
+    short: string;
+  };
+}
+
+type DaDataResponseItem = Partial<DaDataFio & DaDataEmail & DaDataPassportFms & DaDataOrganization>;
 
 export interface ListRequestOption {
   url: string;
   query?: string;
+  queryPrefix?: string;
   requestData?: HintOption['requestData'];
+  responseItemHandler?: (item?: DaDataSuggestion) => string;
 }

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

@@ -1,4 +1,6 @@
-export const NAME_HINTS_LIST_OPTIONS = {
+import { type DaDataSuggestion } from './dadataHintsType';
+
+const NAME_HINTS_LIST_OPTIONS = {
   url: 'suggest/fio',
   requestData: {
     parts: ['NAME'],
@@ -6,7 +8,7 @@ export const NAME_HINTS_LIST_OPTIONS = {
   },
 };
 
-export const SURNAME_HINTS_LIST_OPTIONS = {
+const SURNAME_HINTS_LIST_OPTIONS = {
   url: 'suggest/fio',
   requestData: {
     parts: ['SURNAME'],
@@ -14,7 +16,7 @@ export const SURNAME_HINTS_LIST_OPTIONS = {
   },
 };
 
-export const PATRONYMIC_HINTS_LIST_OPTIONS = {
+const PATRONYMIC_HINTS_LIST_OPTIONS = {
   url: 'suggest/fio',
   requestData: {
     parts: ['PATRONYMIC'],
@@ -22,10 +24,32 @@ export const PATRONYMIC_HINTS_LIST_OPTIONS = {
   },
 };
 
-export const EMAIL_HINTS_LIST_OPTIONS = {
+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?: DaDataSuggestion) => item?.data?.code?.replace('-', '') || '',
+};
+
+const ORGANIZATION_NAME_HINTS_LIST_OPTIONS = {
+  url: 'suggest/party',
+};
+
+const ORGANIZATION_INN_HINTS_LIST_OPTIONS = {
+  url: 'suggest/party',
+  responseItemHandler: (item?: DaDataSuggestion) => item?.data?.inn || '',
+};
+
+const ADDRESS_HINTS_LIST_OPTIONS = {
+  url: 'suggest/address',
+};
+
 export type HintsListOptions = Record<string, HintOption>;
 
 export const hintsListsOptions: HintsListOptions = {
@@ -33,6 +57,11 @@ export const hintsListsOptions: HintsListOptions = {
   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,
 };
 
 export type HintOption = {
@@ -41,4 +70,5 @@ export type HintOption = {
     parts?: string[];
     gender?: string;
   };
+  responseItemHandler?: (item?: DaDataSuggestion) => string;
 };

package/mobile/src/components/DepositFiltration/DepositFiltration.tsx

@@ -37,7 +37,7 @@ export const DepositFiltration = UniBlock<DepositFiltrationProps>(
         normalize: (content) => ({ ...content, period: getPeriod(content) }),
       },
     );
-    const rateRows = blocksWithProps.map(([, _]) => _?.paramsSource?.rateRows);
+    const rateRows = blocksWithProps.map(([, _]) => _?.paramsSource?.rows?.[0]?.rates);
     const months = getMonths(rateRows as Partial<RateRow>[]);
 
     return (

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

@@ -0,0 +1,26 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { value: dulSubdivisionCode, onChange: changeDulSubdivisionCode } =
+    field('dulSubdivisionCode');
+
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    changeDulSubdivisionCode?.(item?.data?.code?.replace('-', ''));
+  }, []);
+
+  return (
+    <InputControl
+      label="Кем выдан"
+      {...input}
+      {...getValidation(field('dulIssuedBy'), validatorObj.dulIssuedBy, input?.required)}
+      onDaDataChange={onDaDataChange}
+      daDataQueryPrefix={dulSubdivisionCode}
+    />
+  );
+});

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

@@ -0,0 +1,27 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    field?.('dulIssuedBy')?.onChange?.(item?.data?.name);
+  }, []);
+
+  return (
+    <InputControl
+      label="Код подразделения"
+      type="number"
+      {...input}
+      {...getValidation(
+        field('dulSubdivisionCode'),
+        validatorObj.dulSubdivisionCode,
+        input?.required,
+      )}
+      onDaDataChange={onDaDataChange}
+    />
+  );
+});

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

@@ -1,13 +1,24 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const InnField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl
-    label="ИНН"
-    type="number"
-    {...getValidation(field('inn'), validatorObj.inn, input?.required)}
-  />
-));
+export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
+    field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+  }, []);
+
+  return (
+    <InputControl
+      label="ИНН"
+      type="number"
+      {...input}
+      {...getValidation(field('inn'), validatorObj.inn, input?.required)}
+      onDaDataChange={onDaDataChange}
+    />
+  );
+});

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

@@ -1,13 +1,23 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl
-    label="Наименование организации"
-    {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
-    {...input}
-  />
-));
+export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    field?.('inn')?.onChange?.(item.data?.inn);
+    field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+  }, []);
+
+  return (
+    <InputControl
+      label="Наименование организации"
+      {...input}
+      {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
+      onDaDataChange={onDaDataChange}
+    />
+  );
+});

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

@@ -10,15 +10,11 @@ export const SEX_TYPES: RadioButtonItem[] = [
   { id: 'female', text: 'Женский' },
 ];
 
-export const SexField = JSX<CustomFieldProps>(({ field, input }) => {
-  return (
-    <div>
-      <RadioButtonGroupControl
-        label="Пол"
-        orientation="horizontal"
-        items={SEX_TYPES}
-        {...getValidation(field('sex'), validatorObj.sex, input?.required)}
-      />
-    </div>
-  );
-});
+export const SexField = JSX<CustomFieldProps>(({ field, input }) => (
+  <RadioButtonGroupControl
+    label="Пол"
+    orientation="horizontal"
+    items={SEX_TYPES}
+    {...getValidation(field('sex'), validatorObj.sex, input?.required)}
+  />
+));

package/mobile/src/ui-kit/FormField/getField.tsx

@@ -26,10 +26,10 @@ import { ConsentToReceiveMaterialsField } from './Fields/ConsentToReceiveMateria
 import { DependentsField } from './Fields/DependentsField';
 import { DesiredMeetingDateField } from './Fields/DesiredMeetingDateField';
 import { DulIssueDateField } from './Fields/DulIssueDateField';
-import { DulIssuedBy } from './Fields/DulIssuedBy';
+import { DulIssuedByField } from './Fields/DulIssuedByField';
 import { DulNumberField } from './Fields/DulNumberField';
 import { DulSerieField } from './Fields/DulSerieField';
-import { DulSubdivisionCode } from './Fields/DulSubdivisionCode';
+import { DulSubdivisionCodeField } from './Fields/DulSubdivisionCodeField';
 import { EducationField } from './Fields/EducationField';
 import { EmailField } from './Fields/EmailField';
 import { EmployerActivitiesField } from './Fields/EmployerActivitiesField';
@@ -163,8 +163,8 @@ export const getField =
       dulSerie: <DulSerieField field={field} input={input} />,
       dulNumber: <DulNumberField field={field} input={input} />,
       dulIssueDateField: <DulIssueDateField field={field} input={input} />,
-      dulSubdivisionCode: <DulSubdivisionCode field={field} input={input} />,
-      dulIssuedBy: <DulIssuedBy field={field} input={input} />,
+      dulSubdivisionCode: <DulSubdivisionCodeField field={field} input={input} />,
+      dulIssuedBy: <DulIssuedByField field={field} input={input} />,
       participantAddress: <ParticipantAddressField field={field} input={input} />,
       participantDateRegistration: <ParticipantDateRegistrationField field={field} input={input} />,
     };

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

@@ -18,10 +18,12 @@ export const InputControl = JSX<InputProps>(
     error,
     errors,
     onChange = noop,
+    onDaDataChange,
     onBlur,
     isTextarea,
     type,
     name = '',
+    daDataQueryPrefix,
     dadata = false,
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
@@ -31,7 +33,9 @@ export const InputControl = JSX<InputProps>(
       isOpen: isOpen && dadata,
       name,
       value,
+      daDataQueryPrefix,
       onChange,
+      onDaDataChange,
     });
 
     return (

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

@@ -3,7 +3,7 @@ import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 
 export interface InputPopupProps {
   options?: Array<DaDataSuggestion>;
-  onChange: (e: string) => void;
+  onChange: (e: DaDataSuggestion) => void;
   value?: string;
 }
 
@@ -17,7 +17,7 @@ export const InputPopup = JSX<InputPopupProps>(({ options, onChange }) => (
         key={key.toString()}
         className="flex px-m py-s cursor-pointer hover:bg-main-divider pr-5xl relative"
         role="listitem"
-        onMouseDown={() => onChange(item.processedValue)}
+        onMouseDown={() => onChange(item)}
       >
         <span className="min-h-6">{item.processedValue}</span>
       </div>

package/mobile/src/ui-kit/Input/InputProps.ts

@@ -1,4 +1,5 @@
 import { type DefaultControlType } from '../../model/DefaultControlType';
+import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { type InputTypes } from '../../model/InputTypes';
 import { type ControlProps } from '../ControlProps';
 import { type PreventableEventWithTarget } from '../PreventableEvent';
@@ -10,6 +11,8 @@ export interface InputProps<V = string> extends DefaultControlType, ControlProps
   pattern?: string;
   onFocus?: (ev: PreventableEventWithTarget) => void;
   onBlur?: (ev?: PreventableEventWithTarget) => void;
+  onDaDataChange?: (ev: DaDataSuggestion) => void;
+  daDataQueryPrefix?: string;
   valid?: boolean;
   disabled?: boolean;
   autoFocus?: boolean;

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

@@ -10,10 +10,19 @@ interface InputPopupOptions {
   isOpen?: boolean;
   name: string;
   value?: string;
+  daDataQueryPrefix?: string;
   onChange: (e: string) => void;
+  onDaDataChange?: (e: DaDataSuggestion) => void;
 }
 
-export function useInputPopup({ isOpen, value, name, onChange }: InputPopupOptions) {
+export function useInputPopup({
+  isOpen,
+  value,
+  name,
+  onChange,
+  onDaDataChange,
+  daDataQueryPrefix,
+}: InputPopupOptions) {
   const prevInputValue = useRef(value);
   const currentInputValue = useRef(value);
   const [hintsList, setHintsList] = useState<Array<DaDataSuggestion>>([]);
@@ -27,10 +36,11 @@ export function useInputPopup({ isOpen, value, name, onChange }: InputPopupOptio
   }, [value]);
 
   const handleChange = useCallback(
-    (option: string) => {
+    (option: DaDataSuggestion) => {
       close();
-      currentInputValue.current = option;
-      onChange && onChange(option);
+      currentInputValue.current = option.processedValue;
+      onChange && onChange(option.processedValue);
+      onDaDataChange && onDaDataChange(option);
     },
     [close, onChange],
   );
@@ -44,16 +54,18 @@ export function useInputPopup({ isOpen, value, name, onChange }: InputPopupOptio
       }
       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]);

package/package.json

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

package/src/api/dadataHints/dadataHints.ts

@@ -2,17 +2,34 @@ import { type DaDataSuggestion, type ListRequestOption } from './dadataHintsType
 
 const DEFAULT_HINTS_COUNT = 10;
 
-const getResponseHandler = (response: { suggestions: Array<DaDataSuggestion> }) => {
-  const responseData: Array<DaDataSuggestion> = response?.suggestions || [];
+const defaultResponseItemHandler = (item?: DaDataSuggestion): string => item?.value || '';
 
-  return responseData.map((item) => ({
-    ...item,
-    processedValue: item?.value,
-  }));
-};
+const getResponseHandler =
+  (itemHandler: (item?: DaDataSuggestion) => string) =>
+  (response: { suggestions: Array<DaDataSuggestion> }) => {
+    const responseData: Array<DaDataSuggestion> = response?.suggestions || [];
+
+    return responseData.map((item) => {
+      const value = itemHandler(item);
+
+      return {
+        ...item,
+        processedValue: value,
+      };
+    });
+  };
 
 export const getDaDataHints = (options: ListRequestOption): Promise<Array<DaDataSuggestion>> => {
-  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',
@@ -23,11 +40,11 @@ export const getDaDataHints = (options: ListRequestOption): Promise<Array<DaData
     body: JSON.stringify({
       count: DEFAULT_HINTS_COUNT,
       ...requestData,
-      query,
+      query: combinedQuery,
     }),
   })
     .then((response) => response.json())
-    .then(getResponseHandler);
+    .then(responseHandler);
 
   return result;
 };

package/src/api/dadataHints/dadataHintsType.ts

@@ -8,9 +8,9 @@ export interface DaDataSuggestion {
   processedValue: string;
 }
 
-export type DaDataGender = 'MALE' | 'FEMALE' | 'UNKNOWN';
+type DaDataGender = 'MALE' | 'FEMALE' | 'UNKNOWN';
 
-export interface DaDataFio {
+interface DaDataFio {
   surname: Nullable<string>;
   name: Nullable<string>;
   patronymic: Nullable<string>;
@@ -19,15 +19,32 @@ export interface DaDataFio {
   source: null;
 }
 
-export interface DaDataEmail {
+interface DaDataEmail {
   domain: Nullable<string>;
   local: string;
 }
 
-export type DaDataResponseItem = DaDataFio | DaDataEmail;
+interface DaDataPassportFms {
+  code: string;
+  name: string;
+}
+
+interface DaDataOrganization {
+  inn: string;
+  name: {
+    short_with_opf: string;
+  };
+  opf: {
+    short: string;
+  };
+}
+
+type DaDataResponseItem = Partial<DaDataFio & DaDataEmail & DaDataPassportFms & DaDataOrganization>;
 
 export interface ListRequestOption {
   url: string;
   query?: string;
+  queryPrefix?: string;
   requestData?: HintOption['requestData'];
+  responseItemHandler?: (item?: DaDataSuggestion) => string;
 }

package/src/api/dadataHints/hintsListsOptions.ts

@@ -1,4 +1,6 @@
-export const NAME_HINTS_LIST_OPTIONS = {
+import { type DaDataSuggestion } from './dadataHintsType';
+
+const NAME_HINTS_LIST_OPTIONS = {
   url: 'suggest/fio',
   requestData: {
     parts: ['NAME'],
@@ -6,7 +8,7 @@ export const NAME_HINTS_LIST_OPTIONS = {
   },
 };
 
-export const SURNAME_HINTS_LIST_OPTIONS = {
+const SURNAME_HINTS_LIST_OPTIONS = {
   url: 'suggest/fio',
   requestData: {
     parts: ['SURNAME'],
@@ -14,7 +16,7 @@ export const SURNAME_HINTS_LIST_OPTIONS = {
   },
 };
 
-export const PATRONYMIC_HINTS_LIST_OPTIONS = {
+const PATRONYMIC_HINTS_LIST_OPTIONS = {
   url: 'suggest/fio',
   requestData: {
     parts: ['PATRONYMIC'],
@@ -22,10 +24,32 @@ export const PATRONYMIC_HINTS_LIST_OPTIONS = {
   },
 };
 
-export const EMAIL_HINTS_LIST_OPTIONS = {
+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?: DaDataSuggestion) => item?.data?.code?.replace('-', '') || '',
+};
+
+const ORGANIZATION_NAME_HINTS_LIST_OPTIONS = {
+  url: 'suggest/party',
+};
+
+const ORGANIZATION_INN_HINTS_LIST_OPTIONS = {
+  url: 'suggest/party',
+  responseItemHandler: (item?: DaDataSuggestion) => item?.data?.inn || '',
+};
+
+const ADDRESS_HINTS_LIST_OPTIONS = {
+  url: 'suggest/address',
+};
+
 export type HintsListOptions = Record<string, HintOption>;
 
 export const hintsListsOptions: HintsListOptions = {
@@ -33,6 +57,11 @@ export const hintsListsOptions: HintsListOptions = {
   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,
 };
 
 export type HintOption = {
@@ -41,4 +70,5 @@ export type HintOption = {
     parts?: string[];
     gender?: string;
   };
+  responseItemHandler?: (item?: DaDataSuggestion) => string;
 };