@redneckz/wildless-cms-uni-blocks 0.14.684 → 0.14.686

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/getObjectValidator.tsx

@@ -105,6 +105,8 @@ export const validatorObj: Record<string, Validator> = {
   confirmationIncome: defaultValidator(),
   deliveryDate: defaultValidator('Укажите дату доставки'),
   addressCourier: addressDaDataValidator(),
+  cardCategory: defaultValidator('Укажите категорию карты'),
+  paymentSystem: defaultValidator('Укажите тип платежной системы'),
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {

package/package.json

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

package/src/api/RetailAPI/getCardTypes.ts

@@ -1,4 +1,4 @@
-import { doRequest } from './doRequest';
+import { fetchRetailJSON } from './doRequest';
 
 export type CardTypeData = {
   type: string;
@@ -8,13 +8,11 @@ export type CardTypeData = {
   description: string;
 };
 
-export const getCardTypes = async (paymentSystemType: string) => {
-  const response: Response = await doRequest('/dictionaryFiltered', 'POST', {
+export const getCardTypes = async (paymentSystemTypeCd: string, creditProgramId: string) => {
+  const data = await fetchRetailJSON<CardTypeData[]>('/dictionaryFiltered', 'POST', {
     type: 'CARD_TYPE',
-    presets: { paymentSystemType, creditProgramId: 13 },
+    presets: { paymentSystemTypeCd, creditProgramId },
   });
 
-  const data: CardTypeData[] = await response?.json();
-
   return Array.isArray(data) ? data : [];
 };

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/api/RetailAPI/getPaymentSystems.ts

@@ -1,4 +1,4 @@
-import { doRequest } from './doRequest';
+import { fetchRetailJSON } from './doRequest';
 
 type PaymentSystemResponse = {
   paymentSystems?: {
@@ -7,12 +7,14 @@ type PaymentSystemResponse = {
   }[];
 };
 
-export const getPaymentSystems = async () => {
-  const response: Response = await doRequest('/public-data/creditProgramConditions', 'POST', {
-    creditProgramId: 13,
-  });
-
-  const data: PaymentSystemResponse = await response?.json();
+export const getPaymentSystems = async (creditProgramId: string) => {
+  const data = await fetchRetailJSON<PaymentSystemResponse>(
+    '/public-data/creditProgramConditions',
+    'POST',
+    {
+      creditProgramId,
+    },
+  );
 
   return (
     data?.paymentSystems?.map((paymentSystem) => ({

package/src/api/RetailAPI/updateUserProfile.ts

@@ -1,5 +1,4 @@
-import { fetchRetailJSON } from './doRequest';
-import { type CreateUserProfileResponse } from './updateUserTask';
+import { doRequest } from './doRequest';
 
 export type UpdateUserProfileBody = {
   profile: {
@@ -23,4 +22,4 @@ export type UpdateUserProfileBody = {
 };
 
 export const updateUserProfile = (body: UpdateUserProfileBody) =>
-  fetchRetailJSON<CreateUserProfileResponse>('/user-data/updateUserProfile', 'PUT', body);
+  doRequest('/user-data/updateUserProfile', 'PUT', body);

package/src/api/RetailAPI/utils/getUpdateUserProfile.ts

@@ -11,7 +11,7 @@ export const getUpdateUserProfileData = (
     name = '',
     surname = '',
     middleName = '',
-    birthday = '',
+    limitedBirthday = '',
     phone = '',
     email = '',
     processPersonalDataFlg,
@@ -29,7 +29,7 @@ export const getUpdateUserProfileData = (
       name,
       surname,
       midname: middleName,
-      birthDate: birthday && formatDate(birthday, true),
+      birthDate: limitedBirthday && formatDate(limitedBirthday, true),
       email,
       phone: formatPhone(phone),
       processPersonalDataFlg: Boolean(processPersonalDataFlg),

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/ApplicationLeadForm/useApplicationLeadApi.ts

@@ -127,14 +127,18 @@ const updateUserData = async ({
     programId,
   });
 
-  await updateUserTask(
-    getLeadFormTaskData({
-      participantId,
-      taskId,
-      profileId,
-      formData: transformedForm,
-    }),
-  );
+  try {
+    await updateUserTask(
+      getLeadFormTaskData({
+        participantId,
+        taskId,
+        profileId,
+        formData: transformedForm,
+      }),
+    );
+  } catch (ex) {
+    console.log(ex);
+  }
 
   saveUserData({ participantId, taskId, profileId, programId });
   saveForm(formData);

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

@@ -1,18 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getCardTypes, type CardTypeData } from '../../../api/RetailAPI/getCardTypes';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { type Option } from '../../Select/Option';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
   const [cardTypes, setCardTypes] = useState<CardTypeData[]>([]);
+  const [programId] = useLocalStorage<string>('programId');
+  const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
   const selectedPaymentSystem = field('paymentSystem').value;
 
   useEffect(() => {
-    (async () => {
-      const fetchedCardTypes = await getCardTypes(selectedPaymentSystem as string);
-      setCardTypes(fetchedCardTypes);
-    })();
+    if (selectedPaymentSystem && programId) {
+      (async () => {
+        const fetchedCardTypes = await getCardTypes(selectedPaymentSystem as string, programId);
+        setCardTypes(fetchedCardTypes);
+
+        if (!isValidCardCategory(fetchedCardTypes, selectedCardCategory as Option)) {
+          cardCategoryChange && cardCategoryChange(null);
+        }
+      })();
+    }
   }, [selectedPaymentSystem]);
 
   return (
@@ -25,3 +35,6 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
     />
   );
 });
+
+const isValidCardCategory = (cardTypes: CardTypeData[], selectedCardCategory: Option | null) =>
+  cardTypes.some((cardType) => cardType.key === selectedCardCategory?.key);

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/PaymentSystemField.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getPaymentSystems } from '../../../api/RetailAPI/getPaymentSystems';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
 import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
@@ -9,14 +10,17 @@ import { getValidation } from '../getValidation';
 
 export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value, onChange } = field('paymentSystem');
+  const [programId] = useLocalStorage<string>('programId');
 
   const [paymentSystemOptions, setPaymentSystemOptions] = useState<RadioButtonItem[]>([]);
 
   useEffect(() => {
-    (async () => {
-      const fetchedPaymentSystems = await getPaymentSystems();
-      setPaymentSystemOptions(fetchedPaymentSystems || []);
-    })();
+    if (programId) {
+      (async () => {
+        const fetchedPaymentSystems = await getPaymentSystems(programId);
+        setPaymentSystemOptions(fetchedPaymentSystems || []);
+      })();
+    }
   }, []);
 
   return (

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/getObjectValidator.tsx

@@ -105,6 +105,8 @@ export const validatorObj: Record<string, Validator> = {
   confirmationIncome: defaultValidator(),
   deliveryDate: defaultValidator('Укажите дату доставки'),
   addressCourier: addressDaDataValidator(),
+  cardCategory: defaultValidator('Укажите категорию карты'),
+  paymentSystem: defaultValidator('Укажите тип платежной системы'),
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {