@redneckz/wildless-cms-uni-blocks 0.14.672 → 0.14.674

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

@@ -16,6 +16,7 @@ interface YandexMapProps {
   className?: string;
   zoom?: number;
   isLoad?: boolean;
+  selectedAddress?: string;
 }
 
 export const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
@@ -24,59 +25,71 @@ export const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
 //       Сейчас реализован поиск среди тестовых данных
 // TODO: Также выяснить что делать когда ничего не найдено
 // TODO: На макетах также когда есть поле поиска нет кнопки открыть на карте.
-export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5, isLoad }) => {
-  const map = useRef<ymaps.Map | null>(null);
+export const YandexMap = JSX<YandexMapProps>(
+  ({ points, className = '', zoom = 5, isLoad, selectedAddress }) => {
+    const map = useRef<ymaps.Map | null>(null);
 
-  const parentDiv = useRef<HTMLElement>(null);
+    const parentDiv = useRef<HTMLElement>(null);
 
-  const yandexMaps = useYandexMaps();
+    const yandexMaps = useYandexMaps();
 
-  useEffect(() => {
-    if (map.current) {
-      renderClusterer({ yandexMaps, map: map.current, points, isLoad });
-    } else {
-      yandexMaps?.ready(() => {
-        // Ready function may be called few times, but must be called once
-        if (map.current) {
-          renderClusterer({ yandexMaps, map: map.current, points, isLoad });
-
-          return;
-        }
+    useEffect(() => {
+      if (map.current) {
+        renderClusterer({ yandexMaps, map: map.current, points, isLoad });
+      } else {
+        yandexMaps?.ready(() => {
+          // Ready function may be called few times, but must be called once
+          if (map.current) {
+            renderClusterer({ yandexMaps, map: map.current, points, isLoad });
+
+            return;
+          }
+
+          map.current = new yandexMaps.Map(parentDiv.current, {
+            center: getCenterPoint(points),
+            zoom,
+            controls: [],
+            suppressMapOpenBlock: true,
+          });
 
-        map.current = new yandexMaps.Map(parentDiv.current, {
-          center: getCenterPoint(points),
-          zoom,
-          controls: [],
-          suppressMapOpenBlock: true,
+          renderClusterer({ yandexMaps, map: map.current, points, isLoad });
         });
+      }
+
+      // zoom к выбранному отделению банка в рамках задачи по retail
+      if (map.current && selectedAddress) {
+        yandexMaps?.geocode(selectedAddress).then((res) => {
+          const firstGeoObject = res.geoObjects.get(0);
+          const coords = firstGeoObject.geometry.getCoordinates() as number[];
+          map.current.setCenter(coords);
+          map.current.setZoom(18);
+        });
+      }
+    }, [yandexMaps, points, zoom, isLoad, selectedAddress]);
 
-        renderClusterer({ yandexMaps, map: map.current, points, isLoad });
-      });
+    if (!yandexMaps) {
+      return null;
     }
-  }, [yandexMaps, points, zoom, isLoad]);
-
-  if (!yandexMaps) {
-    return null;
-  }
-
-  const zIndex = 'z-10';
-
-  return (
-    <div ref={parentDiv} className={style('relative', 'w-full', className)}>
-      {isLoad ? <Loader /> : null}
-      <div
-        className={style(
-          'absolute right-2 top-52 z-10 w-12 overflow-hidden border border-transparent rounded-md',
-          zIndex,
-        )}
-      >
-        <ZoomButton yandexMaps={map} />
-        <ZoomButton yandexMaps={map} direction="out" />
+
+    const zIndex = 'z-10';
+
+    return (
+      <div ref={parentDiv} className={style('relative', 'w-full', className)}>
+        {isLoad ? <Loader /> : null}
+        <div
+          className={style(
+            'absolute right-2 top-52 z-10 w-12 overflow-hidden border border-transparent rounded-md',
+            zIndex,
+          )}
+        >
+          <ZoomButton yandexMaps={map} />
+          <ZoomButton yandexMaps={map} direction="out" />
+        </div>
+        {renderUserGeolocation(map, yandexMaps, style('right-2 top-80', zIndex))}
       </div>
-      {renderUserGeolocation(map, yandexMaps, style('right-2 top-80', zIndex))}
-    </div>
-  );
-});
+    );
+  },
+);
 
 const getCenterPoint = (points?: BalloonPoints[]) => {
   const centerCoords = [

package/package.json

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

package/src/components/ApplicationForm/ApplicationForm.fixture.tsx

@@ -34,7 +34,7 @@ export default {
         sections={[
           {
             inputs: [
-              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'surname', required: true },
               { fieldType: 'common', name: 'middleName' },
               { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],

package/src/components/ApplicationLeadForm/ApplicationLeadForm.example.json

@@ -57,17 +57,16 @@
               },
               {
                 "fieldType": "common",
-                "name": "consentPfrFlg"
+                "name": "consentOthersFlg",
+                "required": true
               },
               {
                 "fieldType": "common",
-                "name": "consentInformFlg",
-                "required": true
+                "name": "consentInformFlg"
               },
               {
                 "fieldType": "common",
-                "name": "consentOthersFlg",
-                "required": true
+                "name": "consentPfrFlg"
               }
             ]
           }

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.tsx

@@ -32,9 +32,9 @@ export default {
           {
             inputs: [
               { fieldType: 'common', name: 'processPersonalDataFlg', required: true },
-              { fieldType: 'common', name: 'consentInformFlg', required: true },
               { fieldType: 'common', name: 'consentProviderFlg', required: true },
               { fieldType: 'common', name: 'consentOthersFlg', required: true },
+              { fieldType: 'common', name: 'consentInformFlg' },
               { fieldType: 'common', name: 'consentPfrFlg' },
             ],
           },

package/src/components/CreditCardForm/CreditCardForm.tsx

@@ -17,7 +17,7 @@ const WIZARD_TITLES = [
   'Параметры карты',
   'Персональные данные',
   'Данные о трудоустройстве',
-  'Данные о доходах и расходах',
+  'Семейное положение и доход',
   'Дополнительные сведения',
   'Выбор способа получения',
 ];

package/src/components/CreditCardForm/StepsNavigationButtons.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Button } from '../../ui-kit/Button/Button';
-import { style } from '../../utils/style';
 
 export interface StepsNavigationButtonsProps {
   step: number;
@@ -9,21 +8,14 @@ export interface StepsNavigationButtonsProps {
 
 export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(({ step, onPrevStep }) => {
   const isFirstStep = step === 0;
+  const isFinalStep = step === 6;
 
   return (
     <div className="flex justify-between gap-m">
-      <Button
-        onClick={onPrevStep}
-        className={style('w-full @xl:w-auto')}
-        type="button"
-        version="secondary"
-        disabled={isFirstStep}
-      >
+      <Button onClick={onPrevStep} type="button" version="secondary" disabled={isFirstStep}>
         Назад
       </Button>
-      <Button className="w-full @xl:w-auto" type="submit">
-        Далее
-      </Button>
+      <Button type="submit">{isFinalStep ? 'Отправить заявку' : 'Далее'}</Button>
     </div>
   );
 });

package/src/components/CreditForm/CreditForm.tsx

@@ -18,7 +18,7 @@ const WIZARD_TITLES = [
   '',
   'Персональные данные',
   'Данные о трудоустройстве',
-  'Данные о доходах и расходах',
+  'Семейное положение и доход',
   'Дополнительные сведения',
   'Отделение Банка',
 ];

package/src/components/CreditForm/StepsNavigationButtons.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Button } from '../../ui-kit/Button/Button';
-import { style } from '../../utils/style';
 
 export interface StepsNavigationButtonsProps {
   step: number;
@@ -9,21 +8,14 @@ export interface StepsNavigationButtonsProps {
 
 export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(({ step, onPrevStep }) => {
   const isFirstStep = step === 0;
+  const isFinalStep = step === 5;
 
   return (
-    <div className={'flex justify-between'}>
-      <Button
-        onClick={onPrevStep}
-        className={style('w-full @xl:w-auto')}
-        type="button"
-        version="secondary"
-        disabled={isFirstStep}
-      >
+    <div className={'flex justify-between gap-m'}>
+      <Button onClick={onPrevStep} type="button" version="secondary" disabled={isFirstStep}>
         Назад
       </Button>
-      <Button className={style('w-full @xl:w-auto')} type="submit">
-        Далее
-      </Button>
+      <Button type="submit">{isFinalStep ? 'Отправить заявку' : 'Далее'}</Button>
     </div>
   );
 });

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

@@ -56,7 +56,12 @@ export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
       />
       <div className="h-[600px]">
         <ClientOnly>
-          <YandexMap points={points} isLoad={!data} className="h-full" />
+          <YandexMap
+            points={points}
+            isLoad={!data}
+            className="h-full"
+            selectedAddress={fieldBranch?.value?.text}
+          />
         </ClientOnly>
       </div>
     </div>

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

@@ -16,7 +16,9 @@ export const jobNumberValidator = (errorMsg?: string) =>
   );
 
 export const nameValidator = (errorMsg?: string) =>
-  validator((_) => typeof _ === 'string' && _.length > 1)(errorMsg ?? ERROR_MESSAGE);
+  validator((_) => typeof _ === 'string' && _.length > 1 && isCyrillic(_))(
+    errorMsg ?? ERROR_MESSAGE,
+  );
 
 export const lengthStringValidator = (inputLength: number, errorMsg?: string) =>
   validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(
@@ -78,7 +80,10 @@ export const addressOrganizationValidator = () =>
   );
 
 export const codeWordValidator = (errorMsg?: string) =>
-  validator(
-    (_) =>
-      typeof _ === 'string' && _.length >= 3 && _.length <= 21 && /^[\u0400-\u04FF\d]+$/u.test(_),
-  )(errorMsg ?? ERROR_MESSAGE);
+  validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(
+    errorMsg ?? ERROR_MESSAGE,
+  );
+
+const cyrillicPattern = /^[\u0400-\u04FF\d]+$/u;
+
+const isCyrillic = (_ = '') => cyrillicPattern.test(_);

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

@@ -16,6 +16,7 @@ interface YandexMapProps {
   className?: string;
   zoom?: number;
   isLoad?: boolean;
+  selectedAddress?: string;
 }
 
 export const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
@@ -24,59 +25,71 @@ export const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
 //       Сейчас реализован поиск среди тестовых данных
 // TODO: Также выяснить что делать когда ничего не найдено
 // TODO: На макетах также когда есть поле поиска нет кнопки открыть на карте.
-export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5, isLoad }) => {
-  const map = useRef<ymaps.Map | null>(null);
+export const YandexMap = JSX<YandexMapProps>(
+  ({ points, className = '', zoom = 5, isLoad, selectedAddress }) => {
+    const map = useRef<ymaps.Map | null>(null);
 
-  const parentDiv = useRef<HTMLElement>(null);
+    const parentDiv = useRef<HTMLElement>(null);
 
-  const yandexMaps = useYandexMaps();
+    const yandexMaps = useYandexMaps();
 
-  useEffect(() => {
-    if (map.current) {
-      renderClusterer({ yandexMaps, map: map.current, points, isLoad });
-    } else {
-      yandexMaps?.ready(() => {
-        // Ready function may be called few times, but must be called once
-        if (map.current) {
-          renderClusterer({ yandexMaps, map: map.current, points, isLoad });
-
-          return;
-        }
+    useEffect(() => {
+      if (map.current) {
+        renderClusterer({ yandexMaps, map: map.current, points, isLoad });
+      } else {
+        yandexMaps?.ready(() => {
+          // Ready function may be called few times, but must be called once
+          if (map.current) {
+            renderClusterer({ yandexMaps, map: map.current, points, isLoad });
+
+            return;
+          }
+
+          map.current = new yandexMaps.Map(parentDiv.current, {
+            center: getCenterPoint(points),
+            zoom,
+            controls: [],
+            suppressMapOpenBlock: true,
+          });
 
-        map.current = new yandexMaps.Map(parentDiv.current, {
-          center: getCenterPoint(points),
-          zoom,
-          controls: [],
-          suppressMapOpenBlock: true,
+          renderClusterer({ yandexMaps, map: map.current, points, isLoad });
         });
+      }
+
+      // zoom к выбранному отделению банка в рамках задачи по retail
+      if (map.current && selectedAddress) {
+        yandexMaps?.geocode(selectedAddress).then((res) => {
+          const firstGeoObject = res.geoObjects.get(0);
+          const coords = firstGeoObject.geometry.getCoordinates() as number[];
+          map.current.setCenter(coords);
+          map.current.setZoom(18);
+        });
+      }
+    }, [yandexMaps, points, zoom, isLoad, selectedAddress]);
 
-        renderClusterer({ yandexMaps, map: map.current, points, isLoad });
-      });
+    if (!yandexMaps) {
+      return null;
     }
-  }, [yandexMaps, points, zoom, isLoad]);
-
-  if (!yandexMaps) {
-    return null;
-  }
-
-  const zIndex = 'z-10';
-
-  return (
-    <div ref={parentDiv} className={style('relative', 'w-full', className)}>
-      {isLoad ? <Loader /> : null}
-      <div
-        className={style(
-          'absolute right-2 top-52 z-10 w-12 overflow-hidden border border-transparent rounded-md',
-          zIndex,
-        )}
-      >
-        <ZoomButton yandexMaps={map} />
-        <ZoomButton yandexMaps={map} direction="out" />
+
+    const zIndex = 'z-10';
+
+    return (
+      <div ref={parentDiv} className={style('relative', 'w-full', className)}>
+        {isLoad ? <Loader /> : null}
+        <div
+          className={style(
+            'absolute right-2 top-52 z-10 w-12 overflow-hidden border border-transparent rounded-md',
+            zIndex,
+          )}
+        >
+          <ZoomButton yandexMaps={map} />
+          <ZoomButton yandexMaps={map} direction="out" />
+        </div>
+        {renderUserGeolocation(map, yandexMaps, style('right-2 top-80', zIndex))}
       </div>
-      {renderUserGeolocation(map, yandexMaps, style('right-2 top-80', zIndex))}
-    </div>
-  );
-});
+    );
+  },
+);
 
 const getCenterPoint = (points?: BalloonPoints[]) => {
   const centerCoords = [