ublo-lib 1.25.10 → 1.25.12

package/es/common/components/cross-selling-editor/cross-selling-editor.js

@@ -10,6 +10,8 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function CrossSellingEditor({
   titleZoneProps = {},
   contentZoneProps = {},
+  durations,
+  className,
   children
 }) {
   const ref = React.useRef();
@@ -28,10 +30,11 @@ export default function CrossSellingEditor({
     }
   };
   return _jsxs("div", {
-    className: styles.editor,
+    className: classNames(styles.editor, className),
     onClick: sendPlausibleEvent,
     children: [children, cmsMode === "editing" && _jsx(Editor, {
-      zoneRef: ref
+      zoneRef: ref,
+      durations: durations
     }), titleZoneProps.enabled && _jsx(Zone, {
       ref: titleRef,
       id: titleZoneProps.id || "tunnel-offers-title",

package/es/common/components/cross-selling-editor/editor.js

@@ -11,7 +11,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 export default function Editor({
-  zoneRef
+  zoneRef,
+  durations
 }) {
   const zoneContainer = zoneRef.current;
   const [dialogOpened, setDialogOpened] = React.useState(false);
@@ -58,11 +59,13 @@ export default function Editor({
           container: zoneContainer,
           config: config,
           setConfig: setConfig,
-          tunnelOffers: Utils.tunnelOffers
+          tunnelOffers: Utils.tunnelOffers,
+          durations: durations
         }), _jsx(Tester, {
           container: zoneContainer,
           config: config,
-          tunnelOffers: Utils.tunnelOffers
+          tunnelOffers: Utils.tunnelOffers,
+          durations: durations
         })]
       })
     })]

package/es/common/components/cross-selling-editor/hooks/use-custom-offers.js

@@ -17,6 +17,7 @@ export default function useCustomOffers() {
       let merchants = [];
       let stay = {};
       let skiPassDurations = [];
+      let durationTags = [];
       if (cartId) {
         try {
           const {
@@ -25,14 +26,16 @@ export default function useCustomOffers() {
           items = Utils.formatCartContent(cart);
           merchants = Utils.getMerchantsFromCart(cart);
           stay = Utils.getStayFromCart(cart);
-          skiPassDurations = await Utils.getskiPassDurationFromCart(cart);
+          skiPassDurations = await Utils.getSkiPassDurationFromCart(cart);
+          durationTags = await Utils.getDurationTagsFromCart(cart);
         } catch (e) {}
       }
       const content = {
         items,
         merchants,
         stay,
-        skiPassDurations
+        skiPassDurations,
+        durationTags
       };
       const storedConfig = Utils.getConfig(contentZone);
       const sortedOffers = Utils.getSortedOffers(contentZone, content, storedConfig);

package/es/common/components/cross-selling-editor/hooks/use-tunnel-offers.js

@@ -18,12 +18,14 @@ export default function useTunnelOffers(zone, path, cart) {
       const items = Utils.formatCartContent(cart);
       const merchants = Utils.getMerchantsFromCart(cart);
       const stay = Utils.getStayFromCart(cart);
-      const skiPassDurations = await Utils.getskiPassDurationFromCart(cart);
+      const skiPassDurations = await Utils.getSkiPassDurationFromCart(cart);
+      const durationTags = await Utils.getDurationTagsFromCart(cart);
       const content = {
         items,
         merchants,
         stay,
-        skiPassDurations
+        skiPassDurations,
+        durationTags
       };
       const storedConfig = Utils.getConfig(container);
       const sortedOffers = Utils.getSortedOffers(container, content, storedConfig);

package/es/common/components/cross-selling-editor/override-trigger-form.js

@@ -11,7 +11,8 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function OverrideTriggerForm({
   currentOffer,
   override,
-  setConfig
+  setConfig,
+  durations
 }) {
   const triggers = override?.triggers || {};
   const {
@@ -20,7 +21,8 @@ export default function OverrideTriggerForm({
     stayDuration = 0,
     merchant,
     skiPassDuration,
-    skiPassDurationOperator = ">"
+    skiPassDurationOperator = ">",
+    durationTag
   } = triggers;
   const updateEntry = (key, value) => {
     setConfig((config = {}) => {
@@ -151,6 +153,14 @@ export default function OverrideTriggerForm({
       value: skiPassDurationOperator || ">",
       onValueChange: value => updateEntry("skiPassDurationOperator", value),
       compact: true
+    }), durations && _jsx(Select, {
+      className: styles.input,
+      label: durations?.title,
+      placeholder: " ",
+      options: durations?.tags,
+      value: durationTag || "",
+      onValueChange: value => updateEntry("durationTag", value),
+      compact: true
     })]
   });
 }

package/es/common/components/cross-selling-editor/override.js

@@ -16,7 +16,8 @@ export default function Override({
   setCurrentOverride,
   config,
   setConfig,
-  closeCreationForm
+  closeCreationForm,
+  durations
 }) {
   const [formOpen, setFormOpen] = React.useState(false);
   const toggleFormOpen = e => {
@@ -108,7 +109,8 @@ export default function Override({
       children: _jsx(OverrideTriggerForm, {
         currentOffer: currentOffer,
         override: override,
-        setConfig: setConfig
+        setConfig: setConfig,
+        durations: durations
       })
     }), _jsx(Tooltip, {
       content: "Supprimer",

package/es/common/components/cross-selling-editor/overrides-list.js

@@ -14,7 +14,8 @@ export default function OverridesList({
   currentOverride,
   setCurrentOverride,
   config,
-  setConfig
+  setConfig,
+  durations
 }) {
   const [opened, setOpened] = React.useState(false);
   const [newOverride, setNewOverride] = React.useState("");
@@ -75,7 +76,8 @@ export default function OverridesList({
           setCurrentOverride: setCurrentOverride,
           config: config,
           setConfig: setConfig,
-          closeCreationForm: closeCreationForm
+          closeCreationForm: closeCreationForm,
+          durations: durations
         }, override.id);
       })
     }) : null, _jsxs("div", {

package/es/common/components/cross-selling-editor/rules.js

@@ -14,7 +14,8 @@ export default function Rules({
   container,
   config,
   setConfig,
-  tunnelOffers
+  tunnelOffers,
+  durations
 }) {
   const [currentOffer, setCurrentOffer] = React.useState("");
   const [currentOverride, setCurrentOverride] = React.useState(null);
@@ -61,7 +62,8 @@ export default function Rules({
       currentOverride: currentOverride,
       setCurrentOverride: setCurrentOverride,
       config: config,
-      setConfig: setConfig
+      setConfig: setConfig,
+      durations: durations
     }), currentOffer && _jsxs(_Fragment, {
       children: [_jsx("div", {
         className: styles.subTitle,

package/es/common/components/cross-selling-editor/services/utils.js

@@ -20,7 +20,7 @@ export function getSortedOffers(container, cartContent, config) {
     contentEditable.forEach(element => {
       element.removeAttribute("contenteditable");
     });
-    const title = clonedSection.querySelector(".tunnel-offer__title")?.textContent;
+    const title = clonedSection.querySelector(".tunnel-offer__title, [data-title]")?.textContent;
     const uuid = section.getAttribute("data-uuid") || "";
     const weight = Object.keys(config).reduce((acc, key) => {
       const override = getActiveOverride(key, cartContent, config);
@@ -53,7 +53,7 @@ export function getActiveOverride(key, cartContent, config) {
   const item = config[key];
   if (!amountInCart) return item?.default;
   const matchingOverrides = getMatchingOverrides(item, cartContent);
-  const activeOverride = matchingOverrides.length > 0 ? item?.overrides.find(o => o.id === matchingOverrides[0]) : item?.default || {};
+  const activeOverride = matchingOverrides.length > 0 ? item?.overrides.find(o => o.id === matchingOverrides[matchingOverrides.length - 1]) : item?.default || {};
   return activeOverride;
 }
 function getMatchingOverrides(item, cartContent) {
@@ -65,12 +65,14 @@ function getMatchingOverrides(item, cartContent) {
     const {
       stay,
       merchants,
-      skiPassDurations = []
+      skiPassDurations = [],
+      durationTags
     } = cartContent;
     const isStayMatching = checkStay(override, stay);
     const isMerchantMatching = checkMerchants(override, merchants);
     const isSkiPassDurationMatching = checkSkiPassDurations(override, skiPassDurations);
-    const isMatching = isStayMatching || isMerchantMatching || isSkiPassDurationMatching;
+    const isDurationTagMatching = checkDurationTags(override, durationTags);
+    const isMatching = isStayMatching || isMerchantMatching || isSkiPassDurationMatching || isDurationTagMatching;
     return isMatching ? [...acc, override.id] : acc;
   }, []);
   return matchs;
@@ -120,6 +122,14 @@ function checkSkiPassDurations(override, skiPassDurations) {
       return false;
   }
 }
+function checkDurationTags(override, durationTags) {
+  if (!durationTags) return false;
+  const {
+    durationTag
+  } = override.triggers || {};
+  if (!durationTag) return false;
+  return durationTags.includes(durationTag);
+}
 export const allowedOverrides = ["HOT", "LIFT", "SKI_RENTAL", "STAND"];
 export function hasAllowedOverrides(kind) {
   return allowedOverrides.includes(kind);
@@ -165,7 +175,7 @@ export function getStayFromCart(cart) {
     duration
   };
 }
-export async function getskiPassDurationFromCart(cart) {
+export async function getSkiPassDurationFromCart(cart) {
   const {
     LIFT: items
   } = cart.orders;
@@ -191,6 +201,15 @@ export async function getskiPassDurationFromCart(cart) {
   }, []);
   return durations.map(d => d.nbDays);
 }
+export async function getDurationTagsFromCart(cart) {
+  const {
+    LIFT: items
+  } = cart.orders;
+  if (!items?.length) return [];
+  const tags = items[0].inscriptions.flatMap(i => i.durationTags).filter(Boolean);
+  const uniqueTags = tags?.length > 0 ? [...new Set(tags)] : [];
+  return uniqueTags;
+}
 export const CONFIG_ID = "cross-selling-editor";
 export function getConfig(container) {
   const config = container?.querySelector(`#${CONFIG_ID}`);

package/es/common/components/cross-selling-editor/tester-tunnel-offer.js

@@ -1,6 +1,7 @@
 import * as React from "react";
 import NumberPicker from "dt-design-system/es/number-picker";
 import Input from "dt-design-system/es/input";
+import Select from "dt-design-system/es/select";
 import * as Utils from "./services/utils";
 import styles from "./tester-tunnel-offer.module.css";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -11,7 +12,8 @@ export default function TesterTunnelOffer({
   label,
   cartOffers,
   updateCartOffers,
-  refreshCartContent
+  refreshCartContent,
+  durations
 }) {
   const overrideAllowed = Utils.allowedOverrides.includes(kind);
   const isSkiPasses = kind === "LIFT";
@@ -28,16 +30,26 @@ export default function TesterTunnelOffer({
     }), overrideAllowed && items.map((_, index) => {
       const number = index + 1;
       if (isSkiPasses) {
-        return _jsx(Input, {
-          type: "number",
-          className: styles.input,
-          "data-kind": "skiPassDuration",
-          label: `Durée du forfait n°${number}`,
-          placeholder: "En jour(s) (Optionnel)",
-          min: 0,
-          max: 40,
-          onChange: refreshCartContent,
-          compact: true
+        return _jsxs(React.Fragment, {
+          children: [_jsx(Input, {
+            type: "number",
+            className: styles.input,
+            "data-kind": "skiPassDuration",
+            label: `Durée du forfait n°${number}`,
+            placeholder: "En jour(s) (Optionnel)",
+            min: 0,
+            max: 40,
+            onChange: refreshCartContent,
+            compact: true
+          }), durations && _jsx(Select, {
+            className: styles.input,
+            label: durations?.title + ` n°${number}`,
+            placeholder: " ",
+            "data-kind": "durationTags",
+            options: durations?.tags,
+            onChange: refreshCartContent,
+            compact: true
+          })]
         }, index);
       }
       return _jsx(Input, {

package/es/common/components/cross-selling-editor/tester.js

@@ -3,16 +3,17 @@ import Input from "dt-design-system/es/input";
 import Popover from "dt-design-system/es/popover";
 import Button from "dt-design-system/es/button";
 import * as Icons from "dt-design-system/es/icons";
-import styles from "./tester.module.css";
-import * as Utils from "./services/utils";
 import TesterTunnelOffer from "./tester-tunnel-offer";
+import * as Utils from "./services/utils";
+import styles from "./tester.module.css";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 export default function Tester({
   container,
   config,
-  tunnelOffers
+  tunnelOffers,
+  durations
 }) {
   const ref = React.useRef(null);
   const [stayFrom, setStayFrom] = React.useState("");
@@ -20,6 +21,7 @@ export default function Tester({
   const [cartOffers, setCartOffers] = React.useState({});
   const [merchants, setMerchants] = React.useState([]);
   const [skiPassDurations, setSkiPassDurations] = React.useState([]);
+  const [durationTags, setDurationTags] = React.useState([]);
   const updateStayFrom = value => {
     setStayFrom(value);
     const stayToIsUndefined = !stayTo;
@@ -49,7 +51,8 @@ export default function Tester({
     items: cartOffers,
     stay,
     merchants,
-    skiPassDurations
+    skiPassDurations,
+    durationTags
   };
   const sortedOffers = Utils.getSortedOffers(container, cartContent, config);
   const activeOverrides = Object.keys(cartOffers).reduce((acc, key) => {
@@ -73,12 +76,15 @@ export default function Tester({
   const refreshCartContent = () => {
     const container = ref.current;
     if (container) {
-      const merchantInputs = Array.from(container.querySelectorAll("[data-kind=merchant]"));
-      const skiPassDurationInputs = Array.from(container.querySelectorAll("[data-kind=skiPassDuration]"));
+      const merchantInputs = Array.from(container.querySelectorAll("[data-kind='merchant']"));
+      const skiPassDurationInputs = Array.from(container.querySelectorAll("[data-kind='skiPassDuration']"));
+      const durationTagsSelect = Array.from(container.querySelectorAll("[data-kind='durationTags']"));
       const merchants = merchantInputs.map(input => input.value).filter(Boolean);
       const skiPassDurations = skiPassDurationInputs.map(input => Number(input.value)).filter(Boolean);
+      const durationTags = durationTagsSelect.map(select => select.value).filter(Boolean);
       setMerchants(merchants);
       setSkiPassDurations(skiPassDurations);
+      setDurationTags(durationTags);
     }
   };
   const tunnelOptions = Object.keys(tunnelOffers).map(key => {
@@ -139,7 +145,8 @@ export default function Tester({
               label: label,
               cartOffers: cartOffers,
               updateCartOffers: updateCartOffers,
-              refreshCartContent: refreshCartContent
+              refreshCartContent: refreshCartContent,
+              durations: durations
             }, key.concat(label));
           })
         })]

package/es/common/components/editable-map/cluster.js

@@ -1,18 +1,14 @@
 import * as React from "react";
+import MarkerClusterGroup from "react-leaflet-cluster";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function Cluster({
   isEditing,
   children
 }) {
   if (isEditing) return children;
-  try {
-    const MarkerClusterGroup = require("react-leaflet-cluster").default;
-    return _jsx(MarkerClusterGroup, {
-      maxClusterRadius: 20,
-      chunkedLoading: true,
-      children: children
-    });
-  } catch (e) {
-    return children;
-  }
+  return _jsx(MarkerClusterGroup, {
+    maxClusterRadius: 20,
+    chunkedLoading: true,
+    children: children
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.25.10",
+  "version": "1.25.12",
   "peerDependencies": {
     "dt-design-system": "^3.1.5",
     "leaflet": "^1.9.1",