mautourco-components 0.2.70 → 0.2.71

package/dist/components/organisms/SearchBarTransfer/SearchBarTransfer.js

@@ -64,14 +64,58 @@ var SearchBarTransfer = function (_a) {
         { value: "roundtrip", label: "Round trip" },
         { value: "custom", label: "Custom transfer" },
     ];
+    // Helper function to check if roundtrip data is empty or has data
+    var hasRoundtripData = function (data) {
+        if (!data)
+            return false;
+        // Check if at least one field has data (half or full data)
+        return !!(data.paxData ||
+            data.arrivalDate ||
+            data.departureDate ||
+            data.pickupDropoffPoint ||
+            data.accommodation);
+    };
+    // Helper function to create prefilled transfer lines from roundtrip data
+    var createPrefilledTransferLines = function (data) {
+        var lines = [];
+        // Create arrival transfer
+        var arrivalTransfer = {
+            id: generateTransferId(),
+            type: "arrival",
+            paxData: data.paxData,
+            transferDate: data.arrivalDate,
+            pickupPoint: data.pickupDropoffPoint,
+            dropoffPoint: data.accommodation,
+        };
+        lines.push(arrivalTransfer);
+        // Create departure transfer
+        var departureTransfer = {
+            id: generateTransferId(),
+            type: "departure",
+            paxData: data.paxData,
+            transferDate: data.departureDate,
+            pickupPoint: data.accommodation,
+            dropoffPoint: data.pickupDropoffPoint,
+        };
+        lines.push(departureTransfer);
+        return lines;
+    };
     // Handle mode change
     var handleModeChange = function (newMode) {
         var transferMode = newMode;
         if (transferMode === mode)
             return;
         if (transferMode === "custom" && mode === "roundtrip") {
-            // When switching to custom mode, reset transfer lines (will show placeholder)
-            setTransferLines([]);
+            // When switching from roundtrip to custom mode
+            if (hasRoundtripData(roundTripData)) {
+                // Half/full Roundtrip data → prefilled arrival and departure (2h)
+                var prefilledLines = createPrefilledTransferLines(roundTripData);
+                setTransferLines(prefilledLines);
+            }
+            else {
+                // Empty Roundtrip data → empty custom transfer (1h)
+                setTransferLines([]);
+            }
             setRoundTripData(undefined);
         }
         else if (transferMode === "roundtrip" && mode === "custom") {
@@ -88,19 +132,72 @@ var SearchBarTransfer = function (_a) {
             id: generateTransferId(),
             type: type,
         };
+        if (transferLines.length > 0) {
+            // If adding inter-hotel, set pickup point to the dropoff of latest arrival
+            if (type === "inter-hotel") {
+                var arrivalTransfers = transferLines.filter(function (line) { return line.type === "arrival"; });
+                if (arrivalTransfers.length > 0) {
+                    var latestArrival = arrivalTransfers[arrivalTransfers.length - 1];
+                    newTransfer.pickupPoint = latestArrival.dropoffPoint;
+                }
+            }
+            // If adding departure, set pickup point to the dropoff of latest arrival or inter-hotel
+            if (type === "departure") {
+                var arrivalAndInterHotelTransfers = transferLines.filter(function (line) { return line.type === "arrival" || line.type === "inter-hotel"; });
+                if (arrivalAndInterHotelTransfers.length > 0) {
+                    var latestTransfer = arrivalAndInterHotelTransfers[arrivalAndInterHotelTransfers.length - 1];
+                    newTransfer.pickupPoint = latestTransfer.dropoffPoint;
+                }
+            }
+        }
         setTransferLines(__spreadArray(__spreadArray([], transferLines, true), [newTransfer], false));
     };
     // Render transfer type buttons
     var renderTransferTypeButtons = function (onClick) { return (_jsxs("div", { className: "search-bar-transfer__add-buttons", children: [_jsx(Button, { variant: "outline-secondary", size: "sm", leadingIcon: "plus", onClick: function () { return onClick("arrival"); }, children: "Add Arrival" }), _jsx(Button, { variant: "outline-secondary", size: "sm", leadingIcon: "plus", onClick: function () { return onClick("departure"); }, children: "Add Departure" }), _jsx(Button, { variant: "outline-secondary", size: "sm", leadingIcon: "plus", onClick: function () { return onClick("inter-hotel"); }, children: "Add Inter-Hotel" })] })); };
     // Handle adding transfer from round-trip mode (switches to custom and adds new transfer)
     var handleAddTransferFromRoundTrip = function (type) {
-        // Add the new transfer of the clicked type
-        var newTransfer = {
-            id: generateTransferId(),
-            type: type,
-        };
-        // Set the transfer and switch to custom mode
-        setTransferLines([newTransfer]);
+        var newTransferLines = [];
+        if (hasRoundtripData(roundTripData)) {
+            // Half/full Roundtrip data → prefilled arrival & departure + Adding the appropriate transfer type (2h)
+            var prefilledLines = createPrefilledTransferLines(roundTripData);
+            // Add the new transfer of the clicked type with prefilled data
+            var newTransfer = {
+                id: generateTransferId(),
+                type: type,
+                paxData: roundTripData.paxData,
+                // Use the appropriate date based on transfer type
+                transferDate: type === "arrival"
+                    ? roundTripData.arrivalDate
+                    : type === "departure"
+                        ? roundTripData.departureDate
+                        : undefined,
+                // Use appropriate pickup/dropoff points based on transfer type
+                pickupPoint: type === "arrival"
+                    ? roundTripData.pickupDropoffPoint
+                    : type === "departure"
+                        ? roundTripData.accommodation
+                        : type === "inter-hotel"
+                            ? roundTripData.accommodation // Inter-hotel pickup = arrival's dropoff (accommodation)
+                            : undefined,
+                dropoffPoint: type === "arrival"
+                    ? roundTripData.accommodation
+                    : type === "departure"
+                        ? roundTripData.pickupDropoffPoint
+                        : undefined,
+            };
+            // Combine prefilled lines with the new transfer
+            newTransferLines = __spreadArray(__spreadArray([], prefilledLines, true), [newTransfer], false);
+        }
+        else {
+            // Empty Roundtrip data → Adding the appropriate transfer type (1h)
+            var newTransfer = {
+                id: generateTransferId(),
+                type: type,
+            };
+            newTransferLines = [newTransfer];
+        }
+        // Set the transfers and switch to custom mode
+        setTransferLines(newTransferLines);
         setRoundTripData(undefined);
         setMode("custom");
         setError(null);

package/package.json

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

package/src/components/organisms/SearchBarTransfer/SearchBarTransfer.tsx

@@ -102,14 +102,63 @@ const SearchBarTransfer: React.FC<SearchBarTransferProps> = ({
     { value: "custom", label: "Custom transfer" },
   ];
 
+  // Helper function to check if roundtrip data is empty or has data
+  const hasRoundtripData = (data?: RoundTripData): boolean => {
+    if (!data) return false;
+    // Check if at least one field has data (half or full data)
+    return !!(
+      data.paxData ||
+      data.arrivalDate ||
+      data.departureDate ||
+      data.pickupDropoffPoint ||
+      data.accommodation
+    );
+  };
+
+  // Helper function to create prefilled transfer lines from roundtrip data
+  const createPrefilledTransferLines = (data: RoundTripData): TransferLineData[] => {
+    const lines: TransferLineData[] = [];
+
+    // Create arrival transfer
+    const arrivalTransfer: TransferLineData = {
+      id: generateTransferId(),
+      type: "arrival",
+      paxData: data.paxData,
+      transferDate: data.arrivalDate,
+      pickupPoint: data.pickupDropoffPoint,
+      dropoffPoint: data.accommodation,
+    };
+    lines.push(arrivalTransfer);
+
+    // Create departure transfer
+    const departureTransfer: TransferLineData = {
+      id: generateTransferId(),
+      type: "departure",
+      paxData: data.paxData,
+      transferDate: data.departureDate,
+      pickupPoint: data.accommodation,
+      dropoffPoint: data.pickupDropoffPoint,
+    };
+    lines.push(departureTransfer);
+
+    return lines;
+  };
+
   // Handle mode change
   const handleModeChange = (newMode: string) => {
     const transferMode = newMode as TransferMode;
     if (transferMode === mode) return;
 
     if (transferMode === "custom" && mode === "roundtrip") {
-      // When switching to custom mode, reset transfer lines (will show placeholder)
-      setTransferLines([]);
+      // When switching from roundtrip to custom mode
+      if (hasRoundtripData(roundTripData)) {
+        // Half/full Roundtrip data → prefilled arrival and departure (2h)
+        const prefilledLines = createPrefilledTransferLines(roundTripData!);
+        setTransferLines(prefilledLines);
+      } else {
+        // Empty Roundtrip data → empty custom transfer (1h)
+        setTransferLines([]);
+      }
       setRoundTripData(undefined);
     } else if (transferMode === "roundtrip" && mode === "custom") {
       // Reset everything when switching to roundtrip
@@ -127,6 +176,29 @@ const SearchBarTransfer: React.FC<SearchBarTransferProps> = ({
       id: generateTransferId(),
       type,
     };
+
+    if (transferLines.length > 0) {
+      // If adding inter-hotel, set pickup point to the dropoff of latest arrival
+      if (type === "inter-hotel") {
+        const arrivalTransfers = transferLines.filter(line => line.type === "arrival");
+        if (arrivalTransfers.length > 0) {
+          const latestArrival = arrivalTransfers[arrivalTransfers.length - 1];
+          newTransfer.pickupPoint = latestArrival.dropoffPoint;
+        }
+      }
+      
+      // If adding departure, set pickup point to the dropoff of latest arrival or inter-hotel
+      if (type === "departure") {
+        const arrivalAndInterHotelTransfers = transferLines.filter(
+          line => line.type === "arrival" || line.type === "inter-hotel"
+        );
+        if (arrivalAndInterHotelTransfers.length > 0) {
+          const latestTransfer = arrivalAndInterHotelTransfers[arrivalAndInterHotelTransfers.length - 1];
+          newTransfer.pickupPoint = latestTransfer.dropoffPoint;
+        }
+      }
+    }
+
     setTransferLines([...transferLines, newTransfer]);
   };
 
@@ -162,14 +234,51 @@ const SearchBarTransfer: React.FC<SearchBarTransferProps> = ({
 
   // Handle adding transfer from round-trip mode (switches to custom and adds new transfer)
   const handleAddTransferFromRoundTrip = (type: TransferType) => {
-    // Add the new transfer of the clicked type
-    const newTransfer: TransferLineData = {
-      id: generateTransferId(),
-      type,
-    };
+    let newTransferLines: TransferLineData[] = [];
+
+    if (hasRoundtripData(roundTripData)) {
+      // Half/full Roundtrip data → prefilled arrival & departure + Adding the appropriate transfer type (2h)
+      const prefilledLines = createPrefilledTransferLines(roundTripData!);
+      
+      // Add the new transfer of the clicked type with prefilled data
+      const newTransfer: TransferLineData = {
+        id: generateTransferId(),
+        type,
+        paxData: roundTripData!.paxData,
+        // Use the appropriate date based on transfer type
+        transferDate: type === "arrival" 
+          ? roundTripData!.arrivalDate 
+          : type === "departure" 
+            ? roundTripData!.departureDate 
+            : undefined,
+        // Use appropriate pickup/dropoff points based on transfer type
+        pickupPoint: type === "arrival" 
+          ? roundTripData!.pickupDropoffPoint 
+          : type === "departure" 
+            ? roundTripData!.accommodation 
+            : type === "inter-hotel"
+              ? roundTripData!.accommodation // Inter-hotel pickup = arrival's dropoff (accommodation)
+              : undefined,
+        dropoffPoint: type === "arrival" 
+          ? roundTripData!.accommodation 
+          : type === "departure" 
+            ? roundTripData!.pickupDropoffPoint 
+            : undefined,
+      };
+      
+      // Combine prefilled lines with the new transfer
+      newTransferLines = [...prefilledLines, newTransfer];
+    } else {
+      // Empty Roundtrip data → Adding the appropriate transfer type (1h)
+      const newTransfer: TransferLineData = {
+        id: generateTransferId(),
+        type,
+      };
+      newTransferLines = [newTransfer];
+    }
 
-    // Set the transfer and switch to custom mode
-    setTransferLines([newTransfer]);
+    // Set the transfers and switch to custom mode
+    setTransferLines(newTransferLines);
     setRoundTripData(undefined);
     setMode("custom");
     setError(null);