@medalsocial/booking 0.2.1 → 0.3.1

package/dist/react/useBooking.mjs

@@ -5,6 +5,7 @@ import { stylistDisplayName } from "../core/display-name.mjs";
 import { serviceMatches } from "../core/deep-link.mjs";
 import "../core/draft-store.mjs";
 import { visitKey, visitServicesOf } from "../core/visit.mjs";
+import "../core/machine.mjs";
 import { firstOpeningPerResource } from "../core/next-available.mjs";
 import { slotKeysFor } from "../core/party-slots.mjs";
 import { stripVippsReturn, vippsConfirmFrom } from "../core/portal/vipps-return.mjs";
@@ -29,6 +30,22 @@ import { useEffect, useMemo, useReducer, useRef, useState, useSyncExternalStore
 * Moved from the source app's wizard shell with its behaviour unchanged; the
 * long-form reasoning for each rule is kept beside the rule.
 */
+/**
+* A line item as a draft keeps it. `idOnly` — nobody is logged in — keeps a
+* saved child by its id ALONE: the login the draft waits for decides, and only
+* that child's own parent gets the name back (`reseatFor`).
+*/
+function draftItem(item, idOnly = false) {
+	const saved = idOnly && item.bookedForPersonId !== void 0;
+	return {
+		serviceId: item.service.id,
+		...item.extraServices?.length ? { extraServiceIds: item.extraServices.map((service) => service.id) } : {},
+		bookedForName: saved ? null : item.bookedForName ?? null,
+		bookedForBirthYear: saved ? null : item.bookedForBirthYear ?? null,
+		adult: item.adult === true,
+		personId: item.bookedForPersonId ?? null
+	};
+}
 /** How long a replayed submission may take before the restore gate gives up. */
 const REPLAY_TIMEOUT_MS = 15e3;
 /** «hydrated» only ever flips once; `useSyncExternalStore` wants a subscription. */
@@ -81,6 +98,27 @@ function withExtraServices(submission, items) {
 		})
 	};
 }
+/**
+* Under `account.required`, each line's saved child back on it whatever phone
+* was typed. The details screen sends a person id only under the parent's own
+* number (the phone rule), but with an account required the booking goes on
+* the logged-in parent's contact anyway, so a child sent by name alone would
+* be created there a second time. The machine's id is the line's own: a name
+* typed over a saved child clears it. The route checks every id against the
+* session's own family before it is forwarded.
+*/
+function withSessionPersons(submission, items) {
+	return {
+		...submission,
+		items: submission.items.map((line, index) => {
+			const personId = items[index]?.bookedForPersonId;
+			return personId === void 0 ? line : {
+				...line,
+				bookedForPersonId: personId
+			};
+		})
+	};
+}
 /** What the create route said, narrowed to what the machine can hold. */
 function asSubmitFailure(code) {
 	switch (code) {
@@ -225,11 +263,13 @@ function setupFor(kit) {
 		const unasked = config.party.askWhoFirst ? null : kit.childCategory !== null ? { children: 1 } : { adult: true };
 		const seated = seat ?? unasked;
 		const base = seated !== null && "adult" in seated ? withAdult() : wizard.initialState();
-		if (prefill === null) {
-			if (seated === null) return wizard.initialState();
-			return "adult" in seated ? withAdult() : withGuests(seated.children);
-		}
-		return wizard.applyPrefill(base, prefill, prefillCatalogue(services, resources));
+		const state = prefill === null ? seated === null ? wizard.initialState() : "adult" in seated ? withAdult() : withGuests(seated.children) : wizard.applyPrefill(base, prefill, prefillCatalogue(services, resources));
+		if (config.screens.guestParty && seated === null && state.step === "who" && state.people.length === 0) return wizard.reduce(state, {
+			type: "choosePeople",
+			people: [wizard.guestChild(1)],
+			advance: false
+		});
+		return state;
 	}
 	return {
 		prefillFromQuery,
@@ -238,6 +278,11 @@ function setupFor(kit) {
 		initialWizardState
 	};
 }
+const CONTACT_FIELDS = [
+	"name",
+	"phone",
+	"email"
+];
 function useBooking(options) {
 	const { kit } = useBookingKit(options, options.contact);
 	const { config, labels, wizard, clock, age, phone, deepLinks } = kit;
@@ -251,7 +296,17 @@ function useBooking(options) {
 	* logged-in parent, who must not be offered the login again.
 	*/
 	const [signedIn, setSignedIn] = useState(null);
-	const guardian = signedIn?.guardian ?? arrivedAs;
+	/**
+	* The create route said nobody is logged in (`accountRequired`): the session
+	* the page arrived with — or the one taken here — has run out. From then on
+	* the parent the page found is not trusted; only a fresh login is. Sticky:
+	* a fresh login clears `sessionLost` (the notice), never this.
+	*/
+	const [arrivalExpired, setArrivalExpired] = useState(false);
+	/** The gate is back because the session ran out — until the next login. */
+	const [sessionLost, setSessionLost] = useState(false);
+	const arrivedAsNow = arrivalExpired ? null : arrivedAs;
+	const guardian = signedIn === null ? arrivedAsNow : signedIn.guardian;
 	const query = useSearchParams();
 	const [prefill] = useState(() => setup.prefillFromQuery(query, services));
 	const [deepLink] = useState(() => setup.deepLinkFromQuery(query));
@@ -272,11 +327,88 @@ function useBooking(options) {
 	/** Children a logged-in parent added from step 1 during this visit. */
 	const [addedChildren, setAddedChildren] = useState([]);
 	const family = useMemo(() => guardian === null ? null : [...guardian.family, ...addedChildren], [guardian, addedChildren]);
+	/**
+	* Guest chairs an account change left standing for a seat with services —
+	* the previous parent's child unseated, or a sent visit's child nobody could
+	* vouch for — which `seatFamily` keeps: they are the visit being booked.
+	*/
+	const [keptSeats, setKeptSeats] = useState([]);
 	/** Guest seats go when a family appears over them (`seatFamily`). */
-	const guestSeated = family !== null && state.people.some(wizard.isGuestSeat);
+	const guestSeated = family !== null && state.people.some((person) => wizard.isGuestSeat(person) && !keptSeats.includes(person.key));
 	useEffect(() => {
-		if (guestSeated) dispatch({ type: "seatFamily" });
+		if (guestSeated) dispatch({
+			type: "seatFamily",
+			keep: keptSeats
+		});
 	}, [guestSeated, state.step]);
+	/**
+	* The saved child behind each guest chair a visit was rebuilt into while
+	* nobody was logged in (`restoreDraft`), by seat key — names left out — for
+	* the next login to claim by id (`reseatFor`).
+	*/
+	const awaitingIds = useRef(null);
+	/**
+	* The account the party's saved children were seated under — its e-mail,
+	* `null` before anybody. Kept across a lost session on purpose: the seats
+	* outlive it, held under the gate, and it is the NEXT login that decides
+	* whether they still fit (`reseatFor`).
+	*/
+	const seatedFor = useRef(arrivedAs?.email ?? null);
+	useEffect(() => {
+		if (guardian !== null) seatedFor.current = guardian.email;
+	}, [guardian]);
+	/**
+	* A login from the sheet or the gate, before it lands: when it is ANOTHER
+	* account than the one the party was seated under — or one whose profile
+	* nobody could read — the previous parent's children are not this one's to
+	* book. Their seats become guest chairs (the services and the hour stay),
+	* and what the old parent added here goes with them. Only a person id says
+	* a child is the new parent's too: a child without one is matched by place,
+	* name and year, which two families can share. A guest chair rebuilt from a
+	* sent visit while nobody was logged in (`awaitingIds`) is this parent's
+	* child again when the id is theirs, and stays a blank chair when it is not;
+	* a login with no readable profile decides nothing, so the ids wait on for
+	* the next one — including those of the seats it just let go, which the
+	* next readable login claims back when they are its own. In the same batch as the login, so the form it opens never draws the old
+	* names; the chairs it leaves keep their services on a step back.
+	*/
+	function reseatFor(who) {
+		const before = seatedFor.current;
+		const now = who?.email ?? null;
+		const awaiting = who === null ? null : awaitingIds.current;
+		seatedFor.current = now;
+		if (who !== null) awaitingIds.current = null;
+		const switched = before !== null && before !== now;
+		if (!switched && awaiting === null) return;
+		if (switched) setAddedChildren([]);
+		const theirs = who?.family ?? [];
+		const keys = [];
+		const into = {};
+		for (const person of state.people) {
+			const id = awaiting?.get(person.key) ?? person.personId;
+			const at = theirs.findIndex((child) => id !== void 0 && child.personId === id);
+			if (at !== -1 && person.personId === id) continue;
+			if (at !== -1) into[person.key] = personForChild(theirs[at], at);
+			if (at !== -1 || switched && person.key !== "self" && (person.personId !== void 0 || !wizard.isGuestSeat(person))) keys.push(person.key);
+		}
+		const action = {
+			type: "unseatPeople",
+			keys,
+			into
+		};
+		const after = wizard.reduce(state, action).people;
+		const kept = after.filter((person, index) => wizard.isGuestSeat(person) && (keys.includes(state.people[index].key) || awaiting?.has(person.key)));
+		setKeptSeats((current) => [...current, ...kept.map((person) => person.key)]);
+		if (who === null && switched) {
+			const waiting = new Map(awaitingIds.current ?? []);
+			after.forEach((person, index) => {
+				const before = state.people[index];
+				if (keys.includes(before.key) && before.personId !== void 0) waiting.set(person.key, before.personId);
+			});
+			awaitingIds.current = waiting.size > 0 ? waiting : null;
+		}
+		if (keys.length > 0) dispatch(action);
+	}
 	/** A stylist a party link named, applied once the family reaches step 3. */
 	const partyStylist = useRef(arrivedAs !== null ? prefill?.resourceId ?? deepLink.stylist : null);
 	const childByKey = useMemo(() => new Map((family ?? []).map((child, index) => [personForChild(child, index).key, child])), [family]);
@@ -481,6 +613,13 @@ function useBooking(options) {
 		const resolved = draft.items.map((item) => bookable.get(item.serviceId));
 		const [first, ...rest] = resolved;
 		if (first === void 0 || resolved.some((service) => service === void 0)) return;
+		if (family === null) {
+			const ids = /* @__PURE__ */ new Map();
+			draft.items.forEach((item, index) => {
+				if (item.personId && !item.adult) ids.set(wizard.guestChild(index + 1).key, item.personId);
+			});
+			awaitingIds.current = ids.size > 0 ? ids : null;
+		}
 		if (family === null && draft.items.every((item) => typeof item.adult === "boolean")) dispatch({
 			type: "choosePeople",
 			people: draft.items.map((item, index) => item.adult ? {
@@ -581,18 +720,19 @@ function useBooking(options) {
 	/** The draft, kept current on every answer rather than written on the Vipps tap. */
 	useEffect(() => {
 		if (confirmed !== null || state.items.length === 0) {
+			if (confirmed !== null) awaitingIds.current = null;
 			kit.drafts.clearDraft();
 			return;
 		}
 		kit.drafts.stashDraft({
-			items: state.items.map((item) => ({
-				serviceId: item.service.id,
-				...item.extraServices?.length ? { extraServiceIds: item.extraServices.map((service) => service.id) } : {},
-				bookedForName: item.bookedForName ?? null,
-				bookedForBirthYear: item.bookedForBirthYear ?? null,
-				adult: item.adult === true,
-				personId: item.bookedForPersonId ?? null
-			})),
+			items: state.items.map((item, index) => {
+				const line = draftItem(item, guardian === null);
+				const waiting = awaitingIds.current?.get(state.people[index].key) ?? null;
+				return {
+					...line,
+					personId: line.personId ?? waiting
+				};
+			}),
 			resourceId: state.resourceId,
 			partyMode: state.partyMode,
 			startTs: state.startTs,
@@ -602,53 +742,76 @@ function useBooking(options) {
 	}, [
 		kit,
 		confirmed,
+		guardian,
 		state.items,
+		state.people,
 		state.resourceId,
 		state.partyMode,
 		state.startTs,
 		state.resolvedResourceId,
 		state.partyResourceIds
 	]);
+	/**
+	* The fields a logged-in parent's profile wrote, by value, for as long as it
+	* still owns them — and only those: a field the visitor filled or changed is
+	* never in here, whoever logs in next.
+	*/
+	const guardianFilled = useRef(null);
 	/** A live mirror of the contact fields, for the prefill below. */
 	const latestContact = useRef(state.contact);
 	useEffect(() => {
 		latestContact.current = state.contact;
+		const owns = guardianFilled.current?.owns;
+		if (owns === void 0) return;
+		for (const field of CONTACT_FIELDS) if (field in owns && state.contact[field] !== owns[field]) delete owns[field];
 	});
 	/**
-	* The logged-in parent's details into the fields — once per parent, into
-	* fields still BLANK or still holding exactly what the PREVIOUS parent's
-	* profile put there (a shared device), never over what the visitor typed.
+	* The logged-in parent's details into the fields — once per parent. A field
+	* the previous parent's profile still owns is theirs to replace: with this
+	* parent's value, or emptied when this profile has none (a shared device
+	* must not keep the last account's phone). A blank field is filled. A field
+	* the visitor owns is never touched, and stays theirs.
 	*/
-	const guardianFilled = useRef(null);
 	useEffect(() => {
-		if (guardian === null || guardianFilled.current?.email === guardian.email) return;
-		const previous = guardianFilled.current?.wrote;
 		const contact = latestContact.current;
-		const wrote = {
+		const previous = guardianFilled.current?.owns ?? {};
+		if (guardian === null) {
+			if (signedIn === null || guardianFilled.current === null) return;
+			guardianFilled.current = null;
+			for (const field of CONTACT_FIELDS) if (field in previous) dispatch({
+				type: "setContact",
+				field,
+				value: ""
+			});
+			return;
+		}
+		if (guardianFilled.current?.email === guardian.email) return;
+		const profile = {
 			name: [guardian.firstName, guardian.lastName].filter(Boolean).join(" ").trim(),
 			phone: guardian.phone === null ? "" : phone.nationalDigits(guardian.phone),
 			email: guardian.email
 		};
+		const owns = {};
 		guardianFilled.current = {
 			email: guardian.email,
-			wrote
+			owns
 		};
-		for (const field of [
-			"name",
-			"phone",
-			"email"
-		]) {
-			const value = wrote[field];
-			if (value === "") continue;
-			const held = contact[field].trim();
-			if (held !== "" && held !== previous?.[field]) continue;
-			dispatch({
+		for (const field of CONTACT_FIELDS) {
+			const value = profile[field];
+			const theirs = field in previous;
+			if (!theirs && contact[field].trim() !== "") continue;
+			if (value !== "") owns[field] = value;
+			if (value !== "" || theirs) dispatch({
 				type: "setContact",
 				field,
 				value
 			});
 		}
-	}, [guardian, phone]);
+	}, [
+		guardian,
+		signedIn,
+		phone
+	]);
 	const basketVisits = useMemo(() => slotKeysFor(state.items), [state.items]);
 	const basketKey = basketVisits.join("|");
 	const primaryServiceId = state.items[0]?.service.id ?? null;
@@ -830,6 +993,7 @@ function useBooking(options) {
 		let cancelled = false;
 		const key = scheduleKey;
 		const resourceId = state.resourceId;
+		setScheduleFailedFor((current) => current === key ? null : current);
 		(async () => {
 			try {
 				const response = await fetch(`${api}/schedule?${windowQuery(primaryVisit, fromTs, toTs, resourceId)}`);
@@ -841,7 +1005,10 @@ function useBooking(options) {
 					days: body.days ?? []
 				});
 			} catch {
-				if (!cancelled) setScheduleFailedFor(key);
+				if (!cancelled) {
+					setScheduleFailedFor(key);
+					setFetchedSchedule((current) => current?.key === key ? null : current);
+				}
 			}
 		})();
 		return () => {
@@ -1022,7 +1189,8 @@ function useBooking(options) {
 			return;
 		}
 		const resourceIds = wizard.itemResourceIds(state);
-		const body = withExtraServices(submission, state.items);
+		const extended = withExtraServices(submission, state.items);
+		const body = extended !== null && config.account.required ? withSessionPersons(extended, state.items) : extended;
 		if (body === null) {
 			dispatch({
 				type: "submitFailed",
@@ -1068,12 +1236,25 @@ function useBooking(options) {
 			const payload = await response.json().catch(() => null);
 			if (!response.ok) {
 				const definite = payload?.error !== void 0 && payload.error !== "upstreamError";
+				const sessionGone = payload?.error === "accountRequired";
 				if (definite) {
-					kit.attempts.clearAttempt();
+					if (sessionGone) kit.attempts.releasePending(current);
+					else kit.attempts.clearAttempt();
 					setPendingAttempt(null);
 				}
-				if (sendOptions?.replay === true || sendOptions?.pending === true && rebookLink.current !== null) {
+				const wasResumed = sendOptions?.replay === true || sendOptions?.pending === true && rebookLink.current !== null;
+				if (sessionGone) {
+					setSignedIn(null);
+					setArrivalExpired(true);
+					setSessionLost(true);
+					if (options.loginOffered !== false) {
+						if (sendOptions?.replay === true || sendOptions?.pending === true) rebuildSubmitted(submitted);
+						return;
+					}
+				}
+				if (wasResumed) {
 					if (definite) {
+						forgetChairs();
 						dispatch({ type: "startOver" });
 						restartFromLink();
 					} else dispatch({
@@ -1082,6 +1263,13 @@ function useBooking(options) {
 					});
 					return;
 				}
+				if (sessionGone) {
+					dispatch({
+						type: "submitFailed",
+						error: "upstreamError"
+					});
+					return;
+				}
 				if (payload?.error === "slotTaken") {
 					setTakenSlotTs(submitted.startTs);
 					const lost = new Set(submitted.items.map((item) => visitKey(item)));
@@ -1139,6 +1327,23 @@ function useBooking(options) {
 			setSubmitting(false);
 		}
 	}
+	/**
+	* The visit a refused replay sent, back in the machine as a draft would be
+	* — the hour on «Bekreft» — in place of the link that was waiting on it.
+	*/
+	function rebuildSubmitted(submitted) {
+		rebookLink.current = null;
+		const { items, resourceIds } = submitted;
+		restoreDraft({
+			items: items.map((item) => draftItem(item, true)),
+			resourceId: null,
+			partyMode: submitted.partyMode,
+			startTs: submitted.startTs,
+			resolvedResourceId: resourceIds[0] ?? null,
+			partyResourceIds: items.length > 1 && resourceIds.every((id) => id !== null) ? resourceIds : null,
+			savedAt: Date.now()
+		});
+	}
 	/** «Book again» on the confirmation: a clean wizard with a fresh attempt. */
 	function startOver() {
 		kit.attempts.clearAttempt();
@@ -1148,9 +1353,15 @@ function useBooking(options) {
 		setSlotsFailed(false);
 		setConfirmed(null);
 		setTakenSlotTs(null);
+		forgetChairs();
 		dispatch({ type: "startOver" });
 		restartFromLink();
 	}
+	/** A new visit: no chair of the last one is kept or waits for its parent. */
+	function forgetChairs() {
+		setKeptSeats([]);
+		awaitingIds.current = null;
+	}
 	/** A service tap on step 2 for a party of one — the first carries the link's stylist. */
 	function pickService(service) {
 		const first = deepLinkPending.current && state.items.length === 0;
@@ -1241,6 +1452,10 @@ function useBooking(options) {
 	}
 	/** Who a parent seats on step 1; each new child starts on «same as last time». */
 	function choosePeople(people, advance) {
+		const stays = (key) => people.includes(state.people.find((p) => p.key === key));
+		setKeptSeats((current) => current.filter(stays));
+		const waiting = [...awaitingIds.current ?? []].filter(([key]) => stays(key));
+		awaitingIds.current = waiting.length > 0 ? new Map(waiting) : null;
 		dispatch({
 			type: "choosePeople",
 			people,
@@ -1267,12 +1482,23 @@ function useBooking(options) {
 		kit,
 		state,
 		dispatch: action,
-		/** The parent: who arrived, who logged in from the sheet, and the merged answer. */
+		/**
+		* The parent: who arrived (`null` once the create route said the session
+		* ran out), who logged in from the sheet, the merged answer, and whether
+		* anybody is logged in at all (a good code whose profile read failed is).
+		*/
 		login: {
-			arrivedAs,
+			arrivedAs: arrivedAsNow,
 			signedIn,
 			guardian,
-			signIn: (who) => setSignedIn({ guardian: who }),
+			loggedIn: signedIn !== null || arrivedAsNow !== null,
+			/** `/create` said the session ran out, and no login has happened since. */
+			sessionLost,
+			signIn: (who) => {
+				reseatFor(who);
+				setSessionLost(false);
+				setSignedIn({ guardian: who });
+			},
 			vippsConfirm,
 			resumePath: vippsResumePath
 		},
@@ -1315,6 +1541,7 @@ function useBooking(options) {
 			party,
 			total: wizard.totalPriceOre(state.items, state.startTs),
 			summary: wizard.summaryLine(state, resolveStylistName),
+			summaryParts: wizard.summaryParts(state, resolveStylistName),
 			visitEnd: state.startTs === null ? null : wizard.visitEndTs(state.items, state.startTs, state.partyMode)
 		},
 		pickService,