@acms-subir/core 0.3.6 → 0.3.8

package/src/lib/repo/types.ts

@@ -1,3 +1,5 @@
+import type { FormStore } from '../forms/store';
+import type { SavedForm, FormSubmission } from '../forms/schema';
 import type { LiveStore } from '../live/store';
 import type { BookingRequest } from '../backup/content';
 import type { EmailStore } from '../email/store';
@@ -8,7 +10,7 @@ export type ImportRecordKind = 'post' | 'page' | 'user' | 'tag' | 'media' | 'red
 export interface ImportRecord { runId: string; kind: ImportRecordKind; sourceId: string; acmsId: string; action: 'created' | 'updated'; stamp: number }
 export interface DesignVersion { id: string; createdAt: number; author: string; summary: string; snapshot: Record<string, unknown> }
 
-import type { Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Role, WidgetInstance, Calendar, CalEvent, ApiKey, ApiScope, Webhook, WebhookDelivery, Resource, BookingLink, Booking, BookingStatus } from '../schema';
+import type { Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Role, WidgetInstance, Calendar, CalEvent, ApiKey, ApiScope, Webhook, WebhookDelivery, Resource, BookingLink, Booking, BookingStatus, Place, EventLocation } from '../schema';
 
 export interface Stats {
   publishedPages: number;
@@ -48,6 +50,7 @@ export type EventUpdate = Partial<
 // this — never a concrete adapter.
 export interface ContentRepository {
   readonly email: EmailStore;
+  readonly forms: FormStore;
   readonly live: LiveStore;
   readonly push: PushStore;
   readonly editor: EditorStore;
@@ -131,6 +134,19 @@ export interface ContentRepository {
   applyEventDraft(id: string): Promise<void>;
   discardEventDraft(id: string): Promise<void>;
   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
+  // draft itself — alone. notify = RSVP guests of a published event get an
+  // "event updated" email (the address changed).
+  setEventLocation(id: string, patch: { live?: EventLocation; draft?: EventLocation; notify?: boolean }): Promise<void>;
+
+  // saved places. Only one can be the default (saving one as default clears
+  // the others). Deleting a place unlinks its rooms; events keep their copy.
+  listPlaces(): Promise<Place[]>;
+  getPlace(id: string): Promise<Place | null>;
+  createPlace(data: Partial<Omit<Place, 'id' | 'createdAt' | 'updatedAt' | 'order'>> & { name: string }): Promise<Place>;
+  updatePlace(id: string, data: Partial<Omit<Place, 'id' | 'createdAt' | 'updatedAt'>>): Promise<void>;
+  deletePlace(id: string): Promise<void>;
 
   // resources (rooms, people, vans…) and their booking links. Deleting a
   // resource deletes its links; its bookings stay as history.
@@ -265,6 +281,10 @@ export interface ContentRepository {
     bookingLinks?: BookingLink[];
     bookings?: Booking[];
     bookingRequests?: BookingRequest[];
+    // added with maps support; older backups restore with none
+    places?: Place[];
+    forms?: SavedForm[];
+    formSubmissions?: FormSubmission[];
   }): Promise<void>;
 
   // imports (lib/import/apply.ts drives these). writeImported is the

package/src/lib/schema.ts

@@ -3,6 +3,7 @@ import { PushSettings } from './push/types';
 import { SectionPages } from '../theme-sdk/contract.mjs';
 import { AiConfig, AgentConfig } from './ai-schema';
 import { z } from 'zod';
+import { FormDefinition, FormResponse } from './forms/schema';
 
 // ---- Widgets -------------------------------------------------------------
 // Each widget type has a zod config schema; pages store an ordered array of
@@ -304,6 +305,18 @@ export const EventLocation = z.object({
   address: z.string().default(''),
   // a map link or an online-meeting URL
   url: z.string().default(''),
+  // the pin, when known (picked from suggestions, parsed from a map link,
+  // or copied from a saved place); null = no pin, so no map image
+  lat: z.number().nullable().default(null),
+  lng: z.number().nullable().default(null),
+  // the saved place this was picked from ('' = typed by hand). The fields
+  // above are a copy; saving the place refreshes upcoming events' copies.
+  placeId: z.string().default(''),
+  // show the static map image on the public event page
+  showMap: z.boolean().default(true),
+  // cached static map images (media URLs) for the current pin; '' = none
+  mapImage: z.string().default(''),
+  mapImageDark: z.string().default(''),
 });
 export type EventLocation = z.infer<typeof EventLocation>;
 
@@ -365,6 +378,7 @@ export const CalEvent = z.object({
     capacity: z.number().int().default(0),
     autoConfirm: z.boolean().default(true),
     maxSeats: z.number().int().default(4),
+    form: FormDefinition.optional(),
   }).default({}),
   // rooms/people this event uses: they can't be booked while it happens (or
   // all day). Computed into availability, never stored as bookings. Drafts
@@ -439,12 +453,35 @@ export const Resource = z.object({
   showOnCalendar: z.boolean().default(false),
   // secret for the staff feed /book/<slug>.ics?t=… (bookings with names)
   feedToken: z.string().default(''),
+  // the saved place this room is in ('' = none)
+  placeId: z.string().default(''),
   order: z.number().default(0),
   createdAt: z.number(),
   updatedAt: z.number(),
 });
 export type Resource = z.infer<typeof Resource>;
 
+// A saved place (HQ, the park pavilion…): picked in an event's Where field,
+// it copies its details into the event. Rooms can belong to one (resource.placeId).
+export const Place = z.object({
+  id: z.string(),
+  name: z.string(),
+  address: z.string().default(''),
+  url: z.string().default(''),
+  lat: z.number().nullable().default(null),
+  lng: z.number().nullable().default(null),
+  // shown to editors only ("Use the side door")
+  notes: z.string().default(''),
+  // new events start here
+  isDefault: z.boolean().default(false),
+  mapImage: z.string().default(''),
+  mapImageDark: z.string().default(''),
+  order: z.number().default(0),
+  createdAt: z.number(),
+  updatedAt: z.number(),
+});
+export type Place = z.infer<typeof Place>;
+
 export const QUESTION_TYPES = ['text', 'textarea', 'email', 'phone', 'number', 'select', 'checkbox', 'date'] as const;
 export const BookingQuestion = z.object({
   id: z.string(),
@@ -549,6 +586,7 @@ export const Booking = z.object({
   phone: z.string().default(''),
   seats: z.number().int().default(1),
   answers: z.record(z.string()).default({}),
+  formResponse: FormResponse.optional(),
   notes: z.string().default(''), // staff-only
   manageToken: z.string().default(''),
   source: z.enum(['web', 'admin', 'api', 'agent']).default('web'),

package/src/lib/umami.ts

@@ -21,6 +21,7 @@ export interface TrafficSummary {
 }
 
 const TTL = 10 * 60_000;
+const CACHE_MAX = 32;
 const cache = new Map<string, { at: number; value: TrafficSummary | null }>();
 
 function config(settings: Settings) {
@@ -97,7 +98,13 @@ export async function getTraffic(settings: Settings, days = 30): Promise<Traffic
   } catch {
     value = null;
   }
-  cache.set(cacheKey, { at: Date.now(), value });
+  // Expiry controls freshness, not retention. Bound old site/range keys in
+  // long-lived Node processes as well as short-lived Worker isolates.
+  const now = Date.now();
+  for (const [key, entry] of cache) if (now - entry.at >= TTL) cache.delete(key);
+  cache.delete(cacheKey);
+  cache.set(cacheKey, { at: now, value });
+  if (cache.size > CACHE_MAX) cache.delete(cache.keys().next().value!);
   return value;
 }
 

package/src/pages/admin/calendar/bookings.astro

@@ -1,22 +1,25 @@
 ---
+import { csv } from '../../../lib/forms/service';
+import { readForm } from '../../../lib/forms/http';
 import Admin from '../../../layouts/Admin.astro';
 import BookingsHead from '../../../components/calendar/BookingsHead.astro';
 import { eventHolds } from '../../../lib/booking/holds';
 import Modal from '../../../components/Modal.astro';
 import { getRepo } from '../../../lib/repo';
 import type { Booking, BookingStatus } from '../../../lib/schema';
-import { bookingsEnabled, eventUrl } from '../../../lib/calendar/config';
+import { CALENDAR, bookingsEnabled, eventUrl } from '../../../lib/calendar/config';
 import { createBlock, createResourceBooking, rescheduleBooking, setBookingStatus, BookingError } from '../../../lib/booking/service';
 import { addDaysYmd, localMidnight, ymd } from '../../../lib/booking/availability';
 import { fmt } from '../../../lib/booking/view';
-import { emailProvider } from '../../../lib/email';
+import { resolveConfig } from '../../../lib/email/config';
+import { emailReadiness } from '../../../lib/email/readiness';
 import { siteOrigin } from '../../../lib/seo';
 import { waitUntilFrom } from '../../../lib/webhooks';
 
 // Bookings (mockup I): Cal.com-style tabs, an agenda by day with pending
 // requests first, a Day view with one column per resource, a details panel
 // (?b=<id>) with private notes, plus Block time and Add booking.
-if (!bookingsEnabled()) return new Response(null, { status: 404 });
+if (!CALENDAR.enabled) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const settings = await repo.getSettings();
 const tz = settings.timezone || 'UTC';
@@ -43,15 +46,16 @@ let notice = Astro.url.searchParams.get('notice') ?? '';
 let error = '';
 
 if (Astro.request.method === 'POST') {
-  const form = await Astro.request.formData();
+  const form = await readForm(Astro.request);
   const op = String(form.get('op'));
   const id = String(form.get('id') || '');
   try {
+    if (!bookingsEnabled() && ['block', 'add', 'reschedule'].includes(op)) throw new BookingError(400, 'Resource bookings are disabled.');
     if (op === 'status') {
       const b = await repo.getBooking(id);
       if (!b) throw new BookingError(404, 'Booking not found.');
       await setBookingStatus(repo, b, String(form.get('to')) as BookingStatus, flow, String(form.get('message') || '') || undefined);
-      return Astro.redirect(keep({ notice: form.get('to') === 'confirmed' ? 'Confirmed — it’s on the calendar and the guest was emailed.' : 'Updated.' }));
+      return Astro.redirect(keep({ notice: form.get('to') === 'confirmed' ? 'Confirmed — it’s on the calendar. Check Email → Activity for notification status.' : 'Updated.' }));
     }
     if (op === 'notes') {
       await repo.updateBooking(id, { notes: String(form.get('notes') || '').slice(0, 4000) });
@@ -67,7 +71,7 @@ if (Astro.request.method === 'POST') {
       const start = toMs(String(form.get('date')), String(form.get('time')));
       if (Number.isNaN(start)) throw new BookingError(400, 'Pick a date and time.');
       await rescheduleBooking(repo, b, start, start + (b.end - b.start), { ...flow, skipRules: true });
-      return Astro.redirect(keep({ notice: 'Moved, and the guest was emailed.' }));
+      return Astro.redirect(keep({ notice: 'Moved. Check Email → Activity for notification status.' }));
     }
     if (op === 'block') {
       const r = resById.get(String(form.get('resourceId')));
@@ -104,9 +108,10 @@ if (Astro.request.method === 'POST') {
 // ---- data ----
 const tab = (['upcoming', 'unconfirmed', 'past', 'cancelled'] as const).find((t) => t === Astro.url.searchParams.get('tab')) ?? 'upcoming';
 const view = Astro.url.searchParams.get('view') === 'day' ? 'day' : 'agenda';
+const eventFilter = Astro.url.searchParams.get('event') ?? '';
 const resFilter = Astro.url.searchParams.get('r') ?? '';
 const q = (Astro.url.searchParams.get('q') ?? '').trim().toLowerCase();
-const all = await repo.listBookings({ from: now - 400 * 86_400_000 });
+const all = await repo.listBookings({ from: now - 400 * 86_400_000, ...(eventFilter ? { eventId: eventFilter } : {}), ...(!bookingsEnabled() ? { kinds: ['rsvp'] } : {}) });
 const titleOf = (b: Booking) =>
   b.kind === 'block' ? `Blocked${b.notes ? ` · ${b.notes}` : ''}`
   : b.kind === 'rsvp' ? b.name
@@ -116,6 +121,7 @@ const contextOf = (b: Booking) =>
   : [linkById.get(b.linkId)?.name, ...Object.values(b.answers).slice(0, 2)].filter(Boolean).join(' · ');
 const where = (b: Booking) => (b.kind === 'rsvp' ? evById.get(b.eventId)?.location.name || 'Event' : resById.get(b.resourceId)?.name ?? '—');
 const matches = (b: Booking) =>
+  (!eventFilter || b.eventId === eventFilter) &&
   (!resFilter || b.resourceId === resFilter) &&
   (!q || `${b.name} ${b.email} ${b.phone} ${where(b)} ${contextOf(b)}`.toLowerCase().includes(q));
 const active = (b: Booking) => b.status === 'pending' || b.status === 'confirmed';
@@ -131,15 +137,14 @@ const list = all
   .sort((a, b) => (tab === 'past' || tab === 'cancelled' ? b.start - a.start : a.start - b.start))
   .slice(0, 300);
 if (Astro.url.searchParams.get('format') === 'csv') {
-  const cell = (v: string) => (/[",\n]/.test(v) ? `"${v.replace(/"/g, '""')}"` : v);
   const iso = (ms: number) => new Date(ms).toISOString();
   const keys = [...new Set(list.flatMap((b) => Object.keys(b.answers)))];
   const rows = [
     ['Start', 'End', 'Status', 'Kind', 'Resource / event', 'Link', 'Name', 'Email', 'Phone', 'Seats', ...keys, 'Notes', 'Booked'],
     ...list.map((b) => [iso(b.start), iso(b.end), b.status, b.kind, where(b), linkById.get(b.linkId)?.name ?? '', b.name, b.email, b.phone, String(b.seats), ...keys.map((k) => b.answers[k] ?? ''), b.notes, iso(b.createdAt)]),
   ];
-  return new Response(rows.map((r) => r.map(cell).join(',')).join('\n'), {
-    headers: { 'Content-Type': 'text/csv; charset=utf-8', 'Content-Disposition': `attachment; filename="bookings-${tab}.csv"` },
+  return new Response(csv(rows), {
+    headers: { 'Content-Type': 'text/csv; charset=utf-8', 'Content-Disposition': `attachment; filename="bookings-${tab}.csv"`, 'Cache-Control': 'private, no-store' },
   });
 }
 const pending = tab === 'upcoming' ? list.filter((b) => b.status === 'pending') : [];
@@ -170,7 +175,12 @@ const pos = (b: Booking) => {
 };
 
 const selected = Astro.url.searchParams.get('b') ? await repo.getBooking(Astro.url.searchParams.get('b')!) : null;
-const provider = emailProvider(Astro.locals);
+const emailConfig = resolveConfig(await repo.email.config(), Astro.locals);
+const emailStatus = emailReadiness(emailConfig, settings.siteUrl, Astro.locals);
+const emailNotice = !emailConfig.config.enabled || emailConfig.config.provider === 'none'
+  ? 'Emails are turned off. Enable email so guests can receive confirmations and reminders.'
+  : !emailStatus.configured ? `Email needs attention: ${emailStatus.error || 'Choose a provider in Email settings.'}`
+  : emailStatus.linkError;
 const TABS = [['upcoming', 'Upcoming'], ['unconfirmed', 'Needs approval'], ['past', 'Past'], ['cancelled', 'Cancelled']] as const;
 const statusLabel = (b: Booking) => (b.kind === 'block' ? 'Blocked' : b.status[0].toUpperCase() + b.status.slice(1));
 const whenOf = (b: Booking) => (b.end - b.start >= 86_400_000 - 3_600_000 && ymd(b.start, tz) !== ymd(b.end - 1, tz)
@@ -190,8 +200,9 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
     <a class="btn" href={keep({ format: 'csv', b: null, notice: null })}>Export</a>
   </BookingsHead>
   {notice && <p class="notice" role="status">{notice}</p>}
+  {eventFilter && <p class="notice">Registrations for {evById.get(eventFilter)?.title ?? 'this event'} · <a href={keep({ event: null })}>Show all bookings</a></p>}
   {error && <p class="notice warn" role="alert">{error}</p>}
-  {provider === 'none' && <p class="notice"><span>Emails are off — set <code>EMAIL_FROM</code> plus <code>RESEND_API_KEY</code> (or a Cloudflare <code>send_email</code> binding named EMAIL) so guests get confirmations and reminders.</span></p>}
+  {emailNotice && <p class="notice warn"><span>{emailNotice} <a href={emailStatus.configured && emailStatus.linkError ? '/admin/settings#site' : '/admin/email'}>{emailStatus.configured && emailStatus.linkError ? 'Site settings' : 'Email settings'}</a></span></p>}
 
   {resources.length === 0 && !all.length ? (
     <div class="empty-state">

package/src/pages/admin/calendar/events/[id].astro

@@ -8,14 +8,16 @@ import { BRAND } from '../../../../lib/brand';
 import { CALENDAR, eventUrl } from '../../../../lib/calendar/config';
 import { mergeEventDraft } from '../../../../lib/drafts';
 import { safeColor } from '../../../../lib/calendar/events';
+import { mapsStatus } from '../../../../lib/maps/config';
 import ThemeScript from '../../../../components/ThemeScript.astro';
 import PostEditor from '../../../../components/editor/PostEditor';
 import '../../../../styles/admin.css';
 import '../../../../styles/editor.css';
 
 // The shared writing surface in event mode: same cards, autosave, preview and
-// publish flow as posts, plus the When / Repeats / Where / Button / Calendars
-// sidebar. Live events stage edits until Update, like posts.
+// publish flow as posts, with the event's settings (When · Where ·
+// Registration · Organize) on the page above its content. Live events stage
+// edits until Update, like posts.
 if (!CALENDAR.enabled) return new Response(null, { status: 404, statusText: 'Not found' });
 
 const repo = await getRepo(Astro.locals);
@@ -59,6 +61,7 @@ const trDrafts = trLanguages.length > 0 && translationEngine((await repo.getSett
       calendars={calendars.filter((c) => c.kind === 'native').map((c) => ({ id: c.id, name: c.name, color: safeColor(c.color) }))}
       eventFields={CALENDAR.eventFields}
       siteTimezone={settings.timezone}
+      maps={mapsStatus(Astro.locals)}
       site={{ title: settings.siteTitle, url: settings.siteUrl }}
     />
   </body>

package/src/pages/admin/calendar/events/index.astro

@@ -9,6 +9,7 @@ import { getRepo } from '../../../../lib/repo';
 import { slugify, type Status } from '../../../../lib/schema';
 import { CALENDAR, eventUrl } from '../../../../lib/calendar/config';
 import { featuredOccurrence, formatOccurrence, locationLine, safeColor } from '../../../../lib/calendar/events';
+import { defaultPlaceLocation } from '../../../../lib/maps/places';
 import { describeRepeat } from '../../../../lib/calendar/rrule';
 import { expandVEvents, loadFeed, tzParts } from '../../../../lib/calendar/ics';
 import { normalizeCalendarSrc } from '../../../../lib/calendar/src';
@@ -71,9 +72,11 @@ if (Astro.request.method === 'POST') {
     const today = tzParts(now + 86_400_000, tz);
     const day = /^\d{4}-\d{2}-\d{2}$/.test(date) ? date : `${today.y}-${String(today.m).padStart(2, '0')}-${String(today.d).padStart(2, '0')}`;
     const start = /^\d{2}:\d{2}$/.test(time) ? `${day}T${time}` : day;
+    const place = await defaultPlaceLocation(repo);
     const event = await repo.createEvent({
       title, slug: await uniqueSlug(title), start, allDay: !/^\d{2}:\d{2}$/.test(time),
       calendarIds: calendarId && (await repo.getCalendar(calendarId))?.kind === 'native' ? [calendarId] : [],
+      ...(place ? { location: place } : {}),
     });
     return Astro.redirect(`/admin/calendar/events/${event.id}`);
   }

package/src/pages/admin/calendar/resources/[id].astro

@@ -26,6 +26,9 @@ let notice = Astro.url.searchParams.has('created') ? 'Created. Set its hours, th
 let error = '';
 const token = () => btoa(String.fromCharCode(...crypto.getRandomValues(new Uint8Array(18)))).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
 
+// saved places (Calendar settings → Places): which building this room is in
+const places = await repo.listPlaces();
+
 if (Astro.request.method === 'POST') {
   const form = await Astro.request.formData();
   const op = String(form.get('op'));
@@ -48,6 +51,7 @@ if (Astro.request.method === 'POST') {
       timezone: tz && isValidTimeZone(tz) ? tz : '',
       visibility: form.get('visibility') === 'unlisted' ? 'unlisted' : 'public',
       showOnCalendar: Boolean(form.get('showOnCalendar')),
+      placeId: places.some((p) => p.id === form.get('placeId')) ? String(form.get('placeId')) : '',
       hours: hoursFromForm(form), overrides: overridesFromForm(form), busyFeeds, notifyEmails: emails,
     });
     notice = error ? '' : 'Saved.';
@@ -160,6 +164,13 @@ const ovRows = [...resource.overrides, { date: '', endDate: '', ranges: [], labe
         <label class="field"><span>Description</span><textarea name="description" rows="3">{resource.description}</textarea></label>
         <label class="field"><span>Photo URL</span><input type="text" class="mono" name="photo" value={resource.photo} placeholder="/media/… or https://…" /></label>
         <label class="field"><span>Amenities <em class="hint">comma-separated</em></span><input type="text" name="amenities" value={resource.amenities.join(', ')} placeholder="Kitchen, Projector, Accessible" /></label>
+        <label class="field"><span>Place</span>
+          <select name="placeId">
+            <option value="">{places.length ? 'Not set' : 'No saved places yet'}</option>
+            {places.map((p) => <option value={p.id} selected={resource.placeId === p.id}>{p.name}{p.address ? ` — ${p.address}` : ''}</option>)}
+          </select>
+          <small class="hint">The building or venue it’s in. Add places in <a href="/admin/calendar/settings#places">Calendar settings</a>.</small>
+        </label>
         <label class="field"><span>Timezone</span><input type="text" name="timezone" value={resource.timezone} placeholder={`${settings.timezone || 'UTC'} (site default)`} /></label>
         <label class="field">
           <span>Listed</span>