ublo-lib 1.38.21 → 1.38.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/common/components/cross-selling-editor/editor.js +3 -3
- package/es/common/components/cross-selling-editor/hooks/use-custom-offers.d.ts.map +1 -1
- package/es/common/components/cross-selling-editor/hooks/use-custom-offers.js +54 -40
- package/es/common/components/cross-selling-editor/services/api.d.ts +1 -1
- package/es/common/components/cross-selling-editor/services/api.d.ts.map +1 -1
- package/es/common/components/cross-selling-editor/services/api.js +2 -2
- package/es/common/components/cross-selling-editor/services/utils.d.ts.map +1 -1
- package/es/common/components/cross-selling-editor/services/utils.js +14 -2
- package/package.json +1 -1
|
@@ -59,7 +59,7 @@ function patchSections(zoneContainer) {
|
|
|
59
59
|
if (!zoneContainer)
|
|
60
60
|
return;
|
|
61
61
|
const sections = Array.from(zoneContainer?.querySelectorAll("section[data-class]"));
|
|
62
|
-
sections.forEach((section) => {
|
|
62
|
+
sections.reverse().forEach((section) => {
|
|
63
63
|
const hasUuid = section.hasAttribute("data-uuid");
|
|
64
64
|
if (!hasUuid) {
|
|
65
65
|
const uuid = crypto.randomUUID();
|
|
@@ -68,8 +68,8 @@ function patchSections(zoneContainer) {
|
|
|
68
68
|
else {
|
|
69
69
|
const uuid = section.getAttribute("data-uuid");
|
|
70
70
|
const allUuids = sections.map((section) => section.getAttribute("data-uuid"));
|
|
71
|
-
const
|
|
72
|
-
if (
|
|
71
|
+
const hasDuplicateUuid = allUuids.filter((otherUuid) => otherUuid === uuid).length > 1;
|
|
72
|
+
if (hasDuplicateUuid) {
|
|
73
73
|
const newUuid = crypto.randomUUID();
|
|
74
74
|
section.setAttribute("data-uuid", newUuid);
|
|
75
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-custom-offers.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/hooks/use-custom-offers.ts"],"names":[],"mappings":"AAKA,KAAK,KAAK,GAAG;IACX,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,aAAa,EACb,eAAe,GAChB,GAAE,KAAU,
|
|
1
|
+
{"version":3,"file":"use-custom-offers.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/hooks/use-custom-offers.ts"],"names":[],"mappings":"AAKA,KAAK,KAAK,GAAG;IACX,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,aAAa,EACb,eAAe,GAChB,GAAE,KAAU,UAwFZ"}
|
|
@@ -5,53 +5,67 @@ import * as Utils from "../services/utils";
|
|
|
5
5
|
export default function useCustomOffers({ titleSelector, contentSelector, } = {}) {
|
|
6
6
|
const { lang, path } = useUbloContext();
|
|
7
7
|
const [offers, setOffers] = React.useState();
|
|
8
|
-
React.
|
|
8
|
+
const controller = React.useRef();
|
|
9
|
+
const getOffers = React.useCallback(async () => {
|
|
9
10
|
const titleZone = document.querySelector(titleSelector || "[data-title-zone]");
|
|
10
11
|
const contentZone = document.querySelector(contentSelector || "[data-content-zone]");
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
merchants = Utils.getMerchantsFromCart(cart);
|
|
25
|
-
stay = Utils.getStayFromCart(cart);
|
|
26
|
-
skiPassDurations = Utils.getSkiPassDurationFromCart(cart);
|
|
27
|
-
durationTags = Utils.getDurationTagsFromCart(cart);
|
|
28
|
-
ellohaGroups = Utils.getEllohaGroupsFromCart(cart);
|
|
29
|
-
esfOffersContent = Utils.getEsfOffersFromCart(cart);
|
|
12
|
+
const cartId = window.sessionStorage.getItem("cartId");
|
|
13
|
+
let items = {};
|
|
14
|
+
let merchants = [];
|
|
15
|
+
let stay = {};
|
|
16
|
+
let skiPassDurations = [];
|
|
17
|
+
let durationTags = [];
|
|
18
|
+
let ellohaGroups = [];
|
|
19
|
+
let esfOffersContent = [];
|
|
20
|
+
if (cartId) {
|
|
21
|
+
try {
|
|
22
|
+
if (controller.current) {
|
|
23
|
+
controller.current.abort();
|
|
24
|
+
controller.current = undefined;
|
|
30
25
|
}
|
|
31
|
-
|
|
26
|
+
const abortController = new AbortController();
|
|
27
|
+
controller.current = abortController;
|
|
28
|
+
const { cart } = await API.fetchMseMCart(cartId, lang, controller.current);
|
|
29
|
+
items = Utils.formatCartContent(cart);
|
|
30
|
+
merchants = Utils.getMerchantsFromCart(cart);
|
|
31
|
+
stay = Utils.getStayFromCart(cart);
|
|
32
|
+
skiPassDurations = Utils.getSkiPassDurationFromCart(cart);
|
|
33
|
+
durationTags = Utils.getDurationTagsFromCart(cart);
|
|
34
|
+
ellohaGroups = Utils.getEllohaGroupsFromCart(cart);
|
|
35
|
+
esfOffersContent = Utils.getEsfOffersFromCart(cart);
|
|
32
36
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
37
|
+
catch (e) { }
|
|
38
|
+
}
|
|
39
|
+
const cartContent = {
|
|
40
|
+
items,
|
|
41
|
+
merchants,
|
|
42
|
+
stay,
|
|
43
|
+
skiPassDurations,
|
|
44
|
+
durationTags,
|
|
45
|
+
ellohaGroups,
|
|
46
|
+
esfOffersContent,
|
|
47
|
+
};
|
|
48
|
+
const storedConfig = Utils.getConfig(contentZone);
|
|
49
|
+
const sortedOffers = Utils.getSortedOffers(contentZone, cartContent, storedConfig);
|
|
50
|
+
const title = titleZone?.innerHTML || "";
|
|
51
|
+
const offersHTML = sortedOffers
|
|
52
|
+
.map(({ elementHTML }) => elementHTML)
|
|
53
|
+
.join("");
|
|
54
|
+
const customOffers = sortedOffers.length > 0
|
|
55
|
+
? `
|
|
47
56
|
${title}
|
|
48
57
|
<div data-custom-offers="">
|
|
49
|
-
${
|
|
58
|
+
${offersHTML}
|
|
50
59
|
</div>`
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
60
|
+
: null;
|
|
61
|
+
setOffers(customOffers);
|
|
62
|
+
}, [contentSelector, lang, titleSelector]);
|
|
63
|
+
React.useEffect(() => {
|
|
54
64
|
getOffers();
|
|
55
|
-
|
|
65
|
+
document.addEventListener("ublo-content-saved", getOffers);
|
|
66
|
+
return () => {
|
|
67
|
+
document.removeEventListener("ublo-content-saved", getOffers);
|
|
68
|
+
};
|
|
69
|
+
}, [getOffers, lang, path]);
|
|
56
70
|
return offers;
|
|
57
71
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare function fetchTunnelOffers(lang: string, facet: 0 | 1): Promise<any>;
|
|
2
|
-
export declare function fetchMseMCart(cartId: string, lang: string): Promise<any>;
|
|
2
|
+
export declare function fetchMseMCart(cartId: string, lang: string, abortController: AbortController): Promise<any>;
|
|
3
3
|
export declare function fetchEsfWelcome(lang: string, abortController: AbortController): Promise<any>;
|
|
4
4
|
export declare function fetchEsfKinds(lang: string, season: string, stayFrom: string, stayTo: string, period: number, abortController: AbortController): Promise<any>;
|
|
5
5
|
export declare function fetchEsfAges(lang: string, season: string, stayFrom: string, stayTo: string, period: number, abortController: AbortController): Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/services/api.ts"],"names":[],"mappings":"AAOA,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,gBASjE;AAED,wBAAsB,aAAa,
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/services/api.ts"],"names":[],"mappings":"AAOA,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,gBASjE;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,eAAe,gBAYjC;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,eAAe,gBAWjC;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,gBAqBjC;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,gBAmBjC;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,MAAM,EAAE,EACf,eAAe,EAAE,eAAe,gBAqBjC;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAAE,EACpB,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,MAAM,EAAE,EACf,eAAe,EAAE,eAAe,gBAsBjC;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAAE,EACpB,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,EAAE,MAAM,EAAE,EAChB,eAAe,EAAE,eAAe,gBAuBjC;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAAE,EACpB,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,EAAE,MAAM,EAAE,EAClB,eAAe,EAAE,eAAe,gBAwBjC"}
|
|
@@ -7,10 +7,10 @@ export async function fetchTunnelOffers(lang, facet) {
|
|
|
7
7
|
const result = await Fetcher.get(endpoint, { lang, facet }, undefined, undefined);
|
|
8
8
|
return result;
|
|
9
9
|
}
|
|
10
|
-
export async function fetchMseMCart(cartId, lang) {
|
|
10
|
+
export async function fetchMseMCart(cartId, lang, abortController) {
|
|
11
11
|
const endpoint = `${esfplusUrl}/api/esfplus/cart`;
|
|
12
12
|
const id = JSON.parse(cartId);
|
|
13
|
-
const result = await Fetcher.post(endpoint, { cartId: id, lang, resort }, undefined, undefined,
|
|
13
|
+
const result = await Fetcher.post(endpoint, { cartId: id, lang, resort }, undefined, undefined, abortController.signal);
|
|
14
14
|
return result;
|
|
15
15
|
}
|
|
16
16
|
export async function fetchEsfWelcome(lang, abortController) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/services/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAa,MAAM,UAAU,CAAC;AAE9E,KAAK,IAAI,GAAG;IACV,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACvC,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;CAOxB,CAAC;AAEF,KAAK,QAAQ,GAAG,MAAM,OAAO,YAAY,CAAC;AAE1C,wBAAgB,eAAe,CAC7B,SAAS,EAAE,WAAW,EACtB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,CAAC,EAAE,MAAM;;;;;IA6D3B;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/services/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAa,MAAM,UAAU,CAAC;AAE9E,KAAK,IAAI,GAAG;IACV,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACvC,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;CAOxB,CAAC;AAEF,KAAK,QAAQ,GAAG,MAAM,OAAO,YAAY,CAAC;AAE1C,wBAAgB,eAAe,CAC7B,SAAS,EAAE,WAAW,EACtB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,CAAC,EAAE,MAAM;;;;;IA6D3B;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,CAAC,EAAE,MAAM,YAsB3B;AA4JD,eAAO,MAAM,gBAAgB,UAAgD,CAAC;AAE9E,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,WAE/C;AAED,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,EAAE,gBAAgB,CAAC;CACzB,CAAC;AAEF,KAAK,KAAK,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC;AAE/D,KAAK,IAAI,GAAG;IACV,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,MAY3C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,YAS9C;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI;;;;;;;;EAMzC;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,YAKpD;AAcD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,YAQjD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,YAMjD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,gBAAgB,EAAE,CAUnE;AAED,eAAO,MAAM,SAAS,yBAAyB,CAAC;AAEhD,wBAAgB,SAAS,CAAC,SAAS,EAAE,WAAW,OAc/C;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAOlE"}
|
|
@@ -44,6 +44,7 @@ export function getActiveOverride(key, cartContent, config, forcedEsfOverride) {
|
|
|
44
44
|
const { items } = cartContent;
|
|
45
45
|
const amountInCart = items[key];
|
|
46
46
|
const item = config[key];
|
|
47
|
+
console.log(items, key);
|
|
47
48
|
if (!amountInCart)
|
|
48
49
|
return item?.default;
|
|
49
50
|
const matchingOverrides = getMatchingOverrides(item, cartContent, forcedEsfOverride);
|
|
@@ -70,13 +71,24 @@ function getMatchingOverrides(item, cartContent, forcedEsfOverride) {
|
|
|
70
71
|
isDurationTagMatching &&
|
|
71
72
|
isEllohaGroupMatching &&
|
|
72
73
|
isEsfProductMatching;
|
|
74
|
+
console.log({
|
|
75
|
+
isMatching,
|
|
76
|
+
isStayMatching,
|
|
77
|
+
isMerchantMatching,
|
|
78
|
+
isSkiPassDurationMatching,
|
|
79
|
+
isDurationTagMatching,
|
|
80
|
+
isEllohaGroupMatching,
|
|
81
|
+
isEsfProductMatching,
|
|
82
|
+
});
|
|
73
83
|
return isMatching ? [...acc, override.id] : acc;
|
|
74
84
|
}, []);
|
|
75
85
|
return matchs;
|
|
76
86
|
}
|
|
77
87
|
function checkStay(override, stay) {
|
|
88
|
+
if (!stay)
|
|
89
|
+
return false;
|
|
78
90
|
const { stayFrom, stayTo, stayDuration } = override.triggers || {};
|
|
79
|
-
if (!stayFrom || !stayTo
|
|
91
|
+
if (!stayFrom || !stayTo)
|
|
80
92
|
return true;
|
|
81
93
|
const triggerStayFrom = new Date(stayFrom).getTime();
|
|
82
94
|
const triggerStayTo = new Date(stayTo).getTime();
|
|
@@ -91,7 +103,7 @@ function checkStay(override, stay) {
|
|
|
91
103
|
return stayIsBetweenTrigger || stayHasRightDuration;
|
|
92
104
|
}
|
|
93
105
|
function checkMerchants(override, merchants) {
|
|
94
|
-
if (!merchants
|
|
106
|
+
if (!merchants)
|
|
95
107
|
return false;
|
|
96
108
|
const { merchant = "" } = override.triggers || {};
|
|
97
109
|
if (!merchant)
|