@redneckz/wildless-cms-uni-blocks 0.14.737 → 0.14.739

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

@@ -1,14 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Checkbox } from '../../Checkbox/Checkbox';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
-
-const FIELD_NAME = 'consentToReceiveMaterials';
 
 export const ConsentToReceiveMaterialsField = JSX<CustomFieldProps>(({ field, input }) => (
   <Checkbox
     text="Согласен на получение информационных и аналитических материалов по электронной почте"
-    {...getValidation(field(FIELD_NAME), validatorObj[FIELD_NAME], input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));

package/mobile/src/ui-kit/FormField/NameFieldDef.ts

@@ -1,79 +1,3 @@
-type NameFieldConsentDef =
-  | 'processPersonalDataFlg'
-  | 'consentProviderFlg'
-  | 'consentInformFlg'
-  | 'consentPfrFlg'
-  | 'consentOthersFlg';
-
-type NameFieldCreditCardDef =
-  | 'addressCourier'
-  | 'paymentSystem'
-  | 'currency'
-  | 'cardCategory'
-  | 'codeWord'
-  | 'confirmationIncome'
-  | 'methodObtain'
-  | 'deliveryDate';
-
-type NameFieldRetailDef =
-  | 'organization'
-  | 'organizationAddress'
-  | 'organizationPhone'
-  | 'organizationName'
-  | 'legalForm'
-  | 'generalSeniority'
-  | 'lastJobExperience'
-  | 'experience5Years'
-  | 'jobsNumber'
-  | 'beginDate'
-  | 'addressFact'
-  | 'addressRegistration'
-  | 'addressRetail'
-  | 'addressMatch'
-  | 'sex'
-  | 'limitedBirthday'
-  | 'birthPlace'
-  | 'education'
-  | 'housing'
-  | 'amountWorkers'
-  | 'employment'
-  | 'employerActivities'
-  | 'employerOrganization'
-  | 'positionOrganization'
-  | 'familyStatus'
-  | 'familyMembers'
-  | 'children'
-  | 'dependents'
-  | 'totalIncome'
-  | 'expenses'
-  | 'snils'
-  | 'conscription'
-  | 'armyIdFlg'
-  | 'dulSerie'
-  | 'dulNumber'
-  | 'dulIssueDateField'
-  | 'dulSubdivisionCode'
-  | 'dulIssuedBy'
-  | 'participantDateRegistration'
-  | 'retirementIncome'
-  | 'rentalIncome'
-  | 'otherIncome'
-  | 'otherPayments'
-  | 'additionalIncome'
-  | 'wages'
-  | 'mandatoryPayments'
-  | 'incomeAverage'
-  | 'disablePeopleFlg'
-  | 'bankruptcyFlg'
-  | 'shareholderFlg'
-  | 'legalEntityName'
-  | 'creditInRshbCd'
-  | 'bankEmployeeCode'
-  | 'partInBusiness'
-  | 'regionRetail'
-  | 'calculator'
-  | 'infoCard';
-
 type NameFieldApplicationDef =
   | 'surname'
   | 'name'
@@ -110,8 +34,4 @@ type NameFieldApplicationDef =
   | 'consentToReceiveMaterials'
   | 'consentDataProcessing';
 
-export type NameFieldDef =
-  | NameFieldApplicationDef
-  | NameFieldRetailDef
-  | NameFieldCreditCardDef
-  | NameFieldConsentDef;
+export type NameFieldDef = NameFieldApplicationDef;

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

@@ -4,8 +4,6 @@ import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type Option } from '../Select/Option';
 import { SelectControl } from '../Select/SelectControl';
 import { type CustomFieldProps } from './CustomFieldProps';
-import { validatorObj } from './getObjectValidator';
-import { getValidation } from './getValidation';
 
 export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
   source?: DictionaryItem[];
@@ -21,7 +19,6 @@ export const SelectField = UniBlock<SelectFieldProps>(
     field,
     source,
     fieldName,
-    input,
     placeholder = 'Выберите из списка',
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     options,
@@ -37,7 +34,7 @@ export const SelectField = UniBlock<SelectFieldProps>(
       <SelectControl
         placeholder={placeholder}
         options={leadOptions}
-        {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
+        {...field(fieldName)}
         {...rest}
       />
     );

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

@@ -1,9 +1,8 @@
-//TODO: Убрать обращение к компонентам т.к. ApplicationForm
-import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 import { type VNode } from '../../model/VNode';
 import { InputControl } from '../Input/InputControl';
+import { type BaseFieldDef } from './BaseFieldDef';
 import { type CustomFieldProps } from './CustomFieldProps';
 import { AcquiringField } from './Fields/AcquiringField';
 import { AddressBranchField } from './Fields/AddressBranchField';
@@ -37,33 +36,33 @@ import { TermField } from './Fields/TermField';
 import { UltraPremiumField } from './Fields/UltraPremiumField';
 import { VedField } from './Fields/VedField';
 import { getPremium } from './getPremium';
-import { isRenderField } from './isRenderField';
+import { shouldRenderField } from './shouldRenderField';
 
 const PRODUCT_REF = {
   $ref: '/wcms-resources/outservice-productlist.json',
 };
 
 const InputsMap = {
-  fullName: (props: CustomFieldProps) => <FullNameField {...props} />,
-  addressBranch: (props: CustomFieldProps) => <AddressBranchField {...props} />,
-  desiredMeetingDate: (props: CustomFieldProps) => <DesiredMeetingDateField {...props} />,
+  fullName: FullNameField,
+  addressBranch: AddressBranchField,
+  desiredMeetingDate: DesiredMeetingDateField,
   product: (props: CustomFieldProps) => <ProductField {...props} source={PRODUCT_REF} />,
-  localities: (props: CustomFieldProps) => <LocalitiesField {...props} />,
-  isClient: (props: CustomFieldProps) => <IsClientField {...props} />,
-  partnerComments: (props: CustomFieldProps) => <PartnerCommentsField {...props} />,
-  collectionCount: (props: CustomFieldProps) => <CollectionCountField {...props} />,
-  acquiringType: (props: CustomFieldProps) => <AcquiringField {...props} />,
-  onlineCheckout: (props: CustomFieldProps) => <OnlineCheckoutField {...props} />,
-  posTerminal: (props: CustomFieldProps) => <PosTerminalField {...props} />,
-  serviceType: (props: CustomFieldProps) => <UltraPremiumField {...props} />,
-  term: (props: CustomFieldProps) => <TermField {...props} />,
-  amount: (props: CustomFieldProps) => <AmountField {...props} />,
-  annualRevenue: (props: CustomFieldProps) => <AnnualRevenueField {...props} />,
-  vedTypes: (props: CustomFieldProps) => <VedField {...props} />,
-  feedbackMethod: (props: CustomFieldProps) => <FeedbackMethodField {...props} />,
-  serviceDirection: (props: CustomFieldProps) => <ServiceDirectionField {...props} />,
-  bankEmpolee: (props: CustomFieldProps) => <BankEmpoleeField {...props} />,
-  secondaryPhone: (props: CustomFieldProps) => <SecondaryPhoneField {...props} />,
+  localities: LocalitiesField,
+  isClient: IsClientField,
+  partnerComments: PartnerCommentsField,
+  collectionCount: CollectionCountField,
+  acquiringType: AcquiringField,
+  onlineCheckout: OnlineCheckoutField,
+  posTerminal: PosTerminalField,
+  serviceType: UltraPremiumField,
+  term: TermField,
+  amount: AmountField,
+  annualRevenue: AnnualRevenueField,
+  vedTypes: VedField,
+  feedbackMethod: FeedbackMethodField,
+  serviceDirection: ServiceDirectionField,
+  bankEmpolee: BankEmpoleeField,
+  secondaryPhone: SecondaryPhoneField,
   applicationDate: (props: CustomFieldProps) => (
     <InputControl label="Дата и время обращения в Банк" {...props} />
   ),
@@ -73,33 +72,33 @@ const InputsMap = {
     ) : (
       <RegionField {...props} />
     ),
-  consentToReceiveMaterials: (props: CustomFieldProps) => (
-    <ConsentToReceiveMaterialsField {...props} />
-  ),
+  consentToReceiveMaterials: ConsentToReceiveMaterialsField,
 
-  surname: (props: CustomFieldProps) => <SurnameField {...props} />,
-  name: (props: CustomFieldProps) => <NameField {...props} />,
-  middleName: (props: CustomFieldProps) => <MiddleNameField {...props} />,
-  birthday: (props: CustomFieldProps) => <BirthdayField {...props} />,
-  phone: (props: CustomFieldProps) => <PhoneField {...props} />,
-  email: (props: CustomFieldProps) => <EmailField {...props} />,
-  inn: (props: CustomFieldProps) => <InnField {...props} />,
-  comment: (props: CustomFieldProps) => <CommentField {...props} />,
+  surname: SurnameField,
+  name: NameField,
+  middleName: MiddleNameField,
+  birthday: BirthdayField,
+  phone: PhoneField,
+  email: EmailField,
+  inn: InnField,
+  comment: CommentField,
 };
 
 export const getField =
-  (
+  <F extends BaseFieldDef>(
     field: FormFieldRegisterer<any>,
     params?: Record<string, any>,
     externalInputs: Record<string, VNode> = {},
   ) =>
-  (input: FieldDef, i: number) => {
-    const resultInputsMap = {
+  (input: F, i: number) => {
+    const fieldsRegister = {
       ...InputsMap,
       ...externalInputs,
     };
 
-    return isRenderField({ input, field }) ? (
-      <div key={String(i)}>{resultInputsMap[input?.name || '']?.({ field, input, params })}</div>
-    ) : null;
+    return (
+      shouldRenderField({ input, field }) && (
+        <div key={i}>{fieldsRegister[String(input.name)]?.({ field, input, params })}</div>
+      )
+    );
   };

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

@@ -1,6 +1,6 @@
-import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
+import { type FieldValidatorsMap } from '../../hooks/useForm/FormOptions';
 import { type Validator } from '../../validation/validator';
-import { getNamesFromInput } from './getNamesFromInput';
+import { type BaseFieldDef } from './BaseFieldDef';
 import {
   addressDaDataValidator,
   addressOrganizationValidator,
@@ -124,10 +124,35 @@ export const validatorObj: Record<string, Validator> = {
   ...validatorCreditCardObj,
 };
 
-export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {
-  const requiredInputs = getNamesFromInput(inputs.filter((_: FieldDef) => Boolean(_?.required)));
+export const getFormValidator = <FormState extends Record<string, any>, F extends BaseFieldDef>(
+  fieldDefs: F[],
+): ((_: FormState) => FieldValidatorsMap<FormState>) => {
+  const requiredFields = fieldDefs.filter((_) => Boolean(_?.required && _?.name));
 
-  return Object.fromEntries(
-    requiredInputs.map((_) => [_, validatorObj?.[_ || '']]).filter(([, validator]) => validator),
+  const hasConditions = requiredFields.some((_) => _.condition?.values);
+  const requiredFieldValidatorsMap: FieldValidatorsMap<FormState> = Object.fromEntries(
+    requiredFields.filter(byNonEmptyValidator).map(({ name }) => [name, validatorObj[name ?? '']]),
   );
+
+  return (formState) =>
+    hasConditions
+      ? Object.fromEntries(
+          requiredFields
+            .filter(byNonEmptyValidator)
+            .filter(byCondition(formState))
+            .map(({ name }) => [name, validatorObj[name ?? '']]),
+        )
+      : requiredFieldValidatorsMap;
 };
+
+const byNonEmptyValidator = ({ name }: BaseFieldDef): boolean => Boolean(validatorObj[name ?? '']);
+
+const byCondition =
+  <FormState extends Record<string, any>>(formState: FormState) =>
+  (fieldDef: BaseFieldDef) =>
+    !fieldDef?.condition ||
+    fieldDef.condition.values.find((_) => {
+      const dependencyValue = formState?.[fieldDef?.condition?.name ?? ''];
+
+      return _ === (dependencyValue?.key ?? dependencyValue);
+    });

package/mobile/src/ui-kit/FormField/isEsiaAuthorize.ts

@@ -1,4 +1,4 @@
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 
 const ESIA_FIELD_NAME = 'esiaAccountTypeCd';
 

package/mobile/src/ui-kit/FormField/{isRenderField.tsx → shouldRenderField.tsx}

@@ -1,11 +1,11 @@
-import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
+import { type BaseFieldDef } from './BaseFieldDef';
 
-export function isRenderField({
+export function shouldRenderField<F extends BaseFieldDef>({
   input,
   field,
 }: {
-  input: FieldDef;
+  input: F;
   field: FormFieldRegisterer<any>;
 }) {
   const { condition } = input;

package/mobile/src/ui-kit/FormField/updateOrganizationFields.ts

@@ -1,5 +1,5 @@
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type CreditFormDictionarySlice } from '../../hooks/useRetailFormStore';
 import {
   getEmployeesNumberOption,

package/mobile/src/ui-kit/RadioButtonGroup/RadioButtonGroup.tsx

@@ -29,9 +29,9 @@ export const RadioButtonGroup = JSX<RadioButtonGroupProps>(
     items,
     value,
     className,
-    onChange: onChangeCheckedItem,
     disabled = false,
     orientation = 'horizontal',
+    onChange: onChangeCheckedItem,
   }) => (
     <div className="grid gap-xs whitespace-nowrap">
       {label ? (
@@ -52,7 +52,7 @@ export const RadioButtonGroup = JSX<RadioButtonGroupProps>(
             isRadio
             text={text}
             value={value === id}
-            onChange={() => onChangeCheckedItem && onChangeCheckedItem(id)}
+            onChange={() => onChangeCheckedItem?.(id)}
             disabled={disabled}
           />
         ))}

package/mobile/src/ui-kit/RadioButtonGroup/RadioButtonGroupControl.tsx

@@ -5,13 +5,9 @@ import { renderErrorText } from '../Input/renderErrorText';
 import { RadioButtonGroup, type RadioButtonGroupProps } from './RadioButtonGroup';
 
 export const RadioButtonGroupControl = JSX<RadioButtonGroupProps>(
-  ({ className, label, onChange, error, ...rest }) => (
+  ({ className, label, error, ...rest }) => (
     <div className={style('shrink-0 w-full', className)}>
-      <RadioButtonGroup
-        label={getRequiredLabel({ label, errors: rest?.errors })}
-        onChange={(_) => onChange && onChange(_)}
-        {...rest}
-      />
+      <RadioButtonGroup label={getRequiredLabel({ label, errors: rest?.errors })} {...rest} />
       {renderErrorText(error)}
     </div>
   ),

package/mobile/src/ui-kit/ResponseTypeDialog/ResponseTypeDialog.tsx

@@ -5,39 +5,36 @@ import { Dialog } from '../DialogManager/Dialog';
 import { Img } from '../Img/Img';
 
 export interface ResponseNotificationProps {
-  responseType?: 'OK' | 'Fail';
+  ok?: boolean;
   typeForm?: string;
   onClose?: () => void;
 }
 
-export const ResponseTypeDialog = JSX<ResponseNotificationProps>(
-  ({ responseType, typeForm, onClose }) => {
-    const responseOK = responseType === 'OK';
-    const statusIcon = responseOK ? 'ResponseOKIcon' : 'ResponseFailIcon';
+export const ResponseTypeDialog = JSX<ResponseNotificationProps>(({ ok, typeForm, onClose }) => {
+  const statusIcon = ok ? 'ResponseOKIcon' : 'ResponseFailIcon';
 
-    const responseOKDescription =
-      typeForm === 'ANTIFRAUD'
-        ? `Сообщение отправлено. Для уточнения информации с Вами могут связаться работники Банка либо Вы
+  const responseOKDescription =
+    typeForm === 'ANTIFRAUD'
+      ? `Сообщение отправлено. Для уточнения информации с Вами могут связаться работники Банка либо Вы
   можете самостоятельно позвонить по номеру контакт-центра +78001000100. Будьте внимательны, работники Банка
    не звонят с использованием мессенджеров.`
-        : 'Совсем скоро мы с вами свяжемся';
+      : 'Совсем скоро мы с вами свяжемся';
 
-    return (
-      <Dialog className="my-6xl max-w-lg w-full min-h-fit mx-auto" onClose={onClose}>
-        <div className="flex flex-col gap-lg items-center rounded-md space-x-m">
-          <Img image={{ icon: statusIcon, iconVersion: 'normal' }} width="136" height="136" />
-          <Headline
-            className="w-full"
-            title={responseOK ? 'Ваша заявка отправлена' : 'Не удалось отправить заявку'}
-            description={responseOK ? responseOKDescription : 'Пожалуйста, повторите позднее'}
-            headlineVersion="XS"
-            isEmbedded={true}
-          />
-          <Button type="button" onClick={onClose}>
-            Хорошо
-          </Button>
-        </div>
-      </Dialog>
-    );
-  },
-);
+  return (
+    <Dialog className="my-6xl max-w-lg w-full min-h-fit mx-auto" onClose={onClose}>
+      <div className="flex flex-col gap-lg items-center rounded-md space-x-m">
+        <Img image={{ icon: statusIcon, iconVersion: 'normal' }} width="136" height="136" />
+        <Headline
+          className="w-full"
+          title={ok ? 'Ваша заявка отправлена' : 'Не удалось отправить заявку'}
+          description={ok ? responseOKDescription : 'Пожалуйста, повторите позднее'}
+          headlineVersion="XS"
+          isEmbedded={true}
+        />
+        <Button type="button" onClick={onClose}>
+          Хорошо
+        </Button>
+      </div>
+    </Dialog>
+  );
+});

package/mobile/src/utils/getRequiredLabel.ts

@@ -1,4 +1,5 @@
 import type { DefaultControlType } from '../model/DefaultControlType';
 
+// TODO Базовая функицональность всех Control - надо вынести и привязать к required флагу
 export const getRequiredLabel = ({ label, errors }: DefaultControlType) =>
   label && errors ? `${label}*` : label;

package/mobile/src/validation/objectValidator.ts

@@ -1,10 +1,12 @@
 import { type ValidationInfo, type Validator } from './validator';
 
 export const objectValidator =
-  <VMap extends Record<string, Validator>>(validatorsMap: VMap) =>
-  <O extends Partial<{ [P in keyof VMap]: Parameters<VMap[P]>[0] }>>(o: O): ValidationInfo =>
+  <O extends Record<string, any>>(
+    validatorsMap: { [K in keyof O]?: Validator<O[K]> } | undefined,
+  ) =>
+  (o: O): ValidationInfo =>
     (o &&
-      (Object.entries(validatorsMap).flatMap(([key, validator]) =>
-        validator(o[key]),
+      (Object.entries(validatorsMap ?? {}).flatMap(([key, validator]) =>
+        validator ? validator(o[key]) : [],
       ) as ValidationInfo)) ||
     [];

package/package.json

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

package/src/EventBus/defaultEventBus.ts

@@ -1,12 +1,10 @@
-import { type CarouselTariffsCardAction } from '../components/CarouselTariffsCard/CarouselTariffsCardAction';
+import { EventBus } from '@redneckz/uni-jsx/lib/EventBus/EventBus';
 import { type DialogAction } from '../ui-kit/DialogManager/DialogAction';
 import { type PopupAction } from '../ui-kit/PopupManager/PopupAction';
-import { EventBus } from './EventBus';
 
 interface GlobalEventMap {
   dialog: DialogAction;
   popup: PopupAction;
-  fold: CarouselTariffsCardAction;
 }
 
 export const defaultEventBus = new EventBus<GlobalEventMap>();

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -1,22 +1,20 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { LeadServiceAPI } from '../../api/LeadServiceAPI';
 import { handleAspects } from '../../hooks/useAspects/handleAspects';
 import { useAspects } from '../../hooks/useAspects/useAspects';
-import { useForm } from '../../hooks/useForm';
+import { useForm } from '../../hooks/useForm/useForm';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { getConsentDataProcessing } from '../../ui-kit/FormField/getConsentDataProcessing';
 import { getField } from '../../ui-kit/FormField/getField';
-import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
+import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
 import { ResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/ResponseTypeDialog';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
-import { objectValidator } from '../../validation/objectValidator';
-import { isValidationSuccess } from '../../validation/validator';
 import { type ApplicationFormContent, type FieldDef } from './ApplicationFormContent';
 import { getFormatData } from './getFormatData';
 import { getInitialFormState, type FormState } from './getInitialFormState';
@@ -28,7 +26,6 @@ interface ApplicationFormProps extends ApplicationFormContent, UniBlockProps {}
 const API = LeadServiceAPI();
 
 export const ApplicationForm = JSX<ApplicationFormProps>(
-  // eslint-disable-next-line max-lines-per-function
   ({
     className,
     title,
@@ -42,46 +39,40 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
     data,
     ...rest
   }) => {
-    const inputs = (sections?.flatMap((_) => _?.inputs) || []) as FieldDef[];
-    const initialFormState = getInitialFormState(inputs, typeForm);
-    const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
+    const inputs = useMemo(
+      () => (sections?.flatMap((_) => _?.inputs) || []) as FieldDef[],
+      [sections],
+    );
+    const initialFormState = useMemo(
+      () => getInitialFormState(inputs, typeForm),
+      [inputs, typeForm],
+    );
+
+    const formValidator = useMemo(() => getFormValidator(inputs), [inputs]);
 
     const responseTypeDialog = useDialog(ResponseTypeDialog);
+    const aspects = useAspects();
 
     const handleSubmit = useCallback(
       async (formData: FormState, ev: PreventableEventWithTarget) => {
-        const inputsFiltered = getFilteredInputs(inputs, formData);
-        const feedbackValidator = objectValidator(getObjectValidator(inputsFiltered));
-        if (!isValidationSuccess(feedbackValidator(formData))) {
-          return console.warn('validation fail');
-        }
         const formatData = getFormatData({ ...formData, ...additionalParams });
-        const status = (await API.send(formatData, endpoint === 'lead')) ? 'OK' : 'Fail';
-        setResponseType(status);
+        const ok = Boolean(await API.send(formatData, endpoint === 'lead'));
 
-        if (status) {
-          responseTypeDialog.open({ typeForm, responseType: status });
-        }
-        if (status === 'OK' && data) {
-          const aspects = useAspects();
+        responseTypeDialog.open({ ok, typeForm });
+        if (ok) {
           handleAspects({ aspectsAttributes: data, aspects, ev });
         }
-
-        return status;
       },
       [typeForm],
     );
 
-    const [, { field, onSubmit, reset }] = useForm(initialFormState, { onSubmit: handleSubmit });
+    const [, { field, onSubmit }] = useForm(initialFormState, {
+      resetOnSubmit: true,
+      formValidator,
+      onSubmit: handleSubmit,
+    });
     const fieldName = getConsentDataProcessing(inputs)?.name;
 
-    useEffect(() => {
-      if (responseType === 'OK') {
-        setResponseType('');
-        reset();
-      }
-    }, [responseType]);
-
     return (
       <ApplicationFormLayout
         className={style('container space-y-m', className)}
@@ -95,7 +86,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
               className={style(inputColumnStyles(_.columns), 'grid gap-x-m')}
             >
               {renderTitle(_.title)}
-              {(_?.inputs || [])?.map(getField(field, { typeForm }))}
+              {(_?.inputs || [])?.map(getField<FieldDef>(field, { typeForm }))}
             </div>
           ))}
           {renderAgreementSubmit(
@@ -109,14 +100,3 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
     );
   },
 );
-
-const getFilteredInputs = (inputs: FieldDef[], data: FormState) =>
-  inputs.filter(
-    (input) =>
-      !input?.condition ||
-      input?.condition.values.find((_) => {
-        const dataValue = data?.[input?.condition?.name ?? ''];
-
-        return _ === (dataValue?.key ?? dataValue);
-      }),
-  );

package/src/components/ApplicationForm/renderAgreementSubmit.tsx

@@ -1,4 +1,4 @@
-import { type FieldProps } from '../../hooks/useForm';
+import { type FieldProps } from '../../hooks/useForm/useForm';
 import { type LinkProps } from '../../model/LinkProps';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { agreementValidator } from '../../ui-kit/FormField/validators';