@pisell/private-materials 6.11.652 → 6.11.654

package/es/pro/skuDetailModal/flow/modules/time/index.js

@@ -10,7 +10,7 @@ import { buildDraftCacheItem, getModuleOptions, getUnsupportedBookingFlowReason,
 import TimeResourceSelector from "../../../../../components/eventBooking/components/timeResourceSelector/index.js";
 import { resolveAvailabilityStatus } from "../../../../../components/eventBooking/components/bookingAvailabilityCalendar/utils.js";
 import { validateAvailabilityTimeAutoResolution } from "../autoResolution.js";
-import { getAvailabilityCandidateDurationMinutes, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, shouldShowPosCustomTimeCandidateCards } from "./posCustomTime.js";
+import { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, resolvePosFlexibleDurationInitialCandidate, shouldShowPosCustomTimeCandidateCards } from "./posCustomTime.js";
 import dayjs from "dayjs";
 import React, { useEffect, useMemo } from "react";
 import { Alert, Space } from "antd";
@@ -217,7 +217,7 @@ const refreshAvailabilityTimes = function() {
 				yield refreshAvailabilityTimes(context, module, {
 					durationOverride: nextDuration,
 					startTimeOverride: nextStartTime,
-					selectionIntent: "custom"
+					selectionIntent: "fallback"
 				});
 				return;
 			}
@@ -264,25 +264,35 @@ const refreshAvailabilityTimes = function() {
 			durationMinutes: requestedPosDuration
 		}) : isSameCandidateStart(candidate, selectedDate, requestedPosStartTime)) : void 0;
 		const customSelectionIntent = posCustomTimeAvailability && selectionIntent === "custom";
+		const requestedCustomRange = requestedPosStartTime && requestedPosDuration ? {
+			date: selectedDate,
+			startTime: requestedPosStartTime,
+			durationMinutes: requestedPosDuration
+		} : void 0;
 		const restoredCandidate = resolvePosCustomTimeCandidate({
 			candidates: times.filter((candidate) => isAvailabilityCandidateSelectable(candidate, allowUnavailable)),
 			customSelectionIntent,
-			requestedCustomRange: customSelectionIntent && requestedPosStartTime && requestedPosDuration ? {
-				date: selectedDate,
-				startTime: requestedPosStartTime,
-				durationMinutes: requestedPosDuration
-			} : void 0,
+			requestedCustomRange: customSelectionIntent ? requestedCustomRange : void 0,
 			restoredDraftCandidate,
 			restoredExistingCandidate,
 			fallbackCandidate: fallbackOsCandidate
 		});
 		const normallySelectableCandidates = times.filter((candidate) => isAvailabilityCandidateSelectable(candidate));
 		const selectableCandidates = normallySelectableCandidates.length > 0 || !allowUnavailable ? normallySelectableCandidates : times;
-		const initialCandidate = restoredCandidate || (posCustomTimeAvailability && Boolean(requestedPosStartTime && requestedPosDuration) ? void 0 : selectableCandidates[0]);
+		const shouldPreserveRequestedPosStart = posCustomTimeAvailability && Boolean(requestedPosStartTime && requestedPosDuration);
+		const displayCandidates = posSessionAvailability ? getSessionPresetCandidates(times) : posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? getPosFlexibleDurationPresetCandidates(times, requestedCustomRange, customSelectionIntent) : times;
+		const fallbackCandidate = shouldPreserveRequestedPosStart ? void 0 : selectableCandidates[0];
+		const preferPosFlexiblePreset = posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && !customSelectionIntent && context.services.selectionFlowMode !== "edit" && (selectionIntent === "fallback" || !existingCandidate || existingCandidate.date !== selectedDate);
+		const initialCandidate = posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? resolvePosFlexibleDurationInitialCandidate({
+			presetCandidates: displayCandidates,
+			restoredCandidate,
+			fallbackCandidate,
+			preferPreset: preferPosFlexiblePreset
+		}) : restoredCandidate || fallbackCandidate;
 		context.setModuleData(module.key, {
 			requestId,
 			slotStepMinutes: group === null || group === void 0 ? void 0 : group.slotStepMinutes,
-			timeSlots: (posSessionAvailability ? getSessionPresetCandidates(times) : times).map((candidate) => ({
+			timeSlots: displayCandidates.map((candidate) => ({
 				id: candidate.key,
 				start_time: candidate.startTime,
 				end_time: candidate.endTime,

package/es/pro/skuDetailModal/flow/modules/time/posCustomTime.js

@@ -55,5 +55,15 @@ const resolvePosCustomTimeCandidate = (params) => {
 	return params.restoredDraftCandidate || params.restoredExistingCandidate || params.fallbackCandidate;
 };
 const getSessionPresetCandidates = (candidates) => candidates.filter((candidate) => candidate.source === "session_schedule");
+const getPosFlexibleDurationPresetCandidates = (candidates, requestedCustomRange, customSelectionIntent = false) => {
+	if (!requestedCustomRange) return [...candidates];
+	const presets = candidates.filter((candidate) => !isSameAvailabilityCandidateRange(candidate, requestedCustomRange));
+	return presets.length > 0 || customSelectionIntent ? presets : [...candidates];
+};
+const resolvePosFlexibleDurationInitialCandidate = (params) => {
+	const firstAvailablePreset = params.presetCandidates.find((candidate) => (!candidate.status || candidate.status === "available" || candidate.status === "limited") && !(typeof candidate.maxPartySize === "number" && candidate.maxPartySize <= 0));
+	if (params.preferPreset && firstAvailablePreset) return firstAvailablePreset;
+	return params.restoredCandidate || params.fallbackCandidate;
+};
 //#endregion
-export { getAvailabilityCandidateDurationMinutes, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, shouldShowPosCustomTimeCandidateCards };
+export { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, resolvePosFlexibleDurationInitialCandidate, shouldShowPosCustomTimeCandidateCards };

package/lib/pro/skuDetailModal/flow/modules/time/index.js

@@ -221,7 +221,7 @@ const refreshAvailabilityTimes = function() {
 				yield refreshAvailabilityTimes(context, module, {
 					durationOverride: nextDuration,
 					startTimeOverride: nextStartTime,
-					selectionIntent: "custom"
+					selectionIntent: "fallback"
 				});
 				return;
 			}
@@ -268,25 +268,35 @@ const refreshAvailabilityTimes = function() {
 			durationMinutes: requestedPosDuration
 		}) : isSameCandidateStart(candidate, selectedDate, requestedPosStartTime)) : void 0;
 		const customSelectionIntent = posCustomTimeAvailability && selectionIntent === "custom";
+		const requestedCustomRange = requestedPosStartTime && requestedPosDuration ? {
+			date: selectedDate,
+			startTime: requestedPosStartTime,
+			durationMinutes: requestedPosDuration
+		} : void 0;
 		const restoredCandidate = require_posCustomTime.resolvePosCustomTimeCandidate({
 			candidates: times.filter((candidate) => isAvailabilityCandidateSelectable(candidate, allowUnavailable)),
 			customSelectionIntent,
-			requestedCustomRange: customSelectionIntent && requestedPosStartTime && requestedPosDuration ? {
-				date: selectedDate,
-				startTime: requestedPosStartTime,
-				durationMinutes: requestedPosDuration
-			} : void 0,
+			requestedCustomRange: customSelectionIntent ? requestedCustomRange : void 0,
 			restoredDraftCandidate,
 			restoredExistingCandidate,
 			fallbackCandidate: fallbackOsCandidate
 		});
 		const normallySelectableCandidates = times.filter((candidate) => isAvailabilityCandidateSelectable(candidate));
 		const selectableCandidates = normallySelectableCandidates.length > 0 || !allowUnavailable ? normallySelectableCandidates : times;
-		const initialCandidate = restoredCandidate || (posCustomTimeAvailability && Boolean(requestedPosStartTime && requestedPosDuration) ? void 0 : selectableCandidates[0]);
+		const shouldPreserveRequestedPosStart = posCustomTimeAvailability && Boolean(requestedPosStartTime && requestedPosDuration);
+		const displayCandidates = posSessionAvailability ? require_posCustomTime.getSessionPresetCandidates(times) : posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? require_posCustomTime.getPosFlexibleDurationPresetCandidates(times, requestedCustomRange, customSelectionIntent) : times;
+		const fallbackCandidate = shouldPreserveRequestedPosStart ? void 0 : selectableCandidates[0];
+		const preferPosFlexiblePreset = posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && !customSelectionIntent && context.services.selectionFlowMode !== "edit" && (selectionIntent === "fallback" || !existingCandidate || existingCandidate.date !== selectedDate);
+		const initialCandidate = posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? require_posCustomTime.resolvePosFlexibleDurationInitialCandidate({
+			presetCandidates: displayCandidates,
+			restoredCandidate,
+			fallbackCandidate,
+			preferPreset: preferPosFlexiblePreset
+		}) : restoredCandidate || fallbackCandidate;
 		context.setModuleData(module.key, {
 			requestId,
 			slotStepMinutes: group === null || group === void 0 ? void 0 : group.slotStepMinutes,
-			timeSlots: (posSessionAvailability ? require_posCustomTime.getSessionPresetCandidates(times) : times).map((candidate) => ({
+			timeSlots: displayCandidates.map((candidate) => ({
 				id: candidate.key,
 				start_time: candidate.startTime,
 				end_time: candidate.endTime,

package/lib/pro/skuDetailModal/flow/modules/time/posCustomTime.js

@@ -57,8 +57,19 @@ const resolvePosCustomTimeCandidate = (params) => {
 	return params.restoredDraftCandidate || params.restoredExistingCandidate || params.fallbackCandidate;
 };
 const getSessionPresetCandidates = (candidates) => candidates.filter((candidate) => candidate.source === "session_schedule");
+const getPosFlexibleDurationPresetCandidates = (candidates, requestedCustomRange, customSelectionIntent = false) => {
+	if (!requestedCustomRange) return [...candidates];
+	const presets = candidates.filter((candidate) => !isSameAvailabilityCandidateRange(candidate, requestedCustomRange));
+	return presets.length > 0 || customSelectionIntent ? presets : [...candidates];
+};
+const resolvePosFlexibleDurationInitialCandidate = (params) => {
+	const firstAvailablePreset = params.presetCandidates.find((candidate) => (!candidate.status || candidate.status === "available" || candidate.status === "limited") && !(typeof candidate.maxPartySize === "number" && candidate.maxPartySize <= 0));
+	if (params.preferPreset && firstAvailablePreset) return firstAvailablePreset;
+	return params.restoredCandidate || params.fallbackCandidate;
+};
 //#endregion
 exports.getAvailabilityCandidateDurationMinutes = getAvailabilityCandidateDurationMinutes;
+exports.getPosFlexibleDurationPresetCandidates = getPosFlexibleDurationPresetCandidates;
 exports.getSessionPresetCandidates = getSessionPresetCandidates;
 exports.isFlexibleDurationValue = isFlexibleDurationValue;
 exports.isSameAvailabilityCandidateRange = isSameAvailabilityCandidateRange;
@@ -66,4 +77,5 @@ exports.resolvePosCustomTimeBaseMinutes = resolvePosCustomTimeBaseMinutes;
 exports.resolvePosCustomTimeCandidate = resolvePosCustomTimeCandidate;
 exports.resolvePosCustomTimeDefaultDurationMinutes = resolvePosCustomTimeDefaultDurationMinutes;
 exports.resolvePosCustomTimeDefaultStartTime = resolvePosCustomTimeDefaultStartTime;
+exports.resolvePosFlexibleDurationInitialCandidate = resolvePosFlexibleDurationInitialCandidate;
 exports.shouldShowPosCustomTimeCandidateCards = shouldShowPosCustomTimeCandidateCards;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.652",
+  "version": "6.11.654",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,10 +70,10 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/utils": "3.0.4",
     "@pisell/materials": "6.11.256",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.10"
+    "@pisell/date-picker": "3.0.10",
+    "@pisell/utils": "3.0.4"
   },
   "peerDependencies": {
     "react": "^18.0.0",