@qite/tide-booking-component 1.4.103 → 1.4.105

package/src/search-results/store/search-results-selectors.ts

@@ -0,0 +1,84 @@
+import { createSelector } from '@reduxjs/toolkit';
+import { SearchResultsRootState } from './search-results-store';
+import { getFlightKey } from '../utils/flight-utils';
+import { PackagingFlightResponse } from '@qite/tide-client';
+
+const selectSearchResultsState = (state: SearchResultsRootState) => state.searchResults;
+
+export const selectPackagingAccoResults = createSelector([selectSearchResultsState], (state) => state.packagingAccoResults);
+export const selectSelectedPackagingAccoResultCode = createSelector([selectSearchResultsState], (state) => state.selectedPackagingAccoResultCode);
+export const selectSelectedPackagingAccoResult = createSelector(
+  [selectPackagingAccoResults, selectSelectedPackagingAccoResultCode],
+  (packagingAccoResults, selectedPackagingAccoResultCode) => {
+    if (!selectedPackagingAccoResultCode) return null;
+
+    return packagingAccoResults.find((accoResult) => accoResult.code === selectedPackagingAccoResultCode) ?? null;
+  }
+);
+
+export const selectPackagingFlightResults = createSelector([selectSearchResultsState], (state) => state.packagingFlightResults);
+export const selectFilteredPackagingFlightResults = createSelector([selectSearchResultsState], (state) => state.filteredPackagingFlightResults);
+
+export const selectSelectedOutwardKey = createSelector([selectSearchResultsState], (state) => state.selectedOutwardKey);
+
+export const selectSelectedReturnKey = createSelector([selectSearchResultsState], (state) => state.selectedReturnKey);
+
+export const selectUniqueOutwardFlights = createSelector([selectFilteredPackagingFlightResults], (packagingFlightResults): PackagingFlightResponse[] => {
+  const map = new Map<string, PackagingFlightResponse>();
+
+  packagingFlightResults.forEach((flight) => {
+    const key = getFlightKey(flight.outward.segments);
+
+    if (!map.has(key)) {
+      map.set(key, flight);
+    }
+  });
+
+  return Array.from(map.values());
+});
+
+export const selectUniqueReturnFlights = createSelector(
+  [selectFilteredPackagingFlightResults, selectSelectedOutwardKey],
+  (packagingFlightResults, selectedOutwardKey): PackagingFlightResponse[] => {
+    if (!selectedOutwardKey) return [];
+
+    const matchingCombinations = packagingFlightResults.filter((flight) => getFlightKey(flight.outward.segments) === selectedOutwardKey);
+
+    const map = new Map<string, PackagingFlightResponse>();
+
+    matchingCombinations.forEach((flight) => {
+      const key = getFlightKey(flight.return.segments);
+
+      if (!map.has(key)) {
+        map.set(key, flight);
+      }
+    });
+
+    return Array.from(map.values());
+  }
+);
+
+export const selectSelectedOutward = createSelector([selectPackagingFlightResults, selectSelectedOutwardKey], (packagingFlightResults, selectedOutwardKey) => {
+  if (!selectedOutwardKey) return null;
+
+  return packagingFlightResults.find((flight) => getFlightKey(flight.outward.segments) === selectedOutwardKey) ?? null;
+});
+
+export const selectSelectedReturn = createSelector([selectPackagingFlightResults, selectSelectedReturnKey], (packagingFlightResults, selectedReturnKey) => {
+  if (!selectedReturnKey) return null;
+
+  return packagingFlightResults.find((flight) => getFlightKey(flight.return.segments) === selectedReturnKey) ?? null;
+});
+
+export const selectSelectedCombinationFlight = createSelector(
+  [selectPackagingFlightResults, selectSelectedOutwardKey, selectSelectedReturnKey],
+  (packagingFlightResults, selectedOutwardKey, selectedReturnKey) => {
+    if (!selectedOutwardKey || !selectedReturnKey) return null;
+
+    return (
+      packagingFlightResults.find(
+        (flight) => getFlightKey(flight.outward.segments) === selectedOutwardKey && getFlightKey(flight.return.segments) === selectedReturnKey
+      ) ?? null
+    );
+  }
+);

package/src/search-results/store/search-results-slice.ts

@@ -1,5 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { AccommodationFlyInStep, ExtendedFlightSearchResponseItem, Filter, SortByType } from '../types';
+import { ExcursionSearchParams, ExtendedFlightSearchResponseItem, Filter, FlyInType, SortByType } from '../types';
 import {
   BookingPackage,
   BookingPackageItem,
@@ -14,54 +14,96 @@ export interface SearchResultsState {
   results: BookingPackageItem[];
   filteredResults: BookingPackageItem[];
   selectedSearchResult: BookingPackageItem | null;
+
   packagingAccoResults: PackagingAccommodationResponse[];
   filteredPackagingAccoResults: PackagingAccommodationResponse[];
   packagingAccoSearchDetails: PackagingAccommodationResponse[];
   selectedPackagingAccoResultCode: string | null;
+
   packagingFlightResults: PackagingFlightResponse[];
+  filteredPackagingFlightResults: PackagingFlightResponse[];
   selectedPackagingFlight: PackagingFlightResponse | null;
+  selectedOutwardKey: string | null;
+  selectedReturnKey: string | null;
+
   selectedFlight: ExtendedFlightSearchResponseItem | null;
   selectedFlightDetails: ExtendedFlightSearchResponseItem | null;
+
   bookingPackageDetails: BookingPackage | null;
+  priceDetails: BookingPriceDetails | null;
+
   isLoading: boolean;
   flightsLoading: boolean;
-  filters: Filter[];
+
   selectedSortType: SortByType | null;
+  selectedFlightSortType: SortByType | null;
+  filters: Filter[];
+  initialFilters: Filter[];
+  flightFilters: Filter[];
+  initialFlightFilters: Filter[];
+
   activeTab: string | null;
   currentPage: number;
-  flyInIsOpen: boolean;
-  editablePackagingEntry: PackagingEntry | null;
+
   transactionId: string | null;
-  accommodationFlyInStep: AccommodationFlyInStep;
-  priceDetails: BookingPriceDetails | null;
+
+  flyInIsOpen: boolean;
+  flyInType: FlyInType | null;
+
   itinerary: ClientPortalItinerary | null;
+  editablePackagingEntry: PackagingEntry | null;
+
+  excursionSearchParams: ExcursionSearchParams | null;
+  selectedExcursionSearchResult: PackagingAccommodationResponse | null;
+  confirmedExcursionsByDay: Record<string, PackagingAccommodationResponse[]>;
 }
 
 const initialState: SearchResultsState = {
   results: [],
   filteredResults: [],
   selectedSearchResult: null,
+
   packagingAccoResults: [],
   filteredPackagingAccoResults: [],
   packagingAccoSearchDetails: [],
   selectedPackagingAccoResultCode: null,
+
   packagingFlightResults: [],
+  filteredPackagingFlightResults: [],
   selectedPackagingFlight: null,
+  selectedOutwardKey: null,
+  selectedReturnKey: null,
+
   selectedFlight: null,
   selectedFlightDetails: null,
+
   bookingPackageDetails: null,
+  priceDetails: null,
+
   isLoading: false,
   flightsLoading: false,
-  filters: [],
+
   selectedSortType: null,
+  selectedFlightSortType: null,
+  initialFilters: [],
+  filters: [],
+  initialFlightFilters: [],
+  flightFilters: [],
+
   activeTab: 'compact',
   currentPage: 1,
+
+  transactionId: null,
+
   flyInIsOpen: false,
+  flyInType: null,
+
   editablePackagingEntry: null,
-  transactionId: null,
-  accommodationFlyInStep: 'details',
-  priceDetails: null,
-  itinerary: null
+  itinerary: null,
+
+  excursionSearchParams: null,
+  selectedExcursionSearchResult: null,
+  confirmedExcursionsByDay: {}
 };
 
 const searchResultsSlice = createSlice({
@@ -92,6 +134,9 @@ const searchResultsSlice = createSlice({
     setPackagingFlightResults(state, action: PayloadAction<PackagingFlightResponse[]>) {
       state.packagingFlightResults = action.payload;
     },
+    setFilteredPackagingFlightResults(state, action: PayloadAction<PackagingFlightResponse[]>) {
+      state.filteredPackagingFlightResults = action.payload;
+    },
     setSelectedPackagingFlight(state, action: PayloadAction<PackagingFlightResponse | null>) {
       state.selectedPackagingFlight = action.payload;
     },
@@ -122,6 +167,9 @@ const searchResultsSlice = createSlice({
     setFlightsLoading(state, action: PayloadAction<boolean>) {
       state.flightsLoading = action.payload;
     },
+    setInitialFilters(state, action: PayloadAction<Filter[]>) {
+      state.initialFilters = action.payload;
+    },
     setFilters(state, action: PayloadAction<Filter[]>) {
       const updatedFilters = action.payload;
 
@@ -137,9 +185,30 @@ const searchResultsSlice = createSlice({
     resetFilters(state, action: PayloadAction<Filter[]>) {
       state.filters = action.payload;
     },
+    setInitialFlightFilters(state, action: PayloadAction<Filter[]>) {
+      state.initialFlightFilters = action.payload;
+    },
+    setFlightFilters(state, action: PayloadAction<Filter[]>) {
+      const updatedFilters = action.payload;
+
+      updatedFilters.forEach((updatedFilter) => {
+        const existingIndex = state.flightFilters.findIndex((f) => f.property === updatedFilter.property);
+        if (existingIndex !== -1) {
+          state.flightFilters[existingIndex] = updatedFilter;
+        } else {
+          state.flightFilters.push(updatedFilter); // Optional: Add new filters if not present
+        }
+      });
+    },
+    resetFlightFilters(state, action: PayloadAction<Filter[]>) {
+      state.flightFilters = action.payload;
+    },
     setSortType(state, action: PayloadAction<SortByType | null>) {
       state.selectedSortType = action.payload;
     },
+    setFlightSortType(state, action: PayloadAction<SortByType | null>) {
+      state.selectedFlightSortType = action.payload;
+    },
     setActiveTab(state, action: PayloadAction<string | null>) {
       state.activeTab = action.payload;
     },
@@ -163,14 +232,54 @@ const searchResultsSlice = createSlice({
     setTransactionId(state, action: PayloadAction<string | null>) {
       state.transactionId = action.payload;
     },
-    setAccommodationFlyInStep(state, action: PayloadAction<AccommodationFlyInStep>) {
-      state.accommodationFlyInStep = action.payload;
+    setFlyInType(state, action: PayloadAction<FlyInType | null>) {
+      state.flyInType = action.payload;
     },
     setPriceDetails(state, action: PayloadAction<BookingPriceDetails | null>) {
       state.priceDetails = action.payload;
     },
     setItinerary(state, action: PayloadAction<ClientPortalItinerary | null>) {
       state.itinerary = action.payload;
+    },
+    setSelectedOutwardKey: (state, action: PayloadAction<string | null>) => {
+      state.selectedOutwardKey = action.payload;
+    },
+    setSelectedReturnKey: (state, action: PayloadAction<string | null>) => {
+      state.selectedReturnKey = action.payload;
+    },
+    resetFlightSelection: (state) => {
+      state.selectedOutwardKey = null;
+      state.selectedReturnKey = null;
+    },
+    setExcursionSearchParams(state, action: PayloadAction<ExcursionSearchParams>) {
+      state.excursionSearchParams = action.payload;
+    },
+    setSelectedExcursionSearchResult(state, action: PayloadAction<PackagingAccommodationResponse | null>) {
+      state.selectedExcursionSearchResult = action.payload;
+    },
+    confirmExcursionForDay: (state, action: PayloadAction<{ dayKey: string; excursion: PackagingAccommodationResponse }>) => {
+      const { dayKey, excursion } = action.payload;
+
+      const existingForDay = state.confirmedExcursionsByDay[dayKey] ?? [];
+
+      const existingIndex = existingForDay.findIndex((item) => item.code === excursion.code);
+
+      if (existingIndex >= 0) {
+        // replace existing confirmed version of same excursion
+        existingForDay[existingIndex] = excursion;
+      } else {
+        existingForDay.push(excursion);
+      }
+
+      state.confirmedExcursionsByDay[dayKey] = existingForDay;
+    },
+    removeConfirmedExcursionForDay: (state, action: PayloadAction<{ dayKey: string; excursionCode: string }>) => {
+      const { dayKey, excursionCode } = action.payload;
+
+      state.confirmedExcursionsByDay[dayKey] = (state.confirmedExcursionsByDay[dayKey] ?? []).filter((item) => item.code !== excursionCode);
+    },
+    clearConfirmedExcursionsForDay: (state, action: PayloadAction<{ dayKey: string }>) => {
+      delete state.confirmedExcursionsByDay[action.payload.dayKey];
     }
   }
 });
@@ -181,6 +290,7 @@ export const {
   setSelectedSearchResult,
   setPackagingAccoResults,
   setFilteredPackagingAccoResults,
+  setFilteredPackagingFlightResults,
   setPackagingAccoSearchDetails,
   setSelectedPackagingAccoResult,
   setPackagingFlightResults,
@@ -191,18 +301,31 @@ export const {
   selectFlight,
   setIsLoading,
   setFlightsLoading,
+  setInitialFilters,
   setFilters,
   resetFilters,
+  setInitialFlightFilters,
+  setFlightFilters,
+  resetFlightFilters,
   setSortType,
+  setFlightSortType,
   setActiveTab,
   setCurrentPage,
   resetSearchState,
   setFlyInIsOpen,
   setEditablePackagingEntry,
   setTransactionId,
-  setAccommodationFlyInStep,
+  setFlyInType,
   setPriceDetails,
-  setItinerary
+  setItinerary,
+  setSelectedOutwardKey,
+  setSelectedReturnKey,
+  resetFlightSelection,
+  setExcursionSearchParams,
+  setSelectedExcursionSearchResult,
+  confirmExcursionForDay,
+  removeConfirmedExcursionForDay,
+  clearConfirmedExcursionsForDay
 } = searchResultsSlice.actions;
 
 export default searchResultsSlice.reducer;

package/src/search-results/types.ts

@@ -2,6 +2,7 @@ import {
   BookingPackage,
   BookingPackageRequestRoom,
   FlightSearchResponseItem,
+  PackageMainRoom,
   PackagingEntry,
   WebsiteConfigurationSearchConfiguration
 } from '@qite/tide-client';
@@ -64,7 +65,19 @@ export interface SearchResultsConfiguration {
 
 export type FilterType = 'checkbox' | 'toggle' | 'slider' | 'star-rating';
 
-export type FilterProperty = 'regime' | 'accommodation' | 'max-duration' | 'price' | 'rating' | 'theme';
+export type FilterProperty =
+  | 'regime'
+  | 'accommodation'
+  | 'max-duration'
+  | 'price'
+  | 'rating'
+  | 'theme'
+  | 'airline'
+  | 'numberOfStops'
+  | 'departureRange'
+  | 'departureAirport'
+  | 'arrivalAirport'
+  | 'travelDuration';
 
 export interface FilterOption {
   label: string;
@@ -205,4 +218,44 @@ export type SearchSeed = {
   rooms: BookingPackageRequestRoom[];
 };
 
-export type AccommodationFlyInStep = 'results' | 'details';
+export type FlyInType =
+  | 'flight-outward-results'
+  | 'flight-return-results'
+  | 'flight-details'
+  | 'acco-results'
+  | 'acco-details'
+  | 'excursion-results'
+  | 'excursion-details';
+
+export interface ExcursionSearchParams {
+  // Core: which day are we searching for
+  date: string; // ISO string (e.g. "2026-07-01")
+
+  // Optional but useful if your API expects a range
+  fromDate: string; // usually same as date
+  toDate: string; // usually same as date
+
+  // Location context
+  countryId?: number | null;
+  regionId?: number | null;
+  oordId?: number | null;
+  locationId?: number | null;
+  locationName?: string;
+
+  // Accommodation context (important for availability/pricing)
+  hotelCode: string;
+  hotelName: string;
+
+  accommodationCode: string | null;
+  accommodationName: string | null;
+
+  // Occupancy (VERY likely needed later)
+  rooms?: PackageMainRoom[];
+
+  // Optional: currency / language (depends on your backend)
+  currencyCode?: string;
+  languageCode?: string;
+
+  // Optional: traceability/debugging
+  source?: 'day-by-day-excursions';
+}

package/src/search-results/utils/query-utils.ts

@@ -11,6 +11,7 @@ import { range } from 'lodash';
 
 export const GROUP_TOUR_SERVICE_TYPE = 1;
 export const ACCOMMODATION_SERVICE_TYPE = 3;
+export const EXCURSION_SERVICE_TYPE = 4;
 export const FLIGHT_SERVICE_TYPE = 7;
 
 export const toDateOnlyString = (value: string | Date): string => {