npm - @qite/tide-components - Versions diffs - 1.0.3 → 1.0.4 - Mend

@qite/tide-components 1.0.3 → 1.0.4

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.

Files changed (7) hide show

package/build/build-cjs/index.js CHANGED Viewed

@@ -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 }) => {
@@ -33072,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];
@@ -33093,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;
@@ -33178,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();
@@ -33211,6 +33238,7 @@ 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];
@@ -33239,30 +33267,19 @@ const TrajectResults = ({ isLoading }) => {
                 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" },
@@ -33272,11 +33289,19 @@ 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))) })))))));
+                        ' ',
+                        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 });
@@ -33302,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;
@@ -33322,6 +33346,13 @@ 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;
@@ -33371,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
@@ -33434,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/store/search-results-slice.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,4 +1,4 @@
-import { PackagingAccommodationRequest, PackagingAccommodationResponse, PackagingEntry, PackagingEntryLine, PackagingFlightResponse, PackagingRoom, PackagingTrajectAlternative, 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 {
@@ -25,9 +25,6 @@ export declare const matchesCode: (result: PackagingAccommodationResponse, code:
 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;

package/build/build-esm/index.js CHANGED Viewed

@@ -27341,7 +27341,7 @@ const initialState$1 = {
     currentStep: 0,
     bookingNumber: undefined,
     trajectNodeAvailability: {},
-    trajectFlightsResolved: false
+    trajectFlightAvailability: {}
 };
 const searchResultsSlice = createSlice({
     name: 'searchResults',
@@ -27563,16 +27563,38 @@ const searchResultsSlice = 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 }) => {
@@ -33043,8 +33065,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];
@@ -33064,14 +33104,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;
@@ -33149,15 +33181,10 @@ const TrajectResults = ({ isLoading }) => {
     const dispatch = useDispatch();
     const translations = getTranslations(context?.languageCode ?? 'en-GB');
     const locale = getLocale(context?.languageCode ?? 'en-GB');
-    const { trajectNodeAvailability, flightsLoading, trajectFlightsResolved, selectedOutwardKey, selectedReturnKey } = useSelector((state) => state.searchResults);
-    const uniqueOutwardFlights = useSelector(selectUniqueOutwardFlights);
-    const uniqueReturnFlights = useSelector(selectUniqueReturnFlights);
-    const selectedOutward = useSelector(selectSelectedOutward);
-    const selectedReturn = useSelector(selectSelectedReturn);
+    const { trajectNodeAvailability, trajectFlightAvailability } = useSelector((state) => state.searchResults);
     const [expandedNodes, setExpandedNodes] = useState({});
     const trajectEntry = context?.trajectEntry;
     const nodesWithLines = useMemo(() => (trajectEntry ? getTrajectNodesWithLines(trajectEntry) : []), [trajectEntry]);
-    const flightPairing = useMemo(() => pairTrajectFlights(nodesWithLines), [nodesWithLines]);
     const lineByNodeId = useMemo(() => new Map(nodesWithLines.map((x) => [x.node.nodeId, x])), [nodesWithLines]);
     const nodesByDay = useMemo(() => {
         const map = new Map();
@@ -33182,6 +33209,7 @@ 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];
@@ -33210,30 +33238,19 @@ const TrajectResults = ({ isLoading }) => {
                 others.length > 0 && (React__default.createElement("div", { className: "search__results__cards__actions" },
                     React__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.createElement(React__default.Fragment, { key: line.guid },
-                React__default.createElement("div", { className: "search__results__label search__results__label--secondary" },
-                    React__default.createElement("div", { className: "search__results__label__date" },
-                        React__default.createElement("p", { className: "search__results__label__date-date" }, format$2(new Date(line.from), 'd', { locale })),
-                        React__default.createElement("p", null, format$2(new Date(line.from), 'MMM', { locale }))),
-                    React__default.createElement("div", { className: "search__results__label__text" },
-                        React__default.createElement(Icon, { name: "ui-flight", height: 16 }),
-                        React__default.createElement("h3", null,
-                            React__default.createElement("strong", null, node.name)))),
-                React__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.createElement(React__default.Fragment, { key: line.guid },
             React__default.createElement("div", { className: "search__results__label search__results__label--secondary" },
                 React__default.createElement("div", { className: "search__results__label__date" },
@@ -33243,11 +33260,19 @@ const TrajectResults = ({ isLoading }) => {
                     React__default.createElement(Icon, { name: "ui-flight", height: 16 }),
                     React__default.createElement("h3", null,
                         translations.SRP.SELECT,
-                        " ",
-                        React__default.createElement("strong", null, isOutbound ? translations.SRP.DEPARTURE : translations.SRP.RETURN)))),
-            flightsLoading || !trajectFlightsResolved ? (React__default.createElement(Spinner, { label: translations.SRP.LOADING_FLIGHTS })) : flights.length === 0 ? (React__default.createElement("div", { className: "no-results" }, translations.SRP.NO_RESULTS)) : (React__default.createElement("div", { className: "search__results__cards search__results__cards--extended" },
-                selectedFlight && (React__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.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))) })))))));
+                        ' ',
+                        React__default.createElement("strong", null,
+                            node.departureAirportCode,
+                            " - ",
+                            node.arrivalAirportCode)))),
+            status === 'loading' && React__default.createElement(Spinner, { label: translations.SRP.LOADING_FLIGHTS }),
+            status === 'unavailable' && React__default.createElement("div", { className: "no-results" }, translations.SRP.NO_RESULTS),
+            status === 'resolved' && selected && (React__default.createElement(React__default.Fragment, null,
+                React__default.createElement("div", { className: "search__results__cards search__results__cards--extended" },
+                    React__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.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.createElement("div", { className: "search__results__cards__actions" },
+                    React__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.createElement(Spinner, { label: translations.SRP.LOADING_ITINERARY });
@@ -33273,7 +33298,6 @@ const useTrajectAvailability = () => {
     const context = useContext(SearchResultsConfigurationContext);
     const dispatch = useDispatch();
     const trajectEntry = context?.trajectEntry;
-    const selectedCombinationFlight = useSelector(selectSelectedCombinationFlight);
     useEffect(() => {
         if (!context || !trajectEntry)
             return;
@@ -33293,6 +33317,13 @@ 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 = 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;
@@ -33342,59 +33373,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: 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 = 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
@@ -33405,16 +33413,6 @@ const useTrajectAvailability = () => {
         })();
         return () => controller.abort();
     }, [trajectEntry]);
-    // Keep the traject's own flight lines in step with whatever outward/return the user picks.
-    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-esm/src/search-results/store/search-results-slice.d.ts CHANGED Viewed

@@ -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-esm/src/search-results/utils/traject-utils.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { PackagingAccommodationRequest, PackagingAccommodationResponse, PackagingEntry, PackagingEntryLine, PackagingFlightResponse, PackagingRoom, PackagingTrajectAlternative, 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 {
@@ -25,9 +25,6 @@ export declare const matchesCode: (result: PackagingAccommodationResponse, code:
 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;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@qite/tide-components",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "React components for Tide (booking, product availability, form, ...)",
   "main": "build/build-cjs/index.js",
   "types": "build/build-cjs/src/index.d.ts",
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@jsonurl/jsonurl": "^1.1.4",
     "@popperjs/core": "^2.10.2",
-    "@qite/tide-client": "^2.0.12",
+    "@qite/tide-client": "^2.0.13",
     "@reduxjs/toolkit": "^2.8.2",
     "@rollup/plugin-commonjs": "^19.0.1",
     "@rollup/plugin-json": "^4.1.0",