ublo-lib 1.45.2 → 1.45.4

package/es/esf/components/magic-box/booking.js

@@ -5,7 +5,7 @@ import Button from "dt-design-system/es/button";
 import * as Icons from "dt-design-system/es/icons";
 import { message } from "./messages";
 import { loadWidgetMseM } from "./services/widgets";
-import * as Plausible from "../../../common/components/plausible";
+import * as Plausible from "../../../future/components/plausible";
 import css from "./booking.module.css";
 const Booking = ({ stay, cartUrl, channel, values, maxCPDuration, setCurrentStep, msemWidgetHost, }) => {
     const { lang, cmsMode, config } = useUbloContext();

package/es/esf/components/magic-box/magic-box.d.ts

@@ -3,9 +3,9 @@ type Stay = {
     from: string;
     to: string;
 };
-type MseMWidgetHost = "https://widget.msem.tech" | "https://widget-integration.msem.tech";
-type MseMApiHost = "https://services.msem.tech/api/esf" | "https://services-integration.msem.tech/api/esf";
-type MseMAdminHost = "https://admin.mon-sejour-en-montagne.com/api/gesco" | "https://admin-integration.mon-sejour-en-montagne.com/api/gesco";
+type MseMWidgetHost = "https://widget.msem.tech" | "https://widget-integration.msem.tech" | "https://widget-uat.msem.tech";
+type MseMApiHost = "https://services.msem.tech/api/esf" | "https://services-integration.msem.tech/api/esf" | "https://services-uat.msem.tech/api/esf";
+type MseMAdminHost = "https://admin.mon-sejour-en-montagne.com/api/gesco" | "https://admin-integration.mon-sejour-en-montagne.com/api/gesco" | "https://admin-uat.mon-sejour-en-montagne.com/api/gesco";
 type Props = {
     stay?: Stay;
     cartUrl: string;

package/es/esf/components/magic-box/magic-box.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"magic-box.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/magic-box.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAY/B,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,KAAK,cAAc,GACf,0BAA0B,GAC1B,sCAAsC,CAAC;AAC3C,KAAK,WAAW,GACZ,oCAAoC,GACpC,gDAAgD,CAAC;AACrD,KAAK,aAAa,GACd,oDAAoD,GACpD,gEAAgE,CAAC;AAErE,KAAK,KAAK,GAAG;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE;QACb,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,kBAAkB,EAAE,OAAO,CAAC;KAC7B,CAAC;CACH,CAAC;;AAIF,wBAAoC;AAEpC,iBAAS,QAAQ,CAAC,EAChB,IAAI,EACJ,OAAO,EACP,OAAe,EACf,SAAS,EACT,YAAY,EACZ,aAAa,EACb,OAAW,EACX,OAAkB,EAClB,iBAAiB,EACjB,UAAU,EACV,cAA2C,EAC3C,WAAkD,EAClD,aAAoE,EACpE,YAAY,EACZ,QAAQ,GACT,EAAE,KAAK,2CAgNP"}
+{"version":3,"file":"magic-box.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/magic-box.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,KAAK,cAAc,GACf,0BAA0B,GAC1B,sCAAsC,GACtC,8BAA8B,CAAC;AACnC,KAAK,WAAW,GACZ,oCAAoC,GACpC,gDAAgD,GAChD,wCAAwC,CAAC;AAC7C,KAAK,aAAa,GACd,oDAAoD,GACpD,gEAAgE,GAChE,wDAAwD,CAAC;AAE7D,KAAK,KAAK,GAAG;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE;QACb,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,kBAAkB,EAAE,OAAO,CAAC;KAC7B,CAAC;CACH,CAAC;;AAIF,wBAAoC;AAEpC,iBAAS,QAAQ,CAAC,EAChB,IAAI,EACJ,OAAO,EACP,OAAe,EACf,SAAS,EACT,YAAY,EACZ,aAAa,EACb,OAAW,EACX,OAAkB,EAClB,iBAAiB,EACjB,UAAU,EACV,cAA2C,EAC3C,WAAkD,EAClD,aAAoE,EACpE,YAAY,EACZ,QAAQ,GACT,EAAE,KAAK,2CA4NP"}

package/es/esf/components/magic-box/magic-box.js

@@ -4,6 +4,7 @@ import classNames from "classnames";
 import Router from "next/router";
 import { useUbloContext } from "ublo/with-ublo";
 import Button from "dt-design-system/es/button";
+import Information from "dt-design-system/es/information";
 import * as Icons from "dt-design-system/es/icons";
 import Filters from "./filters";
 import Booking from "./booking";
@@ -15,7 +16,8 @@ function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, max
     const [filters, setFilters] = React.useState();
     const [values, setValues] = React.useState();
     const [currentStep, setCurrentStep] = React.useState(0);
-    const [VELClosed] = React.useState(false);
+    const [VELClosed, setVELClosed] = React.useState(false);
+    const [jmoins, setJmoins] = React.useState();
     const [customSubmitChecked, setCustomSubmitChecked] = React.useState(false);
     const { lang: ubloLang, config } = useUbloContext();
     const { resort, merchant } = config;
@@ -47,19 +49,20 @@ function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, max
     };
     const refreshFilters = React.useCallback(async () => {
         if (stay) {
-            const { from: stayFrom, to: stayTo } = stay;
-            const [welcomeResult, paramsResult] = await Promise.all([
-                API.fetchWelcome({
-                    msemApiHost,
-                    lang,
-                    resort,
-                    stayFrom,
-                    stayTo,
-                }),
-                API.fetchParams(msemAdminHost, lang, resort, merchant, channel, categories),
-            ]);
-            const { season: currentSeason, availableSeasons } = welcomeResult;
-            if (true) {
+            try {
+                setFilters([]);
+                const { from: stayFrom, to: stayTo } = stay;
+                const [welcomeResult, paramsResult] = await Promise.all([
+                    API.fetchWelcome({
+                        msemApiHost,
+                        lang,
+                        resort,
+                        stayFrom,
+                        stayTo,
+                    }),
+                    API.fetchParams(msemAdminHost, lang, resort, merchant, channel, categories),
+                ]);
+                const { season: currentSeason, availableSeasons } = welcomeResult;
                 const { categories: categoryList } = paramsResult;
                 const season = currentSeason || availableSeasons[0] || "2025";
                 const filtersResult = await API.fetchFilters({
@@ -71,8 +74,9 @@ function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, max
                     stayFrom,
                     stayTo,
                 });
-                const newFilters = Object.keys(filtersResult.filters).reduce((acc, key) => {
-                    const filter = filtersResult.filters[key];
+                const { filters = {}, cpInactive, jmoins } = filtersResult;
+                const newFilters = Object.keys(filters).reduce((acc, key) => {
+                    const filter = filters[key];
                     if (key === "days") {
                         const days = filter.filter((item) => {
                             return (!item.restricted &&
@@ -101,6 +105,15 @@ function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, max
                     ? { ...newFilters, categories: formattedCategories }
                     : newFilters;
                 setFilters(allFilters);
+                setVELClosed(cpInactive);
+                const jmoinsValue = Object.keys(filters).length > 0 && jmoins !== 0 ? undefined : jmoins;
+                setJmoins(jmoinsValue);
+            }
+            catch (e) {
+                console.error(e);
+                setFilters([]);
+                setVELClosed(true);
+                setJmoins(undefined);
             }
         }
     }, [
@@ -131,7 +144,7 @@ function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, max
     const showFilter = stay && filters && values;
     const SubmitIcon = customSubmitChecked ? Icons.ArrowRight : Icons.Search;
     const classes = classNames(css.root, className);
-    return (_jsx("div", { className: classes, "data-align": alignContent, children: _jsxs("div", { className: css.top, children: [children, VELClosed && (_jsx("div", { className: css.closedMessage, children: message(lang, "vel-closed") })), !VELClosed && currentStep === 0 && (_jsxs(_Fragment, { children: [!filters && _jsx("div", { className: css.loader }), showFilter && (_jsx(Filters, { filters: filters, values: values, setValues: setValues, customSubmit: customSubmit, customSubmitChecked: customSubmitChecked, setCustomSubmitChecked: setCustomSubmitChecked })), _jsxs(Button, { className: css.confirm, onClick: submit, disabled: !isValid, children: [message(lang, customSubmitChecked ? "proceed" : "confirm"), _jsx(SubmitIcon, {})] })] })), currentStep === 1 && (_jsx(Booking, { stay: stay, cartUrl: cartUrl, channel: channel, values: values, maxCPDuration: maxCPDuration, setCurrentStep: setCurrentStep, msemWidgetHost: msemWidgetHost }))] }) }));
+    return (_jsx("div", { className: classes, "data-align": alignContent, children: _jsxs("div", { className: css.top, children: [children, VELClosed && !jmoins && (_jsx(Information, { type: "error", className: css.errorMessage, children: message(lang, "vel-closed") })), jmoins && (_jsxs(Information, { type: "warning", className: css.errorMessage, children: [message(lang, "booking-block-day-minus-start"), " ", jmoins, message(lang, "booking-block-day-minus-end")] })), !VELClosed && currentStep === 0 && (_jsxs(_Fragment, { children: [!filters && _jsx("div", { className: css.loader }), showFilter && (_jsx(Filters, { filters: filters, values: values, setValues: setValues, customSubmit: customSubmit, customSubmitChecked: customSubmitChecked, setCustomSubmitChecked: setCustomSubmitChecked }))] })), _jsxs(Button, { className: css.confirm, onClick: submit, disabled: VELClosed || !isValid, children: [message(lang, customSubmitChecked ? "proceed" : "confirm"), _jsx(SubmitIcon, {})] }), currentStep === 1 && (_jsx(Booking, { stay: stay, cartUrl: cartUrl, channel: channel, values: values, maxCPDuration: maxCPDuration, setCurrentStep: setCurrentStep, msemWidgetHost: msemWidgetHost }))] }) }));
 }
 function getDefaultValues(filters) {
     return Object.keys(filters || {}).reduce((acc, key) => {

package/es/esf/components/magic-box/magic-box.module.css

@@ -27,8 +27,9 @@
   }
 }
 
-.closedMessage {
-  text-align: center;
+.errorMessage {
+  width: fit-content;
+  margin: 22px auto 24px;
 }
 
 .loader {

package/es/esf/components/magic-box/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/messages.js"],"names":[],"mappings":"AA6BO,iDAIN"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/messages.js"],"names":[],"mappings":"AAmCO,iDAIN"}

package/es/esf/components/magic-box/messages.js

@@ -11,6 +11,8 @@ const locales = {
         categories: " à ",
         "vel-closed": "La vente en ligne est fermée pour le moment.",
         proceed: "Finaliser ma demande",
+        "booking-block-day-minus-start": "La réservation des cours privés est possible uniquement à plus de ",
+        "booking-block-day-minus-end": " jours de la date de début de cours souhaitée.",
     },
     en: {
         confirm: "Find an instructor",
@@ -24,6 +26,8 @@ const locales = {
         categories: " at ",
         "vel-closed": "Online sales are closed for now.",
         proceed: "Finalize my request",
+        "booking-block-day-minus-start": "Booking requests are closed ",
+        "booking-block-day-minus-end": " days before the start of the lesson.",
     },
 };
 export const message = (lang, id) => {

package/es/esf/components/magic-box/services/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../../../src/esf/components/magic-box/services/api.js"],"names":[],"mappings":"AAGA;;;;;;iBAOC;AAED;;;;;;;;;;iBAqBC;AAED,oIAcC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../../../src/esf/components/magic-box/services/api.js"],"names":[],"mappings":"AAGA;;;;;;iBAOC;AAED;;;;;;;;;;iBAqBC;AAED,oIAeC"}

package/es/esf/components/magic-box/services/api.js

@@ -1,6 +1,6 @@
-import * as Fetcher from "../../../../common/utils/fetcher";
+import { POST } from "../../../../future/utils/fetcher";
 export function fetchWelcome({ msemApiHost, lang, resort, stayFrom, stayTo }) {
-    return Fetcher.post(`${msemApiHost}/welcome`, {
+    return POST(`${msemApiHost}/welcome`, {
         resort,
         lang,
         stayFrom,
@@ -8,7 +8,7 @@ export function fetchWelcome({ msemApiHost, lang, resort, stayFrom, stayTo }) {
     });
 }
 export async function fetchFilters({ msemApiHost, channel, lang, resort, season, stayFrom, stayTo, kinds = ["CP"], engagement = true, }) {
-    return Fetcher.post(`${msemApiHost}/filters`, {
+    return POST(`${msemApiHost}/filters`, {
         channel,
         lang,
         resort,
@@ -20,10 +20,11 @@ export async function fetchFilters({ msemApiHost, channel, lang, resort, season,
     });
 }
 export async function fetchParams(msemAdminHost, lang, resort, merchant, channel, categories) {
-    const res = await fetch(`${msemAdminHost}/contact/parameters`, {
-        method: "POST",
-        headers: { "content-type": "application/json;charset=utf-8" },
-        body: JSON.stringify({ lang, resort, merchant, channel, categories }),
+    return POST(`${msemAdminHost}/contact/parameters`, {
+        lang,
+        resort,
+        merchant,
+        channel,
+        categories,
     });
-    return res.json();
 }

package/es/future/hooks/use-msem-presets.d.ts

@@ -1,4 +1,17 @@
-export default function useMseMPresets({ defaultOptions }: {
-    defaultOptions: any;
-}): void;
+type Preset = {
+    widget: string;
+    options: Record<string, any>;
+    presets: Record<string, any>;
+};
+type Props = {
+    defaultOptions: Record<string, any> & {
+        prefixes: Record<string, string>;
+    };
+    callbacks: {
+        beforeLaunch: (preset: Preset) => void;
+        afterLaunch: (preset: Preset) => void;
+    };
+};
+export default function useMseMPresets({ defaultOptions, callbacks }: Props): void;
+export {};
 //# sourceMappingURL=use-msem-presets.d.ts.map

package/es/future/hooks/use-msem-presets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-msem-presets.d.ts","sourceRoot":"","sources":["../../../src/future/hooks/use-msem-presets.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAE,cAAc,EAAE;;CAAA,QAmHxD"}
+{"version":3,"file":"use-msem-presets.d.ts","sourceRoot":"","sources":["../../../src/future/hooks/use-msem-presets.ts"],"names":[],"mappings":"AAYA,KAAK,MAAM,GAAG;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;QACpC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAClC,CAAC;IACF,SAAS,EAAE;QAET,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;QAEvC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;KACvC,CAAC;CACH,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,EAAE,KAAK,QAsI1E"}

package/es/future/hooks/use-msem-presets.js

@@ -5,7 +5,7 @@ import * as MseM from "../components/msem";
 import * as Cms from "../../common/utils/cms";
 const PRESET_ATTRIBUTE = "data-msem-preset";
 const PRESET_PLACEHOLDER_ATTRIBUTE = "data-msem-placeholder";
-export default function useMseMPresets({ defaultOptions }) {
+export default function useMseMPresets({ defaultOptions, callbacks }) {
     const { lang, cmsMode, path } = useUbloContext();
     const isEnabled = cmsMode !== "editing" && cmsMode !== "info";
     const handleSectionClick = React.useCallback((e) => {
@@ -15,7 +15,7 @@ export default function useMseMPresets({ defaultOptions }) {
         const preset = section?.getAttribute(PRESET_ATTRIBUTE);
         if (!preset)
             return;
-        const { widget, options = {}, presets, groundedTo, } = JSON.parse(preset);
+        const { widget, options = {}, presets, groundedTo } = JSON.parse(preset);
         if (groundedTo)
             return;
         const { prefixes = {}, ...otherDefaultOptions } = defaultOptions;
@@ -35,8 +35,14 @@ export default function useMseMPresets({ defaultOptions }) {
             window.open(endpoint, "_blank");
             return;
         }
+        if (typeof callbacks?.beforeLaunch === "function") {
+            callbacks.beforeLaunch({ widget, options: allOptions, presets });
+        }
         MseM.loadWidget(widget, allOptions, presets);
-    }, [defaultOptions, lang]);
+        if (typeof callbacks?.afterLaunch === "function") {
+            callbacks.afterLaunch({ widget, options: allOptions, presets });
+        }
+    }, [callbacks, defaultOptions, lang]);
     React.useEffect(() => {
         if (isEnabled) {
             document.body.addEventListener("click", handleSectionClick);
@@ -84,8 +90,22 @@ export default function useMseMPresets({ defaultOptions }) {
                     ...urlPresets,
                 };
                 placeholder.setAttribute("id", uniqueId);
+                if (typeof callbacks?.beforeLaunch === "function") {
+                    callbacks.beforeLaunch({
+                        widget,
+                        options: allOptions,
+                        presets: allPresets,
+                    });
+                }
                 MseM.loadWidget(widget, allOptions, allPresets);
+                if (typeof callbacks?.afterLaunch === "function") {
+                    callbacks.afterLaunch({
+                        widget,
+                        options: allOptions,
+                        presets: allPresets,
+                    });
+                }
             });
         }
-    }, [defaultOptions, lang]);
+    }, [callbacks, defaultOptions, lang]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.45.2",
+  "version": "1.45.4",
   "peerDependencies": {
     "classnames": "^2.5.1",
     "dt-design-system": "^3.12.0",