@qite/tide-components 1.0.2 → 1.0.4

package/build/build-cjs/index.js

@@ -27370,7 +27370,7 @@ const initialState$1 = {
     currentStep: 0,
     bookingNumber: undefined,
     trajectNodeAvailability: {},
-    trajectFlightsResolved: false
+    trajectFlightAvailability: {}
 };
 const searchResultsSlice = toolkit.createSlice({
     name: 'searchResults',
@@ -27592,16 +27592,38 @@ const searchResultsSlice = toolkit.createSlice({
             const guids = new Set(action.payload);
             state.editablePackagingEntry.lines = (state.editablePackagingEntry.lines ?? []).filter((x) => !guids.has(x.guid));
         },
-        setTrajectFlightsResolved(state, action) {
-            state.trajectFlightsResolved = action.payload;
+        setTrajectFlightLoading(state, action) {
+            const lineGuid = action.payload;
+            state.trajectFlightAvailability[lineGuid] = {
+                lineGuid,
+                status: 'loading',
+                results: state.trajectFlightAvailability[lineGuid]?.results ?? [],
+                selectedGuid: state.trajectFlightAvailability[lineGuid]?.selectedGuid ?? null
+            };
+        },
+        setTrajectFlightAvailability(state, action) {
+            const { lineGuid, results, selectedGuid } = action.payload;
+            state.trajectFlightAvailability[lineGuid] = {
+                lineGuid,
+                status: selectedGuid ? 'resolved' : 'unavailable',
+                results,
+                selectedGuid
+            };
+        },
+        setTrajectFlightSelection(state, action) {
+            const flight = state.trajectFlightAvailability[action.payload.lineGuid];
+            if (!flight)
+                return;
+            flight.selectedGuid = action.payload.guid;
+            flight.status = 'resolved';
         },
         resetTrajectAvailability(state) {
             state.trajectNodeAvailability = {};
-            state.trajectFlightsResolved = false;
+            state.trajectFlightAvailability = {};
         }
     }
 });
-const { setResults, setFilteredResults, setSelectedSearchResult, setPackagingAccoResults, setFilteredPackagingAccoResults, setFilteredPackagingFlightResults, setPackagingAccoSearchDetails, setSelectedPackagingAccoResult, setPackagingFlightResults, setSelectedPackagingFlight, setSelectedFlight, setSelectedFlightDetails, setBookingPackageDetails, selectFlight, setIsLoading, setFlightsLoading, setInitialFilters, setFilters, resetFilters, setInitialFlightFilters, setFlightFilters, resetFlightFilters, setSortType, setFlightSortType, setActiveTab, setCurrentPage, resetSearchState, setFlyInIsOpen, setEditablePackagingEntry, setTransactionId, setFlyInType, setPriceDetails, setItinerary, setSelectedOutwardKey, setSelectedReturnKey, resetFlightSelection, setExcursionSearchParams, setSelectedExcursionSearchResult, confirmExcursionForDay, removeConfirmedExcursionForDay, clearConfirmedExcursionsForDay, setBookPackagingEntry, setCurrentStep, setBookingNumber, setTrajectNodeLoading, setTrajectNodeAvailability, setTrajectNodeSelection, setTrajectFlightsResolved, resetTrajectAvailability, updateEditableEntryLine, removeEditableEntryLines } = searchResultsSlice.actions;
+const { setResults, setFilteredResults, setSelectedSearchResult, setPackagingAccoResults, setFilteredPackagingAccoResults, setFilteredPackagingFlightResults, setPackagingAccoSearchDetails, setSelectedPackagingAccoResult, setPackagingFlightResults, setSelectedPackagingFlight, setSelectedFlight, setSelectedFlightDetails, setBookingPackageDetails, selectFlight, setIsLoading, setFlightsLoading, setInitialFilters, setFilters, resetFilters, setInitialFlightFilters, setFlightFilters, resetFlightFilters, setSortType, setFlightSortType, setActiveTab, setCurrentPage, resetSearchState, setFlyInIsOpen, setEditablePackagingEntry, setTransactionId, setFlyInType, setPriceDetails, setItinerary, setSelectedOutwardKey, setSelectedReturnKey, resetFlightSelection, setExcursionSearchParams, setSelectedExcursionSearchResult, confirmExcursionForDay, removeConfirmedExcursionForDay, clearConfirmedExcursionsForDay, setBookPackagingEntry, setCurrentStep, setBookingNumber, setTrajectNodeLoading, setTrajectNodeAvailability, setTrajectNodeSelection, setTrajectFlightLoading, setTrajectFlightAvailability, setTrajectFlightSelection, resetTrajectAvailability, updateEditableEntryLine, removeEditableEntryLines } = searchResultsSlice.actions;
 var searchResultsReducer = searchResultsSlice.reducer;
 
 const ItemPicker = ({ items, selection, selectedSortByType, label, placeholder, classModifier, onPick, valueFormatter }) => {
@@ -32967,6 +32989,8 @@ const buildDestination = (line) => {
         return { id: line.region.id, isRegion: true };
     if (line.country?.id)
         return { id: line.country.id, isCountry: true };
+    if (line.latitude && line.longitude)
+        return { latitude: line.latitude, longitude: line.longitude };
     return { id: 0 };
 };
 const buildTrajectNodeRequest = ({ node, line }, context, productCode) => ({
@@ -32986,10 +33010,27 @@ const buildTrajectNodeRequest = ({ node, line }, context, productCode) => ({
     rooms: context.rooms,
     tagIds: []
 });
-const getPreferredCodes = (node) => {
-    const codes = [node.code, node.preferredAccommodationCode, ...(node.alternativeAccommodationCodes ?? [])];
-    return codes.filter((code) => !!code && code.trim().length > 0).filter((code, index, all) => all.indexOf(code) === index);
+const getNodeCandidates = (node) => {
+    const configured = (node.alternatives ?? []).filter((x) => !!x.code && x.code.trim().length > 0);
+    if (configured.length)
+        return configured;
+    const fallbackCode = node.code ?? node.preferredAccommodationCode;
+    if (!fallbackCode || !fallbackCode.trim().length)
+        return [];
+    return [
+        {
+            code: fallbackCode,
+            name: node.name,
+            description: node.description,
+            imageUrl: node.imageUrl,
+            contentSource: node.contentSource,
+            vendor: node.vendor,
+            externalVendorId: node.externalVendorId,
+            isPreferred: true
+        }
+    ];
 };
+const findCandidateForResult = (node, result) => getNodeCandidates(node).find((candidate) => matchesCode(result, candidate.code)) ?? null;
 const matchesCode = (result, code) => {
     if (result.code === code)
         return true;
@@ -33053,8 +33094,26 @@ const mapFlightSegmentsToFlightLines = (segments) => segments.map((segment) => (
     arrivalAirportDescription: segment.arrivalAirportName,
     durationInTicks: segment.durationInTicks
 }));
-const applyFlightToLine = (line, flight, isOutbound) => {
-    const segments = (isOutbound ? flight.outward?.segments : flight.return?.segments) ?? [];
+const buildTrajectFlightRequest = ({ node, line }, context, pax) => ({
+    transactionId: context.transactionId,
+    officeId: context.officeId,
+    catalogueId: context.catalogueId,
+    agentId: context.agentId ?? null,
+    language: context.language,
+    departureAirportCode: node.departureAirportCode ?? '',
+    arrivalAirportCode: node.arrivalAirportCode ?? '',
+    returnAirportCode: null,
+    luggageIncluded: null,
+    maxStops: null,
+    travelClass: null,
+    vendorConfigurationId: node.externalVendorId ?? null,
+    pax,
+    outward: { date: dateToDateStruct(new Date(line.from)) },
+    return: null
+});
+const pickCheapestFlight = (flights) => [...flights].sort((a, b) => a.price - b.price)[0] ?? null;
+const applyFlightToLine = (line, flight) => {
+    const segments = flight.outward?.segments ?? [];
     if (!segments.length)
         return line;
     const firstSegment = segments[0];
@@ -33074,14 +33133,6 @@ const applyFlightToLine = (line, flight, isOutbound) => {
         isChanged: true
     };
 };
-const pairTrajectFlights = (nodes) => {
-    const flights = nodes.filter((x) => isTrajectFlightNode(x.node));
-    return {
-        outbound: flights[0] ?? null,
-        inbound: flights.length > 1 ? flights[flights.length - 1] : null,
-        unsupported: flights.slice(1, Math.max(flights.length - 1, 1))
-    };
-};
 
 const getLocation = (result) => {
     const place = result.locationName || result.regionName || result.oordName;
@@ -33089,10 +33140,26 @@ const getLocation = (result) => {
         return result.countryName ?? '';
     return result.countryName ? `${place}, ${result.countryName}` : place;
 };
-const TrajectNodeCard = ({ result, isSelected, languageCode, translations, onSelect, showNights }) => {
+const toPlainText = (value) => {
+    if (!value)
+        return '';
+    return he
+        .decode(value.replace(/<[^>]*>/g, ' '))
+        .replace(/\s+/g, ' ')
+        .trim();
+};
+const TrajectNodeCard = ({ item, result, isSelected, languageCode, translations, onSelect, showNights }) => {
+    const { node } = item;
     const selectedOption = lodash.first(result.rooms)?.options?.find((x) => x.isSelected) ?? lodash.first(result.rooms)?.options?.[0];
     const price = formatPrice$3(result.price, result.currencyCode, languageCode);
     const nights = calculateNights(new Date(result.fromDate), new Date(result.toDate));
+    const candidate = findCandidateForResult(node, result);
+    const image = candidate?.imageUrl ?? null;
+    const description = toPlainText(candidate?.description);
+    const title = candidate?.name ?? result.name;
+    const priceBlock = (React__default["default"].createElement("div", { className: "search__result-card__price__wrapper" },
+        React__default["default"].createElement("span", { className: "search__result-card__price__label" }, translations?.SHARED.TOTAL_PRICE),
+        React__default["default"].createElement("span", { className: "search__result-card__price" }, price)));
     const selectButton = (React__default["default"].createElement("button", { type: "button", className: `cta ${isSelected ? 'cta--selected' : 'cta--select'}`, onClick: onSelect }, isSelected ? translations?.SHARED.SELECTED : translations?.SHARED.SELECT));
     if (result.contents?.length) {
         return (React__default["default"].createElement("div", { className: `search__result-card__wrapper search__result-card__wrapper--custom ${isSelected ? 'search__result-card__wrapper--selected' : ''}` },
@@ -33100,21 +33167,22 @@ const TrajectNodeCard = ({ result, isSelected, languageCode, translations, onSel
             React__default["default"].createElement("div", { className: "search__result-card__footer" }, selectButton)));
     }
     return (React__default["default"].createElement("div", { className: `search__result-card__wrapper ${isSelected ? 'search__result-card__wrapper--selected' : ''}` },
+        image && (React__default["default"].createElement("div", { className: "search__result-card__img-wrapper" },
+            React__default["default"].createElement("img", { src: image, alt: title, className: "search__result-card__img" }),
+            priceBlock)),
         React__default["default"].createElement("div", { className: "search__result-card__content" },
             React__default["default"].createElement("div", { className: "search__result-card__content__wrapper" },
                 React__default["default"].createElement("div", { className: "search__result-card__header" },
                     React__default["default"].createElement("div", { className: "search__result-card__header__wrapper" },
                         !!result.stars && (React__default["default"].createElement("div", { className: "rating" }, [...Array(result.stars)].map((_, index) => (React__default["default"].createElement(Icon, { name: "ui-star", key: `rating-star-${index + 1}`, width: 14, height: 14 }))))),
-                        React__default["default"].createElement("h3", { className: "search__result-card__title" }, result.name)),
-                    React__default["default"].createElement("div", { className: "search__result-card__price__wrapper" },
-                        React__default["default"].createElement("span", { className: "search__result-card__price__label" }, translations?.SHARED.TOTAL_PRICE),
-                        React__default["default"].createElement("span", { className: "search__result-card__price" }, price))),
+                        React__default["default"].createElement("h3", { className: "search__result-card__title" }, title)),
+                    !image && priceBlock),
                 React__default["default"].createElement("span", { className: "search__result-card__location" },
                     React__default["default"].createElement(Icon, { name: "ui-location", height: 16 }),
                     getLocation(result)),
                 React__default["default"].createElement("div", { className: "search__result-card__options" },
                     showNights && nights > 0 && (React__default["default"].createElement("div", { className: "search__result-card__option" },
-                        React__default["default"].createElement(Icon, { name: "ui-bed", height: 16 }),
+                        React__default["default"].createElement(Icon, { name: "ui-moon", height: 16 }),
                         nights,
                         " ",
                         translations?.SRP.NIGHTS)),
@@ -33123,7 +33191,8 @@ const TrajectNodeCard = ({ result, isSelected, languageCode, translations, onSel
                         selectedOption.accommodationName)),
                     selectedOption?.regimeName && (React__default["default"].createElement("div", { className: "search__result-card__option" },
                         React__default["default"].createElement(Icon, { name: "ui-utensils", height: 16 }),
-                        selectedOption.regimeName)))),
+                        selectedOption.regimeName))),
+                description && React__default["default"].createElement("p", { className: "search__result-card__description" }, description)),
             React__default["default"].createElement("div", { className: "search__result-card__footer" }, selectButton))));
 };
 
@@ -33141,15 +33210,10 @@ const TrajectResults = ({ isLoading }) => {
     const dispatch = reactRedux.useDispatch();
     const translations = getTranslations(context?.languageCode ?? 'en-GB');
     const locale = getLocale(context?.languageCode ?? 'en-GB');
-    const { trajectNodeAvailability, flightsLoading, trajectFlightsResolved, selectedOutwardKey, selectedReturnKey } = reactRedux.useSelector((state) => state.searchResults);
-    const uniqueOutwardFlights = reactRedux.useSelector(selectUniqueOutwardFlights);
-    const uniqueReturnFlights = reactRedux.useSelector(selectUniqueReturnFlights);
-    const selectedOutward = reactRedux.useSelector(selectSelectedOutward);
-    const selectedReturn = reactRedux.useSelector(selectSelectedReturn);
+    const { trajectNodeAvailability, trajectFlightAvailability } = reactRedux.useSelector((state) => state.searchResults);
     const [expandedNodes, setExpandedNodes] = React.useState({});
     const trajectEntry = context?.trajectEntry;
     const nodesWithLines = React.useMemo(() => (trajectEntry ? getTrajectNodesWithLines(trajectEntry) : []), [trajectEntry]);
-    const flightPairing = React.useMemo(() => pairTrajectFlights(nodesWithLines), [nodesWithLines]);
     const lineByNodeId = React.useMemo(() => new Map(nodesWithLines.map((x) => [x.node.nodeId, x])), [nodesWithLines]);
     const nodesByDay = React.useMemo(() => {
         const map = new Map();
@@ -33174,12 +33238,14 @@ const TrajectResults = ({ isLoading }) => {
         dispatch(updateEditableEntryLine(applyResultToLine(item.line, result)));
     };
     const renderServiceNode = (item) => {
+        console.log('renderServiceNode', item);
         const { node, line } = item;
         const availability = trajectNodeAvailability[line.guid];
         const isExpanded = !!expandedNodes[line.guid];
         const results = availability?.results ?? [];
         const selected = results.find((x) => x.code === availability?.selectedCode) ?? null;
-        const alternatives = results.filter((x) => x.code !== availability?.selectedCode);
+        const configured = results.filter((x) => x.code !== selected?.code && !!findCandidateForResult(node, x));
+        const others = results.filter((x) => x.code !== selected?.code && !findCandidateForResult(node, x));
         // No entry yet means the node's search has been queued but not dispatched — still loading.
         const status = availability?.status ?? 'loading';
         return (React__default["default"].createElement(React__default["default"].Fragment, { key: line.guid },
@@ -33188,9 +33254,7 @@ const TrajectResults = ({ isLoading }) => {
                     React__default["default"].createElement("p", { className: "search__results__label__date-date" }, dateFns.format(new Date(line.from), 'd', { locale })),
                     React__default["default"].createElement("p", null, dateFns.format(new Date(line.from), 'MMM', { locale }))),
                 React__default["default"].createElement("div", { className: "search__results__label__text" },
-                    React__default["default"].createElement(Icon, { name: getNodeIcon(node), height: 16 }),
-                    React__default["default"].createElement("h3", null,
-                        React__default["default"].createElement("strong", null, node.name)))),
+                    React__default["default"].createElement(Icon, { name: getNodeIcon(node), height: 16 }))),
             status === 'loading' && (React__default["default"].createElement(Spinner, { label: node.serviceType === EXCURSION_SERVICE_TYPE ? translations.SRP.LOADING_EXCURSIONS : translations.SRP.LOADING_ACCOMMODATIONS })),
             status === 'unavailable' && React__default["default"].createElement("div", { className: "no-results" }, translations.SRP.NO_RESULTS),
             status === 'resolved' && selected && (React__default["default"].createElement(React__default["default"].Fragment, null,
@@ -33199,37 +33263,23 @@ const TrajectResults = ({ isLoading }) => {
                         node.preferredAccommodationName,
                         " \u2014 ",
                         translations.SRP.NO_RESULTS))),
-                React__default["default"].createElement("div", { className: "search__results__cards search__results__cards--extended" },
-                    React__default["default"].createElement(TrajectNodeCard, { result: selected, isSelected: true, languageCode: context.languageCode, translations: translations, onSelect: () => handleSelect(item, selected.code), showNights: node.serviceType === ACCOMMODATION_SERVICE_TYPE }),
-                    isExpanded &&
-                        alternatives.map((result) => (React__default["default"].createElement(TrajectNodeCard, { key: result.code, result: result, isSelected: false, languageCode: context.languageCode, translations: translations, onSelect: () => handleSelect(item, result.code), showNights: node.serviceType === ACCOMMODATION_SERVICE_TYPE })))),
-                alternatives.length > 0 && (React__default["default"].createElement("div", { className: "search__results__cards__actions" },
-                    React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => toggleExpanded(line.guid) }, isExpanded ? translations.SRP.SHOW_LESS : `${translations.SRP.SHOW_MORE} (${alternatives.length})`)))))));
+                React__default["default"].createElement("div", { className: "search__results__cards search__results__cards--extended" }, [selected, ...configured, ...(isExpanded ? others : [])].map((result) => (React__default["default"].createElement(TrajectNodeCard, { key: result.code, item: item, result: result, isSelected: result.code === selected.code, languageCode: context.languageCode, translations: translations, onSelect: () => handleSelect(item, result.code), showNights: node.serviceType === ACCOMMODATION_SERVICE_TYPE })))),
+                others.length > 0 && (React__default["default"].createElement("div", { className: "search__results__cards__actions" },
+                    React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => toggleExpanded(line.guid) }, isExpanded ? translations.SRP.SHOW_LESS : `${translations.SRP.SHOW_MORE} (${others.length})`)))))));
+    };
+    const handleSelectFlight = (item, flight) => {
+        dispatch(setTrajectFlightSelection({ lineGuid: item.line.guid, guid: flight.outwardGuid }));
+        dispatch(updateEditableEntryLine(applyFlightToLine(item.line, flight)));
     };
     const renderFlightNode = (item) => {
         const { node, line } = item;
-        const isOutbound = flightPairing.outbound?.node.nodeId === node.nodeId;
-        const isInbound = flightPairing.inbound?.node.nodeId === node.nodeId;
-        // A middle leg of a multi-flight traject: the round-trip flight search cannot express it.
-        if (!isOutbound && !isInbound) {
-            return (React__default["default"].createElement(React__default["default"].Fragment, { key: line.guid },
-                React__default["default"].createElement("div", { className: "search__results__label search__results__label--secondary" },
-                    React__default["default"].createElement("div", { className: "search__results__label__date" },
-                        React__default["default"].createElement("p", { className: "search__results__label__date-date" }, dateFns.format(new Date(line.from), 'd', { locale })),
-                        React__default["default"].createElement("p", null, dateFns.format(new Date(line.from), 'MMM', { locale }))),
-                    React__default["default"].createElement("div", { className: "search__results__label__text" },
-                        React__default["default"].createElement(Icon, { name: "ui-flight", height: 16 }),
-                        React__default["default"].createElement("h3", null,
-                            React__default["default"].createElement("strong", null, node.name)))),
-                React__default["default"].createElement("div", { className: "no-results" },
-                    node.departureAirportCode,
-                    " \u2192 ",
-                    node.arrivalAirportCode)));
-        }
-        const flights = isOutbound ? uniqueOutwardFlights : uniqueReturnFlights;
-        const selectedFlight = isOutbound ? selectedOutward : selectedReturn;
-        const selectedKey = isOutbound ? selectedOutwardKey : selectedReturnKey;
-        const visible = flights.filter((x) => getFlightKey(isOutbound ? x.outward.segments : x.return.segments) !== selectedKey);
+        const availability = trajectFlightAvailability[line.guid];
+        const status = availability?.status ?? 'loading';
+        const flights = availability?.results ?? [];
+        const selected = flights.find((x) => x.outwardGuid === availability?.selectedGuid) ?? null;
+        const others = flights.filter((x) => x.outwardGuid !== availability?.selectedGuid);
+        const isExpanded = !!expandedNodes[line.guid];
+        const visible = isExpanded ? others : others.slice(0, 2);
         return (React__default["default"].createElement(React__default["default"].Fragment, { key: line.guid },
             React__default["default"].createElement("div", { className: "search__results__label search__results__label--secondary" },
                 React__default["default"].createElement("div", { className: "search__results__label__date" },
@@ -33239,42 +33289,37 @@ const TrajectResults = ({ isLoading }) => {
                     React__default["default"].createElement(Icon, { name: "ui-flight", height: 16 }),
                     React__default["default"].createElement("h3", null,
                         translations.SRP.SELECT,
-                        " ",
-                        React__default["default"].createElement("strong", null, isOutbound ? translations.SRP.DEPARTURE : translations.SRP.RETURN)))),
-            flightsLoading || !trajectFlightsResolved ? (React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_FLIGHTS })) : flights.length === 0 ? (React__default["default"].createElement("div", { className: "no-results" }, translations.SRP.NO_RESULTS)) : (React__default["default"].createElement("div", { className: "search__results__cards search__results__cards--extended" },
-                selectedFlight && (React__default["default"].createElement(IndependentFlightOption, { key: `flight-${selectedKey}`, item: isOutbound ? selectedFlight.outward : selectedFlight.return, guid: selectedFlight.outwardGuid, selectedGuid: selectedFlight.outwardGuid, isOutward: isOutbound, showSelectedState: true, price: selectedFlight.price, onSelect: isOutbound ? () => dispatch(setSelectedOutwardKey(null)) : undefined })),
-                visible.map((result) => (React__default["default"].createElement(IndependentFlightOption, { key: `flight-${result.outwardGuid}`, item: isOutbound ? result.outward : result.return, guid: result.outwardGuid, isOutward: isOutbound, price: result.price, currentSelectedPrice: selectedFlight?.price, onSelect: () => dispatch(isOutbound ? setSelectedOutwardKey(getFlightKey(result.outward.segments)) : setSelectedReturnKey(getFlightKey(result.return.segments))) })))))));
-    };
-    /** Connecting markers and points of interest: shown for context, nothing to book. */
-    const renderContextNode = (node) => (React__default["default"].createElement("div", { className: "search__results__cards__actions", key: `${node.nodeId}-context` },
-        React__default["default"].createElement("span", null,
-            React__default["default"].createElement(Icon, { name: "ui-car", height: 14 }),
-            " ",
-            node.name,
-            node.distanceInKm ? ` — ${Math.round(node.distanceInKm)} km` : '')));
+                        ' ',
+                        React__default["default"].createElement("strong", null,
+                            node.departureAirportCode,
+                            " - ",
+                            node.arrivalAirportCode)))),
+            status === 'loading' && React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_FLIGHTS }),
+            status === 'unavailable' && React__default["default"].createElement("div", { className: "no-results" }, translations.SRP.NO_RESULTS),
+            status === 'resolved' && selected && (React__default["default"].createElement(React__default["default"].Fragment, null,
+                React__default["default"].createElement("div", { className: "search__results__cards search__results__cards--extended" },
+                    React__default["default"].createElement(IndependentFlightOption, { key: `flight-${selected.outwardGuid}`, item: selected.outward, guid: selected.outwardGuid, selectedGuid: selected.outwardGuid, isOutward: true, showSelectedState: true, price: selected.price }),
+                    visible.map((result) => (React__default["default"].createElement(IndependentFlightOption, { key: `flight-${result.outwardGuid}`, item: result.outward, guid: result.outwardGuid, isOutward: true, price: result.price, currentSelectedPrice: selected.price, onSelect: () => handleSelectFlight(item, result) })))),
+                others.length > 2 && (React__default["default"].createElement("div", { className: "search__results__cards__actions" },
+                    React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => toggleExpanded(line.guid) }, isExpanded ? translations.SRP.SHOW_LESS : `${translations.SRP.SHOW_MORE} (${others.length - 2})`)))))));
+    };
     if (isLoading)
         return React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_ITINERARY });
     return (React__default["default"].createElement(React__default["default"].Fragment, null, trajectEntry.traject.days.map((day) => {
         const dayNodes = nodesByDay.get(day.order) ?? [];
         if (!dayNodes.length)
             return null;
-        return (React__default["default"].createElement(React__default["default"].Fragment, { key: `day-${day.order}` },
-            React__default["default"].createElement("div", { className: "search__results__label" },
-                React__default["default"].createElement("div", { className: "search__results__label__text" },
-                    React__default["default"].createElement("h2", null,
-                        translations.ITINERARY.DAY,
-                        " ",
-                        day.order + 1,
-                        day.name ? ` — ${day.name}` : ''),
-                    React__default["default"].createElement("span", null, dateFns.format(new Date(day.date), 'EEEE d MMMM yyyy', { locale })))),
-            dayNodes.map((node) => {
-                if (node.trajectNodeType !== REGULAR_TRAJECT_NODE_TYPE)
-                    return renderContextNode(node);
-                const item = lineByNodeId.get(node.nodeId);
-                if (!item)
-                    return renderContextNode(node);
-                return isTrajectFlightNode(node) ? renderFlightNode(item) : renderServiceNode(item);
-            })));
+        return (React__default["default"].createElement(React__default["default"].Fragment, { key: `day-${day.order}` }, dayNodes.map((node) => {
+            // if (node.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE) return null;
+            // if (node.trajectNodeType !== REGULAR_TRAJECT_NODE_TYPE) return renderContextNode(node);
+            if (node.trajectNodeType !== REGULAR_TRAJECT_NODE_TYPE)
+                return null;
+            const item = lineByNodeId.get(node.nodeId);
+            // if (!item) return renderContextNode(node);
+            if (!item)
+                return null;
+            return isTrajectFlightNode(node) ? renderFlightNode(item) : renderServiceNode(item);
+        })));
     })));
 };
 
@@ -33282,7 +33327,6 @@ const useTrajectAvailability = () => {
     const context = React.useContext(SearchResultsConfigurationContext);
     const dispatch = reactRedux.useDispatch();
     const trajectEntry = context?.trajectEntry;
-    const selectedCombinationFlight = reactRedux.useSelector(selectSelectedCombinationFlight);
     React.useEffect(() => {
         if (!context || !trajectEntry)
             return;
@@ -33302,31 +33346,40 @@ const useTrajectAvailability = () => {
             language: context.languageCode ?? 'en-GB',
             rooms: getPackagingRoomsFromEntry(trajectEntry.entry)
         };
+        // Flight searches take passengers rather than rooms; the API buckets by age.
+        const pax = trajectEntry.entry.pax ?? [];
+        const ageOf = (p) => p.age ?? 30;
+        const adults = pax.filter((p) => ageOf(p) >= 12).length;
+        const kids = pax.filter((p) => ageOf(p) >= 2 && ageOf(p) < 12).length;
+        const babies = pax.filter((p) => ageOf(p) < 2).length;
+        const flightPax = lodash.concat(Array.from({ length: adults }, (_, index) => ({ id: index, age: 31 })), Array.from({ length: kids }, (_, index) => ({ id: index + adults, age: 8 })), Array.from({ length: babies }, (_, index) => ({ id: index + adults + kids, age: 1 })));
         const nodesWithLines = getTrajectNodesWithLines(trajectEntry);
         const resolveNode = async (item) => {
             const lineGuid = item.line.guid;
             const search = item.node.serviceType === EXCURSION_SERVICE_TYPE ? build.searchPackagingExcursions : build.searchPackagingAccommodations;
             dispatch(setTrajectNodeLoading(lineGuid));
             try {
-                const preferredCodes = getPreferredCodes(item.node);
-                let results = [];
-                let picked = null;
-                // Try the traject's own product/hotel codes first, in configured order.
-                for (const code of preferredCodes) {
-                    const attempt = await search(config, buildTrajectNodeRequest(item, searchContext, code), controller.signal);
-                    const hit = (attempt ?? []).find((result) => matchesCode(result, code));
-                    if (hit) {
-                        results = attempt;
-                        picked = hit;
-                        break;
+                const candidates = getNodeCandidates(item.node);
+                const attempts = await Promise.all(candidates.map(async (candidate) => {
+                    try {
+                        const attempt = await search(config, buildTrajectNodeRequest(item, searchContext, candidate.code), controller.signal);
+                        return (attempt ?? []).find((result) => matchesCode(result, candidate.code)) ?? null;
                     }
-                }
-                let preferredUnavailable = false;
+                    catch (error) {
+                        if (!controller.signal.aborted)
+                            console.error('Traject hotel unavailable', candidate.code, error);
+                        return null;
+                    }
+                }));
+                let results = attempts.filter((x) => !!x).filter((x, i, all) => all.findIndex((y) => y.code === x.code) === i);
+                let picked = results[0] ?? null;
+                const preferredCandidate = candidates.find((x) => x.isPreferred) ?? candidates[0];
+                let preferredUnavailable = !!preferredCandidate && !results.some((x) => matchesCode(x, preferredCandidate.code));
                 // Nothing configured was available — fall back to the cheapest result in the destination.
                 if (!picked) {
                     results = (await search(config, buildTrajectNodeRequest(item, searchContext, ''), controller.signal)) ?? [];
                     picked = pickCheapest(results);
-                    preferredUnavailable = preferredCodes.length > 0;
+                    preferredUnavailable = candidates.length > 0;
                 }
                 if (controller.signal.aborted)
                     return null;
@@ -33349,59 +33402,36 @@ const useTrajectAvailability = () => {
                 return lineGuid;
             }
         };
-        const resolveFlights = async () => {
-            const { outbound, inbound } = pairTrajectFlights(nodesWithLines);
-            if (!outbound) {
-                dispatch(setTrajectFlightsResolved(true));
-                return;
+        const resolveFlightNode = async (item) => {
+            const lineGuid = item.line.guid;
+            if (!item.node.departureAirportCode || !item.node.arrivalAirportCode) {
+                dispatch(setTrajectFlightAvailability({ lineGuid, results: [], selectedGuid: null }));
+                return lineGuid;
             }
-            dispatch(setFlightsLoading(true));
+            dispatch(setTrajectFlightLoading(lineGuid));
             try {
-                const pax = trajectEntry.entry.pax ?? [];
-                const ageOf = (p) => p.age ?? 30;
-                const adults = pax.filter((p) => ageOf(p) >= 12).length;
-                const kids = pax.filter((p) => ageOf(p) >= 2 && ageOf(p) < 12).length;
-                const babies = pax.filter((p) => ageOf(p) < 2).length;
-                const request = {
-                    transactionId: trajectEntry.entry.transactionId,
-                    officeId: searchContext.officeId,
-                    catalogueId: searchContext.catalogueId,
-                    agentId: searchContext.agentId,
-                    language: searchContext.language,
-                    departureAirportCode: outbound.node.departureAirportCode ?? '',
-                    arrivalAirportCode: outbound.node.arrivalAirportCode ?? '',
-                    returnAirportCode: inbound?.node.arrivalAirportCode ?? outbound.node.departureAirportCode ?? null,
-                    luggageIncluded: null,
-                    maxStops: null,
-                    travelClass: null,
-                    pax: lodash.concat(Array.from({ length: adults }, (_, index) => ({ id: index, age: 31 })), Array.from({ length: kids }, (_, index) => ({ id: index + adults, age: 8 })), Array.from({ length: babies }, (_, index) => ({ id: index + adults + kids, age: 1 }))),
-                    outward: { date: dateToDateStruct(new Date(outbound.line.from)) },
-                    return: { date: dateToDateStruct(new Date((inbound ?? outbound).line.from)) }
-                };
-                const flights = (await build.searchPackagingFlights(config, request, controller.signal)) ?? [];
+                const flights = (await build.searchPackagingFlights(config, buildTrajectFlightRequest(item, searchContext, flightPax), controller.signal)) ?? [];
                 if (controller.signal.aborted)
-                    return;
-                dispatch(setPackagingFlightResults(flights));
-                const firstFlight = lodash.first(flights);
-                if (firstFlight) {
-                    dispatch(setSelectedOutwardKey(getFlightKey(firstFlight.outward.segments)));
-                    dispatch(setSelectedReturnKey(getFlightKey(firstFlight.return.segments)));
-                }
+                    return null;
+                const picked = pickCheapestFlight(flights);
+                dispatch(setTrajectFlightAvailability({ lineGuid, results: flights, selectedGuid: picked?.outwardGuid ?? null }));
+                if (!picked)
+                    return lineGuid;
+                dispatch(updateEditableEntryLine(applyFlightToLine(item.line, picked)));
+                return null;
             }
             catch (error) {
-                if (!controller.signal.aborted)
-                    console.error('Failed to resolve traject flights', error);
-            }
-            finally {
-                if (!controller.signal.aborted) {
-                    dispatch(setFlightsLoading(false));
-                    dispatch(setTrajectFlightsResolved(true));
-                }
+                if (controller.signal.aborted)
+                    return null;
+                console.error('Failed to resolve traject flight', item.node.name, error);
+                dispatch(setTrajectFlightAvailability({ lineGuid, results: [], selectedGuid: null }));
+                return lineGuid;
             }
         };
         (async () => {
             const searchable = nodesWithLines.filter((x) => isSearchableTrajectNode(x.node));
-            const [unresolved] = await Promise.all([Promise.all(searchable.map(resolveNode)), resolveFlights()]);
+            const flightNodes = nodesWithLines.filter((x) => isTrajectFlightNode(x.node));
+            const unresolved = await Promise.all([...searchable.map(resolveNode), ...flightNodes.map(resolveFlightNode)]);
             if (controller.signal.aborted)
                 return;
             // A node with no availability anywhere cannot be priced or booked, so its line comes off
@@ -33412,16 +33442,6 @@ const useTrajectAvailability = () => {
         })();
         return () => controller.abort();
     }, [trajectEntry]);
-    // Keep the traject's own flight lines in step with whatever outward/return the user picks.
-    React.useEffect(() => {
-        if (!trajectEntry || !selectedCombinationFlight)
-            return;
-        const { outbound, inbound } = pairTrajectFlights(getTrajectNodesWithLines(trajectEntry));
-        if (outbound)
-            dispatch(updateEditableEntryLine(applyFlightToLine(outbound.line, selectedCombinationFlight, true)));
-        if (inbound)
-            dispatch(updateEditableEntryLine(applyFlightToLine(inbound.line, selectedCombinationFlight, false)));
-    }, [trajectEntry, selectedCombinationFlight]);
 };
 
 const SearchResultsContainer = ({ onBookingStarted }) => {

package/build/build-cjs/src/search-results/components/traject/traject-node-card.d.ts

@@ -1,6 +1,8 @@
 import React from 'react';
 import { PackagingAccommodationResponse } from '@qite/tide-client';
+import { TrajectNodeWithLine } from '../../utils/traject-utils';
 interface TrajectNodeCardProps {
+    item: TrajectNodeWithLine;
     result: PackagingAccommodationResponse;
     isSelected: boolean;
     languageCode?: string;

package/build/build-cjs/src/search-results/store/search-results-slice.d.ts

@@ -40,7 +40,8 @@ export interface SearchResultsState {
     bookingNumber?: string;
     /** Per-traject-node availability, keyed by the entry line guid the node maps to. */
     trajectNodeAvailability: Record<string, TrajectNodeAvailability>;
-    trajectFlightsResolved: boolean;
+    /** Per-flight-node one-way search results, keyed by the entry line guid. */
+    trajectFlightAvailability: Record<string, TrajectFlightAvailability>;
 }
 export type TrajectNodeStatus = 'idle' | 'loading' | 'resolved' | 'unavailable';
 export interface TrajectNodeAvailability {
@@ -50,6 +51,12 @@ export interface TrajectNodeAvailability {
     selectedCode: string | null;
     preferredUnavailable: boolean;
 }
+export interface TrajectFlightAvailability {
+    lineGuid: string;
+    status: TrajectNodeStatus;
+    results: PackagingFlightResponse[];
+    selectedGuid: string | null;
+}
 export declare const setResults: import("@reduxjs/toolkit").ActionCreatorWithPayload<BookingPackageItem[], "searchResults/setResults">, setFilteredResults: import("@reduxjs/toolkit").ActionCreatorWithPayload<BookingPackageItem[], "searchResults/setFilteredResults">, setSelectedSearchResult: import("@reduxjs/toolkit").ActionCreatorWithPayload<BookingPackageItem | null, "searchResults/setSelectedSearchResult">, setPackagingAccoResults: import("@reduxjs/toolkit").ActionCreatorWithPayload<PackagingAccommodationResponse[], "searchResults/setPackagingAccoResults">, setFilteredPackagingAccoResults: import("@reduxjs/toolkit").ActionCreatorWithPayload<PackagingAccommodationResponse[], "searchResults/setFilteredPackagingAccoResults">, setFilteredPackagingFlightResults: import("@reduxjs/toolkit").ActionCreatorWithPayload<PackagingFlightResponse[], "searchResults/setFilteredPackagingFlightResults">, setPackagingAccoSearchDetails: import("@reduxjs/toolkit").ActionCreatorWithPayload<PackagingAccommodationResponse[], "searchResults/setPackagingAccoSearchDetails">, setSelectedPackagingAccoResult: import("@reduxjs/toolkit").ActionCreatorWithPayload<string | null, "searchResults/setSelectedPackagingAccoResult">, setPackagingFlightResults: import("@reduxjs/toolkit").ActionCreatorWithPayload<PackagingFlightResponse[], "searchResults/setPackagingFlightResults">, setSelectedPackagingFlight: import("@reduxjs/toolkit").ActionCreatorWithPayload<PackagingFlightResponse | null, "searchResults/setSelectedPackagingFlight">, setSelectedFlight: import("@reduxjs/toolkit").ActionCreatorWithPayload<ExtendedFlightSearchResponseItem | null, "searchResults/setSelectedFlight">, setSelectedFlightDetails: import("@reduxjs/toolkit").ActionCreatorWithPayload<ExtendedFlightSearchResponseItem | null, "searchResults/setSelectedFlightDetails">, setBookingPackageDetails: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     details: BookingPackage;
 }, "searchResults/setBookingPackageDetails">, selectFlight: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
@@ -71,6 +78,13 @@ export declare const setResults: import("@reduxjs/toolkit").ActionCreatorWithPay
 }, "searchResults/setTrajectNodeAvailability">, setTrajectNodeSelection: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     lineGuid: string;
     code: string;
-}, "searchResults/setTrajectNodeSelection">, setTrajectFlightsResolved: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "searchResults/setTrajectFlightsResolved">, resetTrajectAvailability: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"searchResults/resetTrajectAvailability">, updateEditableEntryLine: import("@reduxjs/toolkit").ActionCreatorWithPayload<PackagingEntryLine, "searchResults/updateEditableEntryLine">, removeEditableEntryLines: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "searchResults/removeEditableEntryLines">;
+}, "searchResults/setTrajectNodeSelection">, setTrajectFlightLoading: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "searchResults/setTrajectFlightLoading">, setTrajectFlightAvailability: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    lineGuid: string;
+    results: PackagingFlightResponse[];
+    selectedGuid: string | null;
+}, "searchResults/setTrajectFlightAvailability">, setTrajectFlightSelection: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    lineGuid: string;
+    guid: string;
+}, "searchResults/setTrajectFlightSelection">, resetTrajectAvailability: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"searchResults/resetTrajectAvailability">, updateEditableEntryLine: import("@reduxjs/toolkit").ActionCreatorWithPayload<PackagingEntryLine, "searchResults/updateEditableEntryLine">, removeEditableEntryLines: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "searchResults/removeEditableEntryLines">;
 declare const _default: import("@reduxjs/toolkit").Reducer<SearchResultsState>;
 export default _default;

package/build/build-cjs/src/search-results/utils/traject-utils.d.ts

@@ -1,5 +1,6 @@
-import { PackagingAccommodationRequest, PackagingAccommodationResponse, PackagingEntry, PackagingEntryLine, PackagingFlightResponse, PackagingRoom, PackagingTrajectNode, PackagingTrajectResponse } from '@qite/tide-client';
+import { FlightSearchRequest, PackagingAccommodationRequest, PackagingAccommodationResponse, PackagingEntry, PackagingEntryLine, PackagingFlightResponse, PackagingRoom, PackagingTrajectAlternative, PackagingTrajectNode, PackagingTrajectResponse } from '@qite/tide-client';
 export declare const REGULAR_TRAJECT_NODE_TYPE = 0;
+export declare const CONNECTING_TRAJECT_NODE_TYPE = 1;
 export interface TrajectNodeWithLine {
     node: PackagingTrajectNode;
     line: PackagingEntryLine;
@@ -18,14 +19,12 @@ export interface TrajectSearchContext {
     rooms: PackagingAccommodationRequest['rooms'];
 }
 export declare const buildTrajectNodeRequest: ({ node, line }: TrajectNodeWithLine, context: TrajectSearchContext, productCode: string) => PackagingAccommodationRequest;
-export declare const getPreferredCodes: (node: PackagingTrajectNode) => string[];
+export declare const getNodeCandidates: (node: PackagingTrajectNode) => PackagingTrajectAlternative[];
+export declare const findCandidateForResult: (node: PackagingTrajectNode, result: PackagingAccommodationResponse) => PackagingTrajectAlternative | null;
 export declare const matchesCode: (result: PackagingAccommodationResponse, code: string) => boolean;
 export declare const getPackagingRoomsFromEntry: (entry: PackagingEntry) => PackagingRoom[];
 export declare const pickCheapest: (results: PackagingAccommodationResponse[]) => PackagingAccommodationResponse | null;
 export declare const applyResultToLine: (line: PackagingEntryLine, result: PackagingAccommodationResponse) => PackagingEntryLine;
-export declare const applyFlightToLine: (line: PackagingEntryLine, flight: PackagingFlightResponse, isOutbound: boolean) => PackagingEntryLine;
-export declare const pairTrajectFlights: (nodes: TrajectNodeWithLine[]) => {
-    outbound: TrajectNodeWithLine;
-    inbound: TrajectNodeWithLine | null;
-    unsupported: TrajectNodeWithLine[];
-};
+export declare const buildTrajectFlightRequest: ({ node, line }: TrajectNodeWithLine, context: TrajectSearchContext, pax: FlightSearchRequest["pax"]) => FlightSearchRequest;
+export declare const pickCheapestFlight: (flights: PackagingFlightResponse[]) => PackagingFlightResponse | null;
+export declare const applyFlightToLine: (line: PackagingEntryLine, flight: PackagingFlightResponse) => PackagingEntryLine;