@redneckz/wildless-cms-uni-blocks 0.3.70 → 0.3.71

package/src/components/TextBlock/TextBlock.fixture.mobile.tsx

@@ -1,5 +1,5 @@
 import type { Picture } from '../../model/Picture';
-import { mobileContext } from '../../setup-fixture';
+import { mobileContext } from '../../react/setup-fixture';
 import { TextBlock } from './TextBlock';
 import { TextBlockContent } from './TextBlockContent';
 
@@ -25,112 +25,115 @@ export const TEXT_BLOCK: TextBlockContent = {
 };
 
 export default {
-  default: (
+  'private clients': (
     <div className="container grid grid-cols-12">
       <div className="col-span-12">
-        <div>
-          <p>Private clients</p>
-          <div className="flex flex-col gap-[6px]" data-theme="pc">
-            <TextBlock
-              context={mobileContext}
-              {...TEXT_BLOCK}
-              blockVersion="primary"
-              iconVersion="small"
-            />
-            <TextBlock
-              context={mobileContext}
-              {...TEXT_BLOCK}
-              blockVersion="primary"
-              iconVersion="big"
-              image={image}
-            />
-            <TextBlock
-              context={mobileContext}
-              {...TEXT_BLOCK}
-              blockVersion="primary"
-              iconVersion="none"
-            />
-            <TextBlock
-              context={mobileContext}
-              description="Если не планируете поездку за границу, продолжайте пользоваться картой Своя. Для поездок за границу"
-              blockVersion="primary"
-            />
-            <TextBlock
-              context={mobileContext}
-              title="Все карты Россельхозбанка работают"
-              blockVersion="primary"
-            />
-            <TextBlock
-              context={mobileContext}
-              title="Все карты Россельхозбанка работают"
-              blockVersion="primary"
-              iconVersion="small"
-              items={items}
-            />
-            <TextBlock
-              context={mobileContext}
-              title="Все карты Россельхозбанка работают"
-              description="Если не планируете поездку за границу, продолжайте пользоваться картой Своя. Для поездок за границу"
-              blockVersion="secondary"
-              iconVersion="small"
-              items={items}
-            />
-            <TextBlock
-              context={mobileContext}
-              title="Все карты Россельхозбанка работают"
-              description="Если не планируете поездку за границу, продолжайте пользоваться картой Своя. Для поездок за границу"
-              blockVersion="secondary-light"
-              iconVersion="small"
-              items={items}
-            />
-          </div>
+        <div className="flex flex-col gap-[6px]" data-theme="pc">
+          <TextBlock
+            context={mobileContext}
+            {...TEXT_BLOCK}
+            blockVersion="primary"
+            iconVersion="small"
+          />
+          <TextBlock
+            context={mobileContext}
+            {...TEXT_BLOCK}
+            blockVersion="primary"
+            iconVersion="big"
+            image={image}
+          />
+          <TextBlock
+            context={mobileContext}
+            {...TEXT_BLOCK}
+            blockVersion="primary"
+            iconVersion="none"
+          />
+          <TextBlock
+            context={mobileContext}
+            description="Если не планируете поездку за границу, продолжайте пользоваться картой Своя. Для поездок за границу"
+            blockVersion="primary"
+          />
+          <TextBlock
+            context={mobileContext}
+            title="Все карты Россельхозбанка работают"
+            blockVersion="primary"
+          />
+          <TextBlock
+            context={mobileContext}
+            title="Все карты Россельхозбанка работают"
+            blockVersion="primary"
+            iconVersion="small"
+            items={items}
+          />
+          <TextBlock
+            context={mobileContext}
+            title="Все карты Россельхозбанка работают"
+            description="Если не планируете поездку за границу, продолжайте пользоваться картой Своя. Для поездок за границу"
+            blockVersion="secondary"
+            iconVersion="small"
+            items={items}
+          />
+          <TextBlock
+            context={mobileContext}
+            title="Все карты Россельхозбанка работают"
+            description="Если не планируете поездку за границу, продолжайте пользоваться картой Своя. Для поездок за границу"
+            blockVersion="secondary-light"
+            iconVersion="small"
+            items={items}
+          />
         </div>
-        <div>
-          <p>Business clients</p>
-          <div className="flex flex-col gap-[6px]" data-theme="bc">
-            <TextBlock
-              className="flex flex-col"
-              context={mobileContext}
-              {...TEXT_BLOCK}
-              blockVersion="primary"
-              iconVersion="small"
-            />
-            <TextBlock
-              context={mobileContext}
-              {...TEXT_BLOCK}
-              iconVersion="small"
-              blockVersion="secondary"
-            />
-            <TextBlock
-              context={mobileContext}
-              {...TEXT_BLOCK}
-              iconVersion="small"
-              blockVersion="secondary-light"
-            />
-          </div>
+      </div>
+    </div>
+  ),
+  'business clients': (
+    <div className="container grid grid-cols-12">
+      <div className="col-span-12">
+        <div className="flex flex-col gap-[6px]" data-theme="bc">
+          <TextBlock
+            className="flex flex-col"
+            context={mobileContext}
+            {...TEXT_BLOCK}
+            blockVersion="primary"
+            iconVersion="small"
+          />
+          <TextBlock
+            context={mobileContext}
+            {...TEXT_BLOCK}
+            iconVersion="small"
+            blockVersion="secondary"
+          />
+          <TextBlock
+            context={mobileContext}
+            {...TEXT_BLOCK}
+            iconVersion="small"
+            blockVersion="secondary-light"
+          />
         </div>
-        <div>
-          <p>Ecosystem own</p>
-          <div className="flex flex-col gap-[6px]" data-theme="eo">
-            <TextBlock
-              context={mobileContext}
-              {...TEXT_BLOCK}
-              iconVersion="small"
-              blockVersion="primary"
-            />
-            <TextBlock
-              context={mobileContext}
-              {...TEXT_BLOCK}
-              iconVersion="small"
-              blockVersion="secondary"
-            />
-            <TextBlock
-              context={mobileContext}
-              {...TEXT_BLOCK}
-              iconVersion="small"
-              blockVersion="secondary-light"
-            />
-          </div>
+      </div>
+    </div>
+  ),
+  'ecosystem own': (
+    <div className="container grid grid-cols-12">
+      <div className="col-span-12">
+        <div className="flex flex-col gap-[6px]" data-theme="eo">
+          <TextBlock
+            context={mobileContext}
+            {...TEXT_BLOCK}
+            iconVersion="small"
+            blockVersion="primary"
+          />
+          <TextBlock
+            context={mobileContext}
+            {...TEXT_BLOCK}
+            iconVersion="small"
+            blockVersion="secondary"
+          />
+          <TextBlock
+            context={mobileContext}
+            {...TEXT_BLOCK}
+            iconVersion="small"
+            blockVersion="secondary-light"
+          />
         </div>
       </div>
     </div>

package/src/components/TextBlock/TextBlock.fixture.tsx

@@ -1,5 +1,5 @@
 import type { Picture } from '../../model/Picture';
-import { context } from '../../setup-fixture';
+import { context } from '../../react/setup-fixture';
 import { TextBlock } from './TextBlock';
 import { TextBlockContent } from './TextBlockContent';
 
@@ -19,96 +19,74 @@ export const TEXT_BLOCK: TextBlockContent = {
 };
 
 export default {
-  default: (
+  'private clients': (
     <div className="container grid grid-cols-12">
       <div className="font-sans overflow-hidden col-span-12">
-        <div>
-          <p>Private clients</p>
-          <div className="flex flex-col gap-6" data-theme="pc">
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="primary"
-              iconVersion="small"
-            />
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="primary"
-              iconVersion="big"
-              image={image}
-            />
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="primary"
-              iconVersion="none"
-            />
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="primary"
-              iconVersion="small"
-            />
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="secondary"
-              iconVersion="small"
-            />
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="secondary-light"
-              iconVersion="small"
-            />
-          </div>
+        <div className="flex flex-col gap-6" data-theme="pc">
+          <TextBlock context={context} {...TEXT_BLOCK} blockVersion="primary" iconVersion="small" />
+          <TextBlock
+            context={context}
+            {...TEXT_BLOCK}
+            blockVersion="primary"
+            iconVersion="big"
+            image={image}
+          />
+          <TextBlock context={context} {...TEXT_BLOCK} blockVersion="primary" iconVersion="none" />
+          <TextBlock context={context} {...TEXT_BLOCK} blockVersion="primary" iconVersion="small" />
+          <TextBlock
+            context={context}
+            {...TEXT_BLOCK}
+            blockVersion="secondary"
+            iconVersion="small"
+          />
+          <TextBlock
+            context={context}
+            {...TEXT_BLOCK}
+            blockVersion="secondary-light"
+            iconVersion="small"
+          />
         </div>
-        <div>
-          <p>Business clients</p>
-          <div className="flex flex-col gap-6" data-theme="bc">
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="primary"
-              iconVersion="small"
-            />
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="secondary"
-              iconVersion="small"
-            />
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="secondary-light"
-              iconVersion="small"
-            />
-          </div>
+      </div>
+    </div>
+  ),
+  'business clients': (
+    <div className="container grid grid-cols-12">
+      <div className="font-sans overflow-hidden col-span-12">
+        <div className="flex flex-col gap-6" data-theme="bc">
+          <TextBlock context={context} {...TEXT_BLOCK} blockVersion="primary" iconVersion="small" />
+          <TextBlock
+            context={context}
+            {...TEXT_BLOCK}
+            blockVersion="secondary"
+            iconVersion="small"
+          />
+          <TextBlock
+            context={context}
+            {...TEXT_BLOCK}
+            blockVersion="secondary-light"
+            iconVersion="small"
+          />
         </div>
-        <div>
-          <p>Ecosystem own</p>
-          <div className="flex flex-col gap-6" data-theme="eo">
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="primary"
-              iconVersion="small"
-            />
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="secondary"
-              iconVersion="small"
-            />
-            <TextBlock
-              context={context}
-              {...TEXT_BLOCK}
-              blockVersion="secondary-light"
-              iconVersion="small"
-            />
-          </div>
+      </div>
+    </div>
+  ),
+  'ecosystem own': (
+    <div className="container grid grid-cols-12">
+      <div className="font-sans overflow-hidden col-span-12">
+        <div className="flex flex-col gap-6" data-theme="eo">
+          <TextBlock context={context} {...TEXT_BLOCK} blockVersion="primary" iconVersion="small" />
+          <TextBlock
+            context={context}
+            {...TEXT_BLOCK}
+            blockVersion="secondary"
+            iconVersion="small"
+          />
+          <TextBlock
+            context={context}
+            {...TEXT_BLOCK}
+            blockVersion="secondary-light"
+            iconVersion="small"
+          />
         </div>
       </div>
     </div>

package/src/components/Tile/Tile.example.json

@@ -11,6 +11,7 @@
     "alt": "",
     "title": ""
   },
+  "isDotted": true,
   "items": ["Пункт 1", "Пункт 2", "Пункт 3"],
   "buttons": [
     {

package/src/components/Tile/Tile.fixture.tsx

@@ -1,5 +1,5 @@
 import type { Picture } from '../../model/Picture';
-import { context } from '../../setup-fixture';
+import { context } from '../../react/setup-fixture';
 import { Tile } from './Tile';
 import type { TileContent } from './TileContent';
 
@@ -30,6 +30,7 @@ const image4: Picture = {
 export const TILE: TileContent = {
   title: 'Кредиты',
   headingType: 'h3',
+  isDotted: false,
   items: ['До 3 млн ₽', 'до 5 лет'],
   buttons: [
     {

package/src/components/Tile/Tile.tsx

@@ -30,6 +30,7 @@ export const Tile = JSX<TileProps>((props) => {
     children,
     buttons,
     image,
+    isDotted = true,
     className = '',
     version = 'primary',
     role,
@@ -75,16 +76,17 @@ export const Tile = JSX<TileProps>((props) => {
           />
         ) : null}
         {children}
-        {renderList(items, version)}
+        {renderList(items, version, isDotted)}
       </BaseTile>
     </section>
   );
 });
 
-function renderList(items, version) {
+function renderList(items, version, isDotted: boolean) {
   return items?.length ? (
     <List
       items={items}
+      isDotted={isDotted}
       itemClassName="text-title-2xs font-light mt-2"
       version={version === 'primary' ? 'tile' : 'tile-white'}
     />

package/src/components/Tile/TileContent.ts

@@ -14,5 +14,10 @@ export type TileContent = HeadingContent &
   ListContent &
   ButtonContent &
   ImageContent & {
+    /**
+     *  @title Буллиты
+     *  @default true
+     */
+    isDotted?: boolean;
     version?: BlockVersion;
   };

package/src/content-page-repository/mapJSON.ts

@@ -1,23 +1,27 @@
 export async function mapJSON<T>(
   data: T,
   mapper: <In, Out = In>(value: In, key: string[]) => Promise<Out>,
-  key: string[] = [],
+  keyParts: string[] = [],
 ): Promise<T> {
-  if (data === null || data === undefined) return data;
+  if (data === null || data === undefined) {
+    return data;
+  }
 
-  const mappedData = await mapper(data, key);
-  if (mappedData !== data) return mappedData as T;
+  const mappedData = await mapper(data, keyParts);
+  if (mappedData !== data) {
+    return mappedData as T;
+  }
 
   if (Array.isArray(data)) {
-    const values = data.map((_, i) => mapJSON(_, mapper, [String(i)].concat(key)));
+    const values = data.map((_, i) => mapJSON(_, mapper, [String(i)].concat(keyParts)));
     return Promise.all(values) as any;
   } else if (typeof data === 'object' && (data as any).toString() === '[object Object]') {
     const subKeys = Object.keys(data as any);
-    const values = subKeys.map((k) => mapJSON(data[k], mapper, [k].concat(key)));
+    const values = subKeys.map((k) => mapJSON(data[k], mapper, [k].concat(keyParts)));
     const pairs = (await Promise.all(values)).map((_, i) => ({
       [subKeys[i]]: _,
     }));
     return Object.assign({}, ...pairs);
   }
-  return mapper<T>(data, key);
+  return mapper<T>(data, keyParts);
 }

package/src/content-page-repository/transformMarkdown.ts

@@ -3,7 +3,9 @@ import remarkParse from 'remark-parse';
 import remarkHtml from 'remark-html';
 
 export async function transformMarkdown(markdown: string | null | undefined): Promise<string> {
-  if (!markdown) return '';
+  if (!markdown) {
+    return '';
+  }
 
   const result = await unified().use(remarkParse).use(remarkHtml).process(markdown);
   return result.toString('utf-8');

package/src/content-page-repository/transformPicture.ts

@@ -36,12 +36,15 @@ async function transformImg(
 
   const imgPath = `${path.dirname(pagePath)}/${src}`;
   let chain = sharp(imgPath);
-  if (size)
+  if (size) {
     chain = chain.resize(size?.width, size?.height, {
       fit: sharp.fit.contain,
       background: [0, 0, 0, 0],
     });
-  if (format) chain = chain.toFormat(format, options);
+  }
+  if (format) {
+    chain = chain.toFormat(format, options);
+  }
 
   const transformedSrc = transformSrc(src, transformationOptions);
   const transformedImgPath = `${publicDir}/${path.relative(
@@ -62,7 +65,9 @@ async function transformImg(
 
 function transformSrc(src: string, { format, size }: TransformationOptions & ImgSource): string {
   const noTransform = !format && !size;
-  if (noTransform) return src;
+  if (noTransform) {
+    return src;
+  }
 
   const suffix = [size?.width, size?.height].filter(Boolean).join('-');
   return `${path.basename(src, path.extname(src))}${suffix ? `-${suffix}` : ''}.${

package/src/hooks/useCreditCalculatorData.ts

@@ -1,15 +1,14 @@
 import type { AsyncDataHook } from '../components/ContentPage/ContentPageContext';
-import { CreditCalculatorData } from '../components/CreditCalculator/CreditCalculatorContent';
 
 export function useCreditCalculatorData(
   useAsyncData: AsyncDataHook,
   directoryName: string | undefined,
-): CreditCalculatorData {
+): any {
   const { data } = useAsyncData(creditCalculatorUrl(directoryName), fetchCreditCalculatorData);
   return data || {};
 }
 
-async function fetchCreditCalculatorData(url: string): Promise<CreditCalculatorData> {
+async function fetchCreditCalculatorData(url: string): Promise<any> {
   const response = await fetch(url);
   return await response.json();
 }

package/src/hooks/useExchangeRates.ts

@@ -1,25 +1,85 @@
 import type { AsyncDataHook } from '../components/ContentPage/ContentPageContext';
-import { ExchangeCurrencyItem } from '../components/ExchangeRateTile/ExchangeRateTileContent';
+import type { ExchangeCurrencyItem } from '../components/ExchangeRateTile/ExchangeCurrencyCalculator';
 
-interface ExchangeRatesData {
-  exchangeRate?: {
-    currencies?: ExchangeCurrencyItem[];
-  };
+interface RatesData {
+  code: string;
+  rate_buy: number;
+  rate_sell: number;
 }
 
-export function useExchangeRates(useAsyncData: AsyncDataHook): ExchangeRatesData {
+export function useExchangeRates(useAsyncData: AsyncDataHook): ExchangeCurrencyItem[] {
   const { data } = useAsyncData(EXCHANGE_RATES_URL, fetchExchangeRates);
 
-  return data || {};
+  const result = data?.hits?.hits?.map((_) => _._source) || [];
+  return result.length ? getCurrencyListByRate(result) : result;
 }
 
-async function fetchExchangeRates(): Promise<ExchangeRatesData | undefined> {
+async function fetchExchangeRates(): Promise<any | undefined> {
   try {
-    const response = await fetch(EXCHANGE_RATES_URL);
+    const response = await fetch(EXCHANGE_RATES_URL, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(EXCHANGE_RATES_BODY),
+    });
     return await response.json();
   } catch (err) {
     console.error(err);
   }
 }
 
-const EXCHANGE_RATES_URL = '/api/v1/exchangerates.json';
+const EXCHANGE_RATES_URL =
+  'https://coins.rshb.ru/api/catalog/vue_storefront_magento_1_currency_rates_average/currency_rates_average/_search?size=10000';
+
+const EXCHANGE_RATES_BODY = {
+  query: {
+    bool: {
+      must: [
+        {
+          term: {
+            // eslint-disable-next-line camelcase
+            russian_region_code: '77',
+          },
+        },
+        {
+          term: {
+            // eslint-disable-next-line camelcase
+            from_volume: '0',
+          },
+        },
+        {
+          terms: {
+            // eslint-disable-next-line camelcase
+            currency_pair: ['USD/RUB', 'EUR/RUB'],
+          },
+        },
+      ],
+    },
+  },
+};
+
+interface FormatRatesData {
+  code: string;
+  buy?: number;
+  sell?: number;
+}
+
+const getCurrencyListByRate = (currencyRates: RatesData[]) =>
+  currencyRates.reduce((result: FormatRatesData[], _) => {
+    const currencyInfo = _['currency_first'];
+    if (!validateRate(_['rate_buy']) && !validateRate(_['rate_sell'])) {
+      return result;
+    }
+    const currencyCode = currencyInfo.code;
+    if (!result.some((i) => i.code === currencyCode)) {
+      result.push({
+        code: currencyCode,
+        buy: Number(_.rate_buy),
+        sell: Number(_.rate_sell),
+      });
+    }
+    return result;
+  }, []);
+
+const validateRate = (value) => Math.round(value) > 0;