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

package/bundle/bundle.umd.js

@@ -6243,9 +6243,6 @@
 
     const MIN_DATE = new Date(Date.now() + 1 * 24 * 60 * 60 * 1000);
     const DeliveryDateField = JSX(({ field, input }) => {
-        const { productType } = useRetailFormStore();
-        const isDebit = productType === 'debitCard';
-        const minDate = isDebit ? MIN_DATE : new Date();
         const { data } = useLeadFormData('DAYS_DELIVERY_SETTINGS');
         const weekends = useMemo(() => {
             const weekendItem = data?.find((item) => item.key === 'WEEKEND');
@@ -6254,7 +6251,7 @@
             }
             return [];
         }, [data]);
-        return (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), ...input, minDate: minDate, weekends: isDebit ? weekends : [] }));
+        return (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), ...input, minDate: MIN_DATE, weekends: weekends }));
     });
 
     const DeliveryTimeField = JSX(({ field, input }) => {
@@ -6267,6 +6264,7 @@
             const allowedTimes = isDebit ? debitDeliveryTime : creditDeliveryTime;
             return (data || [])
                 .filter((item) => item.key && allowedTimes.includes(item.key))
+                .sort((a, b) => (a.displayOrder || 0) - (b.displayOrder || 0))
                 .map((item) => ({
                 id: item.key,
                 text: item.value,
@@ -10828,12 +10826,17 @@
 
     const getDeliveryData$1 = (formData) => {
         const { methodObtain, deliveryDate = '', deliveryTime } = formData;
+        const isNewMicroservice = checkNewMicroservice();
+        //TODO временный хардкод для тестирования, требуется чтобы отработал ЕФР
+        const oficeId = isNewMicroservice ? { id: '92fc8b67-2648-43ad-a441-5ca827021186' } : { id: '3' };
         const isCourierDelivery = methodObtain === 'courier';
         const deliveryTimeCd = deliveryTime ? { deliveryTimeCd: { key: deliveryTime } } : {};
         return isCourierDelivery
             ? {
                 courierDeliveryFlg: isCourierDelivery,
                 deliveryDate: dateToISO(deliveryDate.toString().replace(/(GMT)[+-]\d{4}/, 'GMT+0000')),
+                //TODO временный хардкод для тестирования, не забыть удалить
+                office: oficeId,
                 ...deliveryTimeCd,
             }
             : {};
@@ -10929,7 +10932,8 @@
                     cardCategory: leadForm?.cardCategory?.text,
                     deliveryDate: leadForm?.deliveryDate,
                 };
-                retailFormStore.leadForm = initialState;
+                const resetState = { ...initialState, methodObtain: undefined };
+                retailFormStore.leadForm = resetState;
             }
         }, [isFinalStep, initialState]);
         const handleSubmit = useCallback(async (formData) => {
@@ -14080,40 +14084,48 @@
         return (jsx(BlockWrapper, { version: "transparent", className: style(className), defaultPadding: "p-0", ...rest, children: dataType === 'offices' ? jsx(OfficesMap, {}) : jsx(AtmsMap, { descriptionData: data }) }));
     });
 
-    const RATES_URL = `${API_BASE_URI}/rates`;
-    const ARCHIVE_RATES_URL = `${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: `${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
+    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'];
+    };*/
 
     const useCarouselControls = (props, initialIndex = 0) => {
         const { itemCount, visibleItemCount } = props;
@@ -14223,15 +14235,29 @@
         return (jsxs("div", { className: "space-y-xl mb-3xl", children: [maxDate && renderDate({ dateString: maxDate, isArchive }), jsxs("div", { className: style(RATES_COLUMN_STYLE), children: [jsx(Text, { font: "font-medium", children: "\u0412\u0430\u043B\u044E\u0442\u0430" }), jsx(Text, { font: "font-medium", children: "\u041F\u043E\u043A\u0443\u043F\u043A\u0430" }), jsx(Text, { font: "font-medium", children: "\u041F\u0440\u043E\u0434\u0430\u0436\u0430" })] }), list.length > 0 ? (list.map((rate, i) => jsx(Rate, { ...rate }, String(i)))) : (jsx(Paragraph, { children: "\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u0434\u0430\u043D\u043D\u044B\u0445" })), jsx(Paragraph, { color: "text-secondary-text", children: infoMessage })] }));
     });
 
-    const renderDataPickForm = () => (jsxs("div", { className: "flex justify-start items-end space-x-xl", children: [jsx(DatePicker, { label: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u0435\u043D\u044C", maxDate: new Date() }), jsx(SubmitButton$1, { className: "h-fit", children: "\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C" })] }));
-
     const renderLink = (href) => (jsxs(Paragraph, { children: ["\u041F\u043E\u043B\u043D\u044B\u0439 \u0430\u0440\u0445\u0438\u0432 \u0432\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u043F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C ", jsx(Link, { href: href, children: "\u0437\u0434\u0435\u0441\u044C" })] }));
 
-    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] }));
+    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 }));
 
     const inputs = [
         {
@@ -14823,7 +14849,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.1063";
+    const packageVersion = "0.14.1065";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;