@redneckz/wildless-cms-uni-blocks 0.14.917 → 0.14.919

package/package.json

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

package/src/common.css

@@ -19,6 +19,9 @@ html {
   --color-gradient-from: 141, 189, 76;
   --color-gradient-to: 69, 172, 69;
   --color-primary-divider: 235, 237, 240;
+  --border-radius-md: 0.375rem;
+  --border-radius-lg: 0.5rem;
+  --border-radius-none: 0rem;
 }
 
 /* Private clients | Green */

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -3,6 +3,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm';
 import { NoConsentDialog } from '../../retail/components/NoConsentDialog/NoConsentDialog';
+import { useIFrameMode } from '../../retail/hooks/useIFrameMode';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
@@ -49,7 +50,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
     const inputs = useMemo(() => getInputs(applicationFormData), [applicationFormData]);
     const noConsentDialog = useDialog(NoConsentDialog);
-
+    useIFrameMode();
     const extendedValidatorObj = useMemo(() => getExtendedValidatorObj(productType), [productType]);
     const formValidator = useMemo(
       () => getFormValidator(inputs, extendedValidatorObj),

package/src/components/ApplicationLeadForm/EsiaLoginBanner.tsx

@@ -1,7 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { locationNavigator } from '../../external/locationNavigator';
 import { getLink } from '../../retail/api/getLink';
+import { type IFrameStore } from '../../retail/hooks/useIFrameMode';
 import { Button } from '../../ui-kit/Button/Button';
 import { Img } from '../../ui-kit/Img/Img';
 import { EsiaStatuses, type ProductType } from './ApplicationLeadFormContent';
@@ -13,20 +15,23 @@ export interface EsiaLoginBannerProps {
 
 export const EsiaLoginBanner = JSX<EsiaLoginBannerProps>(({ onChangeEsiaStatus, productType }) => {
   const navigator = locationNavigator();
+  const sessionStore = useSessionStore<IFrameStore>();
+  const frameLocation = sessionStore.frameLocation;
 
   const handleAuth = useCallback(async () => {
     try {
       const resp = await getLink({
-        redirectUri: globalThis.location.origin + globalThis.location.pathname,
+        redirectUri: frameLocation || globalThis.location.origin + globalThis.location.pathname,
       });
-
       if (resp?.link) {
-        navigator.assign(resp.link);
+        frameLocation
+          ? window.parent.postMessage({ redirectUri: resp?.link }, '*')
+          : navigator.assign(resp.link);
       }
     } catch {
       onChangeEsiaStatus(EsiaStatuses.Error);
     }
-  }, []);
+  }, [frameLocation]);
 
   return (
     <div className="flex items-center rounded-md bg-main-gray p-4xl">

package/src/components/ContentPage/ContentPage.tsx

@@ -13,6 +13,7 @@ import { CookiePopup } from '../../ui-kit/CookiePopup/CookiePopup';
 import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { PopupManager } from '../../ui-kit/PopupManager/PopupManager';
 import { type UniBlockMeta } from '../../UniBlock/UniBlock';
+import { isIFrame } from '../../utils/isIFrame';
 import { style } from '../../utils/style';
 
 interface ContentPageProps extends ComponentType {
@@ -30,7 +31,7 @@ export const ContentPage = JSX<ContentPageProps>(
   ({ className, data = EMPTY_DATA, blocksRegistry, blockDecorator }) => {
     const { slots, blocks, fallback, ...pageContent } = data;
     const resolvedPageContent = useJSONRef(pageContent, fallback);
-
+    const isFrame = isIFrame();
     useClickHandler();
     useDefaultLocation();
 
@@ -45,7 +46,7 @@ export const ContentPage = JSX<ContentPageProps>(
     return (
       <div data-theme={data.colorPalette || 'pc'}>
         <section className={style('@container relative', data.style, className)}>
-          {slots?.[HEADER_SLOT]?.length ? (
+          {!isFrame && slots?.[HEADER_SLOT]?.length ? (
             <div className="relative z-10 mb-lg shadow-[0_8px_32px_0px_#00000014]">
               {renderBlocksList(slots?.[HEADER_SLOT], { ...options, slotName: HEADER_SLOT })}
             </div>
@@ -56,10 +57,11 @@ export const ContentPage = JSX<ContentPageProps>(
               options,
               extraProps: { className: 'scroll-mt-12' },
             })}
-            {renderBlocksList(slots?.[FOOTER_SLOT], { ...options, slotName: FOOTER_SLOT })}
+            {!isFrame &&
+              renderBlocksList(slots?.[FOOTER_SLOT], { ...options, slotName: FOOTER_SLOT })}
           </div>
         </section>
-        {slots?.[STICKY_FOOTER_SLOT]?.length ? (
+        {!isFrame && slots?.[STICKY_FOOTER_SLOT]?.length ? (
           <div className="fixed w-full bottom-0 left-0 z-[100]">
             {renderBlocksList(slots?.[STICKY_FOOTER_SLOT], {
               ...options,

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm';
+import { useIFrameMode } from '../../retail/hooks/useIFrameMode';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { renderStep } from '../../retail/utils/renderStep';
@@ -20,6 +21,7 @@ const PRODUCT_TYPE = 'creditCard';
 
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
+    useIFrameMode();
     const inputs = useMemo(
       () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs || []),
       [sections],

package/src/components/CreditCardForm/creditCardFormStepsData.tsx

@@ -60,29 +60,32 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
     ],
   },
   {
-    inputs: [
-      { name: 'employment', required: true },
-      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
-    ],
+    inputs: [{ name: 'employment', required: true }],
   },
   {
     columns: 2,
     inputs: [
+      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
       { name: 'inn', required: true, dadata: true, filledByEsia: true },
-      { name: 'legalForm', required: true },
     ],
   },
   {
+    inputs: [{ name: 'amountWorkers', required: true }],
+  },
+  {
+    columns: 2,
     inputs: [
-      { name: 'organization', required: true },
-      { name: 'amountWorkers', required: true },
+      { name: 'employerActivities', required: true },
+      {
+        name: 'organizationPhone',
+        label: 'Телефон работодателя',
+        required: true,
+      },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'employerActivities', required: true },
-      { name: 'employerOrganization', required: true },
       { name: 'generalSeniority', required: true, filledByEsia: true },
       { name: 'lastJobExperience', required: true, filledByEsia: true },
       { name: 'experience5Years', required: true, filledByEsia: true },
@@ -90,14 +93,7 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
     ],
   },
   {
-    inputs: [
-      {
-        name: 'organizationPhone',
-        label: 'Телефон работодателя',
-        required: true,
-      },
-      { name: 'beginDate', required: true, filledByEsia: true },
-    ],
+    inputs: [{ name: 'beginDate', required: true, filledByEsia: true }],
   },
   {
     columns: 2,
@@ -231,13 +227,20 @@ const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
           values: ['office'],
         },
       },
+    ],
+  },
+  {
+    columns: 2,
+    inputs: [
       {
-        name: 'bankEmployeeCode',
         condition: {
           name: 'methodObtain',
           values: ['office'],
         },
       },
+      {
+        name: 'bankEmployeeCode',
+      },
     ],
   },
 ];

package/src/components/CreditCardForm/formStateMap.tsx

@@ -8,6 +8,12 @@ export const formStateMap: Partial<LeadFormState>[] = [
     codeWord: '',
   },
   ...getMainFormStateMap(),
+  {
+    bankruptcyFlg: false,
+    shareholderFlg: false,
+    legalEntityName: '',
+    creditInRshbCd: undefined,
+  },
   {
     regionRetail: { key: '', text: '' },
     addressRetail: { key: '', text: '' },

package/src/components/CreditForm/CreditFormStep.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm';
+import { useIFrameMode } from '../../retail/hooks/useIFrameMode';
 import { useRetailFormStore } from '../../retail/hooks/useRetailFormStore';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
@@ -24,6 +25,7 @@ const PRODUCT_TYPE = 'credit';
 export const CreditFormStep = JSX<CreditFormStepProps>(
   ({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
     const { programId } = useRetailFormStore();
+    useIFrameMode();
     const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
 
     const inputs = useMemo(

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -44,38 +44,30 @@ const EMPLOYMENT_CONTENT: SectionsRetailProps[] = [
     ],
   },
   {
-    inputs: [
-      { name: 'employment', required: true },
-      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
-    ],
+    inputs: [{ name: 'employment', required: true }],
   },
   {
     columns: 2,
     inputs: [
+      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
       { name: 'inn', required: true, dadata: true, filledByEsia: true },
-      { name: 'legalForm', required: true },
     ],
   },
   {
+    columns: 2,
     inputs: [
-      { name: 'organization', required: true },
       { name: 'amountWorkers', required: true },
+      {
+        name: 'organizationPhone',
+        label: 'Телефон работодателя',
+        required: true,
+      },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'employerOrganization', required: true },
       { name: 'jobsNumber', required: true, filledByEsia: true },
-    ],
-  },
-  {
-    inputs: [
-      {
-        name: 'organizationPhone',
-        label: 'Телефон работодателя',
-        required: true,
-      },
       { name: 'beginDate', required: true, filledByEsia: true },
     ],
   },
@@ -177,7 +169,12 @@ const DELIVERY_CREDIT_CONTENT: SectionsRetailProps[] = [
     ],
   },
   {
-    inputs: [{ name: 'bankEmployeeCode' }],
+    columns: 2,
+    inputs: [
+      {
+        name: 'bankEmployeeCode',
+      },
+    ],
   },
 ];
 const CALCULATOR_CONTENT: SectionsRetailProps[] = [

package/src/components/DebitForm/DebitFormStep.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm';
+import { useIFrameMode } from '../../retail/hooks/useIFrameMode';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import type { LeadFormState } from '../../retail/model/LeadFormState';
 import { renderStep } from '../../retail/utils/renderStep';
@@ -20,6 +21,7 @@ const PRODUCT_TYPE = 'debitCard';
 
 export const DebitFormStep = JSX<DebitFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
+    useIFrameMode();
     const inputs = useMemo(
       () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs ?? []),
       [sections],

package/src/retail/adaptors/getPersonalInfoData.tsx

@@ -1,17 +1,11 @@
 import { formatDate } from '../../utils/formatDate';
-import { formatPhone } from '../../utils/formatPhone';
 import { type Participant } from '../api/updateUserTask';
 import { type LeadFormState } from '../model/LeadFormState';
-import { getParticipantAddresses, getParticipantContacts } from './utils';
+import { getParticipantAddresses } from './utils';
 
 export const getPersonalInfoData = (formData: LeadFormState): Partial<Participant> => {
   const {
-    name,
-    surname,
-    middleName,
     limitedBirthday = '',
-    phone = '',
-    email,
     sex,
     birthPlace,
     dulIssueDate = '',
@@ -29,9 +23,6 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
 
   return {
     birthDate: formatDate(limitedBirthday, true),
-    midname: middleName,
-    name,
-    surname,
     birthPlace,
     dulIssueDate: formatDate(dulIssueDate, true),
     dulIssuedBy,
@@ -44,10 +35,6 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
       : undefined,
     homeMatchFlg: addressMatch,
     houseTypeCd: housing,
-    participantContacts: getParticipantContacts({
-      phone: formatPhone(phone),
-      email,
-    }),
     participantAddresses: getParticipantAddresses({
       addressRegistration,
       addressFact: addressMatch ? addressRegistration : addressFact,

package/src/retail/api/getDictionaries.ts

@@ -0,0 +1,21 @@
+import { type CreditFormDictionarySlice } from '../hooks/useRetailFormStore';
+import { type DictionaryItem } from '../model/LeadFormData';
+import { fetchRetailJSON } from './doRequest';
+
+export const getDictionaries = (
+  dictionaries: Record<string, string>,
+  store: CreditFormDictionarySlice,
+) => {
+  Promise.all(
+    Object.entries(dictionaries).map((dictionary) => {
+      const [fieldName, dictionaryName] = dictionary;
+
+      fetchRetailJSON<DictionaryItem[]>(
+        `/dictionary?dictionaryType=${encodeURIComponent(dictionaryName)}`,
+        'POST',
+      ).then((res) => {
+        store[fieldName] = res;
+      });
+    }),
+  );
+};

package/src/retail/components/DraftDialog/parseDraftTask.ts

@@ -90,6 +90,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     employment: getSelectValue(employment, EMPLOYMENT_TYPE),
     organizationName,
     inn,
+    isDadataOrganization: Boolean(inn),
     employerActivities: getSelectValue(employerActivities),
     organization: getSelectValue(organization),
     employerOrganization: getSelectValue(employerOrganization),

package/src/retail/components/Fields/AmountWorkersField.tsx

@@ -1,21 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
-import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { SelectField } from './SelectField';
 
 export const AmountWorkersField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data } = useLeadFormData('EMPLOYEES_NUMBER');
-
   const store = useRetailFormStore();
 
-  useEffect(() => {
-    if (data) {
-      store.amountWorkers = data;
-    }
-  }, [data]);
-
   return (
     <SelectField
       field={field}

package/src/retail/components/Fields/BankEmployeeCodeField.tsx

@@ -1,13 +1,45 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { type RadioButtonItem } from '../../../ui-kit/RadioButtonGroup/RadioButtonGroup';
+import { RadioButtonGroupControl } from '../../../ui-kit/RadioButtonGroup/RadioButtonGroupControl';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const BankEmpoleeCodeField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Код представителя Банка"
-    placeholder="Введите код"
-    isInteger={true}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const BUTTON_TYPES: RadioButtonItem[] = [
+  { id: 'true', text: 'Да' },
+  { id: 'false', text: 'Нет' },
+];
+
+export const BankEmployeeCodeField = JSX<CustomFieldProps>(({ field, input }) => {
+  const [bankEmployeeFlg, setBankEmployeeFlg] = useState('');
+
+  const handleBankEmployeeFlgChange = useCallback((value: string) => {
+    setBankEmployeeFlg(value);
+
+    if (value === 'false') {
+      field('bankEmployeeCode')?.onChange?.(null);
+    }
+  }, []);
+
+  return (
+    <div className="flex flex-col md:flex-row">
+      <RadioButtonGroupControl
+        label="Мне помог сотрудник Банка"
+        orientation="horizontal"
+        items={BUTTON_TYPES}
+        value={bankEmployeeFlg}
+        onChange={handleBankEmployeeFlgChange}
+      />
+      {bankEmployeeFlg === 'true' ? (
+        <DaDataInputControl
+          label="Код представителя Банка"
+          placeholder="Введите код"
+          isInteger={true}
+          maxLength={8}
+          {...field(input?.name ?? '')}
+          {...input}
+        />
+      ) : null}
+    </div>
+  );
+});

package/src/retail/components/Fields/DaDataInnField.tsx

@@ -1,23 +1,40 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
+import { getDictionaries } from '../../api/getDictionaries';
 import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
 import { useRetailFormStore, type CreditFormStoreSlice } from '../../hooks/useRetailFormStore';
+import { organizationDictionaries } from '../../utils/getOrganizationParams';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
+const NO_DADATA_ERROR_TEXT = 'Необходимо выбрать ИНН из выпадающего списка';
+
 export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
   const store = useRetailFormStore();
+  const [errorText, setErrorText] = useState('');
   const { employerActivities, employerOrganization, organization, amountWorkers } = store;
   const esiaAccountTypeCd = field?.('esiaAccountTypeCd')?.value;
   const inn = field?.('inn')?.value;
+  const fieldError = field?.('organizationName')?.error;
+  const isDadataOrganization = field('isDadataOrganization')?.value;
+
+  useEffect(() => {
+    setErrorText(fieldError && !isDadataOrganization ? NO_DADATA_ERROR_TEXT : '');
+  }, [isDadataOrganization, fieldError]);
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     updateOrganizationFields(store, field, item);
   }, []);
 
+  useEffect(() => {
+    (async () => {
+      await getDictionaries(organizationDictionaries, store);
+    })();
+  }, []);
+
   useEffect(() => {
     if (!esiaAccountTypeCd || !inn || !isDictionariesAlreadyLoad(store as CreditFormStoreSlice)) {
       return;
@@ -30,6 +47,11 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
     })();
   }, [employerActivities, employerOrganization, organization, amountWorkers]);
 
+  const onChange = useCallback((value: string) => {
+    field?.('inn')?.onChange?.(value);
+    field?.('isDadataOrganization')?.onChange?.(false);
+  }, []);
+
   return (
     <DaDataInputControl
       label="ИНН"
@@ -39,18 +61,14 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
       {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
       disabled={isEsiaAuthorize(field, input)}
+      onChange={onChange}
+      error={errorText || field('inn')?.error}
     />
   );
 });
 
 const isDictionariesAlreadyLoad = (store: CreditFormStoreSlice) => {
-  const { employerActivities, employerOrganization, organization, amountWorkers, productType } =
-    store;
-
-  return [
-    employerOrganization,
-    organization,
-    amountWorkers,
-    productType === 'creditCard' ? employerActivities : true,
-  ].every(Boolean);
+  const { employerActivities, employerOrganization, organization, amountWorkers } = store;
+
+  return [employerOrganization, organization, amountWorkers, employerActivities].every(Boolean);
 };

package/src/retail/components/Fields/EmployerActivitiesField.tsx

@@ -1,21 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
-import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { SelectField } from './SelectField';
 
 export const EmployerActivitiesField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data } = useLeadFormData('ORGANIZATION_ACTIVITY_TYPE');
-
   const store = useRetailFormStore();
 
-  useEffect(() => {
-    if (data) {
-      store.employerActivities = data;
-    }
-  }, [data]);
-
   return (
     <SelectField
       field={field}

package/src/retail/components/Fields/EmployerOrganizationField.tsx

@@ -1,21 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
-import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { SelectField } from './SelectField';
 
 export const EmployerOrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data } = useLeadFormData('ORGANIZATION_KIND');
-
   const store = useRetailFormStore();
 
-  useEffect(() => {
-    if (data) {
-      store.employerOrganization = data;
-    }
-  }, [data]);
-
   return (
     <SelectField
       field={field}

package/src/retail/components/Fields/OrganizationField.tsx

@@ -1,21 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
-import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { SelectField } from './SelectField';
 
 export const OrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data } = useLeadFormData('ORGANIZATION_TYPE');
-
   const store = useRetailFormStore();
 
-  useEffect(() => {
-    if (data) {
-      store.organization = data;
-    }
-  }, [data]);
-
   return (
     <SelectField
       field={field}

package/src/retail/components/Fields/OrganizationNameField.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
@@ -7,14 +7,27 @@ import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
+const NO_DADATA_ERROR_TEXT = 'Необходимо выбрать организацию из выпадающего списка';
+
 export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => {
   const store = useRetailFormStore();
+  const [errorText, setErrorText] = useState('');
+  const fieldError = field?.('organizationName')?.error;
+  const isDadataOrganization = field('isDadataOrganization')?.value;
+
+  useEffect(() => {
+    setErrorText(fieldError && !isDadataOrganization ? NO_DADATA_ERROR_TEXT : '');
+  }, [isDadataOrganization, fieldError]);
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
-    field?.('inn')?.onChange?.(item.data?.inn);
     updateOrganizationFields(store, field, item);
   }, []);
 
+  const onChange = useCallback((value: string) => {
+    field?.('organizationName')?.onChange?.(value);
+    field?.('isDadataOrganization')?.onChange?.(false);
+  }, []);
+
   return (
     <DaDataInputControl
       label="Наименование организации"
@@ -22,6 +35,8 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
       {...field(input?.name ?? '')}
       disabled={isEsiaAuthorize(field, input)}
       onDaDataChange={onDaDataChange}
+      onChange={onChange}
+      error={errorText || field('organizationName')?.error}
     />
   );
 });