@redneckz/wildless-cms-uni-blocks 0.14.576 → 0.14.578

package/src/components/ApplicationLeadForm/GroupedConsents.tsx

@@ -7,9 +7,9 @@ import { type FoldablePartProps } from '../../ui-kit/Foldable/FoldablePartProps'
 import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
 import { getField } from '../../ui-kit/FormField/getField';
 import { validatorObj } from '../../ui-kit/FormField/getObjectValidator';
+import { getValidation } from '../../ui-kit/FormField/getValidation';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import { renderErrorText } from '../../ui-kit/Input/renderErrorText';
-import { withValidator } from '../../validation/withValidator';
 import { type GroupedConsentsProps } from './ApplicationLeadFormContent';
 import { type FormState } from './getInitialFormState';
 
@@ -31,7 +31,7 @@ export const GroupedConsents = JSX<GroupedConsentsProps>(
       () =>
         inputs
           ?.filter((_) => _.required)
-          ?.some((_) => Boolean(withValidator(field(_?.name), validatorObj[_?.name]).error)),
+          ?.some((_) => Boolean(getValidation(field(_?.name), validatorObj[_?.name], _?.required))),
       [inputs],
     );
 

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -18,6 +18,14 @@ export interface FormState {
   birthday?: Date;
   phone?: string;
   secondaryPhone?: string;
+  education?: string;
+  housing?: string;
+  employment?: string;
+  organization?: string;
+  amountWorkers?: string;
+  employerActivities?: string;
+  employerOrganization?: string;
+  positionOrganization?: string;
   email?: string;
   acquiringType?: Option;
   serviceType?: Option;

package/src/components/CarouselTariffsCard/CarouselTariffsCard.tsx

@@ -72,7 +72,7 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
             )}
             renderFoldButton={
               cardCells.length >= visibleCellsCount
-                ? renderFoldButton(isVisible, options?.parent, data)
+                ? renderFoldButton(options?.parent, data, isVisible)
                 : null
             }
           />
@@ -84,25 +84,27 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
   },
 );
 
-const renderFoldButton = (isUnfolded?: boolean, parent?: Slot, data?: AspectsDef[]) => (): VNode =>
-  (
-    <button
-      className="w-full cursor-pointer text-primary-main pt-lg flex justify-between items-center"
-      onClick={() => {
-        if (parent !== undefined) {
-          defaultEventBus.fire('fold', { type: 'fold', isUnfolded: !isUnfolded, parent });
-        }
-      }}
-      type="button"
-      // eslint-disable-next-line react/jsx-props-no-spreading
-      {...(isUnfolded ? getAspectsAttributes(data) : {})}
-    >
-      <div>{isUnfolded ? 'Скрыть' : 'Подробнее о тарифе'}</div>
-      <Icon
-        className="text-primary-text"
-        name={isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon'}
-        width="16"
-        height="16"
-      />
-    </button>
-  );
+const renderFoldButton =
+  (parent?: Slot, data?: AspectsDef[], isUnfolded = false) =>
+  (): VNode =>
+    (
+      <button
+        className="w-full cursor-pointer text-primary-main pt-lg flex justify-between items-center"
+        onClick={() => {
+          if (parent !== undefined) {
+            defaultEventBus.fire('fold', { type: 'fold', isUnfolded: !isUnfolded, parent });
+          }
+        }}
+        type="button"
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...(isUnfolded ? getAspectsAttributes(data) : {})}
+      >
+        <div>{isUnfolded ? 'Скрыть' : 'Подробнее о тарифе'}</div>
+        <Icon
+          className="text-primary-text"
+          name={isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon'}
+          width="16"
+          height="16"
+        />
+      </button>
+    );

package/src/components/Footer/SocialMedia.tsx

@@ -75,8 +75,11 @@ export const SocialMedia = JSX<SocialMediaProps>(
 const getStretchedStyle = (stretched = false) =>
   stretched ? 'flex-1 @lg:flex-initial justify-center' : '';
 
-const getClassName = (hasText: boolean, stretched: boolean, showButtonText = false): string =>
-  style(
+const getClassName = (hasText: boolean, stretched: boolean, showButtonText = false): string => {
+  const textStyleCondition = showButtonText ? !hasText : true;
+
+  return style(
     hasText || stretched ? 'basis-full' : '',
-    stretched && (showButtonText ? !hasText : true) ? 'flex-nowrap' : '',
+    stretched && textStyleCondition ? 'flex-nowrap' : '',
   );
+};

package/src/components/InvestmentInfo/InvestmentInfo.tsx

@@ -76,19 +76,20 @@ const renderInvestmentColumn = (
 ) => {
   const isSecondColumn = i === 1;
   const isLastColumn = i === arr.length - 1;
+  const reversedCells = column.cells?.reverse() || [];
 
   return (
     <div
       key={`column_${i}`}
       className={`${getColumnClasses(isSecondColumn, isLastColumn, column.cells)}`}
     >
-      {column.cells?.length ? (
+      {reversedCells.length ? (
         <div
           className={`w-full ${
             isLastColumn ? 'border-4 border-green-more-dark p-1.5 min-w-72' : ''
           }`}
         >
-          {column.cells.reverse().map(renderInvestmentCell)}
+          {reversedCells.map(renderInvestmentCell)}
         </div>
       ) : null}
     </div>

package/src/components/LinkDocs/LinkDocs.tsx

@@ -72,13 +72,13 @@ const renderLinkDocItem =
     }
 
     if ('reportSource' in docBlockDef && docBlockDef?.reportSource?.__html) {
-      return renderModalItem(docBlockDef, i);
+      return renderModalItem(icon)(docBlockDef, i);
     }
 
     return renderDefaultItem(router, icon)(docBlockDef, i);
   };
 
-const renderModalItem = (props: LinkDocDef | AttachmentDocDef, i: number) => {
+const renderModalItem = (icon: Picture) => (props: LinkDocDef | AttachmentDocDef, i: number) => {
   const commonProps = {
     text: props.text,
     target: props.target,
@@ -89,6 +89,7 @@ const renderModalItem = (props: LinkDocDef | AttachmentDocDef, i: number) => {
     <div role="listitem" key={String(i)}>
       <ReportDialogButton
         {...commonProps}
+        icon={icon}
         href={isLinkDoc(props) ? props?.href : props?.attachment?.src}
       />
       <RichText __html={props?.__html} />

package/src/components/LinkDocs/RepordDialogButton.tsx

@@ -2,8 +2,10 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type ReportDialogProps } from '../../ui-kit/ReportDialog/ReportDialog';
 import { useReportDialog } from '../../ui-kit/ReportDialog/useReportDialog';
+import { Text } from '../../ui-kit/Text/Text';
+import { renderImg } from './renderDefaultItem';
 
-export const ReportDialogButton = JSX<ReportDialogProps>(({ text, href, target, __html }) => {
+export const ReportDialogButton = JSX<ReportDialogProps>(({ text, href, target, __html, icon }) => {
   if (!text && !__html) {
     return null;
   }
@@ -11,8 +13,12 @@ export const ReportDialogButton = JSX<ReportDialogProps>(({ text, href, target,
   const openReportDialog = useCallback(() => reportDialog.open(), [reportDialog]);
 
   return (
-    <button className="text-primary-main" onClick={openReportDialog}>
-      {text}
+    <button
+      className="flex gap-s text-primary-text no-underline hover:text-primary-main"
+      onClick={openReportDialog}
+    >
+      {renderImg(icon)}
+      <Text font="font-light">{text}</Text>
     </button>
   );
 });

package/src/components/LinkDocs/linkDocsContentExample.ts

@@ -37,6 +37,7 @@ export const linkDocsContentExample: LinkDocsContent = {
       href: '/abc8/archive.zip',
       fileFormat: 'zip',
       fileSize: '2.3МБ',
+      __html: HTML,
     },
     {
       docType: 'Link',

package/src/components/LinkDocs/renderDefaultItem.tsx

@@ -38,7 +38,7 @@ export const renderDefaultItem =
     );
   };
 
-const renderImg = (icon?: Picture) =>
+export const renderImg = (icon?: Picture) =>
   icon ? <Img className={linkIconStyle} image={icon} width="24" height="24" /> : null;
 
 const getExtFromHref = (href?: string) => {

package/src/components/OfficesAtmsMap/renderButtonsGroup.tsx

@@ -12,20 +12,22 @@ export const renderButtonsGroup = (
   const businessButtonVersion = getVersion(activeButton === 'business');
 
   const handleClick = (e: any, key: string, branches: Branch[]) => {
-    if (e.currentTarget === e.target && key === 'business') {
-      branches.filter(
-        (branch) =>
-          branch.workSchedule &&
-          branch.workSchedule.businessScheduleVisibleTag &&
-          !branch.workSchedule.businessScheduleDescription,
-      );
-    }
+    const filteredBranches =
+      e.currentTarget === e.target && key === 'business' ? filterBranches(branches) : branches;
 
     onButtonClick(key);
 
-    return branches;
+    return filteredBranches;
   };
 
+  const filterBranches = (branches: Branch[]) =>
+    branches.filter(
+      (branch) =>
+        branch.workSchedule &&
+        branch.workSchedule.businessScheduleVisibleTag &&
+        !branch.workSchedule.businessScheduleDescription,
+    );
+
   return (
     <div className="flex gap-lg flex-col sm:flex-row pb-lg">
       <Button data-id="all" onClick={(e) => handleClick(e, 'all', data)} version={allButtonVersion}>

package/src/components/OfficesAtmsMap/renderFiltrationForm.tsx

@@ -56,7 +56,7 @@ export const renderFiltrationForm = ({
 };
 
 export const renderFoldButton =
-  (reset: () => void, onlyOffice?: boolean) =>
+  (reset: () => void, onlyOffice = false) =>
   ({ isUnfolded, onToggle }: FoldablePartProps) => {
     const labels = ['Больше фильтров', 'Меньше фильтров'];
     const icons: IconName[] = ['ArrowDownIcon', 'ArrowUpIcon'];

package/src/components/RepresentativeOfficeInfo/RepresentativeOfficeInfo.tsx

@@ -74,7 +74,7 @@ const renderDescriptionBlock = (props: RichTextProps) => (
 interface renderBlockProps {
   label?: string;
   data?: string;
-  iconName?: IconName | undefined;
+  iconName?: IconName;
   dataColor?: TextColor;
 }
 

package/src/hooks/useLeadFormData.ts

@@ -0,0 +1,18 @@
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { type LeadProps } from '../ui-kit/FormField/SelectField';
+import { fetchJSON } from '../utils/fetchJSON';
+
+export const useLeadFormData = (typeField: string) => {
+  const { data, error } = useAsyncData(
+    `https://portal-ui-cc.cprb.dev.rshbdev.ru/light-api-cash/v1/dictionary?dictionaryType=${typeField}`,
+    fetchData,
+  );
+
+  return { data, error };
+};
+
+const fetchData = async (url: string): Promise<LeadProps[]> => {
+  const result = await fetchJSON<LeadProps[]>(url, { method: 'POST' });
+
+  return result || [];
+};

package/src/ui-kit/Button/Button.tsx

@@ -28,7 +28,7 @@ const secondaryButtonStyleMap: Record<ButtonVersion, string> = {
 export interface ButtonProps extends ControlStateProps, ARIAProps {
   className?: string;
   version?: ButtonVersion;
-  type?: 'button' | 'submit' | 'reset' | undefined;
+  type?: 'button' | 'submit' | 'reset';
   rounded?: boolean;
   role?: string;
   onClick?: (ev?: PreventableEvent) => void;

package/src/ui-kit/DatePicker/renderCalendarCells.tsx

@@ -10,8 +10,8 @@ interface RenderCalendarCellsParams {
   totalDays: number;
   currentYear: number;
   currentMonth: number;
-  min?: Date | undefined;
-  max?: Date | undefined;
+  min?: Date;
+  max?: Date;
   onDateClick: (date: Date) => void;
 }
 
@@ -68,7 +68,7 @@ const checkIsToday = (currentDate: Date, today: Date | undefined) =>
 const checkIsDisabled = (currentDate: Date, min: Date | undefined, max: Date | undefined) =>
   (min && currentDate.getTime() < min.getTime()) || (max && currentDate.getTime() > max.getTime());
 
-const getDayStyles = (isToday: boolean | undefined, isDisabled: boolean | undefined) =>
+const getDayStyles = (isToday = false, isDisabled = false) =>
   style(
     'p-s text-center rounded-md border',
     {

package/src/ui-kit/DialogManager/DialogManager.tsx

@@ -7,8 +7,8 @@ import { useDialogManager } from './useDialogManager';
 import { useDialogsList } from './useDialogsList';
 
 export const DialogManager = JSX(() => {
-  const handleCloseAll = useCallback((dialogs: DialogOpenAction[]) => {
-    for (const _ of dialogs) {
+  const handleCloseAll = useCallback((dialogActions: DialogOpenAction[]) => {
+    for (const _ of dialogActions) {
       _?.onClose && _.onClose();
     }
   }, []);

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

@@ -0,0 +1,18 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { SelectField } from '../SelectField';
+
+export const AmountWorkersField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: amountWorkers } = useLeadFormData('EMPLOYEES_NUMBER');
+
+  return (
+    <SelectField
+      field={field}
+      source={amountWorkers || []}
+      label="Количество работающих в организации"
+      fieldName="amountWorkers"
+      input={input}
+    />
+  );
+});

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

@@ -0,0 +1,12 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const AnnualRevenueField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Годовая выручка, ₽"
+    {...getValidation(field('annualRevenue'), validatorObj.annualRevenue, input?.required)}
+  />
+));

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

@@ -0,0 +1,10 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+
+export const BankEmpoleeField = JSX<CustomFieldProps>(({ field }) => (
+  <InputControl
+    label="ФИО или должность обслуживавшего Вас сотрудника Банка"
+    {...field('bankEmpolee')}
+  />
+));

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

@@ -0,0 +1,12 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { DatePickerControl } from '../../DatePicker/DatePickerControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const BirthdayField = JSX<CustomFieldProps>(({ field, input }) => (
+  <DatePickerControl
+    label="Дата рождения"
+    {...getValidation(field('birthday'), validatorObj.birthday, input?.required)}
+  />
+));

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

@@ -0,0 +1,13 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const CollectionCountField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Количество объектов инкассации"
+    type="number"
+    {...getValidation(field('collectionCount'), validatorObj.collectionCount, input?.required)}
+  />
+));

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

@@ -1,12 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ConsentAssignmentField = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentAssignmentField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Прочие согласия (согласие на уступку прав требований)"
-    {...withValidator(field('consentAssignmentClaimsFlg'), validatorObj.consentAssignmentClaimsFlg)}
+    {...getValidation(
+      field('consentAssignmentClaimsFlg'),
+      validatorObj.consentAssignmentClaimsFlg,
+      input?.required,
+    )}
   />
 ));

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

@@ -1,12 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ConsentCollectionField = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentCollectionField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Прочие согласия (согласие на взыскание по исполнительной надписи нотариуса)"
-    {...withValidator(field('consentCollectionFlg'), validatorObj.consentCollectionFlg)}
+    {...getValidation(
+      field('consentCollectionFlg'),
+      validatorObj.consentCollectionFlg,
+      input?.required,
+    )}
   />
 ));

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ConsentInformField = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentInformField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Согласие на информирование о продуктах и услугах Банка"
-    {...withValidator(field('consentInformFlg'), validatorObj.consentInformFlg)}
+    {...getValidation(field('consentInformFlg'), validatorObj.consentInformFlg, input?.required)}
   />
 ));

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ConsentPhotoFlg = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentPhotoFlg = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Прочие согласия (согласие на фотографирование)"
-    {...withValidator(field('consentPhotoFlg'), validatorObj.consentPhotoFlg)}
+    {...getValidation(field('consentPhotoFlg'), validatorObj.consentPhotoFlg, input?.required)}
   />
 ));

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

@@ -1,12 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ConsentProviderField = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentProviderField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Согласие об использовании простой электронной подписи"
-    {...withValidator(field('consentProviderFlg'), validatorObj.consentProviderFlg)}
+    {...getValidation(
+      field('consentProviderFlg'),
+      validatorObj.consentProviderFlg,
+      input?.required,
+    )}
   />
 ));

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

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

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

@@ -0,0 +1,12 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { DatePickerControl } from '../../DatePicker/DatePickerControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const DesiredMeetingDateField = JSX<CustomFieldProps>(({ field, input }) => (
+  <DatePickerControl
+    label="Дата рождения"
+    {...getValidation(field('birthday'), validatorObj.birthday, input?.required)}
+  />
+));

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

@@ -0,0 +1,18 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { SelectField } from '../SelectField';
+
+export const EducationField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: education } = useLeadFormData('EDUCATION_LEVEL');
+
+  return (
+    <SelectField
+      field={field}
+      source={education || []}
+      label="Образование"
+      fieldName="education"
+      input={input}
+    />
+  );
+});

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

@@ -0,0 +1,18 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { SelectField } from '../SelectField';
+
+export const EmployerActivitiesField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: employerActivities } = useLeadFormData('ORGANIZATION_ACTIVITY_TYPE');
+
+  return (
+    <SelectField
+      field={field}
+      source={employerActivities || []}
+      label="Вид деятельности организации-работодателя"
+      fieldName="employerActivities"
+      input={input}
+    />
+  );
+});

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

@@ -0,0 +1,18 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { SelectField } from '../SelectField';
+
+export const EmployerOrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: employerOrganization } = useLeadFormData('ORGANIZATION_KIND');
+
+  return (
+    <SelectField
+      field={field}
+      source={employerOrganization || []}
+      label="Вид организации работодателя"
+      fieldName="employerOrganization"
+      input={input}
+    />
+  );
+});

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

@@ -0,0 +1,18 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { SelectField } from '../SelectField';
+
+export const EmploymentField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: employment } = useLeadFormData('EMPLOYMENT_TYPE');
+
+  return (
+    <SelectField
+      field={field}
+      source={employment || []}
+      label="Информация о трудоустройстве"
+      fieldName="employment"
+      input={input}
+    />
+  );
+});

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

@@ -1,14 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { SelectControl } from '../../Select/SelectControl';
 import { FEEDBACK_METHOD } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const FeedbackMethodField = JSX<CustomFieldProps>(({ field }) => (
+export const FeedbackMethodField = JSX<CustomFieldProps>(({ field, input }) => (
   <SelectControl
     label="Способ получения ответа"
     options={FEEDBACK_METHOD}
-    {...withValidator(field('feedbackMethod'), validatorObj.feedbackMethod)}
+    {...getValidation(field('feedbackMethod'), validatorObj.feedbackMethod, input?.required)}
   />
 ));