ublo-lib 1.17.1 → 1.17.3

package/es/common/components/msem-preset-editor/components/widget-list-item.d.ts

@@ -1,12 +1,13 @@
 import * as React from "react";
 import type { Offer } from "../services/offers";
 type Props = {
+    resort: number;
     item: Offer;
     preset: Record<string, any> | null;
     updatePreset: (item: Offer, subPreset?: Offer) => void;
     removePreset: () => void;
     setShowPresetDialog: React.Dispatch<React.SetStateAction<boolean>>;
 };
-export default function WidgetListItem({ item, preset, updatePreset, removePreset, setShowPresetDialog, }: Props): import("react/jsx-runtime").JSX.Element;
+export default function WidgetListItem({ resort, item, preset, updatePreset, removePreset, setShowPresetDialog, }: Props): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=widget-list-item.d.ts.map

package/es/common/components/msem-preset-editor/components/widget-list-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"widget-list-item.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/msem-preset-editor/components/widget-list-item.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAGhD,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACnC,YAAY,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IACvD,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,mBAAmB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;CACpE,CAAC;AAIF,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,mBAAmB,GACpB,EAAE,KAAK,2CA6IP"}
+{"version":3,"file":"widget-list-item.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/msem-preset-editor/components/widget-list-item.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAGhD,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACnC,YAAY,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IACvD,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,mBAAmB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;CACpE,CAAC;AAIF,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,MAAM,EACN,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,mBAAmB,GACpB,EAAE,KAAK,2CAiJP"}

package/es/common/components/msem-preset-editor/components/widget-list-item.js

@@ -5,14 +5,16 @@ import Button from "dt-design-system/es/button";
 import * as Icons from "dt-design-system/es/icons";
 import css from "./widget-list-item.module.css";
 const ALLOW_PRESETS_ON_WIDGETS = ["lodging", "skiPass", "elloha", "vakario"];
-export default function WidgetListItem({ item, preset, updatePreset, removePreset, setShowPresetDialog, }) {
+export default function WidgetListItem({ resort, item, preset, updatePreset, removePreset, setShowPresetDialog, }) {
     const [opened, setOpened] = React.useState(false);
     const { widget, logo, name, items: subs } = item;
     const toggleItem = () => {
         setOpened(!opened);
     };
     const ToggleIcon = opened ? Icons.ChevronUp : Icons.ChevronDown;
-    const isSelected = preset?.name === name && preset?.widget === widget;
+    const isSelected = preset?.name === name &&
+        preset?.widget === widget &&
+        preset?.options?.resort === resort;
     const hasSubs = subs && subs.length > 0;
     const allowAdvancedPresets = ALLOW_PRESETS_ON_WIDGETS.includes(widget);
     const showEditButton = isSelected && allowAdvancedPresets;
@@ -27,7 +29,7 @@ export default function WidgetListItem({ item, preset, updatePreset, removePrese
         }
     };
     return (_jsxs("div", { className: classes, children: [_jsxs(Button, { variant: "transparent", className: css.button, onClick: handleItemClick, children: [_jsx("div", { className: css.logo, children: _jsx("img", { src: logo, alt: name }) }), _jsx("div", { className: css.name, children: name })] }), (hasSubs || showEditButton || showRemoveButton) && (_jsxs("div", { className: css.actions, children: [showEditButton && (_jsx(Button, { variant: "primary", className: css.action, onClick: () => setShowPresetDialog(true), "data-tooltip": "Modifier", compact: true, children: _jsx(Icons.Edit, {}) })), showRemoveButton && (_jsx(Button, { variant: "danger", className: css.action, onClick: removePreset, "data-tooltip": "Supprimer", compact: true, children: _jsx(Icons.Trash, {}) })), hasSubs && (_jsx(Button, { variant: "secondary", className: css.action, onClick: toggleItem, "data-tooltip": "Afficher les sous-marchands", compact: true, children: _jsx(ToggleIcon, {}) }))] })), opened && subs && (_jsx("div", { className: css.list, children: subs.map((sub) => {
-                    const isSelected = preset?.name === sub.name;
+                    const isSelected = preset?.name === sub.name && preset?.options?.resort === resort;
                     const allowedWidgets = [
                         "otherProducts",
                         ...ALLOW_PRESETS_ON_WIDGETS,

package/es/common/components/msem-preset-editor/components/widget-list.d.ts

@@ -3,7 +3,7 @@ import type { Offer } from "../services/offers";
 type Props = {
     lang: "fr" | "en";
     channel: string;
-    resort: number | string;
+    resort: number;
     facet: string;
     preset: Record<string, any> | null;
     updatePreset: (item: Offer, subPreset?: Offer) => void;

package/es/common/components/msem-preset-editor/components/widget-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"widget-list.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/msem-preset-editor/components/widget-list.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAGhD,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACnC,YAAY,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IACvD,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IAC9D,mBAAmB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;CACpE,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,OAAO,EACP,MAAM,EACN,KAAK,EACL,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,mBAAmB,GACpB,EAAE,KAAK,2CA8CP"}
+{"version":3,"file":"widget-list.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/msem-preset-editor/components/widget-list.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAGhD,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACnC,YAAY,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IACvD,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IAC9D,mBAAmB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;CACpE,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,OAAO,EACP,MAAM,EACN,KAAK,EACL,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,mBAAmB,GACpB,EAAE,KAAK,2CAkDP"}

package/es/common/components/msem-preset-editor/components/widget-list.js

@@ -28,7 +28,7 @@ export default function WidgetList({ lang, channel, resort, facet, preset, updat
         };
         runEffect();
     }, [channel, facet, lang, resort, setError]);
-    return (_jsxs("div", { className: css.list, children: [loading && _jsx(Loader, { className: css.loader }), offers?.map((offer, i) => {
-                return (_jsx(WidgetListItem, { item: offer, preset: preset, updatePreset: updatePreset, removePreset: removePreset, setShowPresetDialog: setShowPresetDialog }, i));
+    return (_jsxs("div", { className: css.list, children: [loading && _jsx(Loader, { className: css.loader }), offers?.length === 0 && !loading && (_jsx("div", { className: css.empty, children: "Aucun widget disponible" })), offers?.map((offer, i) => {
+                return (_jsx(WidgetListItem, { resort: resort, item: offer, preset: preset, updatePreset: updatePreset, removePreset: removePreset, setShowPresetDialog: setShowPresetDialog }, i));
             })] }));
 }

package/es/common/components/msem-preset-editor/components/widget-list.module.css

@@ -10,3 +10,12 @@
 
   margin-top: 10px;
 }
+
+.empty {
+  padding: 8px;
+  font-size: 14px;
+  text-align: center;
+  background: var(--ds-grey-100, #f5f5f5);
+  font-style: italic;
+  border-radius: var(--ds-radius-200, 10px);
+}

package/es/common/components/msem-preset-editor/msem-preset-editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"msem-preset-editor.d.ts","sourceRoot":"","sources":["../../../../src/common/components/msem-preset-editor/msem-preset-editor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAoB/B,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;KACxB,CAAC;IACF,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;QAC/C,QAAQ,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;KAC/C,CAAC;IACF,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IACxD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,cAAc,EACd,QAAQ,EACR,QAAQ,GACT,EAAE,KAAK,kDA6KP"}
+{"version":3,"file":"msem-preset-editor.d.ts","sourceRoot":"","sources":["../../../../src/common/components/msem-preset-editor/msem-preset-editor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAoB/B,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;KACxB,CAAC;IACF,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;QAC/C,QAAQ,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;KAC/C,CAAC;IACF,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IACxD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,cAAc,EACd,QAAQ,EACR,QAAQ,GACT,EAAE,KAAK,kDAqLP"}

package/es/common/components/msem-preset-editor/msem-preset-editor.js

@@ -34,7 +34,7 @@ export default function MseMPresetEditor({ lang, options, urls, selectedPreset,
         resort,
         slug: preset?.openPage ? preset?.presets?.accomodation : undefined,
     });
-    const updatePreset = (item, subPreset) => {
+    const updatePreset = React.useCallback((item, subPreset) => {
         let { name, options: itemOptions, presets: itemPresets } = item;
         const widget = subPreset?.widget || item.widget;
         if (!widget) {
@@ -49,7 +49,12 @@ export default function MseMPresetEditor({ lang, options, urls, selectedPreset,
         if (stay?.from && stay?.to) {
             itemPresets = { ...itemPresets, stay };
         }
-        const allOptions = { facet: Number(facet), ...itemOptions, ...options };
+        const allOptions = {
+            facet: Number(facet),
+            ...itemOptions,
+            ...options,
+            resort,
+        };
         const newPreset = {
             name,
             widget,
@@ -59,7 +64,7 @@ export default function MseMPresetEditor({ lang, options, urls, selectedPreset,
         };
         onChange?.(newPreset);
         setPreset(newPreset);
-    };
+    }, [baseUrl, facet, onChange, options, stay, resort]);
     const removePreset = () => {
         onChange?.(null);
         setPreset(null);
@@ -103,7 +108,7 @@ export default function MseMPresetEditor({ lang, options, urls, selectedPreset,
                 React.cloneElement(children, {
                     resort,
                     setResort,
-                }), _jsx(FacetSelector, { facet: facet, setFacet: setFacet, setPreset: setPreset }), _jsx(StayPicker, { stay: stay, setStay: setStay, setPreset: setPreset }), showWidgetList && (_jsx(WidgetList, { lang: lang, resort: resort, channel: options.channel, facet: facet, preset: preset, updatePreset: updatePreset, removePreset: removePreset, error: error, setError: setError, setShowPresetDialog: setShowPresetDialog })), _jsx(Dialog, { isOpened: showPresetDialog, close: () => setShowPresetDialog(false), container: null, showAsModal: false, showCloseButton: false, children: showPresetDialog && (_jsx(CurrentEditor, { stay: stay, facet: facet, preset: preset, setPreset: setPreset, setShowPresetDialog: setShowPresetDialog, testPreset: testPreset, onChange: onChange, baseUrl: baseUrl })) }), error && _jsx("div", { className: css.error, children: error }), _jsxs("div", { className: css.footer, children: [_jsx(Button, { variant: "secondary", disabled: !preset?.widget, className: css.testButton, onClick: testPreset, "data-tooltip": "Tester dans le widget MseM", children: _jsx(Icons.MdOpenInBrowser, {}) }), _jsx(Input, { type: "text", className: css.url, value: presetUrl, onClick: copyUrl, disabled: !preset?.widget || presetUrl === "", placeholder: !preset
+                }), _jsx(FacetSelector, { facet: facet, setFacet: setFacet, setPreset: setPreset }), _jsx(StayPicker, { stay: stay, setStay: setStay, setPreset: setPreset }), showWidgetList && (_jsx(WidgetList, { lang: lang, resort: resort, channel: options.channel, facet: facet, preset: preset, updatePreset: updatePreset, removePreset: removePreset, error: error, setError: setError, setShowPresetDialog: setShowPresetDialog })), _jsx(Dialog, { isOpened: showPresetDialog, close: () => setShowPresetDialog(false), container: null, showAsModal: false, showCloseButton: false, children: showPresetDialog && (_jsx(CurrentEditor, { stay: stay, facet: facet, preset: preset, setPreset: setPreset, setShowPresetDialog: setShowPresetDialog, testPreset: testPreset, onChange: onChange, baseUrl: baseUrl })) }), error && _jsx("div", { className: css.error, children: error }), _jsxs("div", { className: css.footer, children: [_jsx(Button, { variant: "secondary", disabled: !preset?.widget || preset?.options?.resort !== resort, className: css.testButton, onClick: testPreset, "data-tooltip": "Tester dans le widget MseM", children: _jsx(Icons.MdOpenInBrowser, {}) }), _jsx(Input, { type: "text", className: css.url, value: presetUrl, onClick: copyUrl, disabled: !preset?.widget || presetUrl === "", placeholder: !preset
                             ? "Aucun preset sélectionné"
                             : "Preset incompatible au format URL", readOnly: true })] })] }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.17.1",
+  "version": "1.17.3",
   "peerDependencies": {
     "dt-design-system": "^2.9.0",
     "leaflet": "^1.9.1",