@acms-subir/core 0.3.40 → 0.3.41

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @acms-subir/core
 
+## 0.3.41
+
+### Patch Changes
+
+- 4fed854: Events can keep a waitlist. Turn on **Offer a waitlist when it's full** in the event's CTA card (it needs a number of seats; it's off for every event, including existing ones). When a date is full, the event page says "Full", "40 going · no spots left" and "Join the waitlist and we'll email you if a spot opens.", and **Join the waitlist** opens the same form: name, email, seats and the event's questions. A place in line takes no seats, counts as that email's RSVP for the date (a second one gets the usual "You already have an RSVP" notice), and can only be taken while RSVPs are open. The person gets "You're on the waitlist" by email, with their place in line, and their RSVP's page shows "#3 in line · 2 seats" and **Leave the waitlist**. Staff get no email for it.
+
+  When seats free up (someone cancels or is declined, staff raise the number of seats, or a held spot runs out), the next people in line whose seats fit are offered them, in the order they joined; a larger request keeps its place. Each gets "A spot opened" by email, and the spot is held for them for 24 hours: their page says "A spot is yours until Fri, Oct 24 at 9 PM" with **Confirm my spot** and **Release it**. Confirming makes it an RSVP like any other (waiting for approval when the event approves RSVPs), with the usual confirmation and the hosts' "New RSVP" email. A spot nobody confirms in time is released and goes to the next person. Offers keep going after the RSVP deadline, since those in line joined in time, but stop once the date starts. Each offer counts the seats in the same database write, so offers, cancellations and new RSVPs at once never go over the limit. The scheduler checks every minute. Emails are in the language the person used; a cancelled date or event cancels the line too.
+
+  Bookings has a **Waitlist** tab and a Waitlist group under Upcoming, with "#2 in line", "Spot offered" (and until when) and "Hold expired"; staff can remove someone or take back a held spot, and an event's registrations say "40 going · 3 waiting". The app API takes `waitlist: true` on an RSVP to a full date (the booking's status is `waitlisted`), and the REST booking API does too. `GET /api/v1/events/:slug/rsvp` has `waitlist` (`enabled`, `waiting`, `seats`, `maxSeats`), and held spots count as taken in `going` and `left`. Bookings have three new statuses, `waitlisted`, `offered` and `expired`; `GET /api/v1/bookings/manage` adds `booking.position`, `booking.holdUntil` and `can.confirm`, and the new `POST /api/v1/bookings/manage/confirm` takes a held spot (410 once it ran out). Editor documents and the events API carry `rsvp.waitlist`; saves that leave it out keep it. The editor app's bookings inbox filters by `waitlist`. Theme event templates get `rsvp.waitlist`. Migration 61 adds `bookings.hold_until`.
+
+  The privacy notice now says that when a date is full and someone joins its waitlist, the request is kept like an RSVP and a freed spot is held for 24 hours, so its "Last updated" date moves; the app store answers mention waitlist requests. The RSVP panel in the app recipes shows the waitlist too; update it with `npx acms mobile recipe add rsvp --force`, which overwrites `components/RsvpPanel.tsx`, including any changes you made to it, and needs this release's `@acms-subir/native`.
+
 ## 0.3.40
 
 ### Patch Changes

package/cli/migrations.generated.mjs

@@ -1116,6 +1116,11 @@ var MIGRATIONS = [
   // emails and links follow it; '' = the main language, so older rows need no backfill
   { version: 60, statements: [
     `ALTER TABLE bookings ADD COLUMN locale TEXT NOT NULL DEFAULT ''`
+  ] },
+  // RSVP waitlists: an offered spot is held until hold_until (ms); null for
+  // everything else, so older rows need no backfill
+  { version: 61, statements: [
+    `ALTER TABLE bookings ADD COLUMN hold_until INTEGER`
   ] }
 ];
 var CURRENT_CONTENT_VERSION_COLUMNS = {

package/docs/mobile.md

@@ -120,8 +120,9 @@ Read the app's `AGENTS.md` too: it holds the same rules, next to the code.
 | `useSearch(text, { types, collection, limit })` | site-wide search: `data.posts`, `data.pages`, `data.events` (each with `snippet.text` + `snippet.highlights`), `data.more`; debounced, blank text fetches nothing |
 | `useEvents({ calendar, from, to, limit, q })` | `data.occurrences[]` (`start`, `end`, `allDay`, `event`) in a window (default 30 days, max 90). `from`/`to` take a site-local day (`'2026-10-01'`) or an ISO date-time with a zone (`new Date().toISOString()`) |
 | `useEvent(slug)` | one event |
-| `useRsvpStatus(slug, start)` / `useRsvp(slug, start)` | RSVP to one date (`start` exactly as `useEvents` returns it, a UTC ISO string) when `event.rsvp.enabled`: `open` or `reason` (`full`, `ended`, `closed`, `cancelled`, `disabled`), `closesAt` (the deadline; `rsvpDeadlineText` words it), live `going`/`left`, `maxSeats`, the questions in `form`; `answerProblems(form.fields, answers)` for inline errors. One RSVP per email and date: `rsvp.duplicate` means that email already has one (the site emailed its link again); say so and keep the form. Needs only the calendar (`features.rsvp`). Keep `manageToken` in `expo-secure-store` to show or cancel the RSVP later (`useManagedBooking`, `useCancelBooking`) |
+| `useRsvpStatus(slug, start)` / `useRsvp(slug, start)` | RSVP to one date (`start` exactly as `useEvents` returns it, a UTC ISO string) when `event.rsvp.enabled`: `open` or `reason` (`full`, `ended`, `closed`, `cancelled`, `disabled`), `closesAt` (the deadline; `rsvpDeadlineText` words it), live `going`/`left`, `maxSeats`, the questions in `form`; `answerProblems(form.fields, answers)` for inline errors. One RSVP per email and date: `rsvp.duplicate` means that email already has one (the site emailed its link again); say so and keep the form. A full date whose event keeps a waitlist (`canJoinWaitlist(status)`) takes a place in line: send the details with `waitlist: true` (seats from `waitlistSeatChoices(status)`); the booking comes back `waitlisted`. Needs only the calendar (`features.rsvp`). Keep `manageToken` in `expo-secure-store` to show or cancel the RSVP later (`useManagedBooking`, `useCancelBooking`) |
 | `useManagedBooking(token)` / `useCancelBooking` / `useRescheduleBooking` / `useRescheduleAvailability` | the booker's own booking (from `book()`'s `manageToken`): `can.cancel`, `can.reschedule`, `can.closed` (change cutoff passed: show "Contact us") |
+| `useConfirmBooking(token)` | an RSVP on a waitlist: `waitlisted` shows "#3 in line · 2 seats" (`waitlistLineText(booking, words, locale)`) and can leave (`useCancelBooking`); `offered` holds a spot until `booking.holdUntil` (`holdText`: "We're holding it until Fri, Oct 24 at 9 PM") and `can.confirm` takes it. `isReleased(error)`: the hold ran out (410) and the spot went to the next person |
 | `useGuest()` / `useMyBookings({ when })` | guest sign-in with an emailed code, then every booking made with that email; check `features.guestSignIn` |
 | `useLinks()` / `useForm(id)` / `useSubmitForm(id)` | the links page; published forms and sending answers; check `features.links` / `features.forms` |
 | `useLive()` | live video: `snapshot`, `status` (`live`/`upcoming`/`offline`), `isLive`, localized `view` text, the owner's `display` choices (`style`, `bar`, `header`, `dock`). Polls every 30 s only in the foreground, rechecks on resume, drops an expired "live" even offline; idle while `features.live` is false. Render `<LiveCard>` / `<LiveTag>` |

package/integration.mjs

@@ -851,6 +851,8 @@ export default function acms(options = {}) {
       // the booker's own booking from an app (token in the Booking-Token header)
       ['/api/v1/bookings/manage', 'api/v1/bookings/manage/index.ts'],
       ['/api/v1/bookings/manage/cancel', 'api/v1/bookings/manage/cancel.ts'],
+      // a spot offered from an RSVP's waitlist, taken up
+      ['/api/v1/bookings/manage/confirm', 'api/v1/bookings/manage/confirm.ts'],
       ['/api/v1/bookings/manage/availability', 'api/v1/bookings/manage/availability.ts'],
       ['/api/v1/bookings/manage/reschedule', 'api/v1/bookings/manage/reschedule.ts'],
       ['/api/v1/bookings/manage/ics', 'api/v1/bookings/manage/ics.ts'],

package/mobile-template/recipes/events/files/components/RsvpPanel.tsx

@@ -1,16 +1,19 @@
-import { Fragment, useEffect, useState, type ReactNode } from 'react';
+import { Fragment, useEffect, useRef, useState, type ReactNode } from 'react';
 import { ActivityIndicator, Platform, Pressable, Switch, Text, TextInput, View, type KeyboardTypeOptions } from 'react-native';
 import * as Crypto from 'expo-crypto';
 import * as SecureStore from 'expo-secure-store';
 import { isAcmsError, type FormField } from '@acms-subir/client';
-import { Button, answerProblemText, answerProblems, countWords, fill, rsvpDeadlineText, seatChoices, useCancelBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme } from '@acms-subir/native';
+import { Button, answerProblemText, answerProblems, canJoinWaitlist, countWords, fill, holdText, isReleased, rsvpDeadlineText, seatChoices, useCancelBooking, useConfirmBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme, waitlistLineText, waitlistSeatChoices } from '@acms-subir/native';
 
 // RSVP to one date of an event: <RsvpPanel slug={event.slug} start={occurrence.start} />,
 // with `start` exactly as useEvents returns it. Shows going and spots left,
 // seats, contact details and the event's questions, then the person's RSVP
 // with a way to cancel it; or why the date takes no RSVPs. Same rules as the
 // event's web page: open until the event's deadline or the date ends, one RSVP
-// per email and date, and the organiser may approve each RSVP. useRsvp keeps
+// per email and date, and the organiser may approve each RSVP. A full date
+// whose event keeps a waitlist offers "Join the waitlist" with the same form;
+// then it shows their place in line ("#3 in line · 2 seats"), and when a spot
+// opens, until when it's held, with Confirm my spot and Release it. useRsvp keeps
 // one idempotency key per RSVP, so sending again after a timeout can't
 // register anyone twice. Its words come from
 // useStrings() in the app's language; the event's own form title, labels and
@@ -37,9 +40,11 @@ const withOther = (f: FormField, value: string | string[] | undefined, other: st
 };
 // a count in bold inside its words ("{count} going")
 const bold = (template: string, n: string) => template.split('{count}').map((part, i) => (i ? <Fragment key={i}><Text style={{ fontWeight: '700' }}>{n}</Text>{part}</Fragment> : part));
+// the site holds a spot freed from the waitlist this long
+const HOLD_HOURS = '24';
 
-// children: shown under the person's RSVP (not a declined one), e.g. an offer
-// to get notified if the date, time or place changes
+// children: shown under the person's RSVP (confirmed or waiting for approval,
+// not a place in line), e.g. an offer to get notified if the date, time or place changes
 export function RsvpPanel({ slug, start, children }: { slug: string; start: string; children?: ReactNode }) {
   const t = useTheme();
   const words = useStrings();
@@ -55,6 +60,7 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   const changes = site?.features.bookingChanges === true;
   const managed = useManagedBooking(changes ? stored : null);
   const cancel = useCancelBooking(stored);
+  const take = useConfirmBooking(stored);
   const [confirming, setConfirming] = useState(false);
   const [notice, setNotice] = useState('');
   const [name, setName] = useState('');
@@ -77,13 +83,17 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   }, [site?.features.guestSignIn, guest.email]);
   // cancelled (here, from the email link or by the organiser) or gone: forget the token
   const gone = managed.data?.booking.status === 'cancelled' || (isAcmsError(managed.error) && managed.error.status === 404);
+  // whether it was a place in line or a held spot before then
+  const waited = useRef(false);
+  if (managed.data && managed.data.booking.status !== 'cancelled') waited.current = ['waitlisted', 'offered'].includes(managed.data.booking.status);
   useEffect(() => {
     if (!key || !stored || !gone) return;
     void tokens.remove(key);
     setStored(null);
     setConfirming(false);
     rsvp.reset();
-    if (managed.data?.booking.status === 'cancelled') setNotice(words.rsvpCancelled);
+    take.reset();
+    if (managed.data?.booking.status === 'cancelled') setNotice(waited.current ? words.offWaitlist : words.rsvpCancelled);
   }, [key, stored, gone]);
 
   if (!s) return status.isPending ? <ActivityIndicator color={t.colors.accent} /> : null;
@@ -94,10 +104,12 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   const seatsText = (n: number) => countWords(n, words.seat, words.seats, locale);
   // "RSVPs close Fri, Oct 24 at 9 PM", or once past it "They closed on …"
   const deadline = rsvpDeadlineText(s, words, locale);
+  // full, and the event keeps a waitlist: the same form takes a place in line
+  const joining = canJoinWaitlist(s);
   const going = (
     <Text style={t.styles.text.body}>
       {bold(s.going === 1 ? words.personGoing : words.peopleGoing, num(s.going))}
-      {s.left !== null && <> · {bold(s.left === 1 ? words.spotLeft : words.spotsLeft, num(s.left))}</>}
+      {s.left !== null && <> · {joining ? words.noSpotsLeft : bold(s.left === 1 ? words.spotLeft : words.spotsLeft, num(s.left))}</>}
     </Text>
   );
 
@@ -114,39 +126,59 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
     </View>
   );
   if ((stored && mine) || made) {
-    const state = mine?.booking.status ?? made!.status;
+    // a held spot that ran out (before the site's next sweep, or while they confirmed it) reads as released
+    const ranOut = isReleased(take.error) || (mine?.booking.status === 'offered' && !mine.can.confirm);
+    const state = ranOut ? 'expired' : mine?.booking.status ?? made!.status;
+    const seats = mine?.booking.seats ?? made!.seats;
     const who = mine?.booking.email ?? made!.email;
     const thanks = mine ? mine.confirmation : made!.formResponse?.definition.confirmation || null;
     const canCancel = !!stored && changes && (mine ? mine.can.cancel : false);
+    // declined, or a held spot they didn't confirm in time: nothing left to change
+    const over = state === 'declined' || state === 'expired';
+    const forget = () => { if (key) void tokens.remove(key); setStored(null); rsvp.reset(); take.reset(); };
+    // leaving the line or releasing a held spot asks first, like cancelling
+    const leave = state === 'waitlisted' ? { label: words.leaveWaitlist, ask: words.leaveWaitlistAsk, busy: words.leaving }
+      : state === 'offered' ? { label: words.releaseSpot, ask: words.releaseSpotAsk, busy: words.releasing }
+      : { label: words.cancelRsvp, ask: fill(words.cancelRsvpFor, { seats: seatsText(seats) }), busy: words.cancelling };
+    const heading = state === 'waitlisted' ? words.onWaitlist : state === 'offered' ? words.spotOpened : state === 'expired' ? words.spotReleased
+      : !made ? words.yourRsvp : state === 'confirmed' ? words.confirmed : words.requestSent;
+    const line = state === 'waitlisted' ? waitlistLineText({ position: mine?.booking.position, seats }, words, locale)
+      : state === 'offered' || state === 'expired' ? seatsText(seats)
+      : `${seatsText(seats)} · ${state === 'confirmed' ? words.confirmed : state === 'pending' ? words.awaitingApproval : words.notConfirmed}`;
+    const body = state === 'waitlisted' ? fill(words.waitlistPromise, { hours: HOLD_HOURS })
+      : state === 'offered' ? holdText(mine?.booking.holdUntil, words, locale)
+      : state === 'expired' ? fill(words.spotReleasedNote, { hours: HOLD_HOURS })
+      : state === 'confirmed' ? thanks || fill(words.confirmationOnItsWay, { email: who })
+      : state === 'pending' ? fill(words.emailWhenApproved, { email: who }) : words.rsvpDeclined;
+    const failed = (e: unknown) => (isAcmsError(e) && e.status === 0 ? words.checkConnection : e instanceof Error ? e.message : '');
     return (<>
       <View style={[t.styles.card, { gap: 8 }]}>
-        <Text accessibilityRole="header" style={t.styles.text.heading}>{!made ? words.yourRsvp : state === 'confirmed' ? words.confirmed : words.requestSent}</Text>
-        <Text style={[t.styles.text.label, { color: t.colors.ink }]}>
-          {seatsText(mine?.booking.seats ?? made!.seats)} · {state === 'confirmed' ? words.confirmed : state === 'pending' ? words.awaitingApproval : words.notConfirmed}
-        </Text>
-        <Text style={t.styles.text.body}>
-          {state === 'confirmed' ? thanks || fill(words.confirmationOnItsWay, { email: who })
-            : state === 'pending' ? fill(words.emailWhenApproved, { email: who }) : words.rsvpDeclined}
-        </Text>
-        {state === 'declined' && <Button label={words.rsvpAgain} variant="outline" onPress={() => { if (key) void tokens.remove(key); setStored(null); rsvp.reset(); }} />}
-        {canCancel && state !== 'declined' && (confirming ? (
+        <Text accessibilityRole="header" style={t.styles.text.heading}>{heading}</Text>
+        <Text style={[t.styles.text.label, { color: t.colors.ink }]}>{line}</Text>
+        {!!body && <Text style={t.styles.text.body}>{body}</Text>}
+        {state === 'offered' && !confirming && (
+          <Button label={take.isPending ? words.confirming : words.confirmSpot} disabled={take.isPending} onPress={() => take.mutate()} />
+        )}
+        {over && <Button label={words.rsvpAgain} variant="outline" onPress={forget} />}
+        {canCancel && !over && (confirming ? (
           <View style={{ gap: 8 }}>
-            <Text style={t.styles.text.body}>{fill(words.cancelRsvpFor, { seats: seatsText(mine!.booking.seats) })}</Text>
+            <Text style={t.styles.text.body}>{leave.ask}</Text>
             <View style={{ flexDirection: 'row', flexWrap: 'wrap', gap: 10 }}>
-              <Button label={cancel.isPending ? words.cancelling : words.yesCancel} disabled={cancel.isPending} onPress={() => cancel.mutate()} />
+              <Button label={cancel.isPending ? leave.busy : state === 'waitlisted' || state === 'offered' ? leave.label : words.yesCancel} disabled={cancel.isPending} onPress={() => cancel.mutate()} />
               <Button label={words.keepIt} variant="outline" disabled={cancel.isPending} onPress={() => setConfirming(false)} />
             </View>
           </View>
-        ) : <Button label={words.cancelRsvp} variant="outline" onPress={() => setConfirming(true)} />)}
-        {cancel.error && <Text style={errorText}>{isAcmsError(cancel.error) && cancel.error.status === 0 ? words.checkConnection : cancel.error.message}</Text>}
-        {!canCancel && state !== 'declined' && <Text style={t.styles.text.small}>{words.changeByEmail}</Text>}
+        ) : <Button label={leave.label} variant="outline" disabled={take.isPending} onPress={() => setConfirming(true)} />)}
+        {cancel.error && <Text style={errorText}>{failed(cancel.error)}</Text>}
+        {take.error && !isReleased(take.error) && <Text style={errorText}>{failed(take.error)}</Text>}
+        {!canCancel && !over && <Text style={t.styles.text.small}>{words.changeByEmail}</Text>}
       </View>
-      {state !== 'declined' && children}
+      {(state === 'confirmed' || state === 'pending') && children}
     </>);
   }
 
   if (s.reason === 'disabled') return null;
-  if (!s.open) return (
+  if (!s.open && !joining) return (
     <View style={[t.styles.card, { gap: 6 }]}>
       <Text accessibilityRole="header" style={t.styles.text.heading}>{s.reason === 'full' ? words.full : s.reason === 'cancelled' ? words.dateCancelled : words.rsvpClosed}</Text>
       {s.reason === 'full' ? going : <Text style={t.styles.text.muted}>{s.reason === 'cancelled' ? words.noRsvpNeeded : s.reason === 'closed' ? deadline || words.rsvpClosed : words.dateEnded}</Text>}
@@ -162,12 +194,14 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   const emailProblem = !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email.trim()) ? words.emailProblem : '';
   // the form may ask for a phone itself
   const askPhone = !fields.some((f) => f.type === 'phone');
-  const chosen = Math.min(seats, s.maxSeats) || 1;
+  // a place in line may ask for the event's own limit (the status's maxSeats is what's left)
+  const choices = joining ? waitlistSeatChoices(s) : seatChoices(s);
+  const chosen = Math.min(seats, choices.length) || 1;
   const submit = () => {
     setTried(true);
     setNotice('');
     if (nameProblem || emailProblem || Object.keys(problems).length) return;
-    rsvp.mutate({ name, email, phone: askPhone ? phone : '', seats: chosen, answers }, {
+    rsvp.mutate({ name, email, phone: askPhone ? phone : '', seats: chosen, answers, waitlist: joining }, {
       onSuccess: (data) => { if (key) void tokens.set(key, data.manageToken); setStored(data.manageToken); },
     });
   };
@@ -243,20 +277,21 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   return (
     <View style={[t.styles.card, { gap: 16 }]}>
       <View style={{ gap: 4 }}>
-        <Text accessibilityRole="header" style={t.styles.text.heading}>{form?.title || words.rsvpTitle}</Text>
+        <Text accessibilityRole="header" style={t.styles.text.heading}>{joining ? words.full : form?.title || words.rsvpTitle}</Text>
         {going}
         {!!deadline && <Text style={t.styles.text.muted}>{deadline}</Text>}
+        {joining && <Text style={t.styles.text.muted}>{words.waitlistNote}</Text>}
         {!!notice && <Text style={t.styles.text.muted}>{notice}</Text>}
         {!!form?.intro && <Text style={t.styles.text.muted}>{form.intro}</Text>}
       </View>
       {text(words.nameField, name, setName, { required: true, auto: 'name', problem: tried ? nameProblem : '' })}
       {text(words.emailField, email, setEmail, { required: true, keyboard: 'email-address', auto: 'email', problem: tried ? emailProblem : '' })}
       {askPhone && text(words.phoneField, phone, setPhone, { keyboard: 'phone-pad', auto: 'tel' })}
-      {s.maxSeats > 1 && (
+      {choices.length > 1 && (
         <View style={{ gap: 6 }}>
           {label(words.seatsField, false)}
           <View accessibilityRole="radiogroup" style={{ flexDirection: 'row', flexWrap: 'wrap', gap: 8 }}>
-            {seatChoices(s).map((n) => (
+            {choices.map((n) => (
               <Pressable key={n} accessibilityRole="radio" accessibilityLabel={seatsText(n)} accessibilityState={{ checked: n === chosen }} onPress={() => setSeats(n)} style={[chip(n === chosen), { minWidth: 48, alignItems: 'center' }]}>
                 <Text style={[t.styles.text.body, n === chosen && { fontWeight: '600' }]}>{num(n)}</Text>
               </Pressable>
@@ -274,7 +309,7 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
         </View>
       )}
       {tried && (nameProblem || emailProblem || Object.keys(problems).length > 0) && <Text style={errorText}>{words.checkAnswers}</Text>}
-      <Button label={rsvp.isPending ? words.sending : form?.submitLabel || (s.autoConfirm ? words.confirmSeat : words.requestSeat)} disabled={rsvp.isPending} onPress={submit} />
+      <Button label={rsvp.isPending ? words.sending : joining ? words.joinWaitlist : form?.submitLabel || (s.autoConfirm ? words.confirmSeat : words.requestSeat)} disabled={rsvp.isPending} onPress={submit} />
       <Text style={t.styles.text.small}>{words.rsvpPrivacy}</Text>
     </View>
   );

package/mobile-template/recipes/rsvp/files/components/RsvpPanel.tsx

@@ -1,16 +1,19 @@
-import { Fragment, useEffect, useState, type ReactNode } from 'react';
+import { Fragment, useEffect, useRef, useState, type ReactNode } from 'react';
 import { ActivityIndicator, Platform, Pressable, Switch, Text, TextInput, View, type KeyboardTypeOptions } from 'react-native';
 import * as Crypto from 'expo-crypto';
 import * as SecureStore from 'expo-secure-store';
 import { isAcmsError, type FormField } from '@acms-subir/client';
-import { Button, answerProblemText, answerProblems, countWords, fill, rsvpDeadlineText, seatChoices, useCancelBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme } from '@acms-subir/native';
+import { Button, answerProblemText, answerProblems, canJoinWaitlist, countWords, fill, holdText, isReleased, rsvpDeadlineText, seatChoices, useCancelBooking, useConfirmBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme, waitlistLineText, waitlistSeatChoices } from '@acms-subir/native';
 
 // RSVP to one date of an event: <RsvpPanel slug={event.slug} start={occurrence.start} />,
 // with `start` exactly as useEvents returns it. Shows going and spots left,
 // seats, contact details and the event's questions, then the person's RSVP
 // with a way to cancel it; or why the date takes no RSVPs. Same rules as the
 // event's web page: open until the event's deadline or the date ends, one RSVP
-// per email and date, and the organiser may approve each RSVP. useRsvp keeps
+// per email and date, and the organiser may approve each RSVP. A full date
+// whose event keeps a waitlist offers "Join the waitlist" with the same form;
+// then it shows their place in line ("#3 in line · 2 seats"), and when a spot
+// opens, until when it's held, with Confirm my spot and Release it. useRsvp keeps
 // one idempotency key per RSVP, so sending again after a timeout can't
 // register anyone twice. Its words come from
 // useStrings() in the app's language; the event's own form title, labels and
@@ -37,9 +40,11 @@ const withOther = (f: FormField, value: string | string[] | undefined, other: st
 };
 // a count in bold inside its words ("{count} going")
 const bold = (template: string, n: string) => template.split('{count}').map((part, i) => (i ? <Fragment key={i}><Text style={{ fontWeight: '700' }}>{n}</Text>{part}</Fragment> : part));
+// the site holds a spot freed from the waitlist this long
+const HOLD_HOURS = '24';
 
-// children: shown under the person's RSVP (not a declined one), e.g. an offer
-// to get notified if the date, time or place changes
+// children: shown under the person's RSVP (confirmed or waiting for approval,
+// not a place in line), e.g. an offer to get notified if the date, time or place changes
 export function RsvpPanel({ slug, start, children }: { slug: string; start: string; children?: ReactNode }) {
   const t = useTheme();
   const words = useStrings();
@@ -55,6 +60,7 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   const changes = site?.features.bookingChanges === true;
   const managed = useManagedBooking(changes ? stored : null);
   const cancel = useCancelBooking(stored);
+  const take = useConfirmBooking(stored);
   const [confirming, setConfirming] = useState(false);
   const [notice, setNotice] = useState('');
   const [name, setName] = useState('');
@@ -77,13 +83,17 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   }, [site?.features.guestSignIn, guest.email]);
   // cancelled (here, from the email link or by the organiser) or gone: forget the token
   const gone = managed.data?.booking.status === 'cancelled' || (isAcmsError(managed.error) && managed.error.status === 404);
+  // whether it was a place in line or a held spot before then
+  const waited = useRef(false);
+  if (managed.data && managed.data.booking.status !== 'cancelled') waited.current = ['waitlisted', 'offered'].includes(managed.data.booking.status);
   useEffect(() => {
     if (!key || !stored || !gone) return;
     void tokens.remove(key);
     setStored(null);
     setConfirming(false);
     rsvp.reset();
-    if (managed.data?.booking.status === 'cancelled') setNotice(words.rsvpCancelled);
+    take.reset();
+    if (managed.data?.booking.status === 'cancelled') setNotice(waited.current ? words.offWaitlist : words.rsvpCancelled);
   }, [key, stored, gone]);
 
   if (!s) return status.isPending ? <ActivityIndicator color={t.colors.accent} /> : null;
@@ -94,10 +104,12 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   const seatsText = (n: number) => countWords(n, words.seat, words.seats, locale);
   // "RSVPs close Fri, Oct 24 at 9 PM", or once past it "They closed on …"
   const deadline = rsvpDeadlineText(s, words, locale);
+  // full, and the event keeps a waitlist: the same form takes a place in line
+  const joining = canJoinWaitlist(s);
   const going = (
     <Text style={t.styles.text.body}>
       {bold(s.going === 1 ? words.personGoing : words.peopleGoing, num(s.going))}
-      {s.left !== null && <> · {bold(s.left === 1 ? words.spotLeft : words.spotsLeft, num(s.left))}</>}
+      {s.left !== null && <> · {joining ? words.noSpotsLeft : bold(s.left === 1 ? words.spotLeft : words.spotsLeft, num(s.left))}</>}
     </Text>
   );
 
@@ -114,39 +126,59 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
     </View>
   );
   if ((stored && mine) || made) {
-    const state = mine?.booking.status ?? made!.status;
+    // a held spot that ran out (before the site's next sweep, or while they confirmed it) reads as released
+    const ranOut = isReleased(take.error) || (mine?.booking.status === 'offered' && !mine.can.confirm);
+    const state = ranOut ? 'expired' : mine?.booking.status ?? made!.status;
+    const seats = mine?.booking.seats ?? made!.seats;
     const who = mine?.booking.email ?? made!.email;
     const thanks = mine ? mine.confirmation : made!.formResponse?.definition.confirmation || null;
     const canCancel = !!stored && changes && (mine ? mine.can.cancel : false);
+    // declined, or a held spot they didn't confirm in time: nothing left to change
+    const over = state === 'declined' || state === 'expired';
+    const forget = () => { if (key) void tokens.remove(key); setStored(null); rsvp.reset(); take.reset(); };
+    // leaving the line or releasing a held spot asks first, like cancelling
+    const leave = state === 'waitlisted' ? { label: words.leaveWaitlist, ask: words.leaveWaitlistAsk, busy: words.leaving }
+      : state === 'offered' ? { label: words.releaseSpot, ask: words.releaseSpotAsk, busy: words.releasing }
+      : { label: words.cancelRsvp, ask: fill(words.cancelRsvpFor, { seats: seatsText(seats) }), busy: words.cancelling };
+    const heading = state === 'waitlisted' ? words.onWaitlist : state === 'offered' ? words.spotOpened : state === 'expired' ? words.spotReleased
+      : !made ? words.yourRsvp : state === 'confirmed' ? words.confirmed : words.requestSent;
+    const line = state === 'waitlisted' ? waitlistLineText({ position: mine?.booking.position, seats }, words, locale)
+      : state === 'offered' || state === 'expired' ? seatsText(seats)
+      : `${seatsText(seats)} · ${state === 'confirmed' ? words.confirmed : state === 'pending' ? words.awaitingApproval : words.notConfirmed}`;
+    const body = state === 'waitlisted' ? fill(words.waitlistPromise, { hours: HOLD_HOURS })
+      : state === 'offered' ? holdText(mine?.booking.holdUntil, words, locale)
+      : state === 'expired' ? fill(words.spotReleasedNote, { hours: HOLD_HOURS })
+      : state === 'confirmed' ? thanks || fill(words.confirmationOnItsWay, { email: who })
+      : state === 'pending' ? fill(words.emailWhenApproved, { email: who }) : words.rsvpDeclined;
+    const failed = (e: unknown) => (isAcmsError(e) && e.status === 0 ? words.checkConnection : e instanceof Error ? e.message : '');
     return (<>
       <View style={[t.styles.card, { gap: 8 }]}>
-        <Text accessibilityRole="header" style={t.styles.text.heading}>{!made ? words.yourRsvp : state === 'confirmed' ? words.confirmed : words.requestSent}</Text>
-        <Text style={[t.styles.text.label, { color: t.colors.ink }]}>
-          {seatsText(mine?.booking.seats ?? made!.seats)} · {state === 'confirmed' ? words.confirmed : state === 'pending' ? words.awaitingApproval : words.notConfirmed}
-        </Text>
-        <Text style={t.styles.text.body}>
-          {state === 'confirmed' ? thanks || fill(words.confirmationOnItsWay, { email: who })
-            : state === 'pending' ? fill(words.emailWhenApproved, { email: who }) : words.rsvpDeclined}
-        </Text>
-        {state === 'declined' && <Button label={words.rsvpAgain} variant="outline" onPress={() => { if (key) void tokens.remove(key); setStored(null); rsvp.reset(); }} />}
-        {canCancel && state !== 'declined' && (confirming ? (
+        <Text accessibilityRole="header" style={t.styles.text.heading}>{heading}</Text>
+        <Text style={[t.styles.text.label, { color: t.colors.ink }]}>{line}</Text>
+        {!!body && <Text style={t.styles.text.body}>{body}</Text>}
+        {state === 'offered' && !confirming && (
+          <Button label={take.isPending ? words.confirming : words.confirmSpot} disabled={take.isPending} onPress={() => take.mutate()} />
+        )}
+        {over && <Button label={words.rsvpAgain} variant="outline" onPress={forget} />}
+        {canCancel && !over && (confirming ? (
           <View style={{ gap: 8 }}>
-            <Text style={t.styles.text.body}>{fill(words.cancelRsvpFor, { seats: seatsText(mine!.booking.seats) })}</Text>
+            <Text style={t.styles.text.body}>{leave.ask}</Text>
             <View style={{ flexDirection: 'row', flexWrap: 'wrap', gap: 10 }}>
-              <Button label={cancel.isPending ? words.cancelling : words.yesCancel} disabled={cancel.isPending} onPress={() => cancel.mutate()} />
+              <Button label={cancel.isPending ? leave.busy : state === 'waitlisted' || state === 'offered' ? leave.label : words.yesCancel} disabled={cancel.isPending} onPress={() => cancel.mutate()} />
               <Button label={words.keepIt} variant="outline" disabled={cancel.isPending} onPress={() => setConfirming(false)} />
             </View>
           </View>
-        ) : <Button label={words.cancelRsvp} variant="outline" onPress={() => setConfirming(true)} />)}
-        {cancel.error && <Text style={errorText}>{isAcmsError(cancel.error) && cancel.error.status === 0 ? words.checkConnection : cancel.error.message}</Text>}
-        {!canCancel && state !== 'declined' && <Text style={t.styles.text.small}>{words.changeByEmail}</Text>}
+        ) : <Button label={leave.label} variant="outline" disabled={take.isPending} onPress={() => setConfirming(true)} />)}
+        {cancel.error && <Text style={errorText}>{failed(cancel.error)}</Text>}
+        {take.error && !isReleased(take.error) && <Text style={errorText}>{failed(take.error)}</Text>}
+        {!canCancel && !over && <Text style={t.styles.text.small}>{words.changeByEmail}</Text>}
       </View>
-      {state !== 'declined' && children}
+      {(state === 'confirmed' || state === 'pending') && children}
     </>);
   }
 
   if (s.reason === 'disabled') return null;
-  if (!s.open) return (
+  if (!s.open && !joining) return (
     <View style={[t.styles.card, { gap: 6 }]}>
       <Text accessibilityRole="header" style={t.styles.text.heading}>{s.reason === 'full' ? words.full : s.reason === 'cancelled' ? words.dateCancelled : words.rsvpClosed}</Text>
       {s.reason === 'full' ? going : <Text style={t.styles.text.muted}>{s.reason === 'cancelled' ? words.noRsvpNeeded : s.reason === 'closed' ? deadline || words.rsvpClosed : words.dateEnded}</Text>}
@@ -162,12 +194,14 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   const emailProblem = !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email.trim()) ? words.emailProblem : '';
   // the form may ask for a phone itself
   const askPhone = !fields.some((f) => f.type === 'phone');
-  const chosen = Math.min(seats, s.maxSeats) || 1;
+  // a place in line may ask for the event's own limit (the status's maxSeats is what's left)
+  const choices = joining ? waitlistSeatChoices(s) : seatChoices(s);
+  const chosen = Math.min(seats, choices.length) || 1;
   const submit = () => {
     setTried(true);
     setNotice('');
     if (nameProblem || emailProblem || Object.keys(problems).length) return;
-    rsvp.mutate({ name, email, phone: askPhone ? phone : '', seats: chosen, answers }, {
+    rsvp.mutate({ name, email, phone: askPhone ? phone : '', seats: chosen, answers, waitlist: joining }, {
       onSuccess: (data) => { if (key) void tokens.set(key, data.manageToken); setStored(data.manageToken); },
     });
   };
@@ -243,20 +277,21 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   return (
     <View style={[t.styles.card, { gap: 16 }]}>
       <View style={{ gap: 4 }}>
-        <Text accessibilityRole="header" style={t.styles.text.heading}>{form?.title || words.rsvpTitle}</Text>
+        <Text accessibilityRole="header" style={t.styles.text.heading}>{joining ? words.full : form?.title || words.rsvpTitle}</Text>
         {going}
         {!!deadline && <Text style={t.styles.text.muted}>{deadline}</Text>}
+        {joining && <Text style={t.styles.text.muted}>{words.waitlistNote}</Text>}
         {!!notice && <Text style={t.styles.text.muted}>{notice}</Text>}
         {!!form?.intro && <Text style={t.styles.text.muted}>{form.intro}</Text>}
       </View>
       {text(words.nameField, name, setName, { required: true, auto: 'name', problem: tried ? nameProblem : '' })}
       {text(words.emailField, email, setEmail, { required: true, keyboard: 'email-address', auto: 'email', problem: tried ? emailProblem : '' })}
       {askPhone && text(words.phoneField, phone, setPhone, { keyboard: 'phone-pad', auto: 'tel' })}
-      {s.maxSeats > 1 && (
+      {choices.length > 1 && (
         <View style={{ gap: 6 }}>
           {label(words.seatsField, false)}
           <View accessibilityRole="radiogroup" style={{ flexDirection: 'row', flexWrap: 'wrap', gap: 8 }}>
-            {seatChoices(s).map((n) => (
+            {choices.map((n) => (
               <Pressable key={n} accessibilityRole="radio" accessibilityLabel={seatsText(n)} accessibilityState={{ checked: n === chosen }} onPress={() => setSeats(n)} style={[chip(n === chosen), { minWidth: 48, alignItems: 'center' }]}>
                 <Text style={[t.styles.text.body, n === chosen && { fontWeight: '600' }]}>{num(n)}</Text>
               </Pressable>
@@ -274,7 +309,7 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
         </View>
       )}
       {tried && (nameProblem || emailProblem || Object.keys(problems).length > 0) && <Text style={errorText}>{words.checkAnswers}</Text>}
-      <Button label={rsvp.isPending ? words.sending : form?.submitLabel || (s.autoConfirm ? words.confirmSeat : words.requestSeat)} disabled={rsvp.isPending} onPress={submit} />
+      <Button label={rsvp.isPending ? words.sending : joining ? words.joinWaitlist : form?.submitLabel || (s.autoConfirm ? words.confirmSeat : words.requestSeat)} disabled={rsvp.isPending} onPress={submit} />
       <Text style={t.styles.text.small}>{words.rsvpPrivacy}</Text>
     </View>
   );

package/mobile-template/recipes/rsvp/recipe.json

@@ -1,7 +1,7 @@
 {
   "kind": "client",
   "title": "RSVP",
-  "description": "An RSVP panel for an event date: going and spots left, seats, the event's questions with inline errors, then the person's RSVP with Cancel, or why the date is full or closed. Already part of the events recipe; add it to an event screen of your own.",
+  "description": "An RSVP panel for an event date: going and spots left, seats, the event's questions with inline errors, then the person's RSVP with Cancel, or why the date is full or closed. A full date whose event keeps a waitlist takes places in line, with Confirm my spot when one opens. Already part of the events recipe; add it to an event screen of your own.",
   "packages": [
     "expo-crypto",
     "expo-secure-store"
@@ -11,6 +11,6 @@
     "Mount it on your event screen where the date is known: <RsvpPanel slug={occurrence.event.slug} start={occurrence.start} /> from '../../components/RsvpPanel', with start exactly as useEvents returns it (the UTC ISO string, e.g. pass o.start through router params), and only when occurrence.event.rsvp?.enabled",
     "The screen should scroll and avoid the keyboard: wrap it in <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined}> with <ScrollView keyboardShouldPersistTaps=\"handled\">",
     "RSVPs need only the calendar (useSite().data.features.rsvp). Each RSVP's private manage token stays in expo-secure-store (never a URL or log): the panel shows the person's RSVP and lets them cancel it; the confirmation email's link works too",
-    "Anything you pass as children shows under the person's RSVP (not a declined one), e.g. an offer to get notified if the date, time or place changes: <RsvpPanel slug={…} start={…}><MyOffer /></RsvpPanel>. With push on, occurrence.event.notify.changes lists the topics that hear about changes ([] = none)"
+    "Anything you pass as children shows under the person's RSVP (confirmed or waiting for approval, not a place in line), e.g. an offer to get notified if the date, time or place changes: <RsvpPanel slug={…} start={…}><MyOffer /></RsvpPanel>. With push on, occurrence.event.notify.changes lists the topics that hear about changes ([] = none)"
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.40",
+  "version": "0.3.41",
   "publishConfig": {
     "access": "public"
   },

package/src/actions/index.ts

@@ -995,7 +995,7 @@ export const server = {
         calendarIds: z.array(z.string()).max(50).optional(),
         fields: z.record(z.string().max(2000)).optional(),
         rsvp: z.object({ enabled: z.boolean(), capacity: z.number().int().min(0).max(100000), autoConfirm: z.boolean(), maxSeats: z.number().int().min(1).max(50),
-          closesAt: z.string().max(40).nullable().optional(), closeBefore: z.number().int().min(0).max(86400).optional(), notifyStaff: z.boolean().optional(), form: z.any().optional() }).optional(),
+          closesAt: z.string().max(40).nullable().optional(), closeBefore: z.number().int().min(0).max(86400).optional(), notifyStaff: z.boolean().optional(), waitlist: z.boolean().optional(), form: z.any().optional() }).optional(),
         roomHold: z.object({ resourceIds: z.array(z.string()).max(50), span: z.enum(['event', 'day']), before: z.number().int().min(0).max(1440), after: z.number().int().min(0).max(1440), whileDraft: z.boolean(), keep: z.array(z.string()).max(500).default([]) }).optional(),
         scheduledAt: nullableTs.optional(),
       }),

package/src/components/EventPage.astro

@@ -28,8 +28,9 @@ interface Props {
   preview?: boolean;
   // RSVP state when the event takes RSVPs (null otherwise). closesAt: this
   // date's RSVP deadline (ms; null = open until it ends); duplicate: the
-  // address already has an RSVP for it (error then holds the same words)
-  rsvp?: { going: number; left: number | null; maxSeats: number; error: string; open: boolean; closesAt?: number | null; duplicate?: boolean; formHtml?: string; fieldsHtml?: string; values?: { name: string; email: string; seats: string } } | null;
+  // address already has an RSVP for it (error then holds the same words);
+  // waitlist: a full date takes places in line (the form posts waitlist=1)
+  rsvp?: { going: number; left: number | null; maxSeats: number; error: string; open: boolean; closesAt?: number | null; duplicate?: boolean; waitlist?: boolean; formHtml?: string; fieldsHtml?: string; values?: { name: string; email: string; seats: string } } | null;
 }
 const { event: e, occurrence: o, settings, calendars, html, upcoming, origin, preview = false, rsvp = null } = Astro.props;
 // the whole event, or just this date of a repeating one
@@ -81,6 +82,10 @@ const w = rsvpStrings(lang);
 const going = rsvp ? aroundCount(rsvp.going, w.personGoing, w.peopleGoing) : ['', ''];
 const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.spotsLeft) : ['', ''];
 const taking = Boolean(rsvp?.open) && (rsvp!.left === null || rsvp!.left > 0);
+// full, with a waitlist: "Full · 40 going · no spots left", then "Join the waitlist" with the same form
+const joining = Boolean(rsvp?.open && rsvp.waitlist && rsvp.left === 0);
+const formClass = joining ? 'pc-ev-rsvpform is-waitlist' : 'pc-ev-rsvpform';
+const seatOptions = rsvp ? Math.min(rsvp.maxSeats, joining ? rsvp.maxSeats : rsvp.left ?? rsvp.maxSeats) : 0;
 // "RSVPs close Fri, Oct 24 at 9 PM" while open; once past, "They closed on Fri, Oct 24."
 const deadline = typeof rsvp?.closesAt === 'number' ? deadlineParts(rsvp.closesAt, tz, locale) : null;
 const closesLine = deadline && taking ? fill(w.closesOn, deadline) : '';
@@ -157,13 +162,16 @@ const moreCards = upcoming.map((u) => eventCardHtml(u, settings, { showImage: tr
       ))}
       {rsvp ? (
         <div class="pc-ev-rsvp">
-          <p class="pc-ev-going">{going[0]}<b>{rsvp.going}</b>{going[1]}{rsvp.left !== null && <> · {left[0]}<b>{rsvp.left}</b>{left[1]}</>}</p>
+          {joining && <p class="pc-ev-full is-waitlist">{w.fullTag}</p>}
+          <p class="pc-ev-going">{going[0]}<b>{rsvp.going}</b>{going[1]}{rsvp.left !== null && (joining ? <> · {w.noSpotsLeft}</> : <> · {left[0]}<b>{rsvp.left}</b>{left[1]}</>)}</p>
           {closesLine && <p class="pc-ev-closes">{closesLine}</p>}
-          {taking ? (
-            <details class="pc-ev-rsvpform" open={Boolean(rsvp.error)}>
-              <summary class="pc-ev-cta">{w.saveSeat}</summary>
+          {joining && <p class="pc-ev-waitlist">{w.waitlistNote}</p>}
+          {taking || joining ? (
+            <details class={formClass} open={Boolean(rsvp.error)}>
+              <summary class="pc-ev-cta">{joining ? w.joinWaitlist : w.saveSeat}</summary>
               <form method="post">
                 <Fragment set:html={rsvp.formHtml ?? ''}/>
+                {joining && <input type="hidden" name="waitlist" value="1" />}
                 {e.rsvp.form?.title && <h3>{e.rsvp.form.title}</h3>}
                 {e.rsvp.form?.intro && <p>{e.rsvp.form.intro}</p>}
                 {rsvp.duplicate ? <p class="pc-ev-notice" role="status"><b>{w.duplicate}</b> {w.duplicateNote}</p> : rsvp.error && <p class="pc-bk-error">{rsvp.error}</p>}
@@ -171,11 +179,11 @@ const moreCards = upcoming.map((u) => eventCardHtml(u, settings, { showImage: tr
                 <label class="pc-bk-field"><span>{w.emailField}</span><input name="email" type="email" required maxlength="200" autocomplete="email" value={rsvp.values?.email} /></label>
                 {rsvp.maxSeats > 1 && (
                   <label class="pc-bk-field"><span>{w.seatsField}</span>
-                    <select name="seats">{Array.from({ length: Math.min(rsvp.maxSeats, rsvp.left ?? rsvp.maxSeats) }, (_, i) => <option value={i + 1} selected={Number(rsvp.values?.seats || 1) === i + 1}>{i + 1}</option>)}</select>
+                    <select name="seats">{Array.from({ length: seatOptions }, (_, i) => <option value={i + 1} selected={Number(rsvp.values?.seats || 1) === i + 1}>{i + 1}</option>)}</select>
                   </label>
                 )}
                 <Fragment set:html={rsvp.fieldsHtml ?? ''}/>
-                <button class="pc-bk-submit" type="submit">{e.rsvp.form?.submitLabel || (e.rsvp.autoConfirm ? w.confirmSeat : w.requestSeat)}</button>
+                <button class="pc-bk-submit" type="submit">{joining ? w.joinWaitlist : e.rsvp.form?.submitLabel || (e.rsvp.autoConfirm ? w.confirmSeat : w.requestSeat)}</button>
               </form>
             </details>
           ) : <p class="pc-ev-full">{rsvp.open ? w.full : w.closed}</p>}

package/src/components/editor/EventPanel.tsx

@@ -21,8 +21,8 @@ export interface EventMeta {
   calendarIds: string[];
   fields: Record<string, string>;
   // closesAt: wall time like start; closeBefore: minutes before each date (0 = until it ends);
-  // notifyStaff: the hosts get an email about each new or cancelled RSVP
-  rsvp: { enabled: boolean; capacity: number; autoConfirm: boolean; maxSeats: number; closesAt?: string | null; closeBefore?: number; notifyStaff?: boolean; form?: FormDefinition };
+  // notifyStaff: the hosts get an email about each new or cancelled RSVP; waitlist: a full date takes places in line
+  rsvp: { enabled: boolean; capacity: number; autoConfirm: boolean; maxSeats: number; closesAt?: string | null; closeBefore?: number; notifyStaff?: boolean; waitlist?: boolean; form?: FormDefinition };
   roomHold: RoomHoldValue;
 }
 

package/src/components/editor/PostEditor.tsx

@@ -169,7 +169,7 @@ const NO_MAPS: MapsStatus = { enabled: false, provider: '', label: '', search: f
 const NO_EVENT: EventMeta = {
   start: '', end: '', allDay: false, timezone: '', rrule: '', exdates: [], cancelled: false,
   location: NO_LOCATION, cta: { label: '', href: '', style: 'primary' }, calendarIds: [], fields: {},
-  rsvp: { enabled: false, capacity: 0, autoConfirm: true, maxSeats: 4, closesAt: null, closeBefore: 0, notifyStaff: true },
+  rsvp: { enabled: false, capacity: 0, autoConfirm: true, maxSeats: 4, closesAt: null, closeBefore: 0, notifyStaff: true, waitlist: false },
   roomHold: NO_HOLD,
 };