@redneckz/wildless-cms-uni-blocks 0.14.685 → 0.14.687

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

@@ -1,4 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { getGenderFromName } from '../../../api/RetailAPI/getGenderFromName';
 import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
@@ -10,11 +12,27 @@ export const SEX_TYPES: RadioButtonItem[] = [
   { id: 'female', text: 'Женский' },
 ];
 
-export const SexField = JSX<CustomFieldProps>(({ field, input }) => (
-  <RadioButtonGroupControl
-    label="Пол"
-    orientation="horizontal"
-    items={SEX_TYPES}
-    {...getValidation(field('sex'), validatorObj.sex, input?.required)}
-  />
-));
+export const SexField = JSX<CustomFieldProps>(({ field, input }) => {
+  const name = field('name')?.value;
+  const { value: selectedSex, onChange: changeSex } = field('sex');
+
+  useEffect(() => {
+    if (name && !selectedSex) {
+      (async () => {
+        const gender = await getGenderFromName(name as string);
+        if (gender) {
+          changeSex?.(gender);
+        }
+      })();
+    }
+  }, []);
+
+  return (
+    <RadioButtonGroupControl
+      label="Пол"
+      orientation="horizontal"
+      items={SEX_TYPES}
+      {...getValidation(field('sex'), validatorObj.sex, input?.required)}
+    />
+  );
+});

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

@@ -4,14 +4,10 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const SnilsField = JSX<CustomFieldProps>(({ field, input }) => {
-  const isPfrFlg = field('consentPfrFlg')?.value;
-
-  return (
-    <InputSnilsControl
-      label="СНИЛС"
-      {...getValidation(field('snils'), validatorObj.snils, isPfrFlg ? input?.required : false)}
-      {...input}
-    />
-  );
-});
+export const SnilsField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputSnilsControl
+    label="СНИЛС"
+    {...getValidation(field('snils'), validatorObj.snils, input?.required)}
+    {...input}
+  />
+));

package/package.json

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

package/src/api/RetailAPI/getGenderFromName.ts

@@ -0,0 +1,20 @@
+import { type DaDataSuggestion } from '../dadataHints/dadataHintsType';
+import { fetchRetailJSON } from './doRequest';
+
+const GENDERS = ['male', 'female'];
+
+export const getGenderFromName = async (name: string): Promise<string> => {
+  const res = await fetchRetailJSON<{ suggestions: Array<DaDataSuggestion> }>(
+    '/suggestions/suggest/fio',
+    'POST',
+    {
+      query: name,
+      count: 1,
+      parts: ['NAME'],
+    },
+  );
+
+  const gender = res?.suggestions[0]?.data?.gender?.toLowerCase() || '';
+
+  return GENDERS.includes(gender) ? gender : '';
+};

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.tsx

@@ -15,30 +15,8 @@ export default {
     <div className="container grid grid-cols-12">
       <ApplicationLeadForm
         className="col-span-12"
-        title="Заголовок"
+        title="Заявка на кредит"
         programId="10"
-        sections={[
-          {
-            columns: 2,
-            inputs: [
-              { fieldType: 'common', name: 'surname', required: true, dadata: true },
-              { fieldType: 'common', name: 'name', required: true, dadata: true },
-              { fieldType: 'common', name: 'middleName', dadata: true },
-              { fieldType: 'common', name: 'limitedBirthday', required: true },
-              { fieldType: 'common', name: 'phone', required: true },
-              { fieldType: 'common', name: 'email', required: true, dadata: true },
-            ],
-          },
-          {
-            inputs: [
-              { fieldType: 'common', name: 'processPersonalDataFlg', required: true },
-              { fieldType: 'common', name: 'consentProviderFlg', required: true },
-              { fieldType: 'common', name: 'consentOthersFlg', required: true },
-              { fieldType: 'common', name: 'consentInformFlg' },
-              { fieldType: 'common', name: 'consentPfrFlg' },
-            ],
-          },
-        ]}
         button={button}
       />
       <PopupManager />

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -10,6 +10,7 @@ import { useResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/useRespon
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { renderInputs } from '../ApplicationForm/renderInputs';
+import { applicationFormData } from './applicationFormData';
 import { type ApplicationLeadFormContent, type FieldDef } from './ApplicationLeadFormContent';
 import { getInitialFormState, type FormState } from './getInitialFormState';
 import { renderSubmitButton } from './renderSubmitButton';
@@ -19,16 +20,8 @@ import { useInitApplicationLead } from './useInitApplicationLead';
 interface ApplicationLeadFormProps extends ApplicationLeadFormContent, UniBlockProps {}
 
 export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
-  ({
-    className,
-    title,
-    programId = '',
-    nextStepLink = '/credit-lead',
-    sections = [],
-    button,
-    ...rest
-  }) => {
-    const inputs = (sections?.flatMap((_) => _?.inputs) || []) as FieldDef[];
+  ({ className, title, programId = '', nextStepLink = '/credit-lead', button, ...rest }) => {
+    const inputs = (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldDef[];
     const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
 
     const { isLoading } = useInitApplicationLead(nextStepLink);
@@ -63,7 +56,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       >
         <form onSubmit={onSubmit} className="space-y-m relative">
           {isLoading ? <Loader blur={false} /> : null}
-          {sections.map((_, i) => (
+          {applicationFormData.map((_, i) => (
             <div
               key={`section-${i}`}
               className={style(inputColumnStyles(_.columns), 'grid gap-x-m')}

package/src/components/ApplicationLeadForm/applicationFormData.tsx

@@ -0,0 +1,24 @@
+import { type SectionsProps } from '../../model/InputSectionsType';
+
+export const applicationFormData: SectionsProps[] = [
+  {
+    columns: 2,
+    inputs: [
+      { fieldType: 'common', name: 'surname', required: true, dadata: true },
+      { fieldType: 'common', name: 'name', required: true, dadata: true },
+      { fieldType: 'common', name: 'middleName', dadata: true },
+      { fieldType: 'common', name: 'limitedBirthday', required: true },
+      { fieldType: 'common', name: 'phone', required: true },
+      { fieldType: 'common', name: 'email', required: true, dadata: true },
+    ],
+  },
+  {
+    inputs: [
+      { fieldType: 'common', name: 'processPersonalDataFlg', required: true },
+      { fieldType: 'common', name: 'consentProviderFlg', required: true },
+      { fieldType: 'common', name: 'consentOthersFlg', required: true },
+      { fieldType: 'common', name: 'consentInformFlg' },
+      { fieldType: 'common', name: 'consentPfrFlg' },
+    ],
+  },
+];

package/src/components/CreditForm/calculateInputs.ts

@@ -31,7 +31,7 @@ const checkBusinessOwner = ({ name }: FieldDef, getValue: GetValue) =>
   name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
 
 const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
-  name === 'snils' && !getValue('consentPfrFlg');
+  name === 'snils' && isSnilsRequired(getValue);
 
 const checkAddressFillFromESIA = ({ name, filledByEsia }: FieldDef, getValue: GetValue) =>
   name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
@@ -46,3 +46,6 @@ export const checkCondition = ({ condition }: FieldDef, getValue: GetValue) =>
 
     return _ !== ((dataValue as Option)?.key ?? dataValue);
   });
+
+const isSnilsRequired = (getValue: GetValue) =>
+  getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';

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

@@ -1,6 +1,4 @@
 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';
@@ -9,23 +7,12 @@ import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
 const FIELD_NAME = 'middleName';
 
-export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => {
-  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
-    const dadataGender = item?.data?.gender;
-
-    if (dadataGender && dadataGender !== 'UNKNOWN') {
-      field('sex')?.onChange?.(dadataGender.toLowerCase());
-    }
-  }, []);
-
-  return (
-    <InputControl
-      label="Отчество (Обязательно, при наличии)"
-      maxLength={60}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
-      {...getValidation(field(FIELD_NAME), validatorObj.middleName, input?.required)}
-      {...input}
-      onDaDataChange={onDaDataChange}
-    />
-  );
-});
+export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Отчество (Обязательно, при наличии)"
+    maxLength={60}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+    {...getValidation(field(FIELD_NAME), validatorObj.middleName, input?.required)}
+    {...input}
+  />
+));

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

@@ -1,4 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { getGenderFromName } from '../../../api/RetailAPI/getGenderFromName';
 import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
@@ -10,11 +12,27 @@ export const SEX_TYPES: RadioButtonItem[] = [
   { id: 'female', text: 'Женский' },
 ];
 
-export const SexField = JSX<CustomFieldProps>(({ field, input }) => (
-  <RadioButtonGroupControl
-    label="Пол"
-    orientation="horizontal"
-    items={SEX_TYPES}
-    {...getValidation(field('sex'), validatorObj.sex, input?.required)}
-  />
-));
+export const SexField = JSX<CustomFieldProps>(({ field, input }) => {
+  const name = field('name')?.value;
+  const { value: selectedSex, onChange: changeSex } = field('sex');
+
+  useEffect(() => {
+    if (name && !selectedSex) {
+      (async () => {
+        const gender = await getGenderFromName(name as string);
+        if (gender) {
+          changeSex?.(gender);
+        }
+      })();
+    }
+  }, []);
+
+  return (
+    <RadioButtonGroupControl
+      label="Пол"
+      orientation="horizontal"
+      items={SEX_TYPES}
+      {...getValidation(field('sex'), validatorObj.sex, input?.required)}
+    />
+  );
+});

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

@@ -4,14 +4,10 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const SnilsField = JSX<CustomFieldProps>(({ field, input }) => {
-  const isPfrFlg = field('consentPfrFlg')?.value;
-
-  return (
-    <InputSnilsControl
-      label="СНИЛС"
-      {...getValidation(field('snils'), validatorObj.snils, isPfrFlg ? input?.required : false)}
-      {...input}
-    />
-  );
-});
+export const SnilsField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputSnilsControl
+    label="СНИЛС"
+    {...getValidation(field('snils'), validatorObj.snils, input?.required)}
+    {...input}
+  />
+));