ublo-lib 1.0.21 → 1.0.24

package/es/common/components/cookie-consent/cookie-consent.js

@@ -29,7 +29,7 @@ const CookieConsent = ({
       setMounted(true);
 
       if (!isEnabled) {
-        updateConsent(false);
+        updateConsent(true);
       }
     }
   }, [isEnabled, mounted]);

package/es/common/components/custom-contact-form/custom-contact-form.js

@@ -7,7 +7,7 @@ import Button from "dt-design-system/es/button";
 import * as Messages from "./messages";
 import * as Icons from "./icons";
 import * as DTIcons from "dt-design-system/es/icons";
-import styles from "./index.module.css";
+import styles from "./custom-contact-form.module.css";
 import { getInitialFormState, getSettings, send } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -20,20 +20,17 @@ const CustomContactFormWithSnackbar = props => {
 };
 
 const CustomContactForm = ({
-  formTitle,
-  fields,
   kind,
-  onSubmit,
+  title,
+  fields,
   presets,
-  setPresets,
-  allowPresetsReset,
-  subjectPrefix,
-  subjectSuffix,
   className,
   innerClassName,
+  subject,
+  onSubmit,
   customSend
 }) => {
-  const [data, setData] = React.useState(getInitialFormState(fields, presets));
+  const [data, setData] = React.useState(getInitialFormState(fields, presets?.values));
   const [sending, setSending] = React.useState(false);
   const [ready, setReady] = React.useState(false);
   const [settings, setSettings] = React.useState();
@@ -57,8 +54,8 @@ const CustomContactForm = ({
       site,
       data,
       fields,
-      subjectPrefix,
-      subjectSuffix
+      subjectPrefix: subject?.prefix,
+      subjectSuffix: subject?.suffix
     });
 
     if (error) {
@@ -84,7 +81,7 @@ const CustomContactForm = ({
   };
 
   const resetForm = () => {
-    setPresets?.(undefined);
+    presets.setter?.(undefined);
     setData(getInitialFormState(fields));
   };
 
@@ -104,8 +101,8 @@ const CustomContactForm = ({
     }
   }, [ready, settings, site]);
   React.useEffect(() => {
-    setData(getInitialFormState(fields, presets));
-  }, [fields, presets]);
+    setData(getInitialFormState(fields, presets.values));
+  }, [fields, presets?.values]);
   const classes = classnames(styles.root, {
     [className]: className
   });
@@ -122,12 +119,12 @@ const CustomContactForm = ({
     });
   }
 
-  const formKey = presets ? JSON.stringify(presets) : undefined;
+  const formKey = presets ? JSON.stringify(presets.values) : undefined;
   return _jsxs("div", {
     className: classes,
-    children: [formTitle && _jsx("div", {
+    children: [title && _jsx("div", {
       className: styles.title,
-      children: formTitle
+      children: title
     }), _jsx("div", {
       className: innerClasses,
       children: Object.keys(fields).map(key => _jsx(Field, {
@@ -137,11 +134,11 @@ const CustomContactForm = ({
         data: data,
         setData: setData,
         settings: settings,
-        presets: presets
+        presets: presets?.values
       }, key))
     }, formKey), _jsxs("div", {
       className: styles.bottom,
-      children: [presets && allowPresetsReset && _jsx(Button, {
+      children: [presets?.allowReset && _jsx(Button, {
         className: styles.resetButton,
         disabled: sending,
         onClick: resetForm,

package/es/common/components/custom-contact-form/field.js

@@ -38,11 +38,18 @@ const getProps = (type, name, className, data, required, placeholder, autoSizing
     className,
     value: data[name].value,
     placeholder,
-    required,
-    autoSizing
+    required
   };
 
-  if (type === "textarea" || type === "select") {
+  if (type === "textarea") {
+    return {
+      onValueChange: onChange,
+      autoSizing,
+      ...commonProps
+    };
+  }
+
+  if (type === "select") {
     return {
       onValueChange: onChange,
       ...commonProps

package/es/lbm/components/msem-linker/editor/messages.js

@@ -17,6 +17,7 @@ const messages = {
   rooms: "Chambres",
   nbRooms: "Nombre de chambres",
   roomType: "Type de chambre",
+  activities: "Activités",
   domains: "Domaines",
   durations: "Durées",
   skiers: "Personnes",

package/es/lbm/components/msem-linker/editor/ski-pass.js

@@ -14,6 +14,16 @@ import styles from "./ski-pass.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";
+const ACTIVITIES_LABELS = {
+  piscine: "Piscine",
+  patinoire: "Patinoire",
+  vtt: "VTT",
+  ski: "Ski",
+  "acces-pieton": "Accès piéton",
+  "bouee-neige": "Bouée sur neige",
+  "ski-activite": "Ski + Activités",
+  luge: "Luge sur rails"
+};
 const DEFAULT_DATA = {
   stayFrom: "",
   stayTo: "",
@@ -30,6 +40,7 @@ const getDefaultData = config => {
     stay,
     skiers,
     firstSkiDate,
+    activities,
     domains,
     durations
   } = config.presets;
@@ -38,6 +49,7 @@ const getDefaultData = config => {
     stayTo: stay?.to || DEFAULT_DATA.stayTo,
     skiers: skiers || DEFAULT_DATA.skiers,
     firstSkiDate: firstSkiDate || DEFAULT_DATA.firstSkiDate,
+    activities: activities || DEFAULT_DATA.activities,
     domains: domains || DEFAULT_DATA.domains,
     durations: durations || DEFAULT_DATA.durations
   };
@@ -81,6 +93,47 @@ const SkiPass = ({
     value: catalog,
     label: catalog
   }))];
+  const activities = [...new Set(filters?.domains?.reduce((acc, domain) => {
+    const {
+      tags
+    } = domain;
+    if (!tags?.length) return acc;
+    const formatedTags = tags.filter(tag => {
+      return Object.keys(ACTIVITIES_LABELS).includes(tag) && !acc.some(item => item.value === tag);
+    }).map(tag => {
+      return {
+        value: tag,
+        label: ACTIVITIES_LABELS[tag] || tag
+      };
+    });
+    return [...acc, ...formatedTags];
+  }, []))];
+  const selectedActivities = data.activities.map(activity => activities.find(a => a.value === activity));
+  const selectedActivitiesCodes = activities.reduce((acc, activity) => {
+    const {
+      value
+    } = activity;
+    return data.activities?.includes(value) ? [...new Set([...acc, value])] : acc;
+  }, []);
+  const filteredDomains = selectedActivitiesCodes?.length > 0 ? filters.domains?.filter(domain => {
+    return domain.tags?.some(tag => {
+      return selectedActivitiesCodes.includes(tag);
+    });
+  }) : filters?.domains;
+  const selectedDomainsIds = filters?.domains.reduce((acc, domain) => {
+    const {
+      code,
+      catalogIds
+    } = domain;
+    return data.domains.includes(code) ? [...new Set([...acc, ...catalogIds])] : acc;
+  }, []);
+  const filteredDurations = selectedActivitiesCodes?.length > 0 ? filters.durations?.filter(duration => {
+    return duration.tags?.some(tag => {
+      return selectedActivitiesCodes.includes(tag) || duration.catalogIds.some(id => selectedDomainsIds.includes(id));
+    });
+  }) : filters?.durations;
+  const selectedDomains = data.domains.map(domain => filters?.domains?.find(d => d.value === domain));
+  const selectedDurations = data.durations.map(domain => filters?.durations?.find(d => d.value === domain));
 
   const updateField = field => value => {
     const isFrom = field === "stayFrom";
@@ -195,12 +248,14 @@ const SkiPass = ({
         to: stayTo
       } : undefined;
       const skiers = data.skiers?.length > 0 ? data.skiers : undefined;
+      const activities = data.activities.length > 0 ? data.activities : undefined;
       const domains = data.domains.length > 0 ? data.domains : undefined;
       const durations = data.durations.length > 0 ? data.durations : undefined;
       const presets = {
         stay,
         skiers,
         firstSkiDate,
+        activities,
         domains,
         durations
       };
@@ -250,16 +305,6 @@ const SkiPass = ({
     }));
   };
 
-  const selectedDomainsIds = filters?.domains.reduce((acc, domain) => {
-    const {
-      code,
-      catalogIds
-    } = domain;
-    return data.domains.includes(code) ? [...new Set([...acc, ...catalogIds])] : acc;
-  }, []);
-  const filteredDurations = selectedDomainsIds?.length > 0 ? filters?.durations?.filter(duration => duration.catalogIds.some(id => selectedDomainsIds.includes(id))) : filters?.durations;
-  const selectedDomains = data.domains.map(domain => filters?.domains?.find(d => d.value === domain));
-  const selectedDurations = data.durations.map(domain => filters?.durations?.find(d => d.value === domain));
   return _jsxs("div", {
     className: styles.skiPass,
     children: [_jsx("div", {
@@ -322,20 +367,27 @@ const SkiPass = ({
       }), _jsx("div", {
         className: styles.label,
         children: messages.filters
+      }), activities.length > 1 && _jsx(MutlipleSelect, {
+        placeholder: "Selectionnez une ou plusieurs options",
+        label: messages.activities,
+        options: activities,
+        values: selectedActivities,
+        onChange: updateFilter("activities")
       }), _jsxs("div", {
         className: styles.row,
-        children: [filters?.domains?.length > 1 && _jsx(MutlipleSelect, {
+        children: [filteredDomains.length > 0 && _jsx(MutlipleSelect, {
           placeholder: "Selectionnez une ou plusieurs options",
           label: messages.domains,
-          options: filters.domains,
+          options: filteredDomains,
           values: selectedDomains,
           onChange: updateFilter("domains")
-        }), data.domains?.length > 0 && filteredDurations?.length > 1 && _jsx(MutlipleSelect, {
+        }), filteredDurations.length > 0 && _jsx(MutlipleSelect, {
           placeholder: "Selectionnez une ou plusieurs options",
           label: messages.durations,
           options: filteredDurations,
           values: selectedDurations,
-          onChange: updateFilter("durations")
+          onChange: updateFilter("durations"),
+          disabled: data.domains?.length === 0
         })]
       }), widgetUrl && _jsxs(_Fragment, {
         children: [_jsx("div", {

package/es/lbm/components/msem-linker/msem-linker.module.css

@@ -100,6 +100,7 @@
       var(--cms-primary-color, #004cc2)
     )
   );
+  font-family: "Open Sans", sans-serif;
   border-radius: var(--cms-radius-300, 15px);
   pointer-events: none;
   touch-action: none;

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "ublo-lib",
-  "version": "1.0.21",
+  "version": "1.0.24",
   "peerDependencies": {
+    "dt-design-system": "^2.0.0",
+    "next": "^12.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "dt-design-system": "^2.0.0",
     "ublo": "^2.0.0"
   },
   "dependencies": {
@@ -31,6 +32,7 @@
     "eslint-plugin-promise": "^6.0.1",
     "eslint-plugin-react": "^7.31.7",
     "eslint-plugin-react-hooks": "^4.6.0",
+    "next": "^12.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1",