@redneckz/wildless-cms-uni-blocks 0.14.730 → 0.14.731

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -1,64 +1,29 @@
 import type { LeadFormState } from '../../services/retail/model/LeadFormState';
-import {
-  FEEDBACK_METHOD,
-  SERVICE_DIRECTIONS,
-  SERVICE_TYPES,
-} from '../../ui-kit/FormField/constants';
-import { ACQUIRING_TYPES } from '../../ui-kit/FormField/Fields/AcquiringField';
-import { VED_TYPES } from '../../ui-kit/FormField/Fields/VedField';
-import { type FieldDef } from './ApplicationLeadFormContent';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 
 const initialFormState = {
-  typeForm: '',
-  region: { key: '', text: '' },
   surname: '',
   name: '',
-  phone: '',
-  secondaryPhone: '',
-  organizationPhone: '',
-  comment: '',
-  product: '',
-  partnerComments: '',
-  annualRevenue: '',
-  term: 12,
-  amount: 100000,
-  acquiringType: ACQUIRING_TYPES[0],
-  serviceType: SERVICE_TYPES[0],
-  feedbackMethod: FEEDBACK_METHOD[0],
-  serviceDirection: SERVICE_DIRECTIONS[0],
-  vedTypes: VED_TYPES[0],
+  middleName: '',
   limitedBirthday: undefined,
-  isClient: false,
-  onlineCheckout: false,
-  posTerminal: false,
-  consentDataProcessing: false,
+  phone: '',
+  email: '',
   processPersonalDataFlg: false,
   consentProviderFlg: false,
   consentOthersFlg: false,
   consentInformFlg: false,
-  addressRegistration: '',
-  participantDateRegistration: undefined,
-  currency: '',
-  paymentSystem: { name: '', type: '' },
-  cardCategory: { key: '', text: '' },
-  codeWord: '',
-  addressRetail: { key: '', text: '' },
+  consentPfrFlg: false,
 };
 
 export const getInitialFormState = (
-  inputs: FieldDef[],
+  inputs: FieldRetailDef[],
   savedForm: LeadFormState | null,
 ): LeadFormState => {
   if (savedForm) {
     return { ...savedForm, limitedBirthday: new Date(savedForm?.limitedBirthday || 0) };
   }
 
-  const formState = Object.fromEntries(
-    inputs.map((_) => [
-      _.name,
-      (_.fieldType === 'ved' && _?.defaultValue) || initialFormState[_.name || ''],
-    ]),
-  );
+  const formState = Object.fromEntries(inputs.map((_) => [_.name, initialFormState[_.name || '']]));
 
-  return { ...formState, typeForm: { key: '', text: '' } };
+  return { ...formState };
 };

package/src/components/ApplicationLeadForm/renderInputs.tsx

@@ -1,23 +1,23 @@
 import { InputsApplicationLeadMap } from '../../services/retail/inputs';
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { getField } from '../../ui-kit/FormField/getField';
 import { CONSENTS } from './consents';
 import { GroupedConsents, type GroupedConsentsProps } from './GroupedConsents';
 
-export const renderInputs = ({ field, typeForm = '', inputs }: GroupedConsentsProps) => {
+export const renderInputs = ({ field, inputs }: GroupedConsentsProps) => {
   const { consentInputs, restInputs } = splitInputs(inputs || []);
 
   return consentInputs.length > 2 ? (
     <div>
-      {restInputs.map(getField(field, { typeForm }, { ...InputsApplicationLeadMap }))}
+      {restInputs.map(getField(field, {}, { ...InputsApplicationLeadMap }))}
       <GroupedConsents inputs={consentInputs} field={field} />
     </div>
   ) : (
-    (inputs || [])?.map(getField(field, { typeForm }, { ...InputsApplicationLeadMap }))
+    (inputs || [])?.map(getField(field, {}, { ...InputsApplicationLeadMap }))
   );
 };
 
-const splitInputs = (inputs?: FieldDef[]) => ({
+const splitInputs = (inputs?: FieldRetailDef[]) => ({
   consentInputs: inputs?.filter((_) => Object.keys(CONSENTS).includes(_.name || '')) || [],
   restInputs: inputs?.filter((_) => !Object.keys(CONSENTS).includes(_.name || '')) || [],
 });

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -7,6 +7,7 @@ import { getTaskById } from '../../api/RetailAPI/getTaskById';
 import { updateUserProfile } from '../../api/RetailAPI/updateUserProfile';
 import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { getUpdateUserProfileData } from '../../services/retail/utils/getUpdateUserProfile';
 import { useConsentBkiDialog } from '../../ui-kit/ConsentBkiDialog/useConsentBkiDialog';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
@@ -17,13 +18,12 @@ import { VerifyPhoneDialog } from '../../ui-kit/VerifyPhoneDialog/VerifyPhoneDia
 import { formatPhone } from '../../utils/formatPhone';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
-import { type FieldDef } from './ApplicationLeadFormContent';
 import { CONSENTS } from './consents';
 import { getLeadFormTaskData } from './getLeadFormTaskData';
 import { useSaveUserData, type UserData } from './useSaveUserData';
 
 interface ApplicationLeadApiProps {
-  inputs: FieldDef[];
+  inputs: FieldRetailDef[];
   programId: string;
   nextStepLink: string;
 }

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -4,14 +4,14 @@ import { updateProfileEsia } from '../../api/RetailAPI/updateProfileEsia';
 import { locationNavigator } from '../../external/locationNavigator';
 import { useSetter } from '../../hooks/useSetter';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { safeJsonParse } from '../../utils/safeJsonParse';
-import { type FieldDef } from './ApplicationLeadFormContent';
 import { getInitialFormState } from './getInitialFormState';
 import { parseEsiaProfile } from './pasreEsiaProfile';
 import { useLeadFormStore } from './useLeadFormStore';
 
 export const useInitApplicationLead = (
-  inputs: FieldDef[],
+  inputs: FieldRetailDef[],
   nextStepLink: string,
 ): [LeadFormState, { isLoading: boolean }] => {
   const navigator = locationNavigator();

package/src/components/CreditCardForm/CreditCardFormContent.ts

@@ -1,18 +1,17 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { type TitleProps } from '../../model/HeadlineType';
-import { type InputSectionsType } from '../../model/InputSectionsType';
+import { type InputSectionsType, type SectionsRetailProps } from '../../model/InputSectionsType';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
-import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
-import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 
 /** @hidden */
 export interface RenderInputsProps {
-  inputs?: FieldDef[];
+  inputs?: FieldRetailDef[];
   field: FormFieldRegisterer<LeadFormState>;
 }
 
-export type CreditCardSectionsProps = SectionsProps & {
+export type CreditCardSectionsProps = SectionsRetailProps & {
   type?: 'courier' | 'office';
 };
 

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -1,8 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
+import { type SectionsRetailProps } from '../../model/InputSectionsType';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
-import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { CreditCardFormStatusTracker } from './CreditCardFormStatusTracker';
 import { renderStep } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -10,7 +11,7 @@ import { useCreditCardFormAPI } from './useCreditCardFormAPI';
 
 export interface CreditCardFormStepProps {
   step: number;
-  sections: SectionsProps[];
+  sections: SectionsRetailProps[];
   isFormFinished: boolean;
   onNextStep: () => void;
   onPrevStep: () => void;
@@ -20,7 +21,7 @@ export interface CreditCardFormStepProps {
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
   ({ step, sections, isFormFinished, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
-      () => (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[],
+      () => (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldRetailDef[],
       [sections],
     );
 

package/src/components/CreditCardForm/renderInfo.tsx

@@ -1,7 +1,7 @@
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { InfoCard } from '../../ui-kit/InfoCard/InfoCard';
-import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 
-export const renderInfo = (inputs: FieldDef[] = []) => {
+export const renderInfo = (inputs: FieldRetailDef[] = []) => {
   const infoInputs = inputs.filter((_) => _.fieldType === 'info');
 
   return infoInputs.length

package/src/components/CreditCardForm/renderInputs.tsx

@@ -1,11 +1,11 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { InputRetailCardMap, InputsRetailMap } from '../../services/retail/inputs';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { getField } from '../../ui-kit/FormField/getField';
 
 export interface RenderInputsProps {
-  inputs: FieldDef[];
+  inputs: FieldRetailDef[];
   field: FormFieldRegisterer<LeadFormState>;
   params?: Record<string, any>;
 }

package/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -3,17 +3,17 @@ import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { calculateInputs, type GetValue } from '../../services/retail/utils/calculateInputs';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
-import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { getCreditCardFormTaskData } from './getCreditCardFormTaskData';
 import { getInitialFormState } from './getInitialFormState';
 
 interface CreditFormApiProps {
   step: number;
-  inputs: FieldDef[];
+  inputs: FieldRetailDef[];
   onNextStep: () => void;
   onFinish?: () => void;
 }

package/src/components/CreditForm/CreditFormStep.tsx

@@ -2,8 +2,8 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
-import { type SectionsProps } from '../../model/InputSectionsType';
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type SectionsProps, type SectionsRetailProps } from '../../model/InputSectionsType';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { CreditFormStatusTracker } from './CreditFormStatusTracker';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
 import { renderStep } from './renderStep';
@@ -12,7 +12,7 @@ import { useCreditFormAPI } from './useCreditFormAPI';
 
 export interface CreditFormStepProps {
   step: number;
-  sections: SectionsProps[];
+  sections: SectionsRetailProps[];
   isFormFinished?: boolean;
   programsSource?: ProgramsSourceProps;
   onNextStep: () => void;
@@ -26,7 +26,7 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
     const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
 
     const inputs = useMemo(
-      () => (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[],
+      () => (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldRetailDef[],
       [sections],
     );
 

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -1,11 +1,11 @@
-import { type SectionsProps } from '../../model/InputSectionsType';
+import { type SectionsRetailProps } from '../../model/InputSectionsType';
 import {
   CALCULATOR_CONTENT,
   COMMON_RETAIL_CONTENT,
   DELIVERY_CREDIT_CONTENT,
 } from '../../services/retail/content';
 
-export const stepsSectionsMap: SectionsProps[][] = [
+export const stepsSectionsMap: SectionsRetailProps[][] = [
   CALCULATOR_CONTENT,
   ...COMMON_RETAIL_CONTENT,
   DELIVERY_CREDIT_CONTENT,

package/src/components/CreditForm/renderInfo.tsx

@@ -1,7 +1,7 @@
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { InfoCard } from '../../ui-kit/InfoCard/InfoCard';
 
-export const renderInfo = (inputs: FieldDef[] = []) => {
+export const renderInfo = (inputs: FieldRetailDef[] = []) => {
   const infoInputs = inputs.filter((_) => _.fieldType === 'info');
 
   return infoInputs.length

package/src/components/CreditForm/renderInputs.tsx

@@ -1,11 +1,11 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { InputsRetailMap } from '../../services/retail/inputs';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { getField } from '../../ui-kit/FormField/getField';
 
 export interface RenderInputsProps {
-  inputs: FieldDef[];
+  inputs: FieldRetailDef[];
   field: FormFieldRegisterer<LeadFormState>;
   params?: Record<string, any>;
 }

package/src/components/CreditForm/renderStep.tsx

@@ -1,17 +1,17 @@
 import { type FormFieldRegisterer, type FormOperatorProps } from '../../hooks/useForm';
+import { type SectionsRetailProps } from '../../model/InputSectionsType';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
 import { calculateInputs, type GetValue } from '../../services/retail/utils/calculateInputs';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { style } from '../../utils/style';
-import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
 import { renderInfo } from './renderInfo';
 import { renderInputs } from './renderInputs';
 
 export type CustomSubmit = FormOperatorProps<LeadFormState>['onSubmit'];
 
 export interface StepProps {
-  sections?: SectionsProps[];
+  sections?: SectionsRetailProps[];
   field: FormFieldRegisterer<LeadFormState>;
   step: number;
   params?: Record<string, any>;

package/src/components/CreditForm/useCreditFormAPI.tsx

@@ -4,7 +4,7 @@ import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { getCreditFormTaskData } from '../../services/retail/adaptors/getCreditFormTaskData';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { calculateInputs, type GetValue } from '../../services/retail/utils/calculateInputs';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { objectValidator } from '../../validation/objectValidator';
@@ -13,7 +13,7 @@ import { getInitialFormState } from './getInitialFormState';
 
 interface CreditFormApiProps {
   step: number;
-  inputs: FieldDef[];
+  inputs: FieldRetailDef[];
   onNextStep: () => void;
   onFinish?: () => void;
 }

package/src/model/FormTypeFieldDef.ts

@@ -0,0 +1,20 @@
+/** @hidden */
+export type FormTypeFieldDef =
+  | ''
+  | 'ACQR'
+  | 'ANALITIC'
+  | 'ANTIFRAUD'
+  | 'BCRD'
+  | 'BROK'
+  | 'BROKACCOUNT'
+  | 'COLLECTION'
+  | 'CORRUPTION'
+  | 'CRED'
+  | 'DPST'
+  | 'PRODUCT'
+  | 'SELFCOLLECTION'
+  | 'KVED'
+  | 'ULTRASERVICE'
+  | 'FEEDBACK'
+  | 'FEEDBACK_QS'
+  | 'OUTSERVICE';

package/src/model/InputSectionsType.ts

@@ -1,4 +1,5 @@
-import { type FieldDef } from '../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FieldDef } from '../components/ApplicationForm/ApplicationFormContent';
+import { type FieldRetailDef } from '../services/retail/model/RetailFormContent';
 import { type ColumnsCount } from './ColumnCount';
 import { type TitleProps } from './HeadlineType';
 
@@ -14,3 +15,13 @@ export interface InputSectionsType {
   /** @hidden */
   sections?: SectionsProps[];
 }
+
+export type SectionsRetailProps = TitleProps & {
+  columns?: ColumnsCount;
+  inputs?: FieldRetailDef[];
+};
+
+export interface InputRetailSectionsType {
+  /** @hidden */
+  sections?: SectionsRetailProps[];
+}

package/src/services/retail/model/RetailFormContent.ts

@@ -1,6 +1,3 @@
-/* eslint-disable max-lines */
-/* eslint-disable max-len */
-
 import { type LabelProps, type LinkButtonVersion, type TextProps } from '../external/types';
 import { type NameFieldDef } from './LeadFormState';
 
@@ -45,22 +42,6 @@ export type FieldCommonDef = FieldDefaultDef & {
   fieldType: 'common';
 };
 
-/**
- * @title Значение по умолчанию
- * @enumNames ["Валютный контроль","Документарные операции","Конверсионные операции","Иные вопросы ВЭД"]
- */
-type VedTypes = 'currencyControl' | 'documentOperations' | 'conversionTransactions' | 'otherIssues';
-
-/**
- * @title Поле ввода ВЭД
- * @default {"fieldType": "ved", "name": "vedTypes", "defaultValue": "currencyControl"}
- */
-export type FieldVedDef = FieldDefaultDef & {
-  /** @default "ved" */
-  fieldType: 'ved';
-  defaultValue?: VedTypes;
-};
-
 /**
  * @title Текст для отображения в карточке информации
  * @default {"fieldType": "info"}
@@ -76,26 +57,4 @@ export type FieldInfoDef = FieldDefaultDef &
  * @default { "fieldType": "common" }
  */
 
-export type FieldDef = FieldCommonDef | FieldVedDef | FieldInfoDef;
-
-/** @hidden */
-export type TypeFormFieldDef =
-  | ''
-  | 'ACQR'
-  | 'ANALITIC'
-  | 'ANTIFRAUD'
-  | 'BCRD'
-  | 'BROK'
-  | 'BROKACCOUNT'
-  | 'COLLECTION'
-  | 'CORRUPTION'
-  | 'CRED'
-  | 'DPST'
-  | 'PRODUCT'
-  | 'SELFCOLLECTION'
-  | 'KVED'
-  | 'ULTRASERVICE'
-  | 'PREMIUMSERVICE'
-  | 'FEEDBACK'
-  | 'FEEDBACK_QS'
-  | 'OUTSERVICE';
+export type FieldRetailDef = FieldCommonDef | FieldInfoDef;

package/src/services/retail/utils/calculateInputs.ts

@@ -1,10 +1,11 @@
+import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { type Option } from '../../../ui-kit/Select/Option';
 import { type LeadFormState } from '../model/LeadFormState';
-import { type FieldDef } from '../model/RetailFormContent';
+import { type FieldRetailDef } from '../model/RetailFormContent';
 
 export type GetValue = <K extends keyof LeadFormState>(name: K) => LeadFormState[K];
 
-export const calculateInputs = (getValue: GetValue) => (inputs: FieldDef[], step: number) =>
+export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[], step: number) =>
   inputs
     .filter((_) => _)
     .map((_) => {

package/src/ui-kit/FormField/CustomFieldProps.ts

@@ -1,13 +1,14 @@
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
-import {
-  type FieldDef,
-  type TypeFormFieldDef,
-} from '../../services/retail/model/RetailFormContent';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 
 export interface CustomFieldProps {
   field: FormFieldRegisterer<any>;
   input?: FieldDef;
   url?: string;
   params?: Record<string, any>;
-  typeForm?: TypeFormFieldDef;
+}
+
+export interface CustomFieldPropsWithTypeForm extends CustomFieldProps {
+  typeForm?: FormTypeFieldDef;
 }

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

@@ -2,7 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useBranches } from '../../../hooks/useBranches';
 import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
-import { type TypeFormFieldDef } from '../../../services/retail/model/RetailFormContent';
+import { type FormTypeFieldDef } from '../../../model/FormTypeFieldDef';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
@@ -14,7 +14,7 @@ interface RegionFieldProps extends CustomFieldProps {
 }
 
 export const AddressBranchField = JSX<RegionFieldProps>(({ field, input, params }) => {
-  const isPremium = getPremium(params?.typeForm as TypeFormFieldDef);
+  const isPremium = getPremium(params?.typeForm as FormTypeFieldDef);
 
   const fieldRegion = field('region');
   const regionKey = fieldRegion?.value?.key as string;

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type FieldDef } from '../../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type FieldDef } from '../../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';

package/src/ui-kit/FormField/getConsentDataProcessing.tsx

@@ -1,4 +1,4 @@
-import type { FieldDef } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 
 export const getConsentDataProcessing = (inputs: FieldDef[]) =>
   inputs?.find((_) => _?.name === 'consentDataProcessing');

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

@@ -1,9 +1,7 @@
 //TODO: Убрать обращение к компонентам т.к. ApplicationForm
-import {
-  type FieldDef,
-  type TypeFormFieldDef,
-} from '../../components/ApplicationForm/ApplicationFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 import { type VNode } from '../../model/VNode';
 import { InputControl } from '../Input/InputControl';
 import { type CustomFieldProps } from './CustomFieldProps';
@@ -70,7 +68,7 @@ const InputsMap = {
     <InputControl label="Дата и время обращения в Банк" {...props} />
   ),
   region: (props: CustomFieldProps) =>
-    getPremium(props?.params?.typeForm as TypeFormFieldDef) ? (
+    getPremium(props?.params?.typeForm as FormTypeFieldDef) ? (
       <RegionPremiumField {...props} />
     ) : (
       <RegionField {...props} />

package/src/ui-kit/FormField/getNamesFromInput.tsx

@@ -1,4 +1,4 @@
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 
 export const getNamesFromInput = (inputs: FieldDef[]) =>
   Object.values(inputs.filter((_) => _))?.map((_) => _.name);

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

@@ -1,4 +1,4 @@
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type Validator } from '../../validation/validator';
 import { getNamesFromInput } from './getNamesFromInput';
 import {

package/src/ui-kit/FormField/getPremium.tsx

@@ -1,3 +1,3 @@
-import { type TypeFormFieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 
-export const getPremium = (typeForm: TypeFormFieldDef = ''): boolean => typeForm === 'ULTRASERVICE';
+export const getPremium = (typeForm: FormTypeFieldDef = ''): boolean => typeForm === 'ULTRASERVICE';