@redneckz/wildless-cms-uni-blocks 0.15.339 → 0.15.341

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

@@ -11,7 +11,7 @@ import { useYandexMaps } from './useYandexMaps';
 import { ZoomButton } from './ZoomButton';
 
 interface YandexMapProps {
-  points?: BalloonPoints[];
+  points: BalloonPoints[];
   className?: string;
   zoom?: number;
 }
@@ -42,10 +42,10 @@ export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5
           suppressMapOpenBlock: true,
         });
 
-        renderClusterer(yandexMaps, map.current, points);
+        renderClusterer({ yandexMaps, map: map.current, points });
       });
     } else if (yandexMaps) {
-      renderClusterer(yandexMaps, map.current, points);
+      renderClusterer({ yandexMaps, map: map.current, points });
 
       if (!points?.length) {
         map.current.setCenter(DEFAULT_CENTER_COORDS);

package/mobile/src/ui-kit/YandexMap/renderClusterer.ts

@@ -4,17 +4,71 @@
 import type ymaps from 'yandex-maps';
 import { type BalloonPoints } from '../../components/OfficesAtmsMap/YandexMapProps'; //! Вынести этот тип в файл YandexMapProps.ts расположенный в корне этого компонента
 
-export function renderClusterer(yandexMaps: typeof ymaps, map: ymaps.Map, points: BalloonPoints[]) {
+const MapMarkerClusterIcon = '/icons/MapMarkerClusterIcon.svg';
+const MapMarkerClusterYellowIcon = '/icons/MapMarkerClusterYellowIcon.svg';
+
+export function renderClusterer({
+  yandexMaps,
+  map,
+  points,
+}: {
+  yandexMaps: typeof ymaps;
+  map: ymaps.Map;
+  points: BalloonPoints[];
+}) {
   map.geoObjects.removeAll();
 
   const clusterIconContentLayout = yandexMaps.templateLayoutFactory.createClass(
     '<div style="margin-top: -3px;">{{properties.geoObjects.length}}</div>',
   );
 
-  const clusterer = new yandexMaps.Clusterer({
+  const officeClusterer = defineClusterer('offices', yandexMaps, clusterIconContentLayout);
+
+  if (points.length && points.every((_) => 'type' in _)) {
+    const remoteWorkplaceClusterer = defineClusterer(
+      'workplaces',
+      yandexMaps,
+      clusterIconContentLayout,
+    );
+
+    const remoteWorkplaceGeoObjects = defineGeoObjects(
+      points.filter((_) => _.type === 'workplaces'),
+      'workplaces',
+      yandexMaps,
+    );
+
+    const officesGeoObjects = defineGeoObjects(
+      points.filter((_) => _.type === 'offices'),
+      'offices',
+      yandexMaps,
+    );
+
+    officeClusterer.add(officesGeoObjects);
+    remoteWorkplaceClusterer.add(remoteWorkplaceGeoObjects);
+
+    map.geoObjects.add(remoteWorkplaceClusterer as any);
+    map.geoObjects.add(officeClusterer as any);
+  } else {
+    const geoObjects = defineGeoObjects(points, 'offices', yandexMaps);
+    officeClusterer.add(geoObjects);
+    map.geoObjects.add(officeClusterer as any);
+  }
+  map.setBounds(yandexMaps.util.bounds.fromPoints(points.map((_) => _.coords))).then(() => {
+    if (map.getZoom() > 10) {
+      map.setZoom(10);
+    }
+  });
+}
+
+const defineClusterer = (
+  type: string,
+  yandexMaps: typeof ymaps,
+  clusterIconContentLayout: ymaps.IClassConstructor<ymaps.layout.templateBased.Base>,
+) => {
+  return new yandexMaps.Clusterer({
     clusterIcons: [
       {
-        href: '/icons/MapMarkerClusterIcon.svg',
+        href: type === 'offices' ? MapMarkerClusterIcon : MapMarkerClusterYellowIcon,
         size: [78, 84],
         offset: [-35, -50],
       },
@@ -23,8 +77,10 @@ export function renderClusterer(yandexMaps: typeof ymaps, map: ymaps.Map, points
     clusterHideIconOnBalloonOpen: false,
     geoObjectHideIconOnBalloonOpen: false,
   } as ymaps.IClustererOptions);
+};
 
-  const geoObjects = points.map(
+const defineGeoObjects = (pointArr: BalloonPoints[], type: string, yandexMaps: typeof ymaps) => {
+  return pointArr.map(
     ({ coords, content }) =>
       new yandexMaps.Placemark(
         coords,
@@ -36,20 +92,10 @@ export function renderClusterer(yandexMaps: typeof ymaps, map: ymaps.Map, points
         },
         {
           iconLayout: 'default#image',
-          iconImageHref: '/icons/MapMarkerSingleIcon.svg',
+          iconImageHref: type === 'offices' ? MapMarkerClusterIcon : MapMarkerClusterYellowIcon,
           iconImageSize: [78, 84],
           iconImageOffset: [-35, -50],
         },
       ),
   );
-
-  clusterer.add(geoObjects);
-
-  map.geoObjects.add(clusterer as any);
-
-  map.setBounds(yandexMaps.util.bounds.fromPoints(points.map((_) => _.coords))).then(() => {
-    if (map.getZoom() > 10) {
-      map.setZoom(10);
-    }
-  });
-}
+};

package/mobile/src/utils/getVersion.ts

@@ -0,0 +1 @@
+export const getVersion = (isPrimary: boolean) => (isPrimary ? 'primary' : 'secondary');

package/package.json

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

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -76,6 +76,10 @@ export type FieldCommonDef = FieldDefaultDef & {
   fieldType: 'common';
 };
 
+/**
+ * @title Значение по умолчанию
+ * @enumNames ["Валютный контроль","Документарные операции","Конверсионные операции","Иные вопросы ВЭД"]
+ */
 type VedTypes = 'currencyControl' | 'documentOperations' | 'conversionTransactions' | 'otherIssues';
 
 /**
@@ -85,7 +89,6 @@ type VedTypes = 'currencyControl' | 'documentOperations' | 'conversionTransactio
 export type FieldVedDef = FieldDefaultDef & {
   /** @default "ved" */
   fieldType: 'ved';
-  /** @title Значение по умолчанию */
   defaultValue?: VedTypes;
 };
 

package/src/components/CalculatorCredit/CalculatorCredit.tsx

@@ -23,13 +23,11 @@ import { clamp } from '../../utils/clamp';
 import { style } from '../../utils/style';
 import {
   type CalculatorCreditContent,
-  type CreditCalculatorParamsViewSettings,
-} from './CalculatorCreditContent';
-import {
-  getCreditCalculatorParams,
   type CreditCalculatorData,
   type CreditCalculatorParams,
-} from './getCreditCalculatorParams';
+  type CreditCalculatorParamsViewSettings,
+} from './CalculatorCreditContent';
+import { getCreditCalculatorParams } from './getCreditCalculatorParams';
 
 const CREDIT_DEFAULT_SUM = 200000;
 

package/src/components/CalculatorCredit/CalculatorCreditContent.ts

@@ -1,10 +1,41 @@
 import {
   type CalculatorParamsViewSettingsDefault,
+  type CalcValueProps,
   type CommonCalculatorProps,
   type CommonDefaultParams,
+  type LimitParamsProps,
 } from '../../ui-kit/Calculator/CalculatorProps';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
+export interface CommonCreditParams {
+  isInsurance: boolean;
+  isSalaryClient: boolean;
+  isPensionClient: boolean;
+  isStateEmployee: boolean;
+}
+export interface CreditCalculatorSourceBookRateParams extends CommonCreditParams, LimitParamsProps {
+  rate: number;
+}
+
+export interface CreditCalculatorSourceBookLimitParams
+  extends CommonCreditParams,
+    LimitParamsProps {}
+
+export interface CreditCalculatorUserInputParams extends CommonCreditParams, CalcValueProps {
+  isAnnuity: boolean;
+}
+
+export interface CreditCalculatorParams
+  extends CreditCalculatorSourceBookRateParams,
+    CreditCalculatorUserInputParams {
+  monthlyPayment: number;
+}
+
+export type CreditCalculatorData = {
+  rateRows?: CreditCalculatorSourceBookRateParams[];
+  limitRows?: CreditCalculatorSourceBookLimitParams[];
+};
+
 export interface CreditCalculatorParamsViewSettings extends CalculatorParamsViewSettingsDefault {
   /** @title Работаю в бюджетной организации */
   isShowStateEmployee?: boolean;

package/src/components/CalculatorCredit/checkCreditSourceBookRowCommonParams.ts

@@ -1,8 +1,8 @@
-import { type CreditCalculatorParamsViewSettings } from './CalculatorCreditContent';
 import {
   type CommonCreditParams,
+  type CreditCalculatorParamsViewSettings,
   type CreditCalculatorUserInputParams,
-} from './getCreditCalculatorParams';
+} from './CalculatorCreditContent';
 
 interface CheckSourceBookRowProps {
   row: CommonCreditParams;

package/src/components/CalculatorCredit/defaultCreditCalculatorParams.ts

@@ -0,0 +1,19 @@
+import {
+  DEFAULT_MAX_MONTHS,
+  DEFAULT_MIN_MONTHS,
+} from '../../ui-kit/Calculator/calculatorConstants';
+import { type CreditCalculatorSourceBookRateParams } from './CalculatorCreditContent';
+
+const DEFAULT_MIN_SUM = 10000;
+const DEFAULT_MAX_SUM = 5000000;
+export const DEFAULT_CREDIT_CALCULATOR_PARAMS: CreditCalculatorSourceBookRateParams = {
+  minSum: DEFAULT_MIN_SUM,
+  maxSum: DEFAULT_MAX_SUM,
+  minMonths: DEFAULT_MIN_MONTHS,
+  maxMonths: DEFAULT_MAX_MONTHS,
+  rate: 0,
+  isSalaryClient: false,
+  isPensionClient: false,
+  isStateEmployee: false,
+  isInsurance: true,
+};

package/src/components/CalculatorCredit/getCreditCalculatorLimitParams.ts

@@ -1,9 +1,9 @@
-import { type CreditCalculatorParamsViewSettings } from './CalculatorCreditContent';
-import { checkCreditSourceBookRowCommonParams } from './checkCreditSourceBookRowCommonParams';
 import {
+  type CreditCalculatorParamsViewSettings,
   type CreditCalculatorSourceBookLimitParams,
   type CreditCalculatorUserInputParams,
-} from './getCreditCalculatorParams';
+} from './CalculatorCreditContent';
+import { checkCreditSourceBookRowCommonParams } from './checkCreditSourceBookRowCommonParams';
 
 interface GetCreditCalculatorLimitParamsProps {
   limitRows: CreditCalculatorSourceBookLimitParams[];

package/src/components/CalculatorCredit/getCreditCalculatorParams.ts

@@ -1,61 +1,15 @@
-import {
-  DEFAULT_MAX_MONTHS,
-  DEFAULT_MIN_MONTHS,
-} from '../../ui-kit/Calculator/calculatorConstants';
-import {
-  type CalcValueProps,
-  type LimitParamsProps,
-} from '../../ui-kit/Calculator/CalculatorProps';
 import { getMonthlyPayment } from '../../ui-kit/Calculator/getMonthlyPayment';
 import { getLimitRangeByKeys } from '../../ui-kit/Calculator/rangeHelpers';
-import { type CreditCalculatorParamsViewSettings } from './CalculatorCreditContent';
+import {
+  type CreditCalculatorData,
+  type CreditCalculatorParams,
+  type CreditCalculatorParamsViewSettings,
+  type CreditCalculatorUserInputParams,
+} from './CalculatorCreditContent';
+import { DEFAULT_CREDIT_CALCULATOR_PARAMS } from './defaultCreditCalculatorParams';
 import { getCreditCalculatorLimitParams } from './getCreditCalculatorLimitParams';
 import { getCreditCalculatorRateParams } from './getCreditCalculatorRateParams';
 
-const DEFAULT_MIN_SUM = 10000;
-const DEFAULT_MAX_SUM = 5000000;
-
-export const DEFAULT_CREDIT_CALCULATOR_PARAMS: CreditCalculatorSourceBookRateParams = {
-  minSum: DEFAULT_MIN_SUM,
-  maxSum: DEFAULT_MAX_SUM,
-  minMonths: DEFAULT_MIN_MONTHS,
-  maxMonths: DEFAULT_MAX_MONTHS,
-  rate: 0,
-  isSalaryClient: false,
-  isPensionClient: false,
-  isStateEmployee: false,
-  isInsurance: true,
-};
-
-export interface CommonCreditParams {
-  isInsurance: boolean;
-  isSalaryClient: boolean;
-  isPensionClient: boolean;
-  isStateEmployee: boolean;
-}
-export interface CreditCalculatorSourceBookRateParams extends CommonCreditParams, LimitParamsProps {
-  rate: number;
-}
-
-export interface CreditCalculatorSourceBookLimitParams
-  extends CommonCreditParams,
-    LimitParamsProps {}
-
-export interface CreditCalculatorUserInputParams extends CommonCreditParams, CalcValueProps {
-  isAnnuity: boolean;
-}
-
-export interface CreditCalculatorParams
-  extends CreditCalculatorSourceBookRateParams,
-    CreditCalculatorUserInputParams {
-  monthlyPayment: number;
-}
-
-export type CreditCalculatorData = {
-  rateRows?: CreditCalculatorSourceBookRateParams[];
-  limitRows?: CreditCalculatorSourceBookLimitParams[];
-};
-
 export const getCreditCalculatorParams = (
   userInputParams: CreditCalculatorUserInputParams,
   calcSource?: CreditCalculatorData,

package/src/components/CalculatorCredit/getCreditCalculatorRateParams.ts

@@ -1,12 +1,12 @@
 import { type CalcValueProps } from '../../ui-kit/Calculator/CalculatorProps';
 import { checkRangeByKeys } from '../../ui-kit/Calculator/rangeHelpers';
-import { type CreditCalculatorParamsViewSettings } from './CalculatorCreditContent';
-import { checkCreditSourceBookRowCommonParams } from './checkCreditSourceBookRowCommonParams';
 import {
-  DEFAULT_CREDIT_CALCULATOR_PARAMS,
+  type CreditCalculatorParamsViewSettings,
   type CreditCalculatorSourceBookRateParams,
   type CreditCalculatorUserInputParams,
-} from './getCreditCalculatorParams';
+} from './CalculatorCreditContent';
+import { checkCreditSourceBookRowCommonParams } from './checkCreditSourceBookRowCommonParams';
+import { DEFAULT_CREDIT_CALCULATOR_PARAMS } from './defaultCreditCalculatorParams';
 
 interface GetCreditCalculatorRateParamsProps extends CalcValueProps {
   rateRows: CreditCalculatorSourceBookRateParams[];

package/src/components/CalculatorDeposit/CalculatorDepositContent.ts

@@ -25,7 +25,7 @@ export interface DepositDefaultParams extends CommonDefaultParams {
 }
 
 /**
- * @title Калькулятор бонусов
+ * @title Калькулятор вкладов
  */
 export type CalculatorDepositContent = UniBlockContent &
   CommonCalculatorProps & {

package/src/components/ContactsBlock/ContactsBlock.tsx

@@ -55,7 +55,7 @@ const renderBlocksColumn = ({ column, index }: RenderContactsColumnProps) =>
               </Paragraph>
             </div>
           ) : null}
-          {button?.href ? <LinkButton className="mt-xl" {...button} /> : null}
+          {button?.text ? <LinkButton className="mt-xl" {...button} /> : null}
         </div>
       ))}
     </div>

package/src/components/ContactsBlock/ContactsBlock.ui.json

@@ -1,5 +1,40 @@
 {
-  "content": {},
+  "content": {
+    "info": {
+      "items": {
+        "items": {
+          "button": {
+            "href": {
+              "ui:field": "attachmentHref"
+            },
+            "icon": {
+              "ui:field": "icon"
+            },
+            "iconRight": {
+              "ui:field": "icon"
+            }
+          }
+        }
+      }
+    },
+    "contacts": {
+      "items": {
+        "items": {
+          "button": {
+            "href": {
+              "ui:field": "attachmentHref"
+            },
+            "icon": {
+              "ui:field": "icon"
+            },
+            "iconRight": {
+              "ui:field": "icon"
+            }
+          }
+        }
+      }
+    }
+  },
   "style": {
     "ui:options": {
       "minCols": 12

package/src/components/ContentPage/ContentPage.tsx

@@ -69,6 +69,7 @@ export const ContentPage = JSX<ContentPageProps>(
         <PopupManager />
         <CookiePopup
           termLink={{ href: '/pd-policy#cookie', target: '_blank' }}
+          recommendationLink={{ href: '/recommendation', target: '_blank' }}
           personalDataPolicyLink={{ href: '/pd-policy', target: '_blank' }}
         />
       </div>

package/src/components/Footer/Footer.mobile.tsx

@@ -1,17 +1,13 @@
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type TopMenuItemProps } from '../../data/SitemapData';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
 import { UniBlock } from '../../UniBlock/UniBlock';
 import { appendSlash } from '../../utils/appendSlash';
-import { mapCookie } from '../../utils/mapCookie';
 import { style } from '../../utils/style';
 import { RollupItem } from '../RollupItem/RollupItem';
 import { Contacts } from './Contacts';
-import { COOKIE_REPLACE } from './cookieReplaceData';
 import { type FooterProps } from './FooterProps';
 import { HorizontalNavigation } from './HorizontalNavigation';
-import { HorizontalNavigationLink } from './HorizontalNavigationLink';
 import { LinkList } from './LinkList';
 import { SocialMedia } from './SocialMedia';
 import { TextInformation } from './TextInformation';
@@ -30,11 +26,6 @@ export const Footer = UniBlock<FooterProps>(({ className, footer, ...rest }) =>
     license,
   } = footer || {};
 
-  const handleOnClick = useCallback(() => {
-    const [name, oldValue, newValue] = COOKIE_REPLACE;
-    mapCookie(name, (value) => value?.replace(oldValue, newValue));
-  }, []);
-
   return (
     <BlockWrapper
       tag="footer"
@@ -54,13 +45,6 @@ export const Footer = UniBlock<FooterProps>(({ className, footer, ...rest }) =>
         </SocialMedia>
       ))}
       <div className={borderStyle} />
-      <HorizontalNavigationLink
-        text="Вернуться на прежнюю версию сайта"
-        className="flex text-l font-light max-w-[292px]"
-        href="https://old.rshb.ru"
-        onClick={handleOnClick}
-      />
-      <div className={borderStyle} />
       <HorizontalNavigation title={horizontalNavigationTitle} links={relatedEnterprises} />
       <div className={borderStyle} />
       <TextInformation links={documents} license={license} />

package/src/components/Footer/Footer.tsx

@@ -1,14 +1,11 @@
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
 import { Logo } from '../../ui-kit/Logo/Logo';
 import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
 import { Sitemap } from '../../ui-kit/Sitemap/Sitemap';
 import { UniBlock } from '../../UniBlock/UniBlock';
-import { mapCookie } from '../../utils/mapCookie';
 import { style } from '../../utils/style';
 import { Contacts } from './Contacts';
-import { COOKIE_REPLACE } from './cookieReplaceData';
 import { type FooterProps } from './FooterProps';
 import { HorizontalNavigation } from './HorizontalNavigation';
 import { SocialMedia } from './SocialMedia';
@@ -26,16 +23,10 @@ export const Footer = UniBlock<FooterProps>(({ className, footer, ...rest }) =>
     contacts,
     mediaLinks = [],
     feedbackButton,
-    isOldVersionButton,
     license,
     otherLinks = [],
   } = footer ?? {};
 
-  const handleOnClick = useCallback(() => {
-    const [name, oldValue, newValue] = COOKIE_REPLACE;
-    mapCookie(name, (value) => value?.replace(oldValue, newValue));
-  }, []);
-
   const linkStyle = '!text-left text-s font-light';
 
   return (
@@ -55,16 +46,6 @@ export const Footer = UniBlock<FooterProps>(({ className, footer, ...rest }) =>
               {_?.title}
             </SocialMedia>
           ))}
-          {isOldVersionButton ? (
-            <LinkButton
-              version="link"
-              href="https://old.rshb.ru"
-              className={linkStyle}
-              onClick={handleOnClick}
-            >
-              Вернуться на прежнюю версию сайта
-            </LinkButton>
-          ) : null}
           {otherLinks.map((_, i) => (
             <LinkButton key={String(i)} className={linkStyle} version="link" {..._}>
               {_?.text}

package/src/components/MobileAppTile/MobileAppTile.tsx

@@ -20,8 +20,8 @@ export const MobileAppTile = UniBlock<MobileAppTileProps>(
     description,
     image,
     items,
-    qr,
     headingType,
+    qr,
     additionalDescription = '',
     title = 'Мобильное приложение',
     version = 'primary',

package/src/components/MobileAppTile/MobileAppTileContent.ts

@@ -1,8 +1,6 @@
 import {
   type AdditionalDescriptionProps,
-  type DescriptionProps,
   type HeadlineCommonProps,
-  type TitleProps,
 } from '../../model/HeadlineType';
 import { type Picture } from '../../model/Picture';
 import { type HeadingType } from '../../ui-kit/Heading/HeadingProps';
@@ -17,8 +15,6 @@ import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 export type MobileAppTileContent = UniBlockContent &
   AdditionalDescriptionProps &
   HeadlineCommonProps &
-  TitleProps &
-  DescriptionProps &
   ButtonsSectionContent &
   ListContent &
   ImageContent & {