@redneckz/wildless-cms-uni-blocks 0.14.1064 → 0.14.1065

package/mobile/src/components/RatesTable/RatesTableContent.ts

@@ -1,13 +1,24 @@
 import { type HrefProps } from '../../model/LinkProps';
 
 /**
- * @title Таблица курсов
+ * @title Тип курсов
+ * @default "Курсы для физ.лиц"
+ * @enumNames [
+ *    "Курсы для физ.лиц",
+ *    "Курсы для держателей карт"
+ *  ]
+ */
+export type RatesType = 'natural' | 'cards';
+
+/**
+ * @title Кросс-курсы
  */
 export interface RatesTableContent extends HrefProps {
   /** @title Информационное сообщение */
   infoMessage?: string;
   /** @title Заголовок */
   title?: string;
-  /** @hidden */
-  isArchive?: boolean;
+  ratesType?: RatesType;
+  /** @title Сообщение при отсутствии ставок */
+  notFoundMessage?: string;
 }

package/mobile/src/components/RatesTable/RatesTableItem.tsx

@@ -3,10 +3,11 @@ import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
 import { Rate, RATES_COLUMN_STYLE, type RateItem } from '../../ui-kit/Rate/Rate';
 import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
+import { type ArchiveRates } from './RatesTable';
 import { type RatesTableContent } from './RatesTableContent';
 import { renderDate } from './renderDate';
 
-interface RatesTableItemProps extends RatesTableContent {
+export interface RatesTableItemProps extends RatesTableContent, ArchiveRates {
   maxDate?: string;
   isRatesValid?: boolean;
   list: RateItem[];

package/mobile/src/hooks/useRates.ts

@@ -1,6 +1,7 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { useLocalStore } from '@redneckz/uni-jsx/lib/Store/useLocalStore';
 import { API_BASE_URI } from '../api/apiBaseUrl';
+import { type RatesType } from '../components/RatesTable/RatesTableContent';
 import { type RateItem } from '../ui-kit/Rate/Rate';
 import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 
@@ -9,33 +10,43 @@ type RatesStoreItem = {
   nextUpdate: number;
 };
 
-type RateItemList = RateItem[];
+export type RateItemList = RateItem[];
 
 type RatesStoreSlice = {
   rates: RatesStoreItem;
   archiveRates: RatesStoreItem;
 };
 
-const RATES_URL = `${API_BASE_URI}/rates`;
-const ARCHIVE_RATES_URL = `${API_BASE_URI}/historyrates`;
-const EMPTY_RATES: RateItemList[] = [
-  [
-    {
-      currencyPair: 'Валютная пара',
-      buyRate: 0,
-      sellRate: 0,
-    },
-  ],
-];
-
-export function useRates(isArchive: boolean): RateItemList[] {
-  const url = isArchive ? ARCHIVE_RATES_URL : RATES_URL;
-  const rateKey = isArchive ? 'archiveRates' : 'rates';
+type FetchRatesProps = {
+  ratesType?: RatesType;
+  date?: Date;
+  fetchArchive?: boolean;
+};
+
+const EMPTY_RATES: RateItemList[] = [];
+
+const RATES_URL: Record<RatesType, string> = {
+  natural: `${API_BASE_URI}/rates`,
+  cards: `${API_BASE_URI}/ratescards`,
+  //archive: `${API_BASE_URI}/historyrates`,
+};
+
+const RATES_KEY: Record<RatesType, string> = {
+  natural: 'rates',
+  cards: 'ratescards',
+  //archive: 'historyrates',
+};
+
+// TODO: для архива прокинуть date
+export function useRates({ ratesType = 'natural', fetchArchive = true }: FetchRatesProps) {
+  //const url = ratesType === 'archive' ? getArchiveRatesURL(date) : RATES_URL[ratesType];
+  const url = RATES_URL[ratesType];
+  const rateKey = RATES_KEY[ratesType];
 
   const ratesStore = useLocalStore<RatesStoreSlice>();
 
   // проверяем, надо ли обновлять значения ставок
-  const shouldUpdate = getShouldUpdate(isArchive, ratesStore as RatesStoreSlice);
+  const shouldUpdate = getShouldUpdate(rateKey, ratesStore as RatesStoreSlice, fetchArchive);
 
   // костыль, не отправлять запрос на бэк, если уже был запрос менее 15 мин назад
   const { data } = useAsyncData(
@@ -46,20 +57,32 @@ export function useRates(isArchive: boolean): RateItemList[] {
   // если есть data и значение надо обновить, то обновляем локалсторадж
   if (shouldUpdate && data) {
     const nextUpdate = getTimeAfter15Minutes();
-    ratesStore[rateKey] = { rate: data, nextUpdate };
+    ratesStore[rateKey] = { rate: data ?? [], nextUpdate };
   }
 
   // берем данные из локалсторадж
   const rates = ratesStore[rateKey]?.rate;
 
+  const isLoad = Array.isArray(rates);
+
   // возвращаем данные из локалсторадж или заглушку
-  return Array.isArray(rates) ? rates : EMPTY_RATES;
+  return { ratesList: rates ?? EMPTY_RATES, isLoad };
 }
 
 // Отсчитываем 15 минут с текущего момента
 const getTimeAfter15Minutes = () => Date.now() + 15 * 60 * 1000;
 
-const getShouldUpdate = (isArchive: boolean, ratesStore: RatesStoreSlice | null) =>
-  isArchive
-    ? !ratesStore?.archiveRates || ratesStore?.archiveRates.nextUpdate <= Date.now()
-    : !ratesStore?.rates || ratesStore?.rates.nextUpdate <= Date.now();
+const getShouldUpdate = (
+  rateKey: string,
+  ratesStore: RatesStoreSlice | null,
+  fetchArchive: boolean,
+) =>
+  rateKey === 'archive'
+    ? (!ratesStore?.[rateKey] || ratesStore?.[rateKey].nextUpdate <= Date.now()) && fetchArchive
+    : !ratesStore?.[rateKey] || ratesStore?.[rateKey].nextUpdate <= Date.now();
+
+/*const getArchiveRatesURL = (date?: Date) => {
+  const formattedDate = date && formatDate(date, true);
+
+  return formattedDate ? `${RATES_URL['archive']}?date=${formattedDate}` : RATES_URL['archive'];
+};*/

package/package.json

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

package/src/components/RatesTable/RatesTable.example.json

@@ -1,7 +1,9 @@
 {
   "content": {
-    "infoMessage": "",
-    "title": "Курс покупки/продажи для операций с использованием платежных карт в сети Банка",
-    "href": ""
+    "infoMessage": "Информация может содержать неточности, актуальный курс уточняйте в отделении Банка",
+    "title": "Курс покупки/продажи",
+    "href": "https://www.rshb.ru",
+    "ratesType": "natural",
+    "notFoundMessage": "Подходящие ставки не найдены"
   }
 }

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

@@ -7,20 +7,25 @@ const ratesTableContent = {
   href: 'rshb.ru',
 };
 
-const archiveRatesTableContent = {
+/*const archiveRatesTableContent = {
   title: 'Архив курсов покупки/продажи для операций с использованием платежных карт в сети Банка',
-  isArchive: true,
+  notFoundMessage: 'За этот день ставки не приходили',
+};*/
+
+const cardsRatesTableContent = {
+  title: 'Курс покупки/продажи для операций с использованием платежных карт в сети Банка',
+  notFoundMessage: 'Подходящих ставок нет',
 };
 
 export default {
   default: (
     <div className="container grid grid-cols-12">
-      <RatesTable className="col-span-12" {...ratesTableContent} />
+      <RatesTable className="col-span-12" {...ratesTableContent} ratesType="natural" />
     </div>
   ),
-  archive: (
+  cards: (
     <div className="container grid grid-cols-12">
-      <RatesTable className="col-span-12" {...archiveRatesTableContent} />
+      <RatesTable className="col-span-12" {...cardsRatesTableContent} ratesType="cards" />
     </div>
   ),
 };

package/src/components/RatesTable/RatesTable.fixture.tsx

@@ -7,20 +7,25 @@ const ratesTableContent = {
   href: 'rshb.ru',
 };
 
-const archiveRatesTableContent = {
+/*const archiveRatesTableContent = {
   title: 'Архив курсов покупки/продажи для операций с использованием платежных карт в сети Банка',
-  isArchive: true,
+  notFoundMessage: 'За этот день ставки не приходили',
+};*/
+
+const cardsRatesTableContent = {
+  title: 'Курс покупки/продажи для операций с использованием платежных карт в сети Банка',
+  notFoundMessage: 'Подходящих ставок нет',
 };
 
 export default {
   default: (
     <div className="container grid grid-cols-12">
-      <RatesTable className="col-span-12" {...ratesTableContent} />
+      <RatesTable className="col-span-12" {...ratesTableContent} ratesType="natural" />
     </div>
   ),
-  archive: (
+  cards: (
     <div className="container grid grid-cols-12">
-      <RatesTable className="col-span-12" {...archiveRatesTableContent} />
+      <RatesTable className="col-span-12" {...cardsRatesTableContent} ratesType="cards" />
     </div>
   ),
 };

package/src/components/RatesTable/RatesTable.tsx

@@ -1,38 +1,93 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useRates } from '../../hooks/useRates';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useRates, type RateItemList } from '../../hooks/useRates';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
+import { Loader } from '../../ui-kit/Loader/Loader';
+import { NotFound } from '../../ui-kit/NotFound/NotFound';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { type RatesTableContent } from './RatesTableContent';
 import { RatesTableItem } from './RatesTableItem';
-import { renderDataPickForm } from './renderDataPickForm';
 import { renderLink } from './renderLink';
 
 interface RatesTableProps extends RatesTableContent, UniBlockProps {}
 
+interface RenderRatesContent extends RatesTableContent, ArchiveRates {
+  isRatesValid?: boolean;
+  ratesList?: RateItemList[];
+}
+
+export type ArchiveRates = {
+  isArchive?: boolean;
+};
+
 export const RatesTable = JSX<RatesTableProps>(
-  ({ href, className = '', infoMessage, title, isArchive = false, ...rest }) => {
-    const ratesList = useRates(isArchive);
+  ({
+    href,
+    ratesType = 'natural',
+    className = '',
+    infoMessage,
+    notFoundMessage,
+    title,
+    ...rest
+  }) => {
+    // const [date, setDate] = useState<Date>();
+    const [fetchArchive, setFetchArchive] = useState<boolean>(true);
+
+    //const isArchive = ratesType === 'archive';
+
+    const { ratesList, isLoad } = useRates({
+      ratesType,
+      fetchArchive,
+    });
 
-    const isRatesValid = ratesList[0].length > 0;
+    useEffect(() => {
+      setFetchArchive(false);
+    }, []);
+
+    const isRatesValid = ratesList?.length > 0;
 
     return (
       <BlockWrapper className={style('p-6xl space-y-xl', className)} defaultPadding="p-0" {...rest}>
         <Heading className="mb-xl">{title}</Heading>
-        {isArchive ? renderDataPickForm() : null}
-        {ratesList.map((list, i) => (
-          <RatesTableItem
-            list={list}
-            isRatesValid={isRatesValid}
-            isArchive={isArchive}
-            key={String(i)}
-            infoMessage={infoMessage}
-          />
-        ))}
-
+        {/*{isArchive
+          ? renderDataPickForm({ value: date, onChange: setDate, handleClick: setFetchArchive })
+          : null}*/}
+        {isLoad ? (
+          renderRatesContent({
+            ratesList,
+            isArchive: false,
+            infoMessage,
+            isRatesValid,
+            notFoundMessage,
+          })
+        ) : (
+          <Loader position="static" />
+        )}
         {href ? renderLink(href) : null}
       </BlockWrapper>
     );
   },
 );
+
+const renderRatesContent = ({
+  ratesList = [],
+  isArchive = false,
+  infoMessage,
+  isRatesValid,
+  notFoundMessage,
+}: RenderRatesContent) =>
+  ratesList.length > 0 ? (
+    ratesList.map((list, i) => (
+      <RatesTableItem
+        list={list}
+        isRatesValid={isRatesValid}
+        isArchive={isArchive}
+        key={String(i)}
+        infoMessage={infoMessage}
+      />
+    ))
+  ) : (
+    <NotFound description={notFoundMessage} />
+  );

package/src/components/RatesTable/RatesTableContent.ts

@@ -1,13 +1,24 @@
 import { type HrefProps } from '../../model/LinkProps';
 
 /**
- * @title Таблица курсов
+ * @title Тип курсов
+ * @default "Курсы для физ.лиц"
+ * @enumNames [
+ *    "Курсы для физ.лиц",
+ *    "Курсы для держателей карт"
+ *  ]
+ */
+export type RatesType = 'natural' | 'cards';
+
+/**
+ * @title Кросс-курсы
  */
 export interface RatesTableContent extends HrefProps {
   /** @title Информационное сообщение */
   infoMessage?: string;
   /** @title Заголовок */
   title?: string;
-  /** @hidden */
-  isArchive?: boolean;
+  ratesType?: RatesType;
+  /** @title Сообщение при отсутствии ставок */
+  notFoundMessage?: string;
 }

package/src/components/RatesTable/RatesTableItem.tsx

@@ -3,10 +3,11 @@ import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
 import { Rate, RATES_COLUMN_STYLE, type RateItem } from '../../ui-kit/Rate/Rate';
 import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
+import { type ArchiveRates } from './RatesTable';
 import { type RatesTableContent } from './RatesTableContent';
 import { renderDate } from './renderDate';
 
-interface RatesTableItemProps extends RatesTableContent {
+export interface RatesTableItemProps extends RatesTableContent, ArchiveRates {
   maxDate?: string;
   isRatesValid?: boolean;
   list: RateItem[];

package/src/hooks/useRates.ts

@@ -1,6 +1,7 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { useLocalStore } from '@redneckz/uni-jsx/lib/Store/useLocalStore';
 import { API_BASE_URI } from '../api/apiBaseUrl';
+import { type RatesType } from '../components/RatesTable/RatesTableContent';
 import { type RateItem } from '../ui-kit/Rate/Rate';
 import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 
@@ -9,33 +10,43 @@ type RatesStoreItem = {
   nextUpdate: number;
 };
 
-type RateItemList = RateItem[];
+export type RateItemList = RateItem[];
 
 type RatesStoreSlice = {
   rates: RatesStoreItem;
   archiveRates: RatesStoreItem;
 };
 
-const RATES_URL = `${API_BASE_URI}/rates`;
-const ARCHIVE_RATES_URL = `${API_BASE_URI}/historyrates`;
-const EMPTY_RATES: RateItemList[] = [
-  [
-    {
-      currencyPair: 'Валютная пара',
-      buyRate: 0,
-      sellRate: 0,
-    },
-  ],
-];
-
-export function useRates(isArchive: boolean): RateItemList[] {
-  const url = isArchive ? ARCHIVE_RATES_URL : RATES_URL;
-  const rateKey = isArchive ? 'archiveRates' : 'rates';
+type FetchRatesProps = {
+  ratesType?: RatesType;
+  date?: Date;
+  fetchArchive?: boolean;
+};
+
+const EMPTY_RATES: RateItemList[] = [];
+
+const RATES_URL: Record<RatesType, string> = {
+  natural: `${API_BASE_URI}/rates`,
+  cards: `${API_BASE_URI}/ratescards`,
+  //archive: `${API_BASE_URI}/historyrates`,
+};
+
+const RATES_KEY: Record<RatesType, string> = {
+  natural: 'rates',
+  cards: 'ratescards',
+  //archive: 'historyrates',
+};
+
+// TODO: для архива прокинуть date
+export function useRates({ ratesType = 'natural', fetchArchive = true }: FetchRatesProps) {
+  //const url = ratesType === 'archive' ? getArchiveRatesURL(date) : RATES_URL[ratesType];
+  const url = RATES_URL[ratesType];
+  const rateKey = RATES_KEY[ratesType];
 
   const ratesStore = useLocalStore<RatesStoreSlice>();
 
   // проверяем, надо ли обновлять значения ставок
-  const shouldUpdate = getShouldUpdate(isArchive, ratesStore as RatesStoreSlice);
+  const shouldUpdate = getShouldUpdate(rateKey, ratesStore as RatesStoreSlice, fetchArchive);
 
   // костыль, не отправлять запрос на бэк, если уже был запрос менее 15 мин назад
   const { data } = useAsyncData(
@@ -46,20 +57,32 @@ export function useRates(isArchive: boolean): RateItemList[] {
   // если есть data и значение надо обновить, то обновляем локалсторадж
   if (shouldUpdate && data) {
     const nextUpdate = getTimeAfter15Minutes();
-    ratesStore[rateKey] = { rate: data, nextUpdate };
+    ratesStore[rateKey] = { rate: data ?? [], nextUpdate };
   }
 
   // берем данные из локалсторадж
   const rates = ratesStore[rateKey]?.rate;
 
+  const isLoad = Array.isArray(rates);
+
   // возвращаем данные из локалсторадж или заглушку
-  return Array.isArray(rates) ? rates : EMPTY_RATES;
+  return { ratesList: rates ?? EMPTY_RATES, isLoad };
 }
 
 // Отсчитываем 15 минут с текущего момента
 const getTimeAfter15Minutes = () => Date.now() + 15 * 60 * 1000;
 
-const getShouldUpdate = (isArchive: boolean, ratesStore: RatesStoreSlice | null) =>
-  isArchive
-    ? !ratesStore?.archiveRates || ratesStore?.archiveRates.nextUpdate <= Date.now()
-    : !ratesStore?.rates || ratesStore?.rates.nextUpdate <= Date.now();
+const getShouldUpdate = (
+  rateKey: string,
+  ratesStore: RatesStoreSlice | null,
+  fetchArchive: boolean,
+) =>
+  rateKey === 'archive'
+    ? (!ratesStore?.[rateKey] || ratesStore?.[rateKey].nextUpdate <= Date.now()) && fetchArchive
+    : !ratesStore?.[rateKey] || ratesStore?.[rateKey].nextUpdate <= Date.now();
+
+/*const getArchiveRatesURL = (date?: Date) => {
+  const formattedDate = date && formatDate(date, true);
+
+  return formattedDate ? `${RATES_URL['archive']}?date=${formattedDate}` : RATES_URL['archive'];
+};*/