@redneckz/wildless-cms-uni-blocks 0.14.666 → 0.14.667

package/mobile/src/components/CreditForm/getCreditFormTaskData.ts

@@ -1,5 +1,6 @@
 import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getFifthStepData } from './getFifthStepData';
 import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
@@ -27,7 +28,7 @@ export const getCreditFormTaskData = ({
     taskSource: globalThis.location.origin,
     id: taskId,
     office: {
-      id: '650', // TODO: Remove hardcode
+      id: '',
     },
     authorizedAgentId: formData?.bankEmployeeCode,
     participants: [
@@ -44,6 +45,7 @@ export const getCreditFormTaskData = ({
       },
     ],
     ...getZeroStepData(formData), // moved from participants
+    ...getFifthStepData(formData),
     esiaAccountTypeCd: {
       key: formData?.esiaAccountTypeCd?.key,
     } as UpdateUserTaskBody['task']['esiaAccountTypeCd'],

package/mobile/src/components/CreditForm/getFifthStepData.ts

@@ -0,0 +1,10 @@
+import { type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+
+export const getFifthStepData = (formData: FormState): Partial<UpdateUserTaskBody['task']> => {
+  const { addressRetail } = formData;
+
+  return {
+    office: addressRetail?.key ? { id: addressRetail.key } : undefined,
+  };
+};

package/mobile/src/components/OfficesAtmsMap/renderWorkSchedule.tsx

@@ -8,7 +8,7 @@ export const renderWorkSchedule = (workSchedule?: WorkSchedule) => {
   const businessTimeOfWork = workSchedule ? workSchedule.businessScheduleDescription : '';
 
   if (!workSchedule) {
-    return null;
+    return '';
   }
 
   if (!workSchedule.businessScheduleVisibleTag) {

package/mobile/src/ui-kit/FormField/Fields/{RetailAddressField.tsx → AddressRetailField.tsx}

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { regionOffices, type OfficeType } from '../../../api/RetailAPI/regionOffices';
 import { getOfficePoint } from '../../../components/OfficesAtmsMap/renderOfficeCard';
 import { useOfficesAtmsMapData } from '../../../components/OfficesAtmsMap/useOfficesAtmsMapData';
-import { type Branch } from '../../../hooks/useBranches';
-import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
 import { ClientOnly } from '../../ClientOnly';
 import { SelectControl } from '../../Select/SelectControl';
 import { YandexMap } from '../../YandexMap/YandexMap';
@@ -11,43 +11,40 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-type RegionFieldProps = CustomFieldProps;
+export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
+  const [offices, setOffices] = useState<OfficeType[]>([]);
+  const { data } = useLeadFormData('REGION_RF');
 
-export const RetailAddressField = JSX<RegionFieldProps>(({ field, input }) => {
-  const fieldRegion = field('regionRetail');
+  const regionValue = field('regionRetail')?.value || {};
   const fieldBranch = field('addressRetail');
-  const regions = useBranchesByRegions();
-  const regionKey = fieldRegion?.value?.key as string;
-  const selectedRegion = regions.find(({ region }) => region === regionKey);
-
-  const isLoad = !regions;
-
-  const regionText = fieldRegion?.value?.text as string;
-  const addressBranchRetail = useBranchesByRegions()?.find(
-    (_) => _?.region === regionText,
-  )?.branches;
 
   useEffect(() => {
-    if (fieldRegion?.value?.key !== '') {
+    (async () => {
+      const officesList = await regionOffices((regionValue?.key as string) ?? '');
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      setOffices(officesList || []);
+    })();
+
+    if (regionValue?.key) {
       field?.('addressRetail')?.onChange?.('');
     }
-  }, [fieldRegion?.value]);
+  }, [regionValue.key]);
 
   const { points } = useOfficesAtmsMapData({
-    data: (selectedRegion?.branches as Branch[]) || [],
+    data: offices,
     filtrationState: {},
     getBalloon: getOfficePoint,
   });
 
-  const isRegionSelected = Boolean(fieldRegion?.value?.key);
+  const isRegionSelected = Boolean(regionValue?.key);
 
   return (
     <div>
       <SelectControl
         label="Адрес отделения"
         placeholder="Выберите отделение"
-        options={(addressBranchRetail || []).map(({ address = '' }) => ({
-          key: address,
+        options={offices.map(({ id, address = '' }) => ({
+          key: id?.toString() || '',
           text: address,
         }))}
         {...getValidation(
@@ -61,7 +58,7 @@ export const RetailAddressField = JSX<RegionFieldProps>(({ field, input }) => {
         <ClientOnly>
           <YandexMap
             points={points}
-            isLoad={isLoad}
+            isLoad={!data}
             className="h-full"
             selectedAddress={fieldBranch?.value?.text}
           />

package/mobile/src/ui-kit/FormField/Fields/{RetailRegionField.tsx → RegionRetailField.tsx}

@@ -1,23 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
+import { type Option } from '../../Select/Option';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const RetailRegionField = JSX<CustomFieldProps>(({ field, input }) => {
-  const regions = useBranchesByRegions();
+export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: regions } = useLeadFormData('REGION_RF');
+  const formatRegions = regions?.map(({ key, value }) => ({ key, text: value }));
 
   return (
     <SelectControl
       label="Регион"
       placeholder="Выберите регион"
       isSearch={true}
-      options={useMemo(
-        () => regions?.map(({ region = '' }) => ({ key: region, text: region })),
-        [regions],
-      )}
+      options={formatRegions as Option[]}
       {...getValidation(field('regionRetail'), validatorObj.regionRetail, input?.required)}
     />
   );

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

@@ -18,10 +18,20 @@ export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
   source?: LeadProps[];
   label: string;
   fieldName: string;
+  placeholder?: string;
+  isSearch?: boolean;
 }
 
 export const SelectField = UniBlock<SelectFieldProps>(
-  ({ field, source, label, fieldName, input }) => {
+  ({
+    field,
+    source,
+    label,
+    fieldName,
+    input,
+    placeholder = 'Выберите из списка',
+    isSearch = false,
+  }) => {
     const leadOptions: Option[] =
       (source &&
         source?.map((_: LeadProps) => ({
@@ -32,9 +42,10 @@ export const SelectField = UniBlock<SelectFieldProps>(
 
     return (
       <SelectControl
-        placeholder="Выберите из списка"
+        placeholder={placeholder}
         label={label}
         options={leadOptions}
+        isSearch={isSearch}
         {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
       />
     );

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

@@ -10,6 +10,7 @@ import { AddressBranchField } from './Fields/AddressBranchField';
 import { AddressFactField } from './Fields/AddressFactField';
 import { AddressField } from './Fields/AddressField';
 import { AddressMatchField } from './Fields/AddressMatchField';
+import { AddressRetailField } from './Fields/AddressRetailField';
 import { AmountField } from './Fields/AmountField';
 import { AmountWorkersField } from './Fields/AmountWorkersField';
 import { AnnualRevenueField } from './Fields/AnnualRevenueField';
@@ -77,8 +78,7 @@ import { PosTerminalField } from './Fields/PosTerminalField';
 import { ProductField } from './Fields/ProductField';
 import { RegionField } from './Fields/RegionField';
 import { RegionPremiumField } from './Fields/RegionPremiumField';
-import { RetailAddressField } from './Fields/RetailAddressField';
-import { RetailRegionField } from './Fields/RetailRegionField';
+import { RegionRetailField } from './Fields/RegionRetailField';
 import { RetirementIncomeField } from './Fields/RetirementIncomeField';
 import { SecondaryPhoneField } from './Fields/SecondaryPhoneField';
 import { ServiceDirectionField } from './Fields/ServiceDirectionField';
@@ -193,8 +193,8 @@ export const getField =
       creditInRshbCd: <CreditInRshbCdField field={field} input={input} />,
       bankEmployeeCode: <BankEmpoleeCodeField field={field} input={input} />,
       partInBusiness: <PartInBusinessField field={field} input={input} />,
-      regionRetail: <RetailRegionField field={field} input={input} />,
-      addressRetail: <RetailAddressField field={field} input={input} />,
+      regionRetail: <RegionRetailField field={field} input={input} />,
+      addressRetail: <AddressRetailField field={field} input={input} />,
       addressMatch: <AddressMatchField field={field} input={input} />,
       paymentSystem: <PaymentSystemField field={field} input={input} />,
       currency: <CurrencyField field={field} input={input} />,

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

@@ -62,6 +62,7 @@ export const validatorObj: Record<string, Validator> = {
   feedbackMethod: defaultSelectValidator(),
   serviceType: defaultSelectValidator(),
   serviceDirection: defaultSelectValidator(),
+  regionRetail: defaultSelectValidator('Выберите регион'),
   meetingDay: defaultValidator(),
   product: defaultValidator(),
   localities: defaultValidator(),
@@ -96,7 +97,6 @@ export const validatorObj: Record<string, Validator> = {
   legalEntityName: defaultValidator(),
   bankEmployeeCode: defaultValidator(),
   partInBusiness: defaultValidator(),
-  regionRetail: defaultSelectValidator('Выберите филиал банка'),
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
   codeWord: codeWordValidator('Необходимо ввести кодовое слово'),

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

@@ -19,7 +19,7 @@ interface YandexMapProps {
   selectedAddress?: string;
 }
 
-const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
+export const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
 
 // TODO: Поле для поиска: невыяснено среди каких данных делать поиск (искать в имени офиса, в адресе, метро и т.д.).
 //       Сейчас реализован поиск среди тестовых данных
@@ -33,7 +33,7 @@ export const YandexMap = JSX<YandexMapProps>(
 
     useEffect(() => {
       if (map.current) {
-        renderClusterer({ yandexMaps, map: map.current, points, isLoad });
+        renderClusterer({ yandexMaps, map: map.current, points, isLoad, selectedAddress });
       } else {
         yandexMaps?.ready(() => {
           // Ready function may be called few times, but must be called once

package/package.json

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

package/src/api/RetailAPI/regionOffices.ts

@@ -0,0 +1,36 @@
+import { DEFAULT_CENTER_COORDS } from './../../ui-kit/YandexMap/YandexMap';
+import { doRequest } from './doRequest';
+
+export type OfficeType = {
+  address?: string;
+  id?: number;
+  regionRfCd?: {
+    key: string;
+    text: string;
+  };
+  gpsLatitude?: number;
+  gpsLongitude?: number;
+  latitude?: number;
+  longitude?: number;
+};
+
+export interface RegionOfficesResponseType {
+  offices: OfficeType[];
+}
+
+export const regionOffices = async (regionKey: string) => {
+  const response: Response = await doRequest('/public-data/regionOffices', 'POST', {
+    regionRfCd: {
+      key: regionKey,
+    },
+    cashCardFlg: true,
+  });
+
+  return await response.json().then((_) =>
+    _?.offices?.map((office: OfficeType) => ({
+      ...office,
+      gpsLatitude: (office.latitude ?? DEFAULT_CENTER_COORDS[0]).toString().replace(',', '.'),
+      gpsLongitude: (office.longitude ?? DEFAULT_CENTER_COORDS[1]).toString().replace(',', '.'),
+    })),
+  );
+};

package/src/components/ApplicationForm/getInitialFormState.tsx

@@ -27,6 +27,7 @@ export interface FormState {
   amount?: number;
   annualRevenue?: string;
   consentDataProcessing?: boolean;
+  addressRetail?: Option;
 }
 
 const initialFormState = {
@@ -54,6 +55,7 @@ const initialFormState = {
   posTerminal: false,
   consentToReceiveMaterials: false,
   consentDataProcessing: false,
+  addressRetail: { key: '', text: '' },
 };
 
 export const getInitialFormState = (inputs: FieldDef[], typeForm = ''): FormState => {

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -23,7 +23,7 @@ export type FormStateDeliveryType = {
   bankEmployeeCode?: number;
   methodObtain?: 'office' | 'courier';
   deliveryDate?: Date | string;
-  addressRetail?: Address;
+  addressRetail?: Option;
   addressCourier?: Address;
 };
 
@@ -149,6 +149,7 @@ export interface FormState extends FormConsents, FormStateDeliveryType {
   isSalaryClient?: boolean;
   isPensionClient?: boolean;
   isStateEmployee?: boolean;
+  addressRetail?: Option;
 }
 
 const initialFormState = {
@@ -187,6 +188,7 @@ const initialFormState = {
   paymentSystem: '',
   cardCategory: { key: '', text: '' },
   codeWord: '',
+  addressRetail: { key: '', text: '' },
 };
 
 export const getInitialFormState = (

package/src/components/CreditCardForm/formStateMap.tsx

@@ -78,8 +78,8 @@ export const formStateMap: Partial<FormState>[] = [
   {
     regionRetail: '',
     addressRetail: {
-      fullAddress: '',
-      fiasCode: '',
+      key: '',
+      text: '',
     },
     bankEmployeeCode: undefined,
     addressCourier: {

package/src/components/CreditForm/getCreditFormTaskData.ts

@@ -1,5 +1,6 @@
 import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getFifthStepData } from './getFifthStepData';
 import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
@@ -27,7 +28,7 @@ export const getCreditFormTaskData = ({
     taskSource: globalThis.location.origin,
     id: taskId,
     office: {
-      id: '650', // TODO: Remove hardcode
+      id: '',
     },
     authorizedAgentId: formData?.bankEmployeeCode,
     participants: [
@@ -44,6 +45,7 @@ export const getCreditFormTaskData = ({
       },
     ],
     ...getZeroStepData(formData), // moved from participants
+    ...getFifthStepData(formData),
     esiaAccountTypeCd: {
       key: formData?.esiaAccountTypeCd?.key,
     } as UpdateUserTaskBody['task']['esiaAccountTypeCd'],

package/src/components/CreditForm/getFifthStepData.ts

@@ -0,0 +1,10 @@
+import { type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+
+export const getFifthStepData = (formData: FormState): Partial<UpdateUserTaskBody['task']> => {
+  const { addressRetail } = formData;
+
+  return {
+    office: addressRetail?.key ? { id: addressRetail.key } : undefined,
+  };
+};

package/src/components/OfficesAtmsMap/renderWorkSchedule.tsx

@@ -8,7 +8,7 @@ export const renderWorkSchedule = (workSchedule?: WorkSchedule) => {
   const businessTimeOfWork = workSchedule ? workSchedule.businessScheduleDescription : '';
 
   if (!workSchedule) {
-    return null;
+    return '';
   }
 
   if (!workSchedule.businessScheduleVisibleTag) {

package/src/ui-kit/FormField/Fields/{RetailAddressField.tsx → AddressRetailField.tsx}

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { regionOffices, type OfficeType } from '../../../api/RetailAPI/regionOffices';
 import { getOfficePoint } from '../../../components/OfficesAtmsMap/renderOfficeCard';
 import { useOfficesAtmsMapData } from '../../../components/OfficesAtmsMap/useOfficesAtmsMapData';
-import { type Branch } from '../../../hooks/useBranches';
-import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
 import { ClientOnly } from '../../ClientOnly';
 import { SelectControl } from '../../Select/SelectControl';
 import { YandexMap } from '../../YandexMap/YandexMap';
@@ -11,43 +11,40 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-type RegionFieldProps = CustomFieldProps;
+export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
+  const [offices, setOffices] = useState<OfficeType[]>([]);
+  const { data } = useLeadFormData('REGION_RF');
 
-export const RetailAddressField = JSX<RegionFieldProps>(({ field, input }) => {
-  const fieldRegion = field('regionRetail');
+  const regionValue = field('regionRetail')?.value || {};
   const fieldBranch = field('addressRetail');
-  const regions = useBranchesByRegions();
-  const regionKey = fieldRegion?.value?.key as string;
-  const selectedRegion = regions.find(({ region }) => region === regionKey);
-
-  const isLoad = !regions;
-
-  const regionText = fieldRegion?.value?.text as string;
-  const addressBranchRetail = useBranchesByRegions()?.find(
-    (_) => _?.region === regionText,
-  )?.branches;
 
   useEffect(() => {
-    if (fieldRegion?.value?.key !== '') {
+    (async () => {
+      const officesList = await regionOffices((regionValue?.key as string) ?? '');
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      setOffices(officesList || []);
+    })();
+
+    if (regionValue?.key) {
       field?.('addressRetail')?.onChange?.('');
     }
-  }, [fieldRegion?.value]);
+  }, [regionValue.key]);
 
   const { points } = useOfficesAtmsMapData({
-    data: (selectedRegion?.branches as Branch[]) || [],
+    data: offices,
     filtrationState: {},
     getBalloon: getOfficePoint,
   });
 
-  const isRegionSelected = Boolean(fieldRegion?.value?.key);
+  const isRegionSelected = Boolean(regionValue?.key);
 
   return (
     <div>
       <SelectControl
         label="Адрес отделения"
         placeholder="Выберите отделение"
-        options={(addressBranchRetail || []).map(({ address = '' }) => ({
-          key: address,
+        options={offices.map(({ id, address = '' }) => ({
+          key: id?.toString() || '',
           text: address,
         }))}
         {...getValidation(
@@ -61,7 +58,7 @@ export const RetailAddressField = JSX<RegionFieldProps>(({ field, input }) => {
         <ClientOnly>
           <YandexMap
             points={points}
-            isLoad={isLoad}
+            isLoad={!data}
             className="h-full"
             selectedAddress={fieldBranch?.value?.text}
           />

package/src/ui-kit/FormField/Fields/{RetailRegionField.tsx → RegionRetailField.tsx}

@@ -1,23 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
+import { type Option } from '../../Select/Option';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const RetailRegionField = JSX<CustomFieldProps>(({ field, input }) => {
-  const regions = useBranchesByRegions();
+export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: regions } = useLeadFormData('REGION_RF');
+  const formatRegions = regions?.map(({ key, value }) => ({ key, text: value }));
 
   return (
     <SelectControl
       label="Регион"
       placeholder="Выберите регион"
       isSearch={true}
-      options={useMemo(
-        () => regions?.map(({ region = '' }) => ({ key: region, text: region })),
-        [regions],
-      )}
+      options={formatRegions as Option[]}
       {...getValidation(field('regionRetail'), validatorObj.regionRetail, input?.required)}
     />
   );

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

@@ -18,10 +18,20 @@ export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
   source?: LeadProps[];
   label: string;
   fieldName: string;
+  placeholder?: string;
+  isSearch?: boolean;
 }
 
 export const SelectField = UniBlock<SelectFieldProps>(
-  ({ field, source, label, fieldName, input }) => {
+  ({
+    field,
+    source,
+    label,
+    fieldName,
+    input,
+    placeholder = 'Выберите из списка',
+    isSearch = false,
+  }) => {
     const leadOptions: Option[] =
       (source &&
         source?.map((_: LeadProps) => ({
@@ -32,9 +42,10 @@ export const SelectField = UniBlock<SelectFieldProps>(
 
     return (
       <SelectControl
-        placeholder="Выберите из списка"
+        placeholder={placeholder}
         label={label}
         options={leadOptions}
+        isSearch={isSearch}
         {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
       />
     );

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

@@ -10,6 +10,7 @@ import { AddressBranchField } from './Fields/AddressBranchField';
 import { AddressFactField } from './Fields/AddressFactField';
 import { AddressField } from './Fields/AddressField';
 import { AddressMatchField } from './Fields/AddressMatchField';
+import { AddressRetailField } from './Fields/AddressRetailField';
 import { AmountField } from './Fields/AmountField';
 import { AmountWorkersField } from './Fields/AmountWorkersField';
 import { AnnualRevenueField } from './Fields/AnnualRevenueField';
@@ -77,8 +78,7 @@ import { PosTerminalField } from './Fields/PosTerminalField';
 import { ProductField } from './Fields/ProductField';
 import { RegionField } from './Fields/RegionField';
 import { RegionPremiumField } from './Fields/RegionPremiumField';
-import { RetailAddressField } from './Fields/RetailAddressField';
-import { RetailRegionField } from './Fields/RetailRegionField';
+import { RegionRetailField } from './Fields/RegionRetailField';
 import { RetirementIncomeField } from './Fields/RetirementIncomeField';
 import { SecondaryPhoneField } from './Fields/SecondaryPhoneField';
 import { ServiceDirectionField } from './Fields/ServiceDirectionField';
@@ -193,8 +193,8 @@ export const getField =
       creditInRshbCd: <CreditInRshbCdField field={field} input={input} />,
       bankEmployeeCode: <BankEmpoleeCodeField field={field} input={input} />,
       partInBusiness: <PartInBusinessField field={field} input={input} />,
-      regionRetail: <RetailRegionField field={field} input={input} />,
-      addressRetail: <RetailAddressField field={field} input={input} />,
+      regionRetail: <RegionRetailField field={field} input={input} />,
+      addressRetail: <AddressRetailField field={field} input={input} />,
       addressMatch: <AddressMatchField field={field} input={input} />,
       paymentSystem: <PaymentSystemField field={field} input={input} />,
       currency: <CurrencyField field={field} input={input} />,

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

@@ -62,6 +62,7 @@ export const validatorObj: Record<string, Validator> = {
   feedbackMethod: defaultSelectValidator(),
   serviceType: defaultSelectValidator(),
   serviceDirection: defaultSelectValidator(),
+  regionRetail: defaultSelectValidator('Выберите регион'),
   meetingDay: defaultValidator(),
   product: defaultValidator(),
   localities: defaultValidator(),
@@ -96,7 +97,6 @@ export const validatorObj: Record<string, Validator> = {
   legalEntityName: defaultValidator(),
   bankEmployeeCode: defaultValidator(),
   partInBusiness: defaultValidator(),
-  regionRetail: defaultSelectValidator('Выберите филиал банка'),
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
   codeWord: codeWordValidator('Необходимо ввести кодовое слово'),

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

@@ -19,7 +19,7 @@ interface YandexMapProps {
   selectedAddress?: string;
 }
 
-const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
+export const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
 
 // TODO: Поле для поиска: невыяснено среди каких данных делать поиск (искать в имени офиса, в адресе, метро и т.д.).
 //       Сейчас реализован поиск среди тестовых данных
@@ -33,7 +33,7 @@ export const YandexMap = JSX<YandexMapProps>(
 
     useEffect(() => {
       if (map.current) {
-        renderClusterer({ yandexMaps, map: map.current, points, isLoad });
+        renderClusterer({ yandexMaps, map: map.current, points, isLoad, selectedAddress });
       } else {
         yandexMaps?.ready(() => {
           // Ready function may be called few times, but must be called once

package/dist/ui-kit/FormField/Fields/RetailAddressField.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RetailAddressField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/RetailAddressField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAwD;AACxD,0FAAqF;AACrF,oGAAiG;AAEjG,8EAA2E;AAC3E,iDAA8C;AAC9C,8DAA2D;AAC3D,yDAAsD;AAEtD,8DAAqD;AACrD,oDAAiD;AAIpC,QAAA,kBAAkB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,IAAA,2CAAoB,GAAE,CAAC;IACvC,MAAM,SAAS,GAAG,WAAW,EAAE,KAAK,EAAE,GAAa,CAAC;IACpD,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;IAE1E,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC;IAExB,MAAM,UAAU,GAAG,WAAW,EAAE,KAAK,EAAE,IAAc,CAAC;IACtD,MAAM,mBAAmB,GAAG,IAAA,2CAAoB,GAAE,EAAE,IAAI,CACtD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,UAAU,CAChC,EAAE,QAAQ,CAAC;IAEZ,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,WAAW,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE;YAClC,KAAK,EAAE,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;SAC1C;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IAEzB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,6CAAqB,EAAC;QACvC,IAAI,EAAG,cAAc,EAAE,QAAqB,IAAI,EAAE;QAClD,eAAe,EAAE,EAAE;QACnB,UAAU,EAAE,iCAAc;KAC3B,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IAE1D,OAAO,CACL,4CACE,uBAAC,6BAAa,IACZ,KAAK,EAAC,uFAAiB,EACvB,WAAW,EAAC,yGAAoB,EAChC,OAAO,EAAE,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC9D,GAAG,EAAE,OAAO;oBACZ,IAAI,EAAE,OAAO;iBACd,CAAC,CAAC,KACC,IAAA,6BAAa,EACf,KAAK,CAAC,eAAe,CAAC,EACtB,iCAAY,CAAC,aAAa,EAC1B,KAAK,EAAE,QAAQ,IAAI,gBAAgB,CACpC,EACD,QAAQ,EAAE,IAAI,GACd,EACF,gCAAK,SAAS,EAAC,WAAW,YACxB,uBAAC,uBAAU,cACT,uBAAC,qBAAS,IACR,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAC,QAAQ,EAClB,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,GACzC,GACS,GACT,IACF,CACP,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/ui-kit/FormField/Fields/RetailRegionField.js

@@ -1,14 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RetailRegionField = void 0;
-const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
-const uni_jsx_1 = require("@redneckz/uni-jsx");
-const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
-const useBranchesByRegions_1 = require("../../../hooks/useBranchesByRegions");
-const SelectControl_1 = require("../../Select/SelectControl");
-const getObjectValidator_1 = require("../getObjectValidator");
-const getValidation_1 = require("../getValidation");
-exports.RetailRegionField = (0, uni_jsx_1.JSX)(({ field, input }) => {
-    const regions = (0, useBranchesByRegions_1.useBranchesByRegions)();
-    return ((0, jsx_runtime_1.jsx)(SelectControl_1.SelectControl, { label: "\u0420\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", isSearch: true, options: (0, hooks_1.useMemo)(() => regions?.map(({ region = '' }) => ({ key: region, text: region })), [regions]), ...(0, getValidation_1.getValidation)(field('regionRetail'), getObjectValidator_1.validatorObj.regionRetail, input?.required) }));
-});
-//# sourceMappingURL=RetailRegionField.js.map

package/dist/ui-kit/FormField/Fields/RetailRegionField.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RetailRegionField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/RetailRegionField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAsD;AACtD,8EAA2E;AAC3E,8DAA2D;AAE3D,8DAAqD;AACrD,oDAAiD;AAEpC,QAAA,iBAAiB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,MAAM,OAAO,GAAG,IAAA,2CAAoB,GAAE,CAAC;IAEvC,OAAO,CACL,uBAAC,6BAAa,IACZ,KAAK,EAAC,sCAAQ,EACd,WAAW,EAAC,uFAAiB,EAC7B,QAAQ,EAAE,IAAI,EACd,OAAO,EAAE,IAAA,eAAO,EACd,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EACxE,CAAC,OAAO,CAAC,CACV,KACG,IAAA,6BAAa,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,iCAAY,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,CAAC,GACpF,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}