npm - @redneckz/wildless-cms-uni-blocks - Versions diffs - 0.14.1064 → 0.14.1065 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (64) hide show

package/bundle/components/RatesTable/RatesTable.d.ts CHANGED Viewed

@@ -2,5 +2,8 @@ import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type RatesTableContent } from './RatesTableContent';
 interface RatesTableProps extends RatesTableContent, UniBlockProps {
 }
+export declare type ArchiveRates = {
+    isArchive?: boolean;
+};
 export declare const RatesTable: import("@redneckz/uni-jsx").UNIComponent<RatesTableProps, any, any>;
 export {};

package/bundle/components/RatesTable/RatesTableContent.d.ts CHANGED Viewed

@@ -1,12 +1,22 @@
 import { type HrefProps } from '../../model/LinkProps';
 /**
- * @title Таблица курсов
+ * @title Тип курсов
+ * @default "Курсы для физ.лиц"
+ * @enumNames [
+ *    "Курсы для физ.лиц",
+ *    "Курсы для держателей карт"
+ *  ]
+ */
+export declare 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/bundle/components/RatesTable/RatesTableItem.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import { type RateItem } from '../../ui-kit/Rate/Rate';
+import { type ArchiveRates } from './RatesTable';
 import { type RatesTableContent } from './RatesTableContent';
-interface RatesTableItemProps extends RatesTableContent {
+export interface RatesTableItemProps extends RatesTableContent, ArchiveRates {
     maxDate?: string;
     isRatesValid?: boolean;
     list: RateItem[];
 }
 export declare const RatesTableItem: import("@redneckz/uni-jsx").UNIComponent<RatesTableItemProps, any, any>;
-export {};

package/bundle/hooks/useRates.d.ts CHANGED Viewed

@@ -1,4 +1,13 @@
+import { type RatesType } from '../components/RatesTable/RatesTableContent';
 import { type RateItem } from '../ui-kit/Rate/Rate';
-declare type RateItemList = RateItem[];
-export declare function useRates(isArchive: boolean): RateItemList[];
+export declare type RateItemList = RateItem[];
+declare type FetchRatesProps = {
+    ratesType?: RatesType;
+    date?: Date;
+    fetchArchive?: boolean;
+};
+export declare function useRates({ ratesType, fetchArchive }: FetchRatesProps): {
+    ratesList: any;
+    isLoad: boolean;
+};
 export {};

package/dist/components/RatesTable/RatesTable.d.ts CHANGED Viewed

@@ -2,5 +2,8 @@ import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type RatesTableContent } from './RatesTableContent';
 interface RatesTableProps extends RatesTableContent, UniBlockProps {
 }
+export declare type ArchiveRates = {
+    isArchive?: boolean;
+};
 export declare const RatesTable: import("@redneckz/uni-jsx").UNIComponent<RatesTableProps, any, any>;
 export {};

package/dist/components/RatesTable/RatesTable.js CHANGED Viewed

@@ -2,16 +2,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RatesTable = 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 useRates_1 = require("../../hooks/useRates");
 const BlockWrapper_1 = require("../../ui-kit/BlockWrapper");
 const Heading_1 = require("../../ui-kit/Heading/Heading");
+const Loader_1 = require("../../ui-kit/Loader/Loader");
+const NotFound_1 = require("../../ui-kit/NotFound/NotFound");
 const style_1 = require("../../utils/style");
 const RatesTableItem_1 = require("./RatesTableItem");
-const renderDataPickForm_1 = require("./renderDataPickForm");
 const renderLink_1 = require("./renderLink");
-exports.RatesTable = (0, uni_jsx_1.JSX)(({ href, className = '', infoMessage, title, isArchive = false, ...rest }) => {
-    const ratesList = (0, useRates_1.useRates)(isArchive);
-    const isRatesValid = ratesList[0].length > 0;
-    return ((0, jsx_runtime_1.jsxs)(BlockWrapper_1.BlockWrapper, { className: (0, style_1.style)('p-6xl space-y-xl', className), defaultPadding: "p-0", ...rest, children: [(0, jsx_runtime_1.jsx)(Heading_1.Heading, { className: "mb-xl", children: title }), isArchive ? (0, renderDataPickForm_1.renderDataPickForm)() : null, ratesList.map((list, i) => ((0, jsx_runtime_1.jsx)(RatesTableItem_1.RatesTableItem, { list: list, isRatesValid: isRatesValid, isArchive: isArchive, infoMessage: infoMessage }, String(i)))), href ? (0, renderLink_1.renderLink)(href) : null] }));
+exports.RatesTable = (0, uni_jsx_1.JSX)(({ href, ratesType = 'natural', className = '', infoMessage, notFoundMessage, title, ...rest }) => {
+    // const [date, setDate] = useState<Date>();
+    const [fetchArchive, setFetchArchive] = (0, hooks_1.useState)(true);
+    //const isArchive = ratesType === 'archive';
+    const { ratesList, isLoad } = (0, useRates_1.useRates)({
+        ratesType,
+        fetchArchive,
+    });
+    (0, hooks_1.useEffect)(() => {
+        setFetchArchive(false);
+    }, []);
+    const isRatesValid = ratesList?.length > 0;
+    return ((0, jsx_runtime_1.jsxs)(BlockWrapper_1.BlockWrapper, { className: (0, style_1.style)('p-6xl space-y-xl', className), defaultPadding: "p-0", ...rest, children: [(0, jsx_runtime_1.jsx)(Heading_1.Heading, { className: "mb-xl", children: title }), isLoad ? (renderRatesContent({
+                ratesList,
+                isArchive: false,
+                infoMessage,
+                isRatesValid,
+                notFoundMessage,
+            })) : ((0, jsx_runtime_1.jsx)(Loader_1.Loader, { position: "static" })), href ? (0, renderLink_1.renderLink)(href) : null] }));
 });
+const renderRatesContent = ({ ratesList = [], isArchive = false, infoMessage, isRatesValid, notFoundMessage, }) => ratesList.length > 0 ? (ratesList.map((list, i) => ((0, jsx_runtime_1.jsx)(RatesTableItem_1.RatesTableItem, { list: list, isRatesValid: isRatesValid, isArchive: isArchive, infoMessage: infoMessage }, String(i))))) : ((0, jsx_runtime_1.jsx)(NotFound_1.NotFound, { description: notFoundMessage }));
 //# sourceMappingURL=RatesTable.js.map

package/dist/components/RatesTable/RatesTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RatesTable.js","sourceRoot":"","sources":["../../../src/components/RatesTable/RatesTable.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,~~mDAAgD~~;~~AAChD~~,4DAAyD;AACzD,0DAAuD;~~AAEvD~~,6CAA0C;AAE1C,qDAAkD;AAClD,~~6DAA0D;AAC1D,~~6CAA0C;~~AAI7B~~,QAAA,UAAU,GAAG,IAAA,aAAG,EAC3B,CAAC,~~EAAE~~,IAAI,~~EAAE~~,SAAS,GAAG,~~EAAE~~,~~EAAE~~,~~WAAW~~,EAAE,~~KAAK~~,~~EAAE~~,~~SAAS~~,~~GAAG~~,KAAK,~~EAAE~~,GAAG,IAAI,EAAE,EAAE,EAAE;~~IAC3E~~,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAC,SAAS,CAAC,CAAC;~~IAEtC~~,~~MAAM~~,~~YAAY~~,GAAG,~~SAAS~~,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;~~IAE7C~~,OAAO,CACL,wBAAC,2BAAY,IAAC,SAAS,EAAE,IAAA,aAAK,EAAC,kBAAkB,EAAE,SAAS,CAAC,EAAE,cAAc,EAAC,KAAK,KAAK,IAAI,aAC1F,uBAAC,iBAAO,IAAC,SAAS,EAAC,OAAO,YAAE,KAAK,GAAW,~~EAC3C~~,SAAS,CAAC,CAAC,CAAC,IAAA,~~uCAAkB~~,~~GAAE~~,CAAC,CAAC,CAAC,IAAI,~~EACvC~~,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,~~CAC1B~~,uBAAC,+BAAc,IACb,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EAEpB,WAAW,EAAE,WAAW,IADnB,MAAM,CAAC,CAAC,CAAC,CAEd,CACH,CAAC,~~EAED~~,~~IAAI,~~CAAC,CAAC,CAAC,~~IAAA~~,~~uBAAU~~,~~EAAC~~,~~IAAI~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~IAAI~~,~~IAClB,CAChB,~~CAAC~~;AACJ,CAAC,CACF,CAAC~~"}
1	+ {"version":3,"file":"RatesTable.js","sourceRoot":"","sources":["../../../src/components/RatesTable/RatesTable.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAkE;AAClE,mDAAmE;AACnE,4DAAyD;AACzD,0DAAuD;AACvD,uDAAoD;AACpD,6DAA0D;AAE1D,6CAA0C;AAE1C,qDAAkD;AAClD,6CAA0C;AAa7B,QAAA,UAAU,GAAG,IAAA,aAAG,EAC3B,CAAC,EACC,IAAI,EACJ,SAAS,GAAG,SAAS,EACrB,SAAS,GAAG,EAAE,EACd,WAAW,EACX,eAAe,EACf,KAAK,EACL,GAAG,IAAI,EACR,EAAE,EAAE;IACH,4CAA4C;IAC5C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,EAAU,IAAI,CAAC,CAAC;IAEhE,4CAA4C;IAE5C,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAA,mBAAQ,EAAC;QACrC,SAAS;QACT,YAAY;KACb,CAAC,CAAC;IAEH,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,eAAe,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,YAAY,GAAG,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC;IAE3C,OAAO,CACL,wBAAC,2BAAY,IAAC,SAAS,EAAE,IAAA,aAAK,EAAC,kBAAkB,EAAE,SAAS,CAAC,EAAE,cAAc,EAAC,KAAK,KAAK,IAAI,aAC1F,uBAAC,iBAAO,IAAC,SAAS,EAAC,OAAO,YAAE,KAAK,GAAW,EAI3C,MAAM,CAAC,CAAC,CAAC,CACR,kBAAkB,CAAC;gBACjB,SAAS;gBACT,SAAS,EAAE,KAAK;gBAChB,WAAW;gBACX,YAAY;gBACZ,eAAe;aAChB,CAAC,CACH,CAAC,CAAC,CAAC,CACF,uBAAC,eAAM,IAAC,QAAQ,EAAC,QAAQ,GAAG,CAC7B,EACA,IAAI,CAAC,CAAC,CAAC,IAAA,uBAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAClB,CAChB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,EAC1B,SAAS,GAAG,EAAE,EACd,SAAS,GAAG,KAAK,EACjB,WAAW,EACX,YAAY,EACZ,eAAe,GACI,EAAE,EAAE,CACvB,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACrB,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACzB,uBAAC,+BAAc,IACb,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EAEpB,WAAW,EAAE,WAAW,IADnB,MAAM,CAAC,CAAC,CAAC,CAEd,CACH,CAAC,CACH,CAAC,CAAC,CAAC,CACF,uBAAC,mBAAQ,IAAC,WAAW,EAAE,eAAe,GAAI,CAC3C,CAAC"}

package/dist/components/RatesTable/RatesTableContent.d.ts CHANGED Viewed

@@ -1,12 +1,22 @@
 import { type HrefProps } from '../../model/LinkProps';
 /**
- * @title Таблица курсов
+ * @title Тип курсов
+ * @default "Курсы для физ.лиц"
+ * @enumNames [
+ *    "Курсы для физ.лиц",
+ *    "Курсы для держателей карт"
+ *  ]
+ */
+export declare 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/dist/components/RatesTable/RatesTableItem.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import { type RateItem } from '../../ui-kit/Rate/Rate';
+import { type ArchiveRates } from './RatesTable';
 import { type RatesTableContent } from './RatesTableContent';
-interface RatesTableItemProps extends RatesTableContent {
+export interface RatesTableItemProps extends RatesTableContent, ArchiveRates {
     maxDate?: string;
     isRatesValid?: boolean;
     list: RateItem[];
 }
 export declare const RatesTableItem: import("@redneckz/uni-jsx").UNIComponent<RatesTableItemProps, any, any>;
-export {};

package/dist/components/RatesTable/RatesTableItem.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RatesTableItem.js","sourceRoot":"","sources":["../../../src/components/RatesTable/RatesTableItem.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,gEAA6D;AAC7D,iDAAiF;AACjF,iDAA8C;AAC9C,6CAA0C;~~AAE1C~~,6CAA0C;AAQ7B,QAAA,cAAc,GAAG,IAAA,aAAG,EAC/B,CAAC,EAAE,SAAS,GAAG,KAAK,EAAE,YAAY,EAAE,IAAI,GAAG,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;IAC9D,MAAM,OAAO,GAAG,YAAY;QAC1B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1F,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,CACL,iCAAK,SAAS,EAAC,mBAAmB,aAC/B,OAAO,IAAI,IAAA,uBAAU,EAAC,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,EAC1D,iCAAK,SAAS,EAAE,IAAA,aAAK,EAAC,yBAAkB,CAAC,aACvC,uBAAC,WAAI,IAAC,IAAI,EAAC,aAAa,qDAAc,EACtC,uBAAC,WAAI,IAAC,IAAI,EAAC,aAAa,2DAAe,EACvC,uBAAC,WAAI,IAAC,IAAI,EAAC,aAAa,2DAAe,IACnC,EACL,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACjB,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,uBAAC,WAAI,OAAqB,IAAI,IAAnB,MAAM,CAAC,CAAC,CAAC,CAAc,CAAC,CAC1D,CAAC,CAAC,CAAC,CACF,uBAAC,qBAAS,mJAAoC,CAC/C,EAED,uBAAC,qBAAS,IAAC,KAAK,EAAC,qBAAqB,YAAE,WAAW,GAAa,IAC5D,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}
1	+ {"version":3,"file":"RatesTableItem.js","sourceRoot":"","sources":["../../../src/components/RatesTable/RatesTableItem.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,gEAA6D;AAC7D,iDAAiF;AACjF,iDAA8C;AAC9C,6CAA0C;AAG1C,6CAA0C;AAQ7B,QAAA,cAAc,GAAG,IAAA,aAAG,EAC/B,CAAC,EAAE,SAAS,GAAG,KAAK,EAAE,YAAY,EAAE,IAAI,GAAG,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;IAC9D,MAAM,OAAO,GAAG,YAAY;QAC1B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1F,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,CACL,iCAAK,SAAS,EAAC,mBAAmB,aAC/B,OAAO,IAAI,IAAA,uBAAU,EAAC,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,EAC1D,iCAAK,SAAS,EAAE,IAAA,aAAK,EAAC,yBAAkB,CAAC,aACvC,uBAAC,WAAI,IAAC,IAAI,EAAC,aAAa,qDAAc,EACtC,uBAAC,WAAI,IAAC,IAAI,EAAC,aAAa,2DAAe,EACvC,uBAAC,WAAI,IAAC,IAAI,EAAC,aAAa,2DAAe,IACnC,EACL,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACjB,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,uBAAC,WAAI,OAAqB,IAAI,IAAnB,MAAM,CAAC,CAAC,CAAC,CAAc,CAAC,CAC1D,CAAC,CAAC,CAAC,CACF,uBAAC,qBAAS,mJAAoC,CAC/C,EAED,uBAAC,qBAAS,IAAC,KAAK,EAAC,qBAAqB,YAAE,WAAW,GAAa,IAC5D,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}

package/dist/hooks/useRates.d.ts CHANGED Viewed

@@ -1,4 +1,13 @@
+import { type RatesType } from '../components/RatesTable/RatesTableContent';
 import { type RateItem } from '../ui-kit/Rate/Rate';
-declare type RateItemList = RateItem[];
-export declare function useRates(isArchive: boolean): RateItemList[];
+export declare type RateItemList = RateItem[];
+declare type FetchRatesProps = {
+    ratesType?: RatesType;
+    date?: Date;
+    fetchArchive?: boolean;
+};
+export declare function useRates({ ratesType, fetchArchive }: FetchRatesProps): {
+    ratesList: any;
+    isLoad: boolean;
+};
 export {};

package/dist/hooks/useRates.js CHANGED Viewed

@@ -4,39 +4,47 @@ const useAsyncData_1 = require("@redneckz/uni-jsx/lib/hooks/useAsyncData");
 const useLocalStore_1 = require("@redneckz/uni-jsx/lib/Store/useLocalStore");
 const apiBaseUrl_1 = require("../api/apiBaseUrl");
 const fetchJSON_1 = require("../utils/fetchJSON");
-const RATES_URL = `${apiBaseUrl_1.API_BASE_URI}/rates`;
-const ARCHIVE_RATES_URL = `${apiBaseUrl_1.API_BASE_URI}/historyrates`;
-const EMPTY_RATES = [
-    [
-        {
-            currencyPair: 'Валютная пара',
-            buyRate: 0,
-            sellRate: 0,
-        },
-    ],
-];
-function useRates(isArchive) {
-    const url = isArchive ? ARCHIVE_RATES_URL : RATES_URL;
-    const rateKey = isArchive ? 'archiveRates' : 'rates';
+const EMPTY_RATES = [];
+const RATES_URL = {
+    natural: `${apiBaseUrl_1.API_BASE_URI}/rates`,
+    cards: `${apiBaseUrl_1.API_BASE_URI}/ratescards`,
+    //archive: `${API_BASE_URI}/historyrates`,
+};
+const RATES_KEY = {
+    natural: 'rates',
+    cards: 'ratescards',
+    //archive: 'historyrates',
+};
+// TODO: для архива прокинуть date
+function useRates({ ratesType = 'natural', fetchArchive = true }) {
+    //const url = ratesType === 'archive' ? getArchiveRatesURL(date) : RATES_URL[ratesType];
+    const url = RATES_URL[ratesType];
+    const rateKey = RATES_KEY[ratesType];
     const ratesStore = (0, useLocalStore_1.useLocalStore)();
     // проверяем, надо ли обновлять значения ставок
-    const shouldUpdate = getShouldUpdate(isArchive, ratesStore);
+    const shouldUpdate = getShouldUpdate(rateKey, ratesStore, fetchArchive);
     // костыль, не отправлять запрос на бэк, если уже был запрос менее 15 мин назад
     const { data } = (0, useAsyncData_1.useAsyncData)(shouldUpdate ? url : '', fetchJSON_1.fetchJSONUnsafe);
     // если есть 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 };
 }
 exports.useRates = useRates;
 // Отсчитываем 15 минут с текущего момента
 const getTimeAfter15Minutes = () => Date.now() + 15 * 60 * 1000;
-const getShouldUpdate = (isArchive, ratesStore) => isArchive
-    ? !ratesStore?.archiveRates || ratesStore?.archiveRates.nextUpdate <= Date.now()
-    : !ratesStore?.rates || ratesStore?.rates.nextUpdate <= Date.now();
+const getShouldUpdate = (rateKey, ratesStore, fetchArchive) => 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'];
+};*/
 //# sourceMappingURL=useRates.js.map

package/dist/hooks/useRates.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"useRates.js","sourceRoot":"","sources":["../../src/hooks/useRates.ts"],"names":[],"mappings":";;AAAA,2EAAwE;AACxE,6EAA0E;AAC1E,kDAAiD;~~AAEjD~~,kDAA+E;~~AAc~~/E,MAAM,~~SAAS~~,~~GAAG~~,~~GAAG~~,~~yBAAY,QAAQ,~~CAAC;~~AAC1C~~,MAAM,~~iBAAiB~~,~~GAAG~~,GAAG,yBAAY,~~eAAe,CAAC~~;~~AACzD~~,~~MAAM~~,~~WAAW~~,~~GAAmB~~;~~IAClC~~;~~QACE~~;~~YACE~~,~~YAAY~~,~~EAAE~~,~~eAAe~~;~~YAC7B~~,OAAO,EAAE,~~CAAC~~;~~YACV~~,~~QAAQ~~,EAAE,~~CAAC~~;~~SACZ~~;~~KACF;CACF~~,CAAC;AAEF,SAAgB,QAAQ,CAAC,~~SAAkB;IACzC~~,~~MAAM~~,GAAG,GAAG,~~SAAS~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~iBAAiB~~,~~CAAC~~,~~CAAC~~,CAAC,SAAS,CAAC;~~IACtD~~,MAAM,OAAO,GAAG,SAAS,CAAC,~~CAAC~~,CAAC,~~cAAc,~~CAAC~~,CAAC,CAAC,OAAO,CAAC~~;~~IAErD~~,MAAM,UAAU,GAAG,IAAA,6BAAa,GAAmB,CAAC;IAEpD,+CAA+C;IAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,~~SAAS~~,EAAE,UAA6B,CAAC,CAAC;~~IAE/E~~,+EAA+E;IAC/E,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,2BAAY,EAC3B,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EACvB,2BAAsD,CACvD,CAAC;IAEF,qEAAqE;IACrE,IAAI,YAAY,IAAI,IAAI,EAAE;QACxB,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAC;QAC3C,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;~~KAClD~~;IAED,+BAA+B;IAC/B,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC;IAExC,~~iDAAiD;IACjD~~,~~OAAO~~,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,~~CAAC~~,~~CAAC~~,~~KAAK~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,WAAW,CAAC;~~AACpD~~,CAAC;~~AA1BD~~,~~4BA0BC~~;AAED,0CAA0C;AAC1C,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhE,MAAM,eAAe,GAAG,~~CAAC~~,~~SAAkB~~,~~EAAE~~,UAAkC,~~EAAE~~,EAAE,~~CACjF~~,SAAS;~~IACP~~,CAAC,CAAC,CAAC,UAAU,EAAE,~~YAAY~~,IAAI,UAAU,EAAE,~~YAAY~~,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE;~~IAChF~~,CAAC,CAAC,CAAC,UAAU,EAAE,~~KAAK~~,IAAI,UAAU,EAAE,~~KAAK~~,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC"}
1	+ {"version":3,"file":"useRates.js","sourceRoot":"","sources":["../../src/hooks/useRates.ts"],"names":[],"mappings":";;AAAA,2EAAwE;AACxE,6EAA0E;AAC1E,kDAAiD;AAGjD,kDAA+E;AAoB/E,MAAM,WAAW,GAAmB,EAAE,CAAC;AAEvC,MAAM,SAAS,GAA8B;IAC3C,OAAO,EAAE,GAAG,yBAAY,QAAQ;IAChC,KAAK,EAAE,GAAG,yBAAY,aAAa;IACnC,0CAA0C;CAC3C,CAAC;AAEF,MAAM,SAAS,GAA8B;IAC3C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,YAAY;IACnB,0BAA0B;CAC3B,CAAC;AAEF,kCAAkC;AAClC,SAAgB,QAAQ,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,YAAY,GAAG,IAAI,EAAmB;IACtF,wFAAwF;IACxF,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IACjC,MAAM,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IAErC,MAAM,UAAU,GAAG,IAAA,6BAAa,GAAmB,CAAC;IAEpD,+CAA+C;IAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,EAAE,UAA6B,EAAE,YAAY,CAAC,CAAC;IAE3F,+EAA+E;IAC/E,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,2BAAY,EAC3B,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EACvB,2BAAsD,CACvD,CAAC;IAEF,qEAAqE;IACrE,IAAI,YAAY,IAAI,IAAI,EAAE;QACxB,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAC;QAC3C,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC;KACxD;IAED,+BAA+B;IAC/B,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC;IAExC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpC,iDAAiD;IACjD,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,EAAE,CAAC;AACrD,CAAC;AA7BD,4BA6BC;AAED,0CAA0C;AAC1C,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhE,MAAM,eAAe,GAAG,CACtB,OAAe,EACf,UAAkC,EAClC,YAAqB,EACrB,EAAE,CACF,OAAO,KAAK,SAAS;IACnB,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,YAAY;IAC5F,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;AAE/E;;;;IAII"}

package/lib/components/RatesTable/RatesTable.d.ts CHANGED Viewed

@@ -2,5 +2,8 @@ import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type RatesTableContent } from './RatesTableContent';
 interface RatesTableProps extends RatesTableContent, UniBlockProps {
 }
+export declare type ArchiveRates = {
+    isArchive?: boolean;
+};
 export declare const RatesTable: import("@redneckz/uni-jsx").UNIComponent<RatesTableProps, any, any>;
 export {};

package/lib/components/RatesTable/RatesTable.fixture.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import '../../setup-fixture';
 declare const _default: {
     default: any;
-    archive: any;
+    cards: any;
 };
 export default _default;

package/lib/components/RatesTable/RatesTable.fixture.mobile.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import '../../setup-fixture';
 declare const _default: {
     default: any;
-    archive: any;
+    cards: any;
 };
 export default _default;

package/lib/components/RatesTable/RatesTable.js CHANGED Viewed

@@ -1,15 +1,33 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useRates } from '../../hooks/useRates.js';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper.js';
 import { Heading } from '../../ui-kit/Heading/Heading.js';
+import { Loader } from '../../ui-kit/Loader/Loader.js';
+import { NotFound } from '../../ui-kit/NotFound/NotFound.js';
 import { style } from '../../utils/style.js';
 import { RatesTableItem } from './RatesTableItem.js';
-import { renderDataPickForm } from './renderDataPickForm.js';
 import { renderLink } from './renderLink.js';
-export const RatesTable = JSX(({ href, className = '', infoMessage, title, isArchive = false, ...rest }) => {
-    const ratesList = useRates(isArchive);
-    const isRatesValid = ratesList[0].length > 0;
-    return (_jsxs(BlockWrapper, { className: style('p-6xl space-y-xl', className), defaultPadding: "p-0", ...rest, children: [_jsx(Heading, { className: "mb-xl", children: title }), isArchive ? renderDataPickForm() : null, ratesList.map((list, i) => (_jsx(RatesTableItem, { list: list, isRatesValid: isRatesValid, isArchive: isArchive, infoMessage: infoMessage }, String(i)))), href ? renderLink(href) : null] }));
+export const RatesTable = JSX(({ href, ratesType = 'natural', className = '', infoMessage, notFoundMessage, title, ...rest }) => {
+    // const [date, setDate] = useState<Date>();
+    const [fetchArchive, setFetchArchive] = useState(true);
+    //const isArchive = ratesType === 'archive';
+    const { ratesList, isLoad } = useRates({
+        ratesType,
+        fetchArchive,
+    });
+    useEffect(() => {
+        setFetchArchive(false);
+    }, []);
+    const isRatesValid = ratesList?.length > 0;
+    return (_jsxs(BlockWrapper, { className: style('p-6xl space-y-xl', className), defaultPadding: "p-0", ...rest, children: [_jsx(Heading, { className: "mb-xl", children: title }), isLoad ? (renderRatesContent({
+                ratesList,
+                isArchive: false,
+                infoMessage,
+                isRatesValid,
+                notFoundMessage,
+            })) : (_jsx(Loader, { position: "static" })), href ? renderLink(href) : null] }));
 });
+const renderRatesContent = ({ ratesList = [], isArchive = false, infoMessage, isRatesValid, notFoundMessage, }) => ratesList.length > 0 ? (ratesList.map((list, i) => (_jsx(RatesTableItem, { list: list, isRatesValid: isRatesValid, isArchive: isArchive, infoMessage: infoMessage }, String(i))))) : (_jsx(NotFound, { description: notFoundMessage }));
 //# sourceMappingURL=RatesTable.js.map

package/lib/components/RatesTable/RatesTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RatesTable.js","sourceRoot":"","sources":["../../../src/components/RatesTable/RatesTable.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;~~AAChD~~,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;~~AAEvD~~,OAAO,EAAE,~~KAAK~~,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE1C~~,OAAO,EAAE,~~cAAc~~,EAAE,MAAM,~~kBAAkB~~,CAAC;~~AAClD~~,OAAO,EAAE,~~kBAAkB~~,EAAE,MAAM,~~sBAAsB~~,CAAC;~~AAC1D~~,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;~~AAI1C~~,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAC3B,CAAC,~~EAAE~~,IAAI,~~EAAE~~,SAAS,GAAG,~~EAAE~~,~~EAAE~~,~~WAAW~~,EAAE,~~KAAK~~,~~EAAE~~,~~SAAS~~,~~GAAG~~,KAAK,~~EAAE~~,GAAG,IAAI,EAAE,EAAE,EAAE;~~IAC3E~~,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;~~IAEtC~~,~~MAAM~~,~~YAAY~~,GAAG,~~SAAS~~,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;~~IAE7C~~,OAAO,CACL,MAAC,YAAY,IAAC,SAAS,EAAE,KAAK,CAAC,kBAAkB,EAAE,SAAS,CAAC,EAAE,cAAc,EAAC,KAAK,KAAK,IAAI,aAC1F,KAAC,OAAO,IAAC,SAAS,EAAC,OAAO,YAAE,KAAK,GAAW,~~EAC3C~~,~~SAAS~~,CAAC,CAAC,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,IAAI,~~EACvC~~,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,~~CAC1B~~,KAAC,cAAc,IACb,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EAEpB,WAAW,EAAE,WAAW,IADnB,MAAM,CAAC,CAAC,CAAC,CAEd,CACH,CAAC,~~EAED~~,~~IAAI,~~CAAC,CAAC,CAAC,~~UAAU~~,~~CAAC~~,~~IAAI~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~IAAI~~,~~IAClB~~,~~CAChB,~~CAAC~~;AACJ,CAAC,CACF,CAAC~~"}
1	+ {"version":3,"file":"RatesTable.js","sourceRoot":"","sources":["../../../src/components/RatesTable/RatesTable.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAqB,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE1D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAa1C,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAC3B,CAAC,EACC,IAAI,EACJ,SAAS,GAAG,SAAS,EACrB,SAAS,GAAG,EAAE,EACd,WAAW,EACX,eAAe,EACf,KAAK,EACL,GAAG,IAAI,EACR,EAAE,EAAE;IACH,4CAA4C;IAC5C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAU,IAAI,CAAC,CAAC;IAEhE,4CAA4C;IAE5C,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;QACrC,SAAS;QACT,YAAY;KACb,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,YAAY,GAAG,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC;IAE3C,OAAO,CACL,MAAC,YAAY,IAAC,SAAS,EAAE,KAAK,CAAC,kBAAkB,EAAE,SAAS,CAAC,EAAE,cAAc,EAAC,KAAK,KAAK,IAAI,aAC1F,KAAC,OAAO,IAAC,SAAS,EAAC,OAAO,YAAE,KAAK,GAAW,EAI3C,MAAM,CAAC,CAAC,CAAC,CACR,kBAAkB,CAAC;gBACjB,SAAS;gBACT,SAAS,EAAE,KAAK;gBAChB,WAAW;gBACX,YAAY;gBACZ,eAAe;aAChB,CAAC,CACH,CAAC,CAAC,CAAC,CACF,KAAC,MAAM,IAAC,QAAQ,EAAC,QAAQ,GAAG,CAC7B,EACA,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAClB,CAChB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,EAC1B,SAAS,GAAG,EAAE,EACd,SAAS,GAAG,KAAK,EACjB,WAAW,EACX,YAAY,EACZ,eAAe,GACI,EAAE,EAAE,CACvB,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACrB,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACzB,KAAC,cAAc,IACb,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EAEpB,WAAW,EAAE,WAAW,IADnB,MAAM,CAAC,CAAC,CAAC,CAEd,CACH,CAAC,CACH,CAAC,CAAC,CAAC,CACF,KAAC,QAAQ,IAAC,WAAW,EAAE,eAAe,GAAI,CAC3C,CAAC"}

package/lib/components/RatesTable/RatesTableContent.d.ts CHANGED Viewed

@@ -1,12 +1,22 @@
 import { type HrefProps } from '../../model/LinkProps';
 /**
- * @title Таблица курсов
+ * @title Тип курсов
+ * @default "Курсы для физ.лиц"
+ * @enumNames [
+ *    "Курсы для физ.лиц",
+ *    "Курсы для держателей карт"
+ *  ]
+ */
+export declare 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/lib/components/RatesTable/RatesTableItem.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import { type RateItem } from '../../ui-kit/Rate/Rate';
+import { type ArchiveRates } from './RatesTable';
 import { type RatesTableContent } from './RatesTableContent';
-interface RatesTableItemProps extends RatesTableContent {
+export interface RatesTableItemProps extends RatesTableContent, ArchiveRates {
     maxDate?: string;
     isRatesValid?: boolean;
     list: RateItem[];
 }
 export declare const RatesTableItem: import("@redneckz/uni-jsx").UNIComponent<RatesTableItemProps, any, any>;
-export {};

package/lib/components/RatesTable/RatesTableItem.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RatesTableItem.js","sourceRoot":"","sources":["../../../src/components/RatesTable/RatesTableItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAiB,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;~~AAE1C~~,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQ1C,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAC/B,CAAC,EAAE,SAAS,GAAG,KAAK,EAAE,YAAY,EAAE,IAAI,GAAG,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;IAC9D,MAAM,OAAO,GAAG,YAAY;QAC1B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1F,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,CACL,eAAK,SAAS,EAAC,mBAAmB,aAC/B,OAAO,IAAI,UAAU,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,EAC1D,eAAK,SAAS,EAAE,KAAK,CAAC,kBAAkB,CAAC,aACvC,KAAC,IAAI,IAAC,IAAI,EAAC,aAAa,qDAAc,EACtC,KAAC,IAAI,IAAC,IAAI,EAAC,aAAa,2DAAe,EACvC,KAAC,IAAI,IAAC,IAAI,EAAC,aAAa,2DAAe,IACnC,EACL,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACjB,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,KAAC,IAAI,OAAqB,IAAI,IAAnB,MAAM,CAAC,CAAC,CAAC,CAAc,CAAC,CAC1D,CAAC,CAAC,CAAC,CACF,KAAC,SAAS,mJAAoC,CAC/C,EAED,KAAC,SAAS,IAAC,KAAK,EAAC,qBAAqB,YAAE,WAAW,GAAa,IAC5D,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}
1	+ {"version":3,"file":"RatesTableItem.js","sourceRoot":"","sources":["../../../src/components/RatesTable/RatesTableItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAiB,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQ1C,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAC/B,CAAC,EAAE,SAAS,GAAG,KAAK,EAAE,YAAY,EAAE,IAAI,GAAG,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;IAC9D,MAAM,OAAO,GAAG,YAAY;QAC1B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1F,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,CACL,eAAK,SAAS,EAAC,mBAAmB,aAC/B,OAAO,IAAI,UAAU,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,EAC1D,eAAK,SAAS,EAAE,KAAK,CAAC,kBAAkB,CAAC,aACvC,KAAC,IAAI,IAAC,IAAI,EAAC,aAAa,qDAAc,EACtC,KAAC,IAAI,IAAC,IAAI,EAAC,aAAa,2DAAe,EACvC,KAAC,IAAI,IAAC,IAAI,EAAC,aAAa,2DAAe,IACnC,EACL,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACjB,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,KAAC,IAAI,OAAqB,IAAI,IAAnB,MAAM,CAAC,CAAC,CAAC,CAAc,CAAC,CAC1D,CAAC,CAAC,CAAC,CACF,KAAC,SAAS,mJAAoC,CAC/C,EAED,KAAC,SAAS,IAAC,KAAK,EAAC,qBAAqB,YAAE,WAAW,GAAa,IAC5D,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}

package/lib/hooks/useRates.d.ts CHANGED Viewed

@@ -1,4 +1,13 @@
+import { type RatesType } from '../components/RatesTable/RatesTableContent';
 import { type RateItem } from '../ui-kit/Rate/Rate';
-declare type RateItemList = RateItem[];
-export declare function useRates(isArchive: boolean): RateItemList[];
+export declare type RateItemList = RateItem[];
+declare type FetchRatesProps = {
+    ratesType?: RatesType;
+    date?: Date;
+    fetchArchive?: boolean;
+};
+export declare function useRates({ ratesType, fetchArchive }: FetchRatesProps): {
+    ratesList: any;
+    isLoad: boolean;
+};
 export {};

package/lib/hooks/useRates.js CHANGED Viewed

@@ -2,38 +2,46 @@ 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.js';
 import { fetchJSONUnsafe } from '../utils/fetchJSON.js';
-const RATES_URL = `${API_BASE_URI}/rates`;
-const ARCHIVE_RATES_URL = `${API_BASE_URI}/historyrates`;
-const EMPTY_RATES = [
-    [
-        {
-            currencyPair: 'Валютная пара',
-            buyRate: 0,
-            sellRate: 0,
-        },
-    ],
-];
-export function useRates(isArchive) {
-    const url = isArchive ? ARCHIVE_RATES_URL : RATES_URL;
-    const rateKey = isArchive ? 'archiveRates' : 'rates';
+const EMPTY_RATES = [];
+const RATES_URL = {
+    natural: `${API_BASE_URI}/rates`,
+    cards: `${API_BASE_URI}/ratescards`,
+    //archive: `${API_BASE_URI}/historyrates`,
+};
+const RATES_KEY = {
+    natural: 'rates',
+    cards: 'ratescards',
+    //archive: 'historyrates',
+};
+// TODO: для архива прокинуть date
+export function useRates({ ratesType = 'natural', fetchArchive = true }) {
+    //const url = ratesType === 'archive' ? getArchiveRatesURL(date) : RATES_URL[ratesType];
+    const url = RATES_URL[ratesType];
+    const rateKey = RATES_KEY[ratesType];
     const ratesStore = useLocalStore();
     // проверяем, надо ли обновлять значения ставок
-    const shouldUpdate = getShouldUpdate(isArchive, ratesStore);
+    const shouldUpdate = getShouldUpdate(rateKey, ratesStore, fetchArchive);
     // костыль, не отправлять запрос на бэк, если уже был запрос менее 15 мин назад
     const { data } = useAsyncData(shouldUpdate ? url : '', fetchJSONUnsafe);
     // если есть 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, ratesStore) => isArchive
-    ? !ratesStore?.archiveRates || ratesStore?.archiveRates.nextUpdate <= Date.now()
-    : !ratesStore?.rates || ratesStore?.rates.nextUpdate <= Date.now();
+const getShouldUpdate = (rateKey, ratesStore, fetchArchive) => 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'];
+};*/
 //# sourceMappingURL=useRates.js.map

package/lib/hooks/useRates.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"useRates.js","sourceRoot":"","sources":["../../src/hooks/useRates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;~~AAEjD~~,OAAO,EAAE,eAAe,EAA4B,MAAM,oBAAoB,CAAC;~~AAc~~/E,MAAM,~~SAAS~~,~~GAAG~~,~~GAAG~~,~~YAAY,QAAQ,~~CAAC;~~AAC1C~~,MAAM,~~iBAAiB~~,~~GAAG~~,GAAG,YAAY,~~eAAe,CAAC~~;~~AACzD~~,~~MAAM~~,~~WAAW~~,~~GAAmB~~;~~IAClC~~;~~QACE~~;~~YACE~~,~~YAAY~~,~~EAAE~~,~~eAAe~~;~~YAC7B~~,OAAO,EAAE,~~CAAC~~;~~YACV~~,~~QAAQ~~,EAAE,~~CAAC~~;~~SACZ~~;~~KACF;CACF~~,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,~~SAAkB;IACzC~~,~~MAAM~~,GAAG,GAAG,~~SAAS~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~iBAAiB~~,~~CAAC~~,~~CAAC~~,CAAC,SAAS,CAAC;~~IACtD~~,MAAM,OAAO,GAAG,SAAS,CAAC,~~CAAC~~,CAAC,~~cAAc,~~CAAC~~,CAAC,CAAC,OAAO,CAAC~~;~~IAErD~~,MAAM,UAAU,GAAG,aAAa,EAAmB,CAAC;IAEpD,+CAA+C;IAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,~~SAAS~~,EAAE,UAA6B,CAAC,CAAC;~~IAE/E~~,+EAA+E;IAC/E,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAC3B,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EACvB,eAAsD,CACvD,CAAC;IAEF,qEAAqE;IACrE,IAAI,YAAY,IAAI,IAAI,EAAE;QACxB,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAC;QAC3C,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;~~KAClD~~;IAED,+BAA+B;IAC/B,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC;IAExC,~~iDAAiD;IACjD~~,~~OAAO~~,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,~~CAAC~~,~~CAAC~~,~~KAAK~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,WAAW,CAAC;~~AACpD~~,CAAC;AAED,0CAA0C;AAC1C,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhE,MAAM,eAAe,GAAG,~~CAAC~~,~~SAAkB~~,~~EAAE~~,UAAkC,~~EAAE~~,EAAE,~~CACjF~~,SAAS;~~IACP~~,CAAC,CAAC,CAAC,UAAU,EAAE,~~YAAY~~,IAAI,UAAU,EAAE,~~YAAY~~,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE;~~IAChF~~,CAAC,CAAC,CAAC,UAAU,EAAE,~~KAAK~~,IAAI,UAAU,EAAE,~~KAAK~~,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC"}
1	+ {"version":3,"file":"useRates.js","sourceRoot":"","sources":["../../src/hooks/useRates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,OAAO,EAAE,eAAe,EAA4B,MAAM,oBAAoB,CAAC;AAoB/E,MAAM,WAAW,GAAmB,EAAE,CAAC;AAEvC,MAAM,SAAS,GAA8B;IAC3C,OAAO,EAAE,GAAG,YAAY,QAAQ;IAChC,KAAK,EAAE,GAAG,YAAY,aAAa;IACnC,0CAA0C;CAC3C,CAAC;AAEF,MAAM,SAAS,GAA8B;IAC3C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,YAAY;IACnB,0BAA0B;CAC3B,CAAC;AAEF,kCAAkC;AAClC,MAAM,UAAU,QAAQ,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,YAAY,GAAG,IAAI,EAAmB;IACtF,wFAAwF;IACxF,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IACjC,MAAM,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IAErC,MAAM,UAAU,GAAG,aAAa,EAAmB,CAAC;IAEpD,+CAA+C;IAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,EAAE,UAA6B,EAAE,YAAY,CAAC,CAAC;IAE3F,+EAA+E;IAC/E,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAC3B,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EACvB,eAAsD,CACvD,CAAC;IAEF,qEAAqE;IACrE,IAAI,YAAY,IAAI,IAAI,EAAE;QACxB,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAC;QAC3C,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC;KACxD;IAED,+BAA+B;IAC/B,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC;IAExC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpC,iDAAiD;IACjD,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,EAAE,CAAC;AACrD,CAAC;AAED,0CAA0C;AAC1C,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhE,MAAM,eAAe,GAAG,CACtB,OAAe,EACf,UAAkC,EAClC,YAAqB,EACrB,EAAE,CACF,OAAO,KAAK,SAAS;IACnB,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,YAAY;IAC5F,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;AAE/E;;;;IAII"}