@acms-subir/core 0.3.38 → 0.3.39

package/src/lib/repo/types.ts

@@ -187,7 +187,8 @@ export interface ContentRepository {
 
   // bookings (+ staff blocks and event RSVPs). createBooking is the only
   // write that can fail on a race: it inserts atomically only if the held
-  // range is still free (resource bookings) or seats remain (RSVPs), and
+  // range is still free (resource bookings) or seats remain (RSVPs; with
+  // oncePerEmail, and the address has no active RSVP for that date), and
   // returns null when it lost.
   /** from/to: overlaps the window; endedBy: ended at or before; default order start ascending, at most 5000 rows */
   listBookings(filter?: { resourceId?: string; eventId?: string; email?: string; from?: number; to?: number; endedBy?: number; statuses?: BookingStatus[]; kinds?: Booking['kind'][]; newestFirst?: boolean; limit?: number; offset?: number }): Promise<Booking[]>;
@@ -198,7 +199,7 @@ export interface ContentRepository {
   // locale: the booker's language; '' (the main language) when left out
   createBooking(
     data: Omit<Booking, 'id' | 'createdAt' | 'updatedAt' | 'reminderSentAt' | 'notificationVersion' | 'locale'> & { locale?: string },
-    guard?: { capacity?: number; idempotency?: { keyHash: string; requestHash: string } }
+    guard?: { capacity?: number; oncePerEmail?: boolean; idempotency?: { keyHash: string; requestHash: string } }
   ): Promise<Booking | null>;
   // moves a booking only if the new held range is free (reschedule)
   moveBooking(id: string, times: { start: number; end: number; holdStart: number; holdEnd: number }): Promise<boolean>;

package/src/lib/schema.ts

@@ -415,12 +415,16 @@ export const CalEvent = z.object({
   // UID of the feed event this was imported from ('' = authored here)
   sourceUid: z.string().default(''),
   // RSVP: seats per occurrence (0 = unlimited) and whether RSVPs confirm at
-  // once; RSVPs are stored as bookings of kind 'rsvp'
+  // once; RSVPs are stored as bookings of kind 'rsvp'. They close at closesAt
+  // (wall time in the event's zone, like start; every date), else closeBefore
+  // minutes before each date's start, else when the date ends.
   rsvp: z.object({
     enabled: z.boolean().default(false),
     capacity: z.number().int().default(0),
     autoConfirm: z.boolean().default(true),
     maxSeats: z.number().int().default(4),
+    closesAt: z.string().nullable().default(null),
+    closeBefore: z.number().int().default(0),
     form: FormDefinition.optional(),
   }).default({}),
   // rooms/people this event uses: they can't be booked while it happens (or

package/src/pages/events/[slug].astro

@@ -19,7 +19,7 @@ import { effectiveSettings } from '../../lib/designPreview';
 import { resolveDesign } from '../../lib/theme';
 import { siteOrigin } from '../../lib/seo';
 import { CALENDAR, eventUrl, withoutPrivateFields } from '../../lib/calendar/config';
-import { eventIsPublic, featuredOccurrence } from '../../lib/calendar/events';
+import { eventIsPublic, featuredOccurrence, rsvpDeadline } from '../../lib/calendar/events';
 import { eventJsonLd } from '../../lib/calendar/seo';
 import { upcomingEvents } from '../../lib/calendar/cards';
 import { seatsTaken, BookingError } from '../../lib/booking/service';
@@ -50,6 +50,7 @@ const origin = siteOrigin(settings, Astro.url);
 // RSVP: "Save my seat" posts back here and lands on the manage page, in the
 // visitor's language (its emails speak it too)
 let rsvpError = '';
+let rsvpDuplicate = false;
 let formValues: Record<string,string> = {};
 let coreValues = { name: '', email: '', seats: '1' };
 let requestId: string = crypto.randomUUID();
@@ -66,13 +67,19 @@ if (Astro.request.method === 'POST' && event.rsvp.enabled) {
     const booking = await submitEventForm(repo, event, occurrence, form, requestId, { origin, locals: Astro.locals, waitUntil: waitUntilFrom(Astro.locals) }, locale);
     return Astro.redirect(`${localePath(manageUrl(booking.manageToken), locale)}?new=1`, 303);
   } catch (err) {
-    rsvpError = err instanceof BookingError || err instanceof ApiError ? err.message : rsvpStrings((I18N.enabled ? locale : '') || siteLang(settings)).saveError;
+    const w = rsvpStrings((I18N.enabled ? locale : '') || siteLang(settings));
+    // the address already has one: a notice in the page's words (templates that don't know it show it as the error)
+    rsvpDuplicate = err instanceof BookingError && err.code === 'duplicate';
+    rsvpError = rsvpDuplicate ? `${w.duplicate} ${w.duplicateNote}` : err instanceof BookingError || err instanceof ApiError ? err.message : w.saveError;
   }
 }
 const formHtml = hiddenFields(await formVersion(definition), requestId) + `<input type="hidden" name="occurrence" value="${occurrence.start}">`;
 const taken = event.rsvp.enabled ? await seatsTaken(repo, event.id, occurrence.start) : 0;
+// the event's RSVP deadline for this date (null: open until it ends)
+const closesAt = event.rsvp.enabled ? rsvpDeadline(occurrence, settings) : null;
 const rsvp = event.rsvp.enabled
-  ? { going: taken, left: event.rsvp.capacity ? Math.max(0, event.rsvp.capacity - taken) : null, maxSeats: event.rsvp.maxSeats, error: rsvpError, formHtml, fieldsHtml: renderFields(definition, formValues, 'event-registration'), values: coreValues, open: occurrence.end > now && !occurrence.cancelled }
+  ? { going: taken, left: event.rsvp.capacity ? Math.max(0, event.rsvp.capacity - taken) : null, maxSeats: event.rsvp.maxSeats, error: rsvpError, duplicate: rsvpDuplicate, formHtml, fieldsHtml: renderFields(definition, formValues, 'event-registration'), values: coreValues,
+    open: occurrence.end > now && !occurrence.cancelled && !(closesAt !== null && closesAt <= now), closesAt }
   : null;
 const calendars = event.calendarIds.map((id) => calMap.get(id)).filter((c): c is NonNullable<typeof c> => Boolean(c) && c!.visibility !== 'private');
 const html = highlightCodeHtml(await expandDynamicBlocks(event.bodyHtml, repo));

package/src/styles/editor.css

@@ -1168,6 +1168,10 @@
 .pe-evr-modes + .pe-evs-fields { margin-top: 22px; }
 .pe-evr-link { grid-template-columns: minmax(0, 1fr) 150px; }
 .pe-evr-seats { grid-template-columns: repeat(2, minmax(0, 200px)); }
+.pe-evr-when { display: flex; flex-wrap: wrap; align-items: center; gap: 8px 10px; }
+.pe-evr-when > span { font-size: 13px; color: var(--muted); }
+.pe-field .pe-evr-when input, .pe-field .pe-evr-when select { width: auto; }
+.pe-field .pe-evr-when input[type='number'] { width: 84px; }
 .pe-evr-form { display: flex; flex-wrap: wrap; align-items: center; gap: 10px 18px; padding: 12px 14px; border: 1px solid var(--line); border-radius: var(--r-md); background: var(--panel); }
 .pe-evr-form-t { flex: 1 1 240px; min-width: 0; }
 .pe-evr-form-t b { display: block; font-size: 13.5px; font-weight: 600; color: var(--text); }

package/src/styles/mobile-app.css

@@ -88,6 +88,13 @@
 .ma-tag { display: inline-flex; align-items: center; gap: 5px; background: var(--sel); color: var(--text-2); font-size: 12px; font-weight: 600; padding: 2px 8px; border-radius: var(--r-full); }
 .ma-tag button { background: none; border: 0; color: inherit; cursor: pointer; font-size: 10px; padding: 0; }
 .ma-tags input { flex: 1; min-width: 70px; background: none !important; border: 0 !important; box-shadow: none !important; padding: 2px !important; }
+/* "when an event changes": a card per rule */
+.ma-subrules { display: grid; gap: 8px; margin-top: 10px; }
+.ma-subrule { padding: 6px 12px 12px; border: 1px solid var(--line); border-radius: var(--r-md); min-width: 0; }
+.ma-subrule-head { display: flex; align-items: center; justify-content: space-between; gap: 8px; min-height: 30px; }
+.ma-subrule-head b { font-size: 12.5px; color: var(--text-2); }
+.ma-subrule .ma-choices { margin-top: 2px; }
+.ma-add { margin-top: 10px; }
 .ma .form-actions { margin-top: 6px; }
 .ma-saved { color: var(--green); font-size: 12.5px; font-weight: 500; }
 

package/src/styles/site.css

@@ -1147,6 +1147,9 @@ li::marker { color: var(--muted); }
   .pc-ev-rsvpform[open] > summary { display: none; }
   .pc-ev-rsvpform form { margin-top: 4px; }
   .pc-ev-full { font-size: 14px; font-weight: 600; color: var(--muted); }
+  .pc-ev-closes { font-size: 13.5px; color: var(--muted); margin: 0 0 10px; }
+  .pc-ev-full + .pc-ev-closes { margin-top: 4px; }
+  .pc-ev-notice { font-size: 14px; line-height: 1.5; background: var(--soft); border-radius: var(--r-sm); padding: 9px 12px; margin: 0 0 14px; }
 
   @media (max-width: 860px) {
     .pc-bk { grid-template-columns: 1fr; }

package/src/theme-sdk/index.ts

@@ -11,7 +11,7 @@ export interface HomeProps { settings: Settings; page: Page | null; posts: Post[
 export interface PageProps { settings: Settings; page: Page; html: string }
 export interface PostProps { settings: Settings; post: Post; html: string; authors: User[]; related: Post[] }
 import type { Occurrence } from '../lib/calendar/events';
-export interface EventProps { settings: Settings; event: CalEvent; html: string; calendars: Calendar[]; origin: string; occurrence: Occurrence; upcoming: Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'>[]; preview?: boolean; rsvp?: {going:number;left:number|null;maxSeats:number;error:string;open:boolean}|null }
+export interface EventProps { settings: Settings; event: CalEvent; html: string; calendars: Calendar[]; origin: string; occurrence: Occurrence; upcoming: Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'>[]; preview?: boolean; rsvp?: {going:number;left:number|null;maxSeats:number;error:string;open:boolean;closesAt?:number|null;duplicate?:boolean}|null }
 /**
  * Props for a coded section. `data` holds resolved values: link fields arrive
  * as LinkValue, lists as row arrays, source fields as fresh item arrays