@acms-subir/core 0.3.47 → 0.3.48

package/src/lib/repo/types.ts

@@ -48,7 +48,7 @@ export type EventUpdate = Partial<
     CalEvent,
     | 'title' | 'slug' | 'bodyJson' | 'bodyHtml' | 'excerpt' | 'cover' | 'coverAlt'
     | 'seoTitle' | 'seoDesc' | 'status' | 'featured' | 'tags' | 'template'
-    | 'start' | 'end' | 'allDay' | 'timezone' | 'rrule' | 'exdates' | 'cancelled' | 'cancelledDates'
+    | 'start' | 'end' | 'allDay' | 'timezone' | 'rrule' | 'exdates' | 'cancelled' | 'cancelledDates' | 'movedDates'
     | 'location' | 'cta' | 'calendarIds' | 'fields' | 'sourceUid' | 'rsvp' | 'translations' | 'roomHold'
     | 'publishedAt' | 'scheduledAt'
   >
@@ -168,15 +168,18 @@ export interface ContentRepository {
   discardEventDraft(id: string): Promise<void>;
   /** replace an event's cancelled occurrence keys at once, keeping any staged draft */
   setEventCancelledDates(id: string, dates: string[]): Promise<void>;
+  /** replace an event's moved dates (and cancelled dates, when given) at once, keeping any staged draft; quiet: no member push for it */
+  setEventMovedDates(id: string, moved: CalEvent['movedDates'], cancelledDates?: string[], opts?: { quiet?: boolean }): Promise<void>;
   /** Cancels the RSVPs for one date of an event (they get the "cancelled" email). Returns how many. */
   cancelOccurrenceRsvps(id: string, start: number): Promise<number>;
   /**
    * Moves the RSVPs for one date of an event (those starting at `start`) to a
    * new time, and to another event when `to.eventId` is set. Pending and
-   * confirmed ones get the "new time" email; places in line move quietly.
+   * confirmed ones get the "new time" email (with `message`, when given);
+   * places in line move quietly.
    * Returns how many moved.
    */
-  moveOccurrenceRsvps(id: string, start: number, to: { eventId?: string; start: number; end: number }): Promise<number>;
+  moveOccurrenceRsvps(id: string, start: number, to: { eventId?: string; start: number; end: number }, message?: string): Promise<number>;
   deleteEvent(id: string): Promise<void>;
   // saved-place sync (lib/maps/places.ts): rewrite just the location of the
   // live row and/or the staged draft, leaving every other field — and the

package/src/lib/schema.ts

@@ -357,6 +357,24 @@ export const RoomHold = z.object({
 });
 export type RoomHold = z.infer<typeof RoomHold>;
 
+// One date of a repeating event at another time (and maybe in other rooms or
+// another place): CalEvent.movedDates, keyed by the date's ORIGINAL occurrence
+// key. start/end are wall-clock in the event's zone like the event's own
+// (dates for all-day events, end inclusive). Unset roomIds/location = the
+// event's. note is public ("Moved for the youth retreat"); by is who moved it
+// (a user id, or 'google-sync'), at when. lib/calendar/moves.ts writes these.
+export const MovedDate = z.object({
+  start: z.string(),
+  end: z.string(),
+  roomIds: z.array(z.string()).optional(),
+  location: EventLocation.optional(),
+  note: z.string().max(500).default(''),
+  by: z.string().default(''),
+  at: z.number().default(0),
+});
+export type MovedDate = z.infer<typeof MovedDate>;
+export const MovedDates = z.record(z.string(), MovedDate).default({});
+
 // A member's event request (lib/calendar/requests.ts): a new event waiting
 // for approval (kind 'new', the event stays a draft), or changes to a live
 // event staged in its `draft` (kind 'changes'). Staff approve or decline;
@@ -407,6 +425,9 @@ export const CalEvent = z.object({
   // cancelled: shown struck through, but they don't hold rooms. Keys that no
   // longer match an occurrence (the series moved) are ignored.
   cancelledDates: z.array(z.string()).default([]),
+  // single dates at another time (MovedDate above); a date is moved or
+  // cancelled, never both. Keys that no longer match an occurrence are ignored.
+  movedDates: MovedDates,
   location: EventLocation.default({}),
   cta: EventCta.default({}),
   calendarIds: z.array(z.string()).default([]),

package/src/lib/sections.ts

@@ -32,6 +32,8 @@ export interface LinkValue { label: string; href: string; external: boolean }
 export interface EventItem {
   title: string; url: string; summary: string; image: string; imageAlt: string; location: string;
   start: string; end: string; allDay: boolean; cancelled: boolean;
+  /** this date was moved here: from "Thu, Oct 1 · 6:00 PM" (where it was), with staff's public note; null when not moved */
+  moved: { from: string; note: string } | null;
   /** "Sat, Oct 3 · 11:00 AM" */ when: string; /** "Saturday, October 3, 2026" */ date: string;
   /** "11:00 AM – 1:00 PM EDT" */ time: string; month: string; day: string; weekday: string;
   cta: { label: string; href: string } | null;
@@ -141,11 +143,12 @@ async function resolveSource(field: Extract<FieldDef, { type: 'source' }>, value
     return (await upcomingEvents(repo, settings, now, { calendarIds, limit, tag: cfg.tag, excludeTag: cfg.excludeTag })).map((o): EventItem => {
       const e = lang ? localizeDoc(o.event, lang) : o.event;
       const f = formatOccurrence(o, tz, locale);
+      const was = o.moved ? formatOccurrence({ ...o, start: o.moved.from.start, end: o.moved.from.end }, tz, locale) : null;
       const ctaHref = safeUrl(e.cta.href);
       return {
         title: e.title || 'Untitled event', url: lp(eventUrl(e.slug)), summary: e.excerpt, image: safeUrl(e.cover), imageAlt: e.coverAlt,
-        location: locationLine(e.location), start: new Date(o.start).toISOString(), end: new Date(o.end).toISOString(),
-        allDay: o.allDay, cancelled: o.cancelled, when: f.range, date: f.date, time: f.time, month: f.month, day: f.day, weekday: f.weekday,
+        location: locationLine(o.moved?.location ?? e.location), start: new Date(o.start).toISOString(), end: new Date(o.end).toISOString(),
+        allDay: o.allDay, cancelled: o.cancelled, moved: was && o.moved ? { from: o.allDay ? was.date : was.range, note: o.moved.note } : null, when: f.range, date: f.date, time: f.time, month: f.month, day: f.day, weekday: f.weekday,
         cta: e.cta.label && ctaHref && !o.cancelled ? { label: e.cta.label, href: ctaHref } : null,
       };
     });

package/src/lib/sync/catalog.ts

@@ -130,6 +130,7 @@ const jsonFields = new Set([
   "roomHold",
   "exdates",
   "cancelledDates",
+  "movedDates",
   "amenities",
   "hours",
   "overrides",

package/src/pages/api/calendar/events/index.ts

@@ -100,6 +100,12 @@ export const GET: APIRoute = async ({ request, locals, url }) => {
           end: o.allDay ? isoWithOffset(o.end - 86_400_000, etz).slice(0, 10) : isoWithOffset(o.end, etz),
           allDay: o.allDay,
           cancelled: o.cancelled,
+          // the date's key (a moved date keeps its original one), and where it moved from
+          key: o.key,
+          moved: o.moved ? {
+            from: { start: o.allDay ? isoWithOffset(o.moved.from.start, etz).slice(0, 10) : isoWithOffset(o.moved.from.start, etz), end: o.allDay ? isoWithOffset(o.moved.from.end - 86_400_000, etz).slice(0, 10) : isoWithOffset(o.moved.from.end, etz) },
+            note: o.moved.note, location: o.moved.location ?? null,
+          } : null,
           // that date's rooms
           rooms: roomsToJson(o.roomIds, resources, full),
           event: toJson(o.event.id),

package/src/pages/members/_Layout.astro

@@ -62,6 +62,7 @@ const { title, user } = Astro.props;
     .pc-mem-dates li { display: flex; align-items: center; justify-content: space-between; gap: 10px; min-height: 42px; padding: 5px 0; border-top: 1px solid var(--line); font-variant-numeric: tabular-nums; }
     .pc-mem-dates li.is-cancelled > span { color: var(--muted); }
     .pc-mem-dates em { font-style: normal; font-size: 12.5px; font-weight: 600; color: var(--danger); margin-left: 8px; }
+    .pc-mem-dates em.is-moved { color: var(--accent); font-weight: 500; }
     .pc-mem-past > summary { cursor: pointer; font-weight: 600; font-size: 15px; }
     .pc-mem-past .pc-mem-list { margin-top: 10px; }
     /* the request form */

package/src/pages/members/events/index.astro

@@ -175,7 +175,7 @@ const pastShown = past.slice(0, 10);
                 const off = e.cancelledDates.includes(o.key);
                 return (
                   <li class={o.cancelled ? 'is-cancelled' : undefined}>
-                    <span>{o.cancelled ? <s>{when(o)}</s> : when(o)}{o.cancelled && <em>Cancelled</em>}</span>
+                    <span>{o.cancelled ? <s>{when(o)}</s> : when(o)}{o.cancelled && <em>Cancelled</em>}{o.moved && !o.cancelled && <em class="is-moved" title={o.moved.note || undefined}>Moved from {when({ ...o, start: o.moved.from.start, end: o.moved.from.end })}</em>}</span>
                     {e.rrule && !e.cancelled && o.start > now && (
                       <form method="post" onsubmit={off ? undefined : "return confirm('Cancel this date? It shows as cancelled straight away.')"}>
                         <input type="hidden" name="op" value={off ? 'restore-date' : 'cancel-date'} />

package/src/server/index.ts

@@ -37,6 +37,7 @@ export interface ServerUser {
 export type { CalEvent, Occurrence };
 export type { EventRequestInput } from '../lib/calendar/requests';
 export type { EventClash, BusySlot, Hold } from '../lib/booking/holds';
+export type { MoveInput, MoveResult } from '../lib/calendar/moves';
 
 export interface ListEventsOptions {
   /** only published events (default: every event except archived ones) */
@@ -172,6 +173,38 @@ export async function restoreOccurrence(repo: Repo, eventId: string, occurrenceK
   return restore(internal(repo), eventId, occurrenceKey, { url: context.url, locals: context.locals });
 }
 
+// ---- moved dates -------------------------------------------------------------
+// One date of a repeating event at another time (and maybe other rooms or
+// another place), keeping its key, its RSVPs (moved with it; each person gets
+// the "new time" email with their cancel link) and its hosts. These check who
+// is acting: staff ("Create and edit content") and GOOGLE_SYNC may move any
+// date, and a room taken at the new time comes back in `clashes` as a
+// warning; a host of the event may move its dates only while the rooms are
+// free (409 otherwise), and staff are emailed about it.
+
+/** The actor for a calendar sync acting with staff rights (a change already made elsewhere): clashes only warn. */
+export const GOOGLE_SYNC = 'google-sync';
+
+/**
+ * Move one date (by its occurrence key) to `input.start` (and `end`, else it
+ * keeps its length; wall-clock in the event's timezone, like `start`).
+ * `roomIds`/`location`/`note` replace that date's own (omit to keep them).
+ * Applies at once, even on a published event. `quiet` skips the app notice
+ * and the staff email (a sync catching up); RSVP emails still go. Errors have
+ * a `status`: 400 (not a repeating event, not one of its dates, started or a
+ * past time), 401, 404, 409 (a cancelled date, or a taken room for a host).
+ */
+export async function moveOccurrence(repo: Repo, who: Who | typeof GOOGLE_SYNC, eventId: string, occurrenceKey: string, input: import('../lib/calendar/moves').MoveInput, context: WriteContext, opts: { quiet?: boolean } = {}): Promise<import('../lib/calendar/moves').MoveResult> {
+  const { moveOccurrence: move } = await import('../lib/calendar/moves');
+  return move(internal(repo), who, eventId, occurrenceKey, input, { url: context.url, locals: context.locals }, opts);
+}
+
+/** Put a moved date back where the series has it. Same rules; idempotent. */
+export async function moveOccurrenceBack(repo: Repo, who: Who | typeof GOOGLE_SYNC, eventId: string, occurrenceKey: string, context: WriteContext, opts: { quiet?: boolean } = {}): Promise<import('../lib/calendar/moves').MoveResult> {
+  const { moveOccurrenceBack: back } = await import('../lib/calendar/moves');
+  return back(internal(repo), who, eventId, occurrenceKey, { url: context.url, locals: context.locals }, opts);
+}
+
 // ---- rooms -----------------------------------------------------------------
 // Events hold rooms (CalEvent.roomHold) while they happen. These find where
 // two things want the same room. They don't check permissions, and their

package/src/styles/editor.css

@@ -1328,3 +1328,22 @@ html.pe-evr-lock { overflow: hidden; }
   .pe-evs-wrap { --evs-pad: 14px; padding-top: 18px; }
   .pe-evsec input:where(:not([type='checkbox'], [type='radio'])), .pe-evsec select, .pe-evsec textarea, .pe-loc-search input, .pe-evsec input.mono { font-size: 16px; }
 }
+
+/* Event settings → Single dates (SingleDates.tsx): move or cancel one date */
+.pe-evd { list-style: none; margin: 0; padding: 0; }
+.pe-evd-row { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; gap: 6px 12px; padding: 8px 0; border-top: 1px solid var(--line); }
+.pe-evd-row:first-child { border-top: 0; }
+.pe-evd-main { display: flex; flex-direction: column; min-width: 0; font-size: 13.5px; font-variant-numeric: tabular-nums; }
+.pe-evd-state { font-size: 12px; color: var(--text-2); }
+.pe-evd-row.is-cancelled .pe-evd-when { color: var(--muted); }
+.pe-evd-row.is-cancelled .pe-evd-state { color: var(--red); }
+.pe-evd-row.is-moved .pe-evd-state { color: var(--accent); }
+.pe-evd-acts { display: flex; flex-wrap: wrap; gap: 6px; }
+.pe-evd-form { flex-basis: 100%; display: flex; flex-direction: column; gap: 10px; margin: 4px 0 6px; padding: 12px; border-radius: 10px; background: var(--panel-2, var(--soft)); }
+.pe-evd-fields { display: flex; flex-wrap: wrap; gap: 10px; }
+.pe-evd-fields .pe-field { flex: 1 1 130px; margin: 0; }
+.pe-evd-rooms { border: 0; margin: 0; padding: 0; display: flex; flex-wrap: wrap; gap: 4px 14px; font-size: 13px; }
+.pe-evd-rooms legend { font-size: 12px; color: var(--text-2); margin-bottom: 4px; padding: 0; }
+.pe-evd-room { display: inline-flex; align-items: center; gap: 6px; cursor: pointer; }
+.pe-evd-formacts { display: flex; gap: 8px; }
+.pe-ev-note.is-error { color: var(--red); }

package/src/styles/schedule.css

@@ -205,6 +205,8 @@ kbd { font: 10.5px ui-monospace, SFMono-Regular, Menlo, monospace; color: var(--
 .sch-toast button { border: 0; background: none; color: var(--accent); font: inherit; font-weight: 650; cursor: pointer; padding: 0; }
 :root[data-theme='dark'] .sch-toast { background: #2e2b27; color: var(--text); border: 1px solid var(--line-strong); }
 .sch-toast.err { background: var(--red); color: #fff; }
+/* a room clash after a move: both events keep the room */
+.sch-toast-warn { display: block; max-width: 340px; font-size: 12px; color: var(--amber, #c98a16); }
 
 /* ---- quick add ---- */
 .qa-layer { position: fixed; inset: 0; z-index: 75; }

package/src/styles/site.css

@@ -806,6 +806,10 @@ li::marker { color: var(--muted); }
 @layer base {
   .pc-cal-event.is-cancelled b, .pc-cal-row.is-cancelled .ti { text-decoration: line-through; color: var(--cal-muted); }
   .pc-cal-pop-flag { display: inline-block; font-size: 11px; font-weight: 700; letter-spacing: 0.04em; text-transform: uppercase; color: var(--danger); margin-bottom: 3px; }
+  /* a moved date: flagged, never struck through */
+  .pc-cal-pop-flag.is-moved, .pc-ev-flag.is-moved { color: var(--accent); }
+  .pc-cal-pop-moved { font-size: 12.5px; color: var(--cal-muted); margin-top: 2px; }
+  .pc-cal-event.is-moved b::before { content: '↷ '; }
   .pc-cal-pop-link { display: inline-block; margin-top: 9px; font-weight: 600; font-size: 12.5px; color: var(--cal-accent); text-decoration: none; }
   .pc-cal-pop-link:hover { text-decoration: underline; }
 
@@ -867,6 +871,8 @@ li::marker { color: var(--muted); }
   .pc-ev-page.is-cancelled .pc-ev-title { text-decoration: line-through; text-decoration-thickness: 2px; color: var(--muted); }
   .pc-ev-cancelled { background: color-mix(in srgb, var(--danger) 10%, var(--panel)); border-radius: var(--r-sm); padding: 10px 14px; font-size: 14.5px; margin: 0 0 16px; }
   .pc-ev-cancelled b { color: var(--danger); }
+  .pc-ev-moved { background: color-mix(in srgb, var(--accent) 10%, var(--panel)); border-radius: var(--r-sm); padding: 10px 14px; font-size: 14.5px; margin: 0 0 16px; }
+  .pc-ev-moved b { color: var(--accent); }
   .pc-ev-lede { font-size: 19px; line-height: 1.55; color: var(--muted); margin: 0 0 22px; }
   .pc-ev-side {
     position: sticky; top: 96px; background: var(--panel); border: 1px solid var(--line); border-radius: var(--r-lg);

package/src/theme-sdk/calendar.ts

@@ -29,9 +29,10 @@ export interface UpcomingEventsOptions {
 /**
  * Occurrence start/end are Unix milliseconds; event retains its authored
  * fields except private custom fields. `cancelled` is true when the whole
- * event or just this date is cancelled.
+ * event or just this date is cancelled. `moved` is set when this date of a
+ * series was moved here: `from` (its old start and end) and staff's `note`.
  */
-export type UpcomingEvent = Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days' | 'cancelled'>;
+export type UpcomingEvent = Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days' | 'cancelled'> & Pick<Partial<Occurrence>, 'moved'>;
 
 /** Server-side helper for Astro templates and endpoints. No repository access needed. */
 export async function upcomingEvents(