mautourco-components 0.2.91 → 0.2.92

package/dist/components/organisms/DialogComparison/DialogComparison.d.ts

@@ -1,7 +1,6 @@
-import { DetailResumeAccommodation, DetailResumeExcursion, DetailResumeOtherService, DetailResumeTransfer } from '@/src/types/table';
+import { ComparisonAccom, ComparisonData, ComparisonExcursion, ComparisonOtherService, ComparisonTransfer } from '@/src/types/table/multi-quote-comparison.types';
 import { ColumnType } from '../Table/TableCell';
 import './DialogComparison.css';
-export type ComparisonData = DetailResumeAccommodation | DetailResumeTransfer | DetailResumeExcursion | DetailResumeOtherService;
 export interface MultiComparisonData {
     id: string;
     name: string;
@@ -17,8 +16,8 @@ export interface DialogComparisonProps {
         filteredData: MultiComparisonData[];
     }) => void;
 }
-export declare const isComparisonAccommodation: (data: ComparisonData) => data is ComparisonData & DetailResumeAccommodation;
-export declare const isComparisonTransfer: (data: ComparisonData) => data is ComparisonData & DetailResumeTransfer;
-export declare const isComparisonExcursion: (data: ComparisonData) => data is ComparisonData & DetailResumeExcursion;
-export declare const isComparisonOtherService: (data: ComparisonData) => data is ComparisonData & DetailResumeOtherService;
+export declare const isComparisonAccommodation: (data: ComparisonData) => data is ComparisonData & ComparisonAccom;
+export declare const isComparisonTransfer: (data: ComparisonData) => data is ComparisonData & ComparisonTransfer;
+export declare const isComparisonExcursion: (data: ComparisonData) => data is ComparisonData & ComparisonExcursion;
+export declare const isComparisonOtherService: (data: ComparisonData) => data is ComparisonData & ComparisonOtherService;
 export declare function DialogComparison(props: DialogComparisonProps): import("react/jsx-runtime").JSX.Element;

package/dist/components/organisms/DialogComparison/DialogComparison.js

@@ -1,6 +1,17 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ServiceType, } from '../../../types/table/index';
-import { useEffect, useState } from 'react';
+import { ServiceType } from '../../../types/table/index';
+import { useEffect, useMemo, useState } from 'react';
 import Button from '../../atoms/Button/Button';
 import Chip from '../../atoms/Chip/Chip';
 import MultiSelectDropdown from '../../molecules/MultiSelectDropdown/MultiSelectDropdown';
@@ -9,16 +20,16 @@ import { Table } from '../Table';
 import { columns as defaultColumns } from '../Table/columns';
 import './DialogComparison.css';
 export var isComparisonAccommodation = function (data) {
-    return data.Type === ServiceType.ACCOMMODATION;
+    return data.serviceType === ServiceType.ACCOMMODATION;
 };
 export var isComparisonTransfer = function (data) {
-    return data.Type === ServiceType.TRANSFER;
+    return data.serviceType === ServiceType.TRANSFER;
 };
 export var isComparisonExcursion = function (data) {
-    return data.Type === ServiceType.EXCURSION;
+    return data.serviceType === ServiceType.EXCURSION;
 };
 export var isComparisonOtherService = function (data) {
-    return data.Type === ServiceType.OTHER_SERVICE;
+    return data.serviceType === ServiceType.OTHER_SERVICE;
 };
 export function DialogComparison(props) {
     var open = props.open, data = props.data, columns = props.columns, setOpen = props.setOpen, onBookNow = props.onBookNow;
@@ -26,25 +37,18 @@ export function DialogComparison(props) {
     var _b = useState(data), filteredData = _b[0], setFilteredData = _b[1];
     var getTotalRows = function (comparisonData) {
         var totalMap = new Map();
-        comparisonData.forEach(function (item) {
-            if (isComparisonAccommodation(item)) {
-                var currency = item.Currency;
-                var total = parseFloat(item.Total) || 0;
-                var currentTotal = totalMap.get(currency) || 0;
-                totalMap.set(currency, currentTotal + total);
-            }
-            if (isComparisonTransfer(item) || isComparisonExcursion(item)) {
-                var currency = item.Currency;
-                var total = parseFloat(item.TotalPrice) || 0;
-                var currentTotal = totalMap.get(currency) || 0;
-                totalMap.set(currency, currentTotal + total);
-            }
-            if (isComparisonOtherService(item)) {
-                var currency = item.currency;
-                var total = parseFloat(item.total_price) || 0;
-                var currentTotal = totalMap.get(currency) || 0;
-                totalMap.set(currency, currentTotal + total);
+        var allDatas = comparisonData.flatMap(function (item) {
+            var _a;
+            if ((_a = item.children) === null || _a === void 0 ? void 0 : _a.length) {
+                return item.children;
             }
+            return item;
+        });
+        allDatas.forEach(function (item) {
+            var currency = item.currency;
+            var total = item.total || 0;
+            var currentTotal = totalMap.get(currency) || 0;
+            totalMap.set(currency, currentTotal + total);
         });
         return Object.fromEntries(totalMap);
     };
@@ -54,13 +58,29 @@ export function DialogComparison(props) {
             setFilteredData(data.filter(function (d) { return selectedValues.includes(d.id); }));
         }
     };
+    var remapFilteredData = useMemo(function () {
+        return filteredData.map(function (f) {
+            if (f.data.length > 0) {
+                f.data = f.data.map(function (d) {
+                    if (isComparisonAccommodation(d)) {
+                        d.children = d.rooms.map(function (r, index) {
+                            return __assign(__assign({}, r), { serviceType: ServiceType.ACCOMMODATION, className: 'table__row-border-0', hotelName: index === 0 ? d.hotelName : '' });
+                        });
+                    }
+                    return d;
+                });
+            }
+            return f;
+        });
+    }, [filteredData]);
     useEffect(function () {
         setSelectedValues(data.map(function (d) { return d.id; }));
+        setFilteredData(data);
     }, [data]);
     return (_jsx(DialogBookingConfirm, { title: "Comparison of the quotations", open: open, setOpen: setOpen, className: "!max-w-[1255px]", closeOnOverlayClick: true, children: _jsxs("div", { className: "dialog-comparison", children: [_jsx("div", { className: "dialog-comparison__filter", children: _jsx(MultiSelectDropdown, { options: data.map(function (d) { return ({
                             id: d.id,
                             label: d.name,
-                        }); }), selectedValues: selectedValues, onSelectionChange: handleSelectionChange, maxDisplayedChips: 2, useTextForMaxDisplayedChips: true }) }), _jsx("div", { className: "dialog-comparison__list", children: filteredData.map(function (d, index) { return (_jsxs("div", { className: "dialog-comparison__item", children: [_jsx(Chip, { label: d.name, color: "brand", type: "outline", size: "lg" }), _jsx(Table, { data: d.data, columns: columns || defaultColumns.comparison(), totalRows: getTotalRows(d.data), isTotalBorderDash: false, totalSubstractedSpace: 0 })] }, "cp-".concat(index))); }) }), _jsx("div", { className: "dialog-comparison__footer", children: _jsx(Button, { variant: "secondary", onClick: function () {
+                        }); }), selectedValues: selectedValues, onSelectionChange: handleSelectionChange, maxDisplayedChips: 2, useTextForMaxDisplayedChips: true }) }), _jsx("div", { className: "dialog-comparison__list", children: remapFilteredData.map(function (d, index) { return (_jsxs("div", { className: "dialog-comparison__item", children: [_jsx(Chip, { label: d.name, color: "brand", type: "outline", size: "lg" }), _jsx(Table, { data: d.data, columns: columns || defaultColumns.comparison(), totalRows: getTotalRows(d.data), isTotalBorderDash: false, totalSubstractedSpace: 0, isGrouped: true })] }, "cp-".concat(index))); }) }), _jsx("div", { className: "dialog-comparison__footer", children: _jsx(Button, { variant: "secondary", onClick: function () {
                             return onBookNow({
                                 selectedValues: selectedValues,
                                 filteredData: filteredData,

package/dist/components/organisms/Table/columns/comparison-columns.d.ts

@@ -1,3 +1,3 @@
-import { ComparisonData } from '../../DialogComparison/DialogComparison';
+import { ComparisonData } from '@/src/types/table/multi-quote-comparison.types';
 import { ColumnType } from '../TableCell';
 export declare const comparisonColumns: () => ColumnType<ComparisonData>[];

package/dist/components/organisms/Table/columns/comparison-columns.js

@@ -6,25 +6,24 @@ import { RowOtherServices } from '../../../molecules/TableServiceItem/RowOtherSe
 import { RowTransfer } from '../../../molecules/TableServiceItem/RowTransfer';
 import { priceFormatter } from '../../../../lib/price-formatter';
 import { ServiceType } from '../../../../types/table/index';
-import { isComparisonAccommodation, isComparisonExcursion, isComparisonOtherService, isComparisonTransfer, } from '../../DialogComparison/DialogComparison';
+import { isComparisonAccommodation, isComparisonExcursion, isComparisonTransfer, } from '../../DialogComparison/DialogComparison';
 var COLUMNS_WIDTH = 532 / 3;
 export var comparisonColumns = function () {
     return [
         {
             header: 'Item',
-            key: 'Type',
+            key: 'serviceType',
             width: COLUMNS_WIDTH,
             cell: function (value, raw) {
                 if (isComparisonAccommodation(raw)) {
-                    var accom = raw;
-                    return (_jsx(RowAccommodation.FirstCol, { serviceName: raw.HotelName, offers: raw.Offers, status: raw.RoomStatus }));
+                    return (_jsx(RowAccommodation.FirstCol, { serviceName: raw.hotelName, offers: raw.offers, status: raw.roomName }));
                 }
                 if (isComparisonExcursion(raw)) {
-                    return _jsx(RowExcursion.FirstCol, { serviceName: raw.ExcursionName });
+                    return _jsx(RowExcursion.FirstCol, { serviceName: raw.name });
                 }
                 if (isComparisonTransfer(raw)) {
                     var transfer = raw;
-                    return (_jsx(RowTransfer.FirstCol, { serviceName: transfer.VehicleTypeName, transferType: transfer.TransferType, from: transfer.LocationFromName, to: transfer.LocationToName }));
+                    return (_jsx(RowTransfer.FirstCol, { serviceName: transfer.vehicleType, transferType: transfer.transferType, from: transfer.from, to: transfer.to }));
                 }
                 if (value === ServiceType.OTHER_SERVICE) {
                     return _jsx(RowOtherServices.FirstCol, {});
@@ -34,28 +33,28 @@ export var comparisonColumns = function () {
         },
         {
             header: 'Details',
-            key: 'Type',
+            key: 'serviceType',
             width: COLUMNS_WIDTH,
             cell: function (value, raw, index) {
                 if (isComparisonAccommodation(raw)) {
                     return (_jsx(RowAccommodation.DetailsCol, { data: {
-                            RoomName: raw.RoomName,
-                            Dates: raw.Dates,
-                            ClientCategory: raw.ClientCategory,
-                            MealPlan: raw.MealPlan,
-                        }, index: (index || 0) + 1 }));
+                            RoomName: raw.roomName,
+                            Dates: raw.dates,
+                            ClientCategory: raw.clientType,
+                            MealPlan: raw.mealPlan,
+                        }, index: index }));
                 }
                 if (isComparisonExcursion(raw)) {
                     return (_jsx(RowExcursion.DetailsCol, { data: {
-                            languages: raw.AvailableLanguages,
-                            duration: raw.Duration,
-                            accessibility: raw.Accessibility,
-                            transferType: raw.TransferType,
+                            languages: raw.languages,
+                            duration: raw.duration,
+                            accessibility: raw.accessibility,
+                            transferType: raw.transferType,
                         } }));
                 }
                 if (isComparisonTransfer(raw)) {
                     return (_jsx(RowTransfer.DetailsCol, { data: {
-                            carType: raw.VehicleTypeName,
+                            carType: raw.vehicleType,
                             clientType: 'STD',
                         } }));
                 }
@@ -67,29 +66,13 @@ export var comparisonColumns = function () {
         },
         {
             header: 'Price',
-            key: 'Type',
+            key: 'serviceType',
             width: COLUMNS_WIDTH,
             cell: function (_value, raw) {
                 var total = {
-                    currency: undefined,
-                    total: undefined,
+                    currency: raw.currency,
+                    total: String(raw.total),
                 };
-                if (isComparisonAccommodation(raw)) {
-                    total.currency = raw.Currency;
-                    total.total = raw.Total;
-                }
-                if (isComparisonExcursion(raw)) {
-                    total.currency = raw.Currency;
-                    total.total = raw.TotalPrice;
-                }
-                if (isComparisonTransfer(raw)) {
-                    total.currency = raw.Currency;
-                    total.total = raw.TotalPrice;
-                }
-                if (isComparisonOtherService(raw)) {
-                    total.currency = raw.currency;
-                    total.total = raw.total_price;
-                }
                 return (_jsx("div", { className: "flex items-center justify-between", children: _jsx(Text, { size: "sm", variant: "bold", children: priceFormatter(total.total, total.currency) }) }));
             },
         },

package/dist/components/organisms/Table/columns/index.d.ts

@@ -18,6 +18,6 @@ declare const columns: {
     bookingCancelService: (params?: {
         onRemove?: (value: import("../../../..").DetailResumeItem, index?: number, childIndex?: number) => void;
     }) => import("../TableCell").ColumnType<import("../../../..").DetailResumeItem>[];
-    comparison: () => import("../TableCell").ColumnType<import("../../DialogComparison/DialogComparison").ComparisonData>[];
+    comparison: () => import("../TableCell").ColumnType<import("../../../..").ComparisonData>[];
 };
 export { columns };

package/dist/index.d.ts

@@ -17,7 +17,7 @@ export { DateDisplay } from './components/molecules/DateDisplay/DateDisplay';
 export { DocketPrices } from './components/molecules/DocketPrices/DocketPrices';
 export { PriceDisplay } from './components/molecules/PriceDisplay/PriceDisplay';
 export { TransferDocket } from './components/molecules/TransferDocket/TransferDocket';
-export { ActionDropdown, type ActionDropdownItem } from './components/molecules/ActionDropdown/ActionDropdown';
+export { ActionDropdown, type ActionDropdownItem, } from './components/molecules/ActionDropdown/ActionDropdown';
 export { AddItemButton } from './components/molecules/AddItemButton/AddItemButton';
 export { default as AgeSelector } from './components/molecules/AgeSelector/AgeSelector';
 export * from './components/molecules/BookingResume';
@@ -42,7 +42,7 @@ export { default as TextWithIcon } from './components/molecules/TextWithIcon/Tex
 export { default as TimelineItem } from './components/molecules/TimelineItem/TimelineItem';
 export { default as Toast } from './components/molecules/Toast/Toast';
 export * from './components/molecules/TooltipDisplay/TooltipDisplay';
-export type { Supplement, SupplementValue, VehicleSupplementProps } from './components/molecules/VehicleSupplement';
+export type { Supplement, SupplementValue, VehicleSupplementProps, } from './components/molecules/VehicleSupplement';
 export { default as VehicleSupplement } from './components/molecules/VehicleSupplement/VehicleSupplement';
 export { Illustration } from './components/atoms/Illustration/Illustration';
 export * from './components/molecules/BookingPax';
@@ -89,44 +89,44 @@ export { default as UserIcon } from './components/atoms/Icon/icons/User';
 export { priceFormatter } from './lib/price-formatter';
 export type { DividerProps } from './components/atoms/Divider/Divider';
 export type { FeatureRowProps } from './components/molecules/FeatureRow/FeatureRow';
-export type { LocationData, LocationDropdownProps, LocationGroup, LocationOption } from './components/molecules/LocationDropdown/LocationDropdown';
-export type { ServiceOption, ServiceSelectorProps, ServiceType } from './components/molecules/ServiceSelector/ServiceSelector';
+export type { LocationData, LocationDropdownProps, LocationGroup, LocationOption, } from './components/molecules/LocationDropdown/LocationDropdown';
+export type { ServiceOption, ServiceSelectorProps, ServiceType, } from './components/molecules/ServiceSelector/ServiceSelector';
 export type { StepperProps } from './components/molecules/Stepper/Stepper';
-export type { CarBookingCardPriceRow, CarBookingCardProps, CarBookingCardSize, CarBookingCardState, CarBookingCardType } from './components/organisms/CarBookingCard/CarBookingCard';
-export type { CardContainerProps, CardContainerSpacing } from './components/organisms/CardContainer/CardContainer';
+export type { CarBookingCardPriceRow, CarBookingCardProps, CarBookingCardSize, CarBookingCardState, CarBookingCardType, } from './components/organisms/CarBookingCard/CarBookingCard';
+export type { CardContainerProps, CardContainerSpacing, } from './components/organisms/CardContainer/CardContainer';
 export type { DateTimePickerProps } from './components/organisms/DateTimePicker/DateTimePicker';
 export type { DialogProps, DialogSize } from './components/organisms/Dialog/Dialog';
 export type { FooterProps } from './components/organisms/Footer/Footer';
-export type { DocketDetailsData, DocketServiceType, MultipleQuotationDocketProps } from './components/organisms/MultipleQuotationDocket';
+export type { DocketDetailsData, DocketServiceType, MultipleQuotationDocketProps, } from './components/organisms/MultipleQuotationDocket';
 export { CHILD_CATEGORY_AGES } from './components/organisms/PaxSelector/PaxSelector';
-export type { ClientType, PaxData, PaxSelectorProps } from './components/organisms/PaxSelector/PaxSelector';
-export type { RoundTripData, RoundTripProps, RoundTripTransfer } from './components/organisms/RoundTrip/RoundTrip';
-export type { SearchBarTransferData, SearchBarTransferProps, TransferMode } from './components/organisms/SearchBarTransfer/SearchBarTransfer';
+export type { ClientType, PaxData, PaxSelectorProps, } from './components/organisms/PaxSelector/PaxSelector';
+export type { RoundTripData, RoundTripProps, RoundTripTransfer, } from './components/organisms/RoundTrip/RoundTrip';
+export type { SearchBarTransferData, SearchBarTransferProps, TransferMode, } from './components/organisms/SearchBarTransfer/SearchBarTransfer';
 export type { TopNavigationProps } from './components/organisms/TopNavigation/TopNavigation';
-export type { TransferLineData, TransferLineProps, TransferType } from './components/organisms/TransferLine/TransferLine';
+export type { TransferLineData, TransferLineProps, TransferType, } from './components/organisms/TransferLine/TransferLine';
 export type { CheckboxProps } from './components/atoms/Checkbox/Checkbox';
 export type { InputProps } from './components/atoms/Inputs/Input/Input';
 export type { AddItemButtonProps } from './components/molecules/AddItemButton/AddItemButton';
 export type { AgeSelectorProps } from './components/molecules/AgeSelector/AgeSelector';
-export type { BreadcrumbsItem, BreadcrumbsProps } from './components/molecules/Breadcrumbs/Breadcrumbs';
+export type { BreadcrumbsItem, BreadcrumbsProps, } from './components/molecules/Breadcrumbs/Breadcrumbs';
 export type { DocketPricesProps } from './components/molecules/DocketPrices/DocketPrices';
 export type { FromToProps } from './components/molecules/FromTo/FromTo';
 export type { PaxChipsProps, PaxCount } from './components/molecules/PaxChips/PaxChips';
 export type { PriceDisplayProps } from './components/molecules/PriceDisplay/PriceDisplay';
 export type { SectionTitleProps } from './components/molecules/SectionTitle/SectionTitle';
-export type { DetailsColProps, ItemColProps, RowAccommodationProps, RowExcursionProps, RowTransferProps } from './components/molecules/TableServiceItem';
+export type { DetailsColProps, ItemColProps, RowAccommodationProps, RowExcursionProps, RowTransferProps, } from './components/molecules/TableServiceItem';
 export type { ServiceAccommodationProps } from './components/molecules/TimelineItem/ServiceAccommodation';
 export type { ServiceExcursionProps } from './components/molecules/TimelineItem/ServiceExcursion';
 export type { ServiceTransferProps } from './components/molecules/TimelineItem/ServiceTransfer';
 export type { TimelineHeaderProps } from './components/molecules/TimelineItem/TimelineHeader';
 export type { ToastProps } from './components/molecules/Toast/Toast';
 export type { TransferDocketProps } from './components/molecules/TransferDocket/TransferDocket';
-export type { ComparisonData, DialogComparisonProps, MultiComparisonData } from './components/organisms/DialogComparison/DialogComparison';
+export type { DialogComparisonProps, MultiComparisonData, } from './components/organisms/DialogComparison/DialogComparison';
 export type { DialogDeleteConfirmProps } from './components/organisms/DialogDeleteConfirm/DialogDeleteConfirm';
 export type { DialogQuoteRenameProps } from './components/organisms/DialogQuoteRename/DialogQuoteRename';
 export type { SelectedQuote } from './components/organisms/DialogSendingMail/DialogSendingMailMultiple/DialogSendingMailMultiple';
-export type { FilterType, QuoteHeaderProps } from './components/organisms/QuoteHeader/QuoteHeader';
-export type { TimelineProps, TimelineServices } from './components/organisms/Timeline/Timeline';
-export type { AccomodationDocket as AccomodationDocketType, ExcursionDocket as ExcursionDocketType, OtherServiceDocket as OtherServiceDocketType, ServiceDocket as ServiceDocketType, TransferDocket as TransferDocketType } from './types/docket/services.types';
+export type { FilterType, QuoteHeaderProps, } from './components/organisms/QuoteHeader/QuoteHeader';
+export type { TimelineProps, TimelineServices, } from './components/organisms/Timeline/Timeline';
+export type { AccomodationDocket as AccomodationDocketType, ExcursionDocket as ExcursionDocketType, OtherServiceDocket as OtherServiceDocketType, ServiceDocket as ServiceDocketType, TransferDocket as TransferDocketType, } from './types/docket/services.types';
 export * from './types/table';
 export * from './hooks/useStays';

package/dist/index.js

@@ -19,7 +19,7 @@ export { DocketPrices } from './components/molecules/DocketPrices/DocketPrices';
 export { PriceDisplay } from './components/molecules/PriceDisplay/PriceDisplay';
 export { TransferDocket } from './components/molecules/TransferDocket/TransferDocket';
 // Molecules - Composed components
-export { ActionDropdown } from './components/molecules/ActionDropdown/ActionDropdown';
+export { ActionDropdown, } from './components/molecules/ActionDropdown/ActionDropdown';
 export { AddItemButton } from './components/molecules/AddItemButton/AddItemButton';
 export { default as AgeSelector } from './components/molecules/AgeSelector/AgeSelector';
 export * from './components/molecules/BookingResume';

package/dist/types/table/index.d.ts

@@ -1,3 +1,4 @@
 export * from './action-dropdown-type.types';
 export * from './detail-resume.types';
+export * from './multi-quote-comparison.types';
 export * from './quotation.types';

package/dist/types/table/index.js

@@ -1,3 +1,4 @@
 export * from './action-dropdown-type.types';
 export * from './detail-resume.types';
+export * from './multi-quote-comparison.types';
 export * from './quotation.types';

package/dist/types/table/multi-quote-comparison.types.d.ts

@@ -0,0 +1,40 @@
+import { TableRowData } from '@/src/components/organisms/Table';
+import { Offer, ServiceType } from './detail-resume.types';
+export interface ComparisonService {
+    serviceType: ServiceType;
+    currency: string;
+    total: number;
+    dates: string[];
+}
+export interface ComparisonAccomRoom extends TableRowData<ComparisonAccomRoom> {
+    roomName: string;
+    dates: string[];
+    clientType: string;
+    mealPlan: string;
+    roomStatus: string;
+    offers?: Offer[];
+    currency: string;
+    total: number;
+}
+export interface ComparisonAccom extends Omit<ComparisonAccomRoom, 'children'>, ComparisonService, TableRowData<ComparisonData> {
+    hotelName: string;
+    rooms: ComparisonAccomRoom[];
+}
+export interface ComparisonTransfer extends ComparisonService, TableRowData<ComparisonData> {
+    transferType: string;
+    from: string;
+    to: string;
+    vehicleType: string;
+    clientType: string;
+}
+export interface ComparisonExcursion extends ComparisonService, TableRowData<ComparisonData> {
+    name: string;
+    languages: string[];
+    duration: string;
+    transferType: string;
+    pickUpPoint: string;
+    accessibility: string;
+}
+export interface ComparisonOtherService extends ComparisonService, TableRowData<ComparisonData> {
+}
+export type ComparisonData = ComparisonAccom | ComparisonTransfer | ComparisonExcursion | ComparisonOtherService;

package/dist/types/table/multi-quote-comparison.types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mautourco-components",
-  "version": "0.2.91",
+  "version": "0.2.92",
   "private": false,
   "description": "Bibliothèque de composants Mautourco pour le redesign",
   "main": "dist/index.js",

package/src/components/organisms/DialogComparison/DialogComparison.tsx

@@ -1,11 +1,12 @@
+import { ServiceType } from '@/src/types/table';
 import {
-  DetailResumeAccommodation,
-  DetailResumeExcursion,
-  DetailResumeOtherService,
-  DetailResumeTransfer,
-  ServiceType,
-} from '@/src/types/table';
-import { useEffect, useState } from 'react';
+  ComparisonAccom,
+  ComparisonData,
+  ComparisonExcursion,
+  ComparisonOtherService,
+  ComparisonTransfer,
+} from '@/src/types/table/multi-quote-comparison.types';
+import { useEffect, useMemo, useState } from 'react';
 import Button from '../../atoms/Button/Button';
 import Chip from '../../atoms/Chip/Chip';
 import MultiSelectDropdown from '../../molecules/MultiSelectDropdown/MultiSelectDropdown';
@@ -15,12 +16,6 @@ import { columns as defaultColumns } from '../Table/columns';
 import { ColumnType } from '../Table/TableCell';
 import './DialogComparison.css';
 
-export type ComparisonData =
-  | DetailResumeAccommodation
-  | DetailResumeTransfer
-  | DetailResumeExcursion
-  | DetailResumeOtherService;
-
 export interface MultiComparisonData {
   id: string;
   name: string;
@@ -40,26 +35,26 @@ export interface DialogComparisonProps {
 
 export const isComparisonAccommodation = (
   data: ComparisonData
-): data is ComparisonData & DetailResumeAccommodation => {
-  return data.Type === ServiceType.ACCOMMODATION;
+): data is ComparisonData & ComparisonAccom => {
+  return data.serviceType === ServiceType.ACCOMMODATION;
 };
 
 export const isComparisonTransfer = (
   data: ComparisonData
-): data is ComparisonData & DetailResumeTransfer => {
-  return data.Type === ServiceType.TRANSFER;
+): data is ComparisonData & ComparisonTransfer => {
+  return data.serviceType === ServiceType.TRANSFER;
 };
 
 export const isComparisonExcursion = (
   data: ComparisonData
-): data is ComparisonData & DetailResumeExcursion => {
-  return data.Type === ServiceType.EXCURSION;
+): data is ComparisonData & ComparisonExcursion => {
+  return data.serviceType === ServiceType.EXCURSION;
 };
 
 export const isComparisonOtherService = (
   data: ComparisonData
-): data is ComparisonData & DetailResumeOtherService => {
-  return data.Type === ServiceType.OTHER_SERVICE;
+): data is ComparisonData & ComparisonOtherService => {
+  return data.serviceType === ServiceType.OTHER_SERVICE;
 };
 
 export function DialogComparison(props: DialogComparisonProps) {
@@ -70,25 +65,18 @@ export function DialogComparison(props: DialogComparisonProps) {
   const getTotalRows = (comparisonData: ComparisonData[]) => {
     const totalMap = new Map<string, number>();
 
-    comparisonData.forEach((item) => {
-      if (isComparisonAccommodation(item)) {
-        const currency = item.Currency;
-        const total = parseFloat(item.Total) || 0;
-        const currentTotal = totalMap.get(currency) || 0;
-        totalMap.set(currency, currentTotal + total);
-      }
-      if (isComparisonTransfer(item) || isComparisonExcursion(item)) {
-        const currency = item.Currency;
-        const total = parseFloat(item.TotalPrice) || 0;
-        const currentTotal = totalMap.get(currency) || 0;
-        totalMap.set(currency, currentTotal + total);
-      }
-      if (isComparisonOtherService(item)) {
-        const currency = item.currency;
-        const total = parseFloat(item.total_price) || 0;
-        const currentTotal = totalMap.get(currency) || 0;
-        totalMap.set(currency, currentTotal + total);
+    const allDatas = comparisonData.flatMap((item) => {
+      if (item.children?.length) {
+        return item.children;
       }
+      return item;
+    });
+
+    allDatas.forEach((item) => {
+      const currency = item.currency;
+      const total = item.total || 0;
+      const currentTotal = totalMap.get(currency) || 0;
+      totalMap.set(currency, currentTotal + total);
     });
 
     return Object.fromEntries(totalMap);
@@ -101,8 +89,32 @@ export function DialogComparison(props: DialogComparisonProps) {
     }
   };
 
+  const remapFilteredData = useMemo(() => {
+    return filteredData.map((f) => {
+      if (f.data.length > 0) {
+        f.data = f.data.map((d) => {
+          if (isComparisonAccommodation(d)) {
+            d.children = d.rooms.map((r, index) => {
+              return {
+                ...r,
+                serviceType: ServiceType.ACCOMMODATION,
+                className: 'table__row-border-0',
+                hotelName: index === 0 ? d.hotelName : '',
+              };
+            }) as ComparisonData[];
+          }
+
+          return d;
+        });
+      }
+
+      return f;
+    });
+  }, [filteredData]);
+
   useEffect(() => {
     setSelectedValues(data.map((d) => d.id));
+    setFilteredData(data);
   }, [data]);
 
   return (
@@ -126,7 +138,7 @@ export function DialogComparison(props: DialogComparisonProps) {
           />
         </div>
         <div className="dialog-comparison__list">
-          {filteredData.map((d, index) => (
+          {remapFilteredData.map((d, index) => (
             <div key={`cp-${index}`} className="dialog-comparison__item">
               <Chip label={d.name} color="brand" type="outline" size="lg" />
               <Table<ComparisonData>
@@ -135,6 +147,7 @@ export function DialogComparison(props: DialogComparisonProps) {
                 totalRows={getTotalRows(d.data)}
                 isTotalBorderDash={false}
                 totalSubstractedSpace={0}
+                isGrouped
               />
             </div>
           ))}

package/src/components/organisms/Table/columns/comparison-columns.tsx

@@ -5,11 +5,10 @@ import { RowOtherServices } from '@/src/components/molecules/TableServiceItem/Ro
 import { RowTransfer } from '@/src/components/molecules/TableServiceItem/RowTransfer';
 import { priceFormatter } from '@/src/lib/price-formatter';
 import { ServiceType } from '@/src/types/table';
+import { ComparisonData } from '@/src/types/table/multi-quote-comparison.types';
 import {
-  ComparisonData,
   isComparisonAccommodation,
   isComparisonExcursion,
-  isComparisonOtherService,
   isComparisonTransfer,
 } from '../../DialogComparison/DialogComparison';
 import { ColumnType } from '../TableCell';
@@ -20,30 +19,29 @@ export const comparisonColumns: () => ColumnType<ComparisonData>[] = () => {
   return [
     {
       header: 'Item',
-      key: 'Type',
+      key: 'serviceType',
       width: COLUMNS_WIDTH,
       cell: (value, raw) => {
         if (isComparisonAccommodation(raw)) {
-          const accom = raw;
           return (
             <RowAccommodation.FirstCol
-              serviceName={raw.HotelName as string}
-              offers={raw.Offers}
-              status={raw.RoomStatus}
+              serviceName={raw.hotelName as string}
+              offers={raw.offers}
+              status={raw.roomName}
             />
           );
         }
         if (isComparisonExcursion(raw)) {
-          return <RowExcursion.FirstCol serviceName={raw.ExcursionName as string} />;
+          return <RowExcursion.FirstCol serviceName={raw.name as string} />;
         }
         if (isComparisonTransfer(raw)) {
           const transfer = raw;
           return (
             <RowTransfer.FirstCol
-              serviceName={transfer.VehicleTypeName as string}
-              transferType={transfer.TransferType}
-              from={transfer.LocationFromName}
-              to={transfer.LocationToName}
+              serviceName={transfer.vehicleType as string}
+              transferType={transfer.transferType}
+              from={transfer.from}
+              to={transfer.to}
             />
           );
         }
@@ -56,19 +54,19 @@ export const comparisonColumns: () => ColumnType<ComparisonData>[] = () => {
     },
     {
       header: 'Details',
-      key: 'Type',
+      key: 'serviceType',
       width: COLUMNS_WIDTH,
       cell: (value, raw, index) => {
         if (isComparisonAccommodation(raw)) {
           return (
             <RowAccommodation.DetailsCol
               data={{
-                RoomName: raw.RoomName,
-                Dates: raw.Dates,
-                ClientCategory: raw.ClientCategory,
-                MealPlan: raw.MealPlan,
+                RoomName: raw.roomName,
+                Dates: raw.dates,
+                ClientCategory: raw.clientType,
+                MealPlan: raw.mealPlan,
               }}
-              index={(index || 0) + 1}
+              index={index}
             />
           );
         }
@@ -76,10 +74,10 @@ export const comparisonColumns: () => ColumnType<ComparisonData>[] = () => {
           return (
             <RowExcursion.DetailsCol
               data={{
-                languages: raw.AvailableLanguages,
-                duration: raw.Duration,
-                accessibility: raw.Accessibility,
-                transferType: raw.TransferType,
+                languages: raw.languages,
+                duration: raw.duration,
+                accessibility: raw.accessibility,
+                transferType: raw.transferType,
               }}
             />
           );
@@ -88,7 +86,7 @@ export const comparisonColumns: () => ColumnType<ComparisonData>[] = () => {
           return (
             <RowTransfer.DetailsCol
               data={{
-                carType: raw.VehicleTypeName,
+                carType: raw.vehicleType,
                 clientType: 'STD',
               }}
             />
@@ -102,31 +100,14 @@ export const comparisonColumns: () => ColumnType<ComparisonData>[] = () => {
     },
     {
       header: 'Price',
-      key: 'Type',
+      key: 'serviceType',
       width: COLUMNS_WIDTH,
       cell: (_value, raw) => {
         let total: Record<'currency' | 'total', string | undefined> = {
-          currency: undefined,
-          total: undefined,
+          currency: raw.currency,
+          total: String(raw.total),
         };
 
-        if (isComparisonAccommodation(raw)) {
-          total.currency = raw.Currency;
-          total.total = raw.Total;
-        }
-        if (isComparisonExcursion(raw)) {
-          total.currency = raw.Currency;
-          total.total = raw.TotalPrice;
-        }
-        if (isComparisonTransfer(raw)) {
-          total.currency = raw.Currency;
-          total.total = raw.TotalPrice;
-        }
-        if (isComparisonOtherService(raw)) {
-          total.currency = raw.currency;
-          total.total = raw.total_price;
-        }
-
         return (
           <div className="flex items-center justify-between">
             <Text size="sm" variant="bold">

package/src/types/table/index.ts

@@ -1,3 +1,4 @@
 export * from './action-dropdown-type.types';
 export * from './detail-resume.types';
+export * from './multi-quote-comparison.types';
 export * from './quotation.types';

package/src/types/table/multi-quote-comparison.types.ts

@@ -0,0 +1,58 @@
+import { TableRowData } from '@/src/components/organisms/Table';
+import { Offer, ServiceType } from './detail-resume.types';
+
+export interface ComparisonService {
+  serviceType: ServiceType;
+  currency: string;
+  total: number;
+  dates: string[];
+}
+
+export interface ComparisonAccomRoom extends TableRowData<ComparisonAccomRoom> {
+  roomName: string;
+  dates: string[];
+  clientType: string;
+  mealPlan: string;
+  roomStatus: string;
+  offers?: Offer[];
+  currency: string;
+  total: number;
+}
+
+export interface ComparisonAccom
+  extends
+    Omit<ComparisonAccomRoom, 'children'>,
+    ComparisonService,
+    TableRowData<ComparisonData> {
+  hotelName: string;
+  rooms: ComparisonAccomRoom[];
+}
+
+export interface ComparisonTransfer
+  extends ComparisonService, TableRowData<ComparisonData> {
+  transferType: string;
+  from: string;
+  to: string;
+  vehicleType: string;
+  clientType: string;
+}
+
+export interface ComparisonExcursion
+  extends ComparisonService, TableRowData<ComparisonData> {
+  name: string;
+  languages: string[];
+  duration: string;
+  transferType: string;
+  pickUpPoint: string;
+  accessibility: string;
+}
+
+export interface ComparisonOtherService
+  extends ComparisonService, TableRowData<ComparisonData> {}
+
+// Forward declaration for ComparisonData
+export type ComparisonData =
+  | ComparisonAccom
+  | ComparisonTransfer
+  | ComparisonExcursion
+  | ComparisonOtherService;