@riverbankcms/sdk 0.136.0 → 0.138.0

package/dist/client/{eventDetails-Bl2vWgTX.mjs → eventDetails-BWwGJ54l.mjs}

@@ -1,6 +1,8 @@
-import { B as formatEventPrice, J as resolveEventLinkProps, Jt as toBookingTimeZone, O as resolveEventRegistrationScopedEvents, Qt as publicEventPricingType, Wt as getBookingLocalDateKey, Xt as publicEventPricingCurrency, Y as resolveRuntimeEventPricing, Yt as toScheduledBookingDateTime, et as formatWholeSeriesPriceAmount, nt as resolveWholeSeriesPricingState, t as defineIslandPropsDecoder, tn as formatCurrencyAmount, tt as formatWholeSeriesPriceDisplay, z as formatEventDateParts } from "./propsDecoder-pzBeCh14.mjs";
+import { $t as toBookingTimeZone, Bt as CANCELLED_SESSION_STATUS, O as resolveEventRegistrationScopedEvents, Vt as resolveWholeSeriesBookingPhase, Yt as getBookingLocalDateKey, an as publicEventPricingCurrency, in as isPublicEventPricingOptionDisplayable, ln as publicEventPricingType, nn as formatBookingPriceDisplay, on as publicEventPricingDisplay, t as defineIslandPropsDecoder, tn as toScheduledBookingDateTime, un as formatCurrencyAmount } from "./propsDecoder-CY9gGEF7.mjs";
+import { l as formatTotalCapacity, n as formatEventPriceAmount, t as formatEventPrice } from "./pricing-xj7MPZlK.mjs";
+import { l as resolveEventLinkProps, r as formatEventDateParts } from "./dates-DCYhZBlW.mjs";
 import { t as mountReactIsland } from "./reactMount-SY8AVRof.mjs";
-import { t as LeafletStaticMap } from "./LeafletStaticMap-BY5mIHw9.mjs";
+import { t as LeafletStaticMap } from "./LeafletStaticMap-CWzcq73L.mjs";
 import "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region ../blocks/src/system/runtime/nodes/events/shared/eventProductEligibility.ts
@@ -27,10 +29,9 @@ function membershipCoversEvent(args, event) {
 function filterPassesForEvent(sitePasses, event) {
 	if (!sitePasses || !event) return [];
 	if (event.requiresRegistration === false) return [];
-	const acceptsPasses = event.acceptsPasses ?? true;
 	const eventCategoryId = event.eventCategory?.id ?? null;
 	return sitePasses.filter((pass) => pass.productUseCase === "event_pass" && passCoversEvent({ eligibleCategoryIds: pass.eligibleCategoryIds }, {
-		acceptsPasses,
+		acceptsPasses: event.acceptsPasses,
 		eventCategoryId
 	}));
 }
@@ -44,10 +45,9 @@ function filterPassesForEvent(sitePasses, event) {
 function filterMembershipsForEvent(siteMemberships, event) {
 	if (!siteMemberships || !event) return [];
 	if (event.requiresRegistration === false) return [];
-	const acceptsMemberships = event.acceptsMemberships ?? true;
 	const eventCategoryId = event.eventCategory?.id ?? null;
 	return siteMemberships.filter((membership) => membershipCoversEvent({ eligibleCategoryIds: membership.eligibleCategoryIds }, {
-		acceptsMemberships,
+		acceptsMemberships: event.acceptsMemberships,
 		eventCategoryId
 	}));
 }
@@ -127,11 +127,18 @@ function isWholeSeriesEvent(event) {
 function isOrdinaryEvent(event) {
 	return event.bookingScope === "single_occurrence";
 }
-function deriveWholeSeriesPhase(sessions, nowIso) {
-	const now = Date.parse(nowIso);
-	if (now < Date.parse(sessions[0].startsAt)) return "upcoming";
-	const finalSession = sessions[sessions.length - 1] ?? sessions[0];
-	return now <= Date.parse(finalSession.endsAt) ? "inProgress" : "completed";
+/**
+* Where the run has got to, as the page should say it.
+*
+* `run.lifecycle` is the canonical answer and it is projected server-side. The
+* one thing a cached page can outlive is the start of the first session, and
+* the shared booking phase is what notices that, so an otherwise-upcoming run
+* that has begun is reported as under way. Nothing else is re-derived: reading
+* the state off the occurrence dates instead is how this block came to
+* contradict the run it was describing.
+*/
+function renderedRunLifecycle(run, bookingPhase) {
+	return run.lifecycle === "upcoming" && bookingPhase.kind === "closed" && bookingPhase.reason === "in-progress" ? "in_progress" : run.lifecycle;
 }
 function selectRelatedDates(input) {
 	if (!input.seriesId) return [];
@@ -159,16 +166,16 @@ function selectEventDetails(args) {
 		limit: otherLimit
 	});
 	if (isWholeSeriesEvent(selected)) {
-		const [firstSession, ...remainingSessions] = [selected, ...otherDates].filter(isWholeSeriesEvent).sort((left, right) => Date.parse(left.startsAt) - Date.parse(right.startsAt));
-		if (!firstSession) return emptySelection(timeZone);
-		const nonEmptySessions = [firstSession, ...remainingSessions];
+		const run = selected.run;
+		const bookingPhase = resolveWholeSeriesBookingPhase(run, new Date(args.nowIso));
 		return {
 			kind: "wholeSeries",
-			phase: deriveWholeSeriesPhase(nonEmptySessions, args.nowIso),
+			lifecycle: renderedRunLifecycle(run, bookingPhase),
+			bookingPhase,
 			mode,
 			selected,
-			otherDates: otherDates.filter(isWholeSeriesEvent),
-			sessions: nonEmptySessions,
+			run,
+			sessions: run.sessions,
 			timeZone
 		};
 	}
@@ -247,25 +254,26 @@ function DateTimeTile({ startsAt, endsAt, timeZone }) {
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-details/WholeSeriesPricingDisplay.tsx
 function WholeSeriesPricingDisplay({ pricing, acceptedItems }) {
+	const options = pricing.kind === "tiered" ? pricing.options.filter((option) => option.isActive) : [];
 	return /* @__PURE__ */ jsxs("div", {
 		className: "rb-mt-6",
 		children: [
 			/* @__PURE__ */ jsx("div", {
 				className: "rb-label rb-mb-2",
-				children: pricing.selectableOptions.length > 1 ? "Pricing" : "Cost"
+				children: options.length > 1 ? "Pricing" : "Cost"
 			}),
-			pricing.selectableOptions.length > 1 ? /* @__PURE__ */ jsx("div", {
+			options.length > 1 ? /* @__PURE__ */ jsx("div", {
 				className: "rb-flex rb-flex-col rb-gap-2",
-				children: pricing.selectableOptions.map((option) => /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsxs("strong", { children: [
+				children: options.map((option) => /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsxs("strong", { children: [
 					option.name,
 					":",
 					" ",
-					formatWholeSeriesPriceAmount(option.priceAmount, pricing.currency)
+					formatEventPriceAmount(option.priceAmount, pricing.currency)
 				] }), option.description ? /* @__PURE__ */ jsx("p", {
 					className: "rb-caption status-muted",
 					children: option.description
 				}) : null] }, option.id))
-			}) : /* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: formatWholeSeriesPriceDisplay(pricing.display) }) }),
+			}) : /* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: formatBookingPriceDisplay(publicEventPricingDisplay(pricing)) }) }),
 			acceptedItems.length > 0 ? /* @__PURE__ */ jsxs("p", {
 				className: "rb-caption rb-mt-1",
 				children: ["You can also attend with: ", acceptedItems.join(", ")]
@@ -276,7 +284,7 @@ function WholeSeriesPricingDisplay({ pricing, acceptedItems }) {
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-details/view.tsx
 function formatAutoApplyDiscountLine(preview, currency) {
-	const rate = preview.discountType === "percent" ? `${preview.discountPercent}% off` : `${formatWholeSeriesPriceAmount(preview.discountAmountCents, currency)} off`;
+	const rate = preview.discountType === "percent" ? `${preview.discountPercent}% off` : `${formatEventPriceAmount(preview.discountAmountCents, currency)} off`;
 	const label = preview.publicLabel.trim() || "Discount";
 	return preview.minTicketsRequired && preview.minTicketsRequired > 1 ? `${label} — ${rate} when buying ${preview.minTicketsRequired}+ tickets` : `${label} — ${rate} applied automatically`;
 }
@@ -290,8 +298,8 @@ function TeamMemberName({ name, profilePath }) {
 function formatTicketTypePrice(ticketType, currency) {
 	return formatCurrencyAmount(ticketType.priceAmount, currency, { decimals: "auto" });
 }
-function getActiveTicketTypes(event) {
-	return event.pricing.kind === "ticket_types" ? event.pricing.ticketTypes.filter((ticketType) => ticketType.isActive).sort((left, right) => left.sortOrder - right.sortOrder) : [];
+function getDisplayablePricingOptions(event) {
+	return event.pricing.kind === "tiered" ? event.pricing.options.filter(isPublicEventPricingOptionDisplayable).sort((left, right) => left.sortOrder - right.sortOrder) : [];
 }
 function TicketTypePriceList({ ticketTypes, currency }) {
 	if (ticketTypes.length === 0) return null;
@@ -306,7 +314,7 @@ function TicketTypePriceList({ ticketTypes, currency }) {
 		}, ticketType.id))
 	});
 }
-function EventPricingDetails({ isDropIn, coursePricing, acceptedItems, eventCostLabel, eventPricingCurrency, ticketTypes, autoApplyDiscount }) {
+function EventPricingDetails({ isDropIn, wholeSeriesPricingDisplay, acceptedItems, eventCostLabel, eventPricingCurrency, ticketTypes, autoApplyDiscount }) {
 	if (isDropIn) return /* @__PURE__ */ jsxs("div", {
 		className: "rb-mt-6",
 		children: [/* @__PURE__ */ jsx("div", {
@@ -317,8 +325,8 @@ function EventPricingDetails({ isDropIn, coursePricing, acceptedItems, eventCost
 			children: "No registration required - just show up"
 		})]
 	});
-	if (coursePricing) return /* @__PURE__ */ jsx(WholeSeriesPricingDisplay, {
-		pricing: coursePricing,
+	if (wholeSeriesPricingDisplay) return /* @__PURE__ */ jsx(WholeSeriesPricingDisplay, {
+		pricing: wholeSeriesPricingDisplay,
 		acceptedItems: [...acceptedItems]
 	});
 	if (eventCostLabel) return /* @__PURE__ */ jsxs("div", {
@@ -329,14 +337,14 @@ function EventPricingDetails({ isDropIn, coursePricing, acceptedItems, eventCost
 				children: "Cost"
 			}),
 			/* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: eventCostLabel }) }),
-			autoApplyDiscount ? /* @__PURE__ */ jsx("p", {
+			autoApplyDiscount && eventPricingCurrency ? /* @__PURE__ */ jsx("p", {
 				className: "rb-caption rb-mt-1",
 				children: formatAutoApplyDiscountLine(autoApplyDiscount, eventPricingCurrency)
 			}) : null,
-			/* @__PURE__ */ jsx(TicketTypePriceList, {
+			eventPricingCurrency ? /* @__PURE__ */ jsx(TicketTypePriceList, {
 				ticketTypes,
 				currency: eventPricingCurrency
-			}),
+			}) : null,
 			acceptedItems.length > 0 ? /* @__PURE__ */ jsxs("p", {
 				className: "rb-caption rb-mt-1",
 				children: ["You can also attend with: ", acceptedItems.join(", ")]
@@ -363,7 +371,7 @@ function EventFacts({ selection, selected, venue, teamMembers, pricing, showCapa
 			/* @__PURE__ */ jsxs("div", { children: [
 				/* @__PURE__ */ jsx("div", {
 					className: "rb-label rb-mb-2",
-					children: selection.kind === "wholeSeries" ? selection.phase === "upcoming" ? "First session" : selection.phase === "inProgress" ? "Course in progress" : "Course finished" : selection.mode === "next" ? "Next date" : "Date"
+					children: selection.kind === "wholeSeries" ? runLifecycleLabel(selection.lifecycle) : selection.mode === "next" ? "Next date" : "Date"
 				}),
 				/* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: date }) }),
 				/* @__PURE__ */ jsx("p", {
@@ -406,27 +414,102 @@ function EventFacts({ selection, selected, venue, teamMembers, pricing, showCapa
 				children: [/* @__PURE__ */ jsx("div", {
 					className: "rb-label rb-mb-2",
 					children: "Places"
-				}), /* @__PURE__ */ jsxs("p", { children: [selected.capacity, " places"] })]
+				}), /* @__PURE__ */ jsx("p", { children: formatTotalCapacity(selected.capacity) })]
 			}) : null,
 			pricing,
-			selected.bookingScope === "whole_series" ? /* @__PURE__ */ jsxs("div", {
-				className: "rb-mt-6",
-				children: [/* @__PURE__ */ jsx("div", {
-					className: "rb-label rb-mb-2",
-					children: "Registration"
-				}), /* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: selected.wholeSeries?.enrollmentOpen ? "Open" : "Closed" }) })]
+			selection.kind === "wholeSeries" ? /* @__PURE__ */ jsx(BookingState, { phase: selection.bookingPhase }) : null
+		]
+	});
+}
+/**
+* Where the run has got to, in the words a visitor would use.
+*
+* A cancelled run says so plainly rather than being described by its dates,
+* which is what happens when the label is inferred from the schedule alone.
+*/
+function runLifecycleLabel(lifecycle) {
+	switch (lifecycle) {
+		case "upcoming": return "First session";
+		case "in_progress": return "In progress";
+		case "completed": return "Finished";
+		case "cancelled": return "Cancelled";
+	}
+}
+/**
+* Whether these dates still take bookings, and if not, why.
+*
+* The run decides, not its enrolment flag on its own: a cancelled run can still
+* carry an open enrolment window and future dates, and saying "Open" here while
+* the booking panel beside it says cancelled is the contradiction a visitor
+* actually notices.
+*/
+function BookingState({ phase }) {
+	return /* @__PURE__ */ jsxs("div", {
+		className: "rb-mt-6",
+		children: [
+			/* @__PURE__ */ jsx("div", {
+				className: "rb-label rb-mb-2",
+				children: "Booking"
+			}),
+			/* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: phase.kind === "open" ? "Open" : "Closed" }) }),
+			phase.kind === "closed" ? /* @__PURE__ */ jsx("p", {
+				className: "rb-caption",
+				children: bookingClosedReason(phase.reason)
 			}) : null
 		]
 	});
 }
+function bookingClosedReason(reason) {
+	switch (reason) {
+		case "cancelled": return "These dates have been cancelled.";
+		case "in-progress": return "Bookings closed when the first session began.";
+		case "completed": return "These dates have finished.";
+		case "enrolment-closed": return "Bookings for these dates have closed.";
+		case "no-sessions": return "No dates are currently scheduled.";
+	}
+}
+/**
+* The run's own schedule, cancellations included and labelled.
+*
+* Every session belongs to the run whose page this is, so the schedule is a
+* list rather than a set of links to somewhere else. A cancelled week stays on
+* the list and says so: dropping it would leave a visitor wondering whether
+* they had misremembered the dates.
+*/
+function SessionSchedule({ sessions, timeZone }) {
+	if (sessions.length === 0) return null;
+	return /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx("div", {
+		className: "rb-label",
+		children: "Session schedule"
+	}), /* @__PURE__ */ jsx("div", {
+		className: "rb-mt-2 rb-tiles-grid",
+		children: sessions.map((session) => {
+			const cancelled = session.status === CANCELLED_SESSION_STATUS;
+			return /* @__PURE__ */ jsxs("div", {
+				className: `rb-tile${cancelled ? " rb-tile--cancelled" : ""}`,
+				children: [/* @__PURE__ */ jsx(DateTimeTile, {
+					startsAt: session.startsAt,
+					endsAt: session.endsAt,
+					timeZone
+				}), cancelled ? /* @__PURE__ */ jsx("p", {
+					className: "rb-caption status-muted",
+					children: "Cancelled"
+				}) : null]
+			}, session.occurrenceId);
+		})
+	})] });
+}
 function OtherEventDates({ selection }) {
 	if (selection.kind === "empty") return null;
-	const isWholeSeries = selection.kind === "wholeSeries";
-	const dates = isWholeSeries ? selection.sessions : selection.otherDates;
+	if (selection.kind === "wholeSeries") return /* @__PURE__ */ jsx(SessionSchedule, {
+		sessions: selection.sessions,
+		timeZone: selection.timeZone
+	});
+	const dates = selection.otherDates;
 	if (dates.length === 0) return null;
 	return /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx("div", {
 		className: "rb-label",
-		children: isWholeSeries ? "Session schedule" : "Other dates"
+		children: "Other dates"
 	}), /* @__PURE__ */ jsx("div", {
 		className: "rb-mt-2 rb-tiles-grid",
 		children: dates.map((event) => /* @__PURE__ */ jsx("a", {
@@ -465,13 +548,10 @@ function SelectedEventDetailsView({ selection, showVenue, showMap, showOtherDate
 	const selected = selection.selected;
 	const venue = showVenue ? selected.venue : void 0;
 	const isDropIn = selected.bookingScope === "single_occurrence" && selected.requiresRegistration === false;
-	const wholeSeriesPricing = selected.bookingScope === "whole_series" && selected.wholeSeries ? resolveWholeSeriesPricingState({
-		pricing: selected.wholeSeries.pricing,
-		currency: selected.wholeSeries.currency
-	}) : null;
-	const eventPricing = resolveRuntimeEventPricing(selected);
-	const currency = publicEventPricingCurrency(eventPricing) ?? "USD";
-	const showEventCost = showCost && publicEventPricingType(eventPricing) === "paid" && !isDropIn && wholeSeriesPricing === null;
+	const wholeSeriesPricing = selected.bookingScope === "whole_series" && selected.pricing.kind !== "external" ? selected.pricing : null;
+	const eventPricing = selected.pricing;
+	const currency = publicEventPricingCurrency(eventPricing);
+	const showEventCost = showCost && publicEventPricingType(eventPricing) !== "free" && !isDropIn && wholeSeriesPricing === null;
 	return /* @__PURE__ */ jsxs("div", {
 		className: "rb-flex rb-flex-col rb-gap-6 rb-text-left",
 		children: [
@@ -490,11 +570,11 @@ function SelectedEventDetailsView({ selection, showVenue, showMap, showOtherDate
 					showCapacity,
 					pricing: /* @__PURE__ */ jsx(EventPricingDetails, {
 						isDropIn,
-						coursePricing: showCost ? wholeSeriesPricing : null,
+						wholeSeriesPricingDisplay: showCost ? wholeSeriesPricing : null,
 						acceptedItems,
 						eventCostLabel: showEventCost ? formatEventPrice(selected) : null,
 						eventPricingCurrency: currency,
-						ticketTypes: showEventCost ? getActiveTicketTypes(selected) : [],
+						ticketTypes: showEventCost ? getDisplayablePricingOptions(selected) : [],
 						autoApplyDiscount: autoApplyDiscount ?? null
 					})
 				}), /* @__PURE__ */ jsx(EventVenueMap, {

package/dist/client/{eventListing-CS7PHY7v.mjs → eventListing-DqYqV8vp.mjs}

@@ -1,8 +1,8 @@
-import { t as defineIslandPropsDecoder } from "./propsDecoder-pzBeCh14.mjs";
-import { t as BlockApiProvider } from "./context-BImarOAq.mjs";
+import { t as defineIslandPropsDecoder } from "./propsDecoder-CY9gGEF7.mjs";
+import { t as BlockApiProvider } from "./context-DBzX85Xc.mjs";
 import { t as mountReactIsland } from "./reactMount-SY8AVRof.mjs";
 import { t as buildRouteIslandApiConfig } from "./routeIslandApiConfig-UNsfPcYq.mjs";
-import { t as EventListingClient } from "./EventListing.client-DVFCDe3i.mjs";
+import { t as EventListingClient } from "./EventListing.client-99qx7jFl.mjs";
 import "react";
 import { jsx } from "react/jsx-runtime";
 //#region src/rendering/islands/enhancers/eventListing.tsx