@qite/tide-components 1.0.14-preview.4 → 1.0.14-preview.5

package/build/build-cjs/index.js

@@ -30695,8 +30695,13 @@ const TrajectItinerary = ({ trajectEntry, packagingEntry, translations }) => {
  */
 const isBookedEntryTraject = (trajectEntry) => !!trajectEntry?.entry?.magicLink;
 const NODE_SERVICE_TYPES = new Set([ACCOMMODATION_SERVICE_TYPE, EXCURSION_SERVICE_TYPE, FLIGHT_SERVICE_TYPE]);
+const isBookedRoomLineOf = (line, root) => !!line.parentGuid &&
+    (line.parentGuid === root.guid || line.parentGuid === root.parentGuid) &&
+    line.serviceType === root.serviceType &&
+    line.productCode === root.productCode &&
+    dateFns.isSameDay(new Date(line.from), new Date(root.from));
 /**
- * A room or option line joins its parent's node; a flight line never does — an outward and its
+ * A room or option line joins its service's node; a flight line never does — an outward and its
  * return are separate legs of the trip even though the return points at the outward as parent.
  *
  * Lines that share a group key are one choice (a couple of hotels of which one is picked), so
@@ -30704,16 +30709,13 @@ const NODE_SERVICE_TYPES = new Set([ACCOMMODATION_SERVICE_TYPE, EXCURSION_SERVIC
  */
 const groupNodeLines = (lines) => {
     const groups = [];
-    const groupByGuid = new Map();
     lines.forEach((line) => {
-        const parentGroup = line.serviceType !== FLIGHT_SERVICE_TYPE && line.parentGuid ? groupByGuid.get(line.parentGuid) : undefined;
-        if (parentGroup) {
-            parentGroup.push(line);
+        const service = line.serviceType !== FLIGHT_SERVICE_TYPE ? groups.find((group) => isBookedRoomLineOf(line, group[0])) : undefined;
+        if (service) {
+            service.push(line);
             return;
         }
-        const group = [line];
-        groups.push(group);
-        groupByGuid.set(line.guid, group);
+        groups.push([line]);
     });
     const nodes = [];
     const nodeByGroupKey = new Map();
@@ -30770,11 +30772,13 @@ const buildBookedTrajectEntry = (entry) => {
         date: toDateOnlyString(dateFns.addDays(start, order))
     }));
     const dayOrderOf = (line) => Math.max(dateFns.differenceInCalendarDays(new Date(line.from), start), 0);
-    // Services starting the same day are laid out by where they end: the one that ends soonest opens
-    // the day (an outward flight on 2 Oct) and the one that spans further follows (the stay until 9 Oct).
+    const flights = lodash.sortBy(lines.filter((line) => line.serviceType === FLIGHT_SERVICE_TYPE && isActiveEntryLine(line)), (line) => new Date(line.from).getTime(), (line) => line.order);
+    const outward = lodash.first(flights);
+    const homeward = flights.length > 1 ? lodash.last(flights) : undefined;
+    const placeInDay = (line) => (line === outward ? -1 : line === homeward ? 1 : 0);
     const orderedGroups = groupNodeLines(lines).sort((a, b) => {
         const [lineA, lineB] = [a.lines[0], b.lines[0]];
-        return dayOrderOf(lineA) - dayOrderOf(lineB) || new Date(lineA.to).getTime() - new Date(lineB.to).getTime() || lineA.order - lineB.order;
+        return dayOrderOf(lineA) - dayOrderOf(lineB) || placeInDay(lineA) - placeInDay(lineB) || lineA.order - lineB.order;
     });
     const nodes = orderedGroups.map(({ lines: groupLines, alternatives }, index) => {
         const line = groupLines[0];

package/build/build-esm/index.js

@@ -30666,8 +30666,13 @@ const TrajectItinerary = ({ trajectEntry, packagingEntry, translations }) => {
  */
 const isBookedEntryTraject = (trajectEntry) => !!trajectEntry?.entry?.magicLink;
 const NODE_SERVICE_TYPES = new Set([ACCOMMODATION_SERVICE_TYPE, EXCURSION_SERVICE_TYPE, FLIGHT_SERVICE_TYPE]);
+const isBookedRoomLineOf = (line, root) => !!line.parentGuid &&
+    (line.parentGuid === root.guid || line.parentGuid === root.parentGuid) &&
+    line.serviceType === root.serviceType &&
+    line.productCode === root.productCode &&
+    isSameDay(new Date(line.from), new Date(root.from));
 /**
- * A room or option line joins its parent's node; a flight line never does — an outward and its
+ * A room or option line joins its service's node; a flight line never does — an outward and its
  * return are separate legs of the trip even though the return points at the outward as parent.
  *
  * Lines that share a group key are one choice (a couple of hotels of which one is picked), so
@@ -30675,16 +30680,13 @@ const NODE_SERVICE_TYPES = new Set([ACCOMMODATION_SERVICE_TYPE, EXCURSION_SERVIC
  */
 const groupNodeLines = (lines) => {
     const groups = [];
-    const groupByGuid = new Map();
     lines.forEach((line) => {
-        const parentGroup = line.serviceType !== FLIGHT_SERVICE_TYPE && line.parentGuid ? groupByGuid.get(line.parentGuid) : undefined;
-        if (parentGroup) {
-            parentGroup.push(line);
+        const service = line.serviceType !== FLIGHT_SERVICE_TYPE ? groups.find((group) => isBookedRoomLineOf(line, group[0])) : undefined;
+        if (service) {
+            service.push(line);
             return;
         }
-        const group = [line];
-        groups.push(group);
-        groupByGuid.set(line.guid, group);
+        groups.push([line]);
     });
     const nodes = [];
     const nodeByGroupKey = new Map();
@@ -30741,11 +30743,13 @@ const buildBookedTrajectEntry = (entry) => {
         date: toDateOnlyString(addDays(start, order))
     }));
     const dayOrderOf = (line) => Math.max(differenceInCalendarDays(new Date(line.from), start), 0);
-    // Services starting the same day are laid out by where they end: the one that ends soonest opens
-    // the day (an outward flight on 2 Oct) and the one that spans further follows (the stay until 9 Oct).
+    const flights = sortBy(lines.filter((line) => line.serviceType === FLIGHT_SERVICE_TYPE && isActiveEntryLine(line)), (line) => new Date(line.from).getTime(), (line) => line.order);
+    const outward = first(flights);
+    const homeward = flights.length > 1 ? last(flights) : undefined;
+    const placeInDay = (line) => (line === outward ? -1 : line === homeward ? 1 : 0);
     const orderedGroups = groupNodeLines(lines).sort((a, b) => {
         const [lineA, lineB] = [a.lines[0], b.lines[0]];
-        return dayOrderOf(lineA) - dayOrderOf(lineB) || new Date(lineA.to).getTime() - new Date(lineB.to).getTime() || lineA.order - lineB.order;
+        return dayOrderOf(lineA) - dayOrderOf(lineB) || placeInDay(lineA) - placeInDay(lineB) || lineA.order - lineB.order;
     });
     const nodes = orderedGroups.map(({ lines: groupLines, alternatives }, index) => {
         const line = groupLines[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qite/tide-components",
-  "version": "1.0.14-preview.4",
+  "version": "1.0.14-preview.5",
   "description": "React components for Tide (booking, product availability, form, ...)",
   "main": "build/build-cjs/index.js",
   "types": "build/build-cjs/src/index.d.ts",