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

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
-import { withValidator } from '../../../validation/withValidator';
 import { SelectControl } from '../../Select/SelectControl';
 import { FEEDBACK_TYPES, SERVICE_DIRECTIONS } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const FeedbackTypeField = JSX<CustomFieldProps>(({ field }) => {
+export const FeedbackTypeField = JSX<CustomFieldProps>(({ field, input }) => {
   const feedbackType = field('feedbackType');
   useEffect(() => {
     if (feedbackType?.value?.key === 'FEEDBACK') {
@@ -19,7 +19,7 @@ export const FeedbackTypeField = JSX<CustomFieldProps>(({ field }) => {
       label="Тема"
       placeholder="Выберите тему"
       options={FEEDBACK_TYPES}
-      {...withValidator(feedbackType, validatorObj.feedbackType)}
+      {...getValidation(feedbackType, validatorObj.feedbackType, input?.required)}
     />
   );
 });

package/src/ui-kit/FormField/Fields/FullNameField.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 FullNameField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="ФИО"
+    {...getValidation(field('fullName'), validatorObj.fullName, input?.required)}
+    {...input}
+  />
+));

package/src/ui-kit/FormField/Fields/HousingField.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 HousingField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: housing } = useLeadFormData('HOUSE_TYPE');
+
+  return (
+    <SelectField
+      field={field}
+      source={housing || []}
+      label="Тип жилья"
+      fieldName="housing"
+      input={input}
+    />
+  );
+});

package/src/ui-kit/FormField/Fields/InnField.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 InnField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="ИНН"
+    type="number"
+    {...getValidation(field('inn'), validatorObj.inn, input?.required)}
+  />
+));

package/src/ui-kit/FormField/Fields/OrganizationField.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 OrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: organization } = useLeadFormData('ORGANIZATION_TYPE');
+
+  return (
+    <SelectField
+      field={field}
+      source={organization || []}
+      label="Тип организации"
+      fieldName="organization"
+      input={input}
+    />
+  );
+});

package/src/ui-kit/FormField/Fields/PositionOrganizationField.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 PositionOrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: positionOrganization } = useLeadFormData('POSITION');
+
+  return (
+    <SelectField
+      field={field}
+      source={positionOrganization || []}
+      label="Должность в организации"
+      fieldName="positionOrganization"
+      input={input}
+    />
+  );
+});

package/src/ui-kit/FormField/Fields/ProcessPersonalDataField.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 ProcessPersonalDataField = JSX<CustomFieldProps>(({ field }) => (
+export const ProcessPersonalDataField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Согласие на обработку персональных данных"
-    {...withValidator(field('processPersonalDataLeadFlg'), validatorObj.processPersonalDataLeadFlg)}
+    {...getValidation(
+      field('processPersonalDataLeadFlg'),
+      validatorObj.processPersonalDataLeadFlg,
+      input?.required,
+    )}
   />
 ));

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

@@ -1,15 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { SelectControl } from '../../Select/SelectControl';
 import { SERVICE_DIRECTIONS } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ServiceDirectionField = JSX<CustomFieldProps>(({ field }) => (
+export const ServiceDirectionField = JSX<CustomFieldProps>(({ field, input }) => (
   <SelectControl
     label="Направление обслуживания"
     placeholder="Выберите направление"
     options={SERVICE_DIRECTIONS}
-    {...withValidator(field('serviceDirection'), validatorObj.serviceDirection)}
+    {...getValidation(field('serviceDirection'), validatorObj.serviceDirection, input?.required)}
   />
 ));

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

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

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

@@ -0,0 +1,37 @@
+import { UniBlock } from '../../UniBlock/UniBlock';
+import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
+import { SelectControl } from '../Select/SelectControl';
+import { type CustomFieldProps } from './CustomFieldProps';
+import { validatorObj } from './getObjectValidator';
+import { getValidation } from './getValidation';
+
+export interface LeadProps {
+  type: string;
+  key: string;
+  value: string;
+  displayOrder: number;
+  description: string;
+}
+
+export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
+  source?: LeadProps[];
+  label: string;
+  fieldName: string;
+}
+
+export const SelectField = UniBlock<SelectFieldProps>(
+  ({ field, source, label, fieldName, input }) => {
+    const leadDescription = (source && source?.map((_: LeadProps) => _.description)) || [];
+
+    return (
+      <SelectControl
+        placeholder="Выберите из списка"
+        label={label}
+        options={arrayToOptions(leadDescription)}
+        {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
+      />
+    );
+  },
+);
+
+const arrayToOptions = (array?: string[]) => (array ?? []).map((_) => ({ key: _, value: _ }));

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

@@ -0,0 +1,3 @@
+export const PRODUCT_REF = {
+  $ref: '/wcms-resources/outservice-productlist.json',
+};

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

@@ -2,11 +2,15 @@ import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormC
 import { getRegionUrl } from '../../components/ApplicationForm/getRegionUrl';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { CheckboxWithError } from '../Checkbox/CheckboxWithError';
-import { DatePickerControl } from '../DatePicker/DatePickerControl';
 import { InputControl } from '../Input/InputControl';
 import { AcquiringField } from './Fields/AcquiringField';
 import { AddressBranchField } from './Fields/AddressBranchField';
 import { AmountField } from './Fields/AmountField';
+import { AmountWorkersField } from './Fields/AmountWorkersField';
+import { AnnualRevenueField } from './Fields/AnnualRevenueField';
+import { BankEmpoleeField } from './Fields/BankEmpoleeField';
+import { BirthdayField } from './Fields/BirthdayField';
+import { CollectionCountField } from './Fields/CollectionCountField';
 import { CommentField } from './Fields/CommentField';
 import { ConsentAssignmentField } from './Fields/ConsentAssignmentField';
 import { ConsentCollectionField } from './Fields/ConsentCollectionField';
@@ -14,16 +18,26 @@ import { ConsentInformField } from './Fields/ConsentInformField';
 import { ConsentPhotoFlg } from './Fields/ConsentPhotoField';
 import { ConsentProviderField } from './Fields/ConsentProviderField';
 import { ConsentToReceiveMaterialsField } from './Fields/ConsentToReceiveMaterialsField';
+import { DesiredMeetingDateField } from './Fields/DesiredMeetingDateField';
+import { EducationField } from './Fields/EducationField';
 import { EmailField } from './Fields/EmailField';
+import { EmployerActivitiesField } from './Fields/EmployerActivitiesField';
+import { EmployerOrganizationField } from './Fields/EmployerOrganizationField';
+import { EmploymentField } from './Fields/EmploymentField';
 import { FeedbackMethodField } from './Fields/FeedbackMethodField';
 import { FeedbackTypeField } from './Fields/FeedbackTypeField';
+import { FullNameField } from './Fields/FullNameField';
+import { HousingField } from './Fields/HousingField';
+import { InnField } from './Fields/InnField';
 import { IsClientField } from './Fields/IsClientField';
 import { LocalitiesField } from './Fields/LocalitiesField';
 import { MiddleNameField } from './Fields/MiddleNameField';
 import { NameField } from './Fields/NameField';
 import { OnlineCheckoutField } from './Fields/OnlineCheckoutField';
+import { OrganizationField } from './Fields/OrganizationField';
 import { PartnerCommentsField } from './Fields/PartnerCommentsField';
 import { PhoneField } from './Fields/PhoneField';
+import { PositionOrganizationField } from './Fields/PositionOrganizationField';
 import { PosTerminalField } from './Fields/PosTerminalField';
 import { ProcessPersonalDataField } from './Fields/ProcessPersonalDataField';
 import { ProductField } from './Fields/ProductField';
@@ -35,8 +49,6 @@ import { SurnameField } from './Fields/SurnameField';
 import { TermField } from './Fields/TermField';
 import { UltraPremiumField } from './Fields/UltraPremiumField';
 import { VedField } from './Fields/VedField';
-import { validatorObj } from './getObjectValidator';
-import { getValidation } from './getValidation';
 import { isRenderField } from './isRenderField';
 
 const PRODUCT_REF = {
@@ -46,7 +58,6 @@ const PRODUCT_REF = {
 export const getField =
   // eslint-disable-next-line max-lines-per-function
   (field: FormFieldRegisterer<any>, typeForm: string) => (input: FieldDef, i: number) => {
-    const { required, ...rest } = input;
     const isPremium = typeForm === 'ULTRASERVICE' || typeForm === 'PREMIUMSERVICE';
 
     const InputsMap = {
@@ -55,86 +66,56 @@ export const getField =
       middleName: <MiddleNameField field={field} input={input} />,
       phone: <PhoneField field={field} input={input} />,
       email: <EmailField field={field} input={input} />,
-      fullName: (
-        <InputControl
-          label="ФИО"
-          {...getValidation(field('fullName'), validatorObj.fullName, required)}
-          {...rest}
-        />
-      ),
-      inn: (
-        <InputControl
-          label="ИНН"
-          type="number"
-          {...getValidation(field('inn'), validatorObj.inn, required)}
-        />
-      ),
+      fullName: <FullNameField field={field} input={input} />,
+      inn: <InnField field={field} input={input} />,
       comment: <CommentField field={field} input={input} />,
-      region: isPremium ? (
-        <RegionPremiumField field={field} />
-      ) : (
-        <RegionField field={field} input={input} url={getRegionUrl(typeForm)} />
-      ),
       addressBranch: <AddressBranchField field={field} input={input} isPremium={isPremium} />,
-      birthday: (
-        <DatePickerControl
-          label="Дата рождения"
-          {...getValidation(field('birthday'), validatorObj.birthday, required)}
-        />
-      ),
-      desiredMeetingDate: (
-        <DatePickerControl
-          label="Желаемая дата встречи"
-          {...getValidation(field('desiredMeetingDate'), validatorObj.meetingDay, required)}
-        />
-      ),
+      birthday: <BirthdayField field={field} input={input} />,
+      desiredMeetingDate: <DesiredMeetingDateField field={field} input={input} />,
       product: <ProductField field={field} source={PRODUCT_REF} />,
       localities: <LocalitiesField field={field} input={input} />,
       isClient: <IsClientField field={field} />,
       partnerComments: <PartnerCommentsField field={field} input={input} />,
-      collectionCount: (
-        <InputControl
-          label="Количество объектов инкассации"
-          type="number"
-          {...getValidation(field('collectionCount'), validatorObj.collectionCount, required)}
-        />
-      ),
+      collectionCount: <CollectionCountField field={field} input={input} />,
       acquiringType: <AcquiringField field={field} input={input} />,
       onlineCheckout: <OnlineCheckoutField field={field} />,
       posTerminal: <PosTerminalField field={field} />,
-      serviceType: <UltraPremiumField field={field} />,
+      serviceType: <UltraPremiumField field={field} input={input} />,
       term: <TermField field={field} />,
       amount: <AmountField field={field} />,
-      annualRevenue: (
-        <InputControl
-          label="Годовая выручка, ₽"
-          {...getValidation(field('annualRevenue'), validatorObj.annualRevenue, required)}
-        />
-      ),
+      annualRevenue: <AnnualRevenueField field={field} input={input} />,
       vedTypes: <VedField field={field} />,
-      feedbackType: <FeedbackTypeField field={field} />,
-      feedbackMethod: <FeedbackMethodField field={field} />,
-      serviceDirection: <ServiceDirectionField field={field} />,
-      bankEmpolee: (
-        <InputControl
-          label="ФИО или должность обслуживавшего Вас сотрудника Банка"
-          {...field('bankEmpolee')}
-        />
-      ),
+      feedbackType: <FeedbackTypeField field={field} input={input} />,
+      feedbackMethod: <FeedbackMethodField field={field} input={input} />,
+      serviceDirection: <ServiceDirectionField field={field} input={input} />,
+      bankEmpolee: <BankEmpoleeField field={field} />,
+      secondaryPhone: <SecondaryPhoneField field={field} />,
+      consentToReceiveMaterials: <ConsentToReceiveMaterialsField field={field} input={input} />,
+      processPersonalDataLeadFlg: <ProcessPersonalDataField field={field} input={input} />,
+      consentProviderFlg: <ConsentProviderField field={field} input={input} />,
+      consentPhotoFlg: <ConsentPhotoFlg field={field} input={input} />,
+      consentAssignmentClaimsFlg: <ConsentAssignmentField field={field} input={input} />,
+      consentCollectionFlg: <ConsentCollectionField field={field} input={input} />,
+      consentInformFlg: <ConsentInformField field={field} input={input} />,
       applicationDate: (
         <InputControl label="Дата и время обращения в Банк" {...field('applicationDate')} />
       ),
-      secondaryPhone: <SecondaryPhoneField field={field} />,
       consentPfrFlg: (
         <CheckboxWithError text="Согласие на запрос в ПФР" {...field('consentPfrFlg')} />
       ),
-      consentToReceiveMaterials: <ConsentToReceiveMaterialsField field={field} />,
-      processPersonalDataLeadFlg: <ProcessPersonalDataField field={field} />,
-      consentProviderFlg: <ConsentProviderField field={field} />,
-      consentPhotoFlg: <ConsentPhotoFlg field={field} />,
-      consentAssignmentClaimsFlg: <ConsentAssignmentField field={field} />,
-      consentCollectionFlg: <ConsentCollectionField field={field} />,
-      consentInformFlg: <ConsentInformField field={field} />,
+      region: isPremium ? (
+        <RegionPremiumField field={field} />
+      ) : (
+        <RegionField field={field} input={input} url={getRegionUrl(typeForm)} />
+      ),
+      education: <EducationField field={field} input={input} />,
+      housing: <HousingField field={field} input={input} />,
+      employment: <EmploymentField field={field} input={input} />,
+      organization: <OrganizationField field={field} input={input} />,
+      amountWorkers: <AmountWorkersField field={field} input={input} />,
+      employerActivities: <EmployerActivitiesField field={field} input={input} />,
+      employerOrganization: <EmployerOrganizationField field={field} input={input} />,
+      positionOrganization: <PositionOrganizationField field={field} input={input} />,
     };
 
     return isRenderField({ input, field }) ? (

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

@@ -19,6 +19,14 @@ export const validatorObj: Record<string, Validator> = {
   phone: phoneValidator,
   secondaryPhone: phoneValidator,
   birthday: defaultValidator,
+  education: defaultValidator,
+  housing: defaultValidator,
+  employment: defaultValidator,
+  organization: defaultValidator,
+  amountWorkers: defaultValidator,
+  employerActivities: defaultValidator,
+  employerOrganization: defaultValidator,
+  positionOrganization: defaultValidator,
   email: defaultValidator,
   fullName: nameValidator,
   inn: innValidator,

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

@@ -10,7 +10,9 @@ export const PhoneInput = JSX<InputProps>(({ children, onChange, ...inputProps }
     [onChange],
   );
   const handleBlur = useCallback((v: string) => {
-    v === '+7 (' ? onChange && onChange('') : null;
+    if (v === '+7 (') {
+      onChange && onChange('');
+    }
   }, []);
 
   return (

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

@@ -1,24 +1,19 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { JSX } from '@redneckz/uni-jsx';
-import { useState } from '@redneckz/uni-jsx/lib/hooks';
 
 interface ProgressBarProps {
   step?: number;
   description?: string;
 }
 
-export const ProgressBar = JSX<ProgressBarProps>(({ step = 10, description }) => {
-  const [progressPercent, setProgressPercent] = useState(0);
-
-  return (
-    <div>
-      <div className="h-4 w-full bg-gray relative">
-        <div className="h-4 bg-green" style={{ width: `${progressPercent}%` }} />
-      </div>
-      <div className="relative">
-        <div className="absolute left-2/4 text-green">{progressPercent}%</div>
-        {description ? <div className="text-right mr-4 text-gray">{description}</div> : null}
-      </div>
+export const ProgressBar = JSX<ProgressBarProps>(({ step = 10, description }) => (
+  <div>
+    <div className="h-4 w-full bg-gray relative">
+      <div className="h-4 bg-green" style={{ width: `${step}%` }} />
+    </div>
+    <div className="relative">
+      <div className="absolute left-2/4 text-green">{step}%</div>
+      {description ? <div className="text-right mr-4 text-gray">{description}</div> : null}
     </div>
-  );
-});
+  </div>
+));

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

@@ -2,14 +2,17 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type LinkDoc } from '../../components/LinkDocs/LinkDocsContent';
 import { useRouter } from '../../hooks/useRouter';
+import { type Picture } from '../../model/Picture';
 import { adjustHref } from '../../utils/adjustHref';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
 import { useDialogManager } from '../DialogManager/useDialogManager';
 import { LinkButton } from '../LinkButton/LinkButton';
 import { RichText } from '../RichText/RichText';
+
 export interface ReportDialogProps extends LinkDoc {
   __html?: string;
+  icon?: Picture;
 }
 
 export const ReportDialog = JSX<ReportDialogProps>(({ href, __html, target }) => {

package/src/ui-kit/VerifyPhoneDialog/InputCode.tsx

@@ -81,7 +81,7 @@ export const InputCode = JSX<InputCodeProps>(({ values, setValues, hasError }) =
   );
 });
 
-const getInputStyle = (index: number, values: string[], hasError?: boolean) => {
+const getInputStyle = (index: number, values: string[], hasError = false) => {
   const isInputEmpty = !values[index];
 
   return `w-16 h-20 text-3xl text-center p-2 m-2 border ${