@acms-subir/core 0.3.57 → 0.3.59

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @acms-subir/core
 
+## 0.3.59
+
+### Patch Changes
+
+- fa476b6: The Google Calendar sync now maps Google's "this and following" to "from this date on" (C4), both ways.
+
+  - A split in Google changes the site event from that date on (`changeFromDate` as `GOOGLE_SYNC`). It stays one event, with the same page, hosts and RSVPs, and sign-ups move to the nearest new date with the "new time" email. The new Google series becomes that later part's pair. Its later time, rule or place edits change the part again, and its single dates are cancelled and moved like any date.
+  - A change from a date on, made on the site, gives the later part its own Google series. The first series gets an UNTIL before that day, as in the site's own feeds. Undo removes the later series again.
+  - Deleting the later series in Google, or ending a series sooner, cancels those dates on the site from the first one on (`cancelFromDate`). They're struck through, their rooms are freed, and they can be restored. Restoring them on either side brings them back on the other.
+  - At the first match, a split Google already has is recorded as it is (Q18). Matching now pairs a Google series that was split with its site twin.
+  - Before this, splits were only listed for staff, and both Google series stayed linked to the one site event. Those pairs carry on: the next change on either side applies the new way.
+
+  No migration. Nothing to do after updating.
+
+## 0.3.58
+
+### Patch Changes
+
+- c26c7c1: Rooms can have a name in each of the site's other languages. Admin → Calendar → Rooms → a room shows **Name in Español** (one field per extra language) under its name, and the editor API takes `translations: { es: { name } }`. Each place that names a room uses the name in its language, and falls back to the main name:
+
+  - public event data: `rooms` in `/api/v1/events`, `/api/v1/events/:slug` and search, following `?locale=` (else the site's main language);
+  - calendar views and cards, including "Reserved" blocks, and section event items on Spanish pages;
+  - the `/request` form and `GET /api/v1/requests/options?locale=`;
+  - the TV display (its room columns and legend);
+  - the hosts' My events;
+  - request emails and the request status page, in the requester's language;
+  - booking emails, in the booker's language.
+
+  The slug stays the same in every language. Staff screens, staff emails and `GET /api/v1/rooms/free` keep the main name. `roomName(room, locale)` in `lib/schema.ts` picks the name, and `es-MX` uses the `es` name. Migration 71 adds `resources.translations` (`'{}'` for existing rooms); changing it refreshes cached pages and API answers. Backups and environment sync carry it.
+
 ## 0.3.57
 
 ### Patch Changes

package/cli/migrations.generated.mjs

@@ -1363,13 +1363,20 @@ var MIGRATIONS = [
   GCAL_MIGRATION,
   // a series changed from one date on (CalEvent.segments): a column on the
   // row, so the triggers on events see it, like moved_dates
-  SEGMENTS_MIGRATION(contentVersionTriggers("events", [...CONTENT_VERSION_COLUMNS.events, "cancelled_dates", "moved_dates", "segments"])[2])
+  SEGMENTS_MIGRATION(contentVersionTriggers("events", [...CONTENT_VERSION_COLUMNS.events, "cancelled_dates", "moved_dates", "segments"])[2]),
+  // a room's name in other languages (Resource.translations): public, so a
+  // change refreshes cached pages and API answers
+  { version: 71, statements: [
+    `ALTER TABLE resources ADD COLUMN translations TEXT NOT NULL DEFAULT '{}'`,
+    `DROP TRIGGER content_version_resources_update`,
+    contentVersionTriggers("resources", [...CONTENT_VERSION_COLUMNS.resources, "color", "show_on_events", "translations"])[2]
+  ] }
 ];
 var CURRENT_CONTENT_VERSION_COLUMNS = {
   ...CONTENT_VERSION_COLUMNS,
   settings: [...CONTENT_VERSION_COLUMNS.settings, "links_verified", "links_avatar_shape", "links_avatar_fit", "links_avatar_scale", "legal"],
   events: [...CONTENT_VERSION_COLUMNS.events, "cancelled_dates", "moved_dates", "segments"],
-  resources: [...CONTENT_VERSION_COLUMNS.resources, "color", "show_on_events"],
+  resources: [...CONTENT_VERSION_COLUMNS.resources, "color", "show_on_events", "translations"],
   announcements: ANNOUNCEMENT_VISIBLE_COLUMNS
 };
 var LATEST_VERSION = MIGRATIONS[MIGRATIONS.length - 1].version;

package/docs/calendar.md

@@ -283,6 +283,20 @@ Each room also has:
   names the room. When it's off, only staff see that an event uses the room.
 - **Anyone can check if it’s free** (`requestable`, off by default): the room answers
   the public free/busy check below.
+- **Name in Español** (and each of the site's other languages; `translations: { es: {
+  name } }`): the room's name on pages, app answers, TV screens and emails in that
+  language. Without one, the main name shows. The slug stays the same in every
+  language. Site code reads it with `roomName(room, locale)` from the schema.
+
+Where a room's name follows the language:
+- public event data (`rooms`, with `?locale=` in the app API);
+- calendar views, cards and section items;
+- the request form and `GET /api/v1/requests/options`;
+- the TV display;
+- My events;
+- request emails and booking emails, in the person's language.
+
+The admin and staff emails use the main name.
 
 ### Rooms in event data
 
@@ -426,8 +440,11 @@ calendars in step, both ways, within a few minutes. The full guide is
 - **Booked appointments** from Google booking pages come in as "Booked" with the
   internal tag `#google-booking` (`GOOGLE_BOOKING_TAG`), holding the link's room. Treat
   them as bookings: the tag never shows publicly.
-- **"This and following"** in Google is listed for staff, and the site series stays whole
-  until "from this date on" exists.
+- **"This and following"** maps to "from this date on", both ways:
+  - A Google split changes the event from that date on (`changeFromDate` as `GOOGLE_SYNC`).
+  - A change from a date on gives the later part its own Google series.
+  - Deleting the later series in Google, or ending a series sooner, cancels those dates
+    (`cancelFromDate`), so they stay restorable.
 - Site code can read an event's Google copies with `googleCopies(repo, eventId)`, and
   Recent changes with `googleSyncHistory(repo)`.
 

package/docs/google-calendar.md

@@ -185,12 +185,28 @@ A series is one event with a rule on both sides. Single dates:
   taken room only warns. A date moved on the site moves that Google instance.
 - **Per-date titles or descriptions** from Google aren't applied, because the
   site keeps one title for every date. They're listed under Recent changes.
-- **"This and following"** in Google splits the series in two. Until the site
-  has "from this date on", the new Google series is linked to the same site
-  event as a later part. The split is listed for staff, and the site series
-  stays whole: its time and rule don't change from either side. Likewise, a
-  series Google ends sooner keeps its later dates on the site, listed for
-  staff to end or cancel.
+- **"This and following"** maps to "from this date on", both ways.
+  - **In Google:** a split makes a second Google series. The site changes the
+    same event from that date on (`changeFromDate`, as `GOOGLE_SYNC`), so its
+    page, hosts and RSVPs stay. Sign-ups move to the nearest new date (with the
+    "new time" email). The date is the one Google split at: its id ends in
+    `_R` and that date's original start.
+  - **Pairs:** the new Google series becomes the later part's pair. Its later
+    time, rule or place edits change that part again. Its single dates are
+    cancelled and moved like any date. Its own title or description isn't kept,
+    because the site keeps one for the whole series.
+  - **On the site:** a change from a date on gives the later part its own
+    Google series (its hidden link names the part), and the first series gets
+    an UNTIL before that day, as in the site's feeds. **Undo** removes the
+    later series again.
+  - **Deleting:** deleting the later series in Google, or ending a series
+    sooner, cancels those dates on the site from the first one on
+    (`cancelFromDate`): struck through, rooms freed, restorable (Q6).
+    Restoring them, in Google or on the site, brings them back on the other
+    side. Dates cancelled from a date on, on the site, are removed from
+    Google, like a cancelled date's instance.
+  - **First match:** a split Google already has is recorded as it is. Neither
+    side changes until one of them does (Q18).
 
 ## Clashes
 
@@ -284,9 +300,6 @@ insert, update and delete of `events`) and `gcal_log`.
 
 - **Google push notifications** (`events.watch`) for near-instant updates.
   Reading every 2 minutes is the mechanism.
-- **"This and following"** as a real change on the site, once "from this date
-  on" exists. Until then, splits are listed and both Google series stay linked
-  to the one site event.
 
 ## Troubleshooting
 

package/package.json

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

package/src/lib/booking/service.ts

@@ -5,6 +5,7 @@ import { collectResponse, displayAnswers } from '../forms/service';
 // calendar immediately); the rest wait as "pending" for staff.
 import type { ContentRepository } from '../repo/types';
 import type { Booking, BookingLink, BookingStatus, CalEvent, Resource, Settings } from '../schema';
+import { roomName } from '../schema';
 import { loadFeed, expandVEvents } from '../calendar/ics';
 import { emitWebhook } from '../webhooks';
 import { parseFrom } from '../email/config';
@@ -108,8 +109,9 @@ async function describe(repo: ContentRepository, b: Booking, settings: Settings,
   const tz = resource ? resourceZone(resource, settings.timezone) : settings.timezone || 'UTC';
   return {
     resource, link, event: null as CalEvent | null, tz,
-    title: [resource?.name, link?.name].filter(Boolean).join(' · ') || 'Booking',
-    location: resource?.name ?? '',
+    // the room in the booking's language (its main name without one)
+    title: [resource && roomName(resource, locale), link?.name].filter(Boolean).join(' · ') || 'Booking',
+    location: resource ? roomName(resource, locale) : '',
     when: whenText(b, tz, settings, link?.mode === 'day'),
   };
 }

package/src/lib/calendar/api.ts

@@ -3,7 +3,7 @@
 // everywhere. Drafts, internal ids of private calendars, staging data and
 // private custom fields (unless a staff caller asks for them) never appear
 // here. Rooms are named only when set to show on public events (or for staff).
-import { roomColor, type CalEvent, type Calendar, type MovedDate, type Resource } from '../schema';
+import { roomColor, roomName, type CalEvent, type Calendar, type MovedDate, type Resource } from '../schema';
 import { calendarFeedUrl, eventIcsUrl, eventUrl, publicEventFields } from './config';
 import { describeRepeat } from './rrule';
 import { localizeForm } from '../forms/localize';
@@ -67,11 +67,11 @@ export function movedDatesToJson(e: Pick<CalEvent, 'movedDates'>, includePrivate
   return Object.fromEntries(Object.entries(e.movedDates ?? {}).map(([k, m]) => [k, includePrivate ? m : { start: m.start, end: m.end, note: m.note }]));
 }
 
-/** Rooms as public data: only those set to show on public events, unless `includePrivate` (staff). Unknown ids are skipped. */
-export function roomsToJson(ids: string[], resources: Map<string, Resource> | undefined, includePrivate = false): RoomJson[] {
+/** Rooms as public data: only those set to show on public events, unless `includePrivate` (staff); named in `locale` when they have a name in it. Unknown ids are skipped. */
+export function roomsToJson(ids: string[], resources: Map<string, Resource> | undefined, includePrivate = false, locale?: string | null): RoomJson[] {
   if (!resources) return [];
   return ids.map((id) => resources.get(id)).filter((r): r is Resource => Boolean(r) && (includePrivate || r!.showOnEvents))
-    .map((r) => ({ slug: r.slug, name: r.name, color: roomColor(r) || null }));
+    .map((r) => ({ slug: r.slug, name: roomName(r, locale), color: roomColor(r) || null }));
 }
 
 const abs = (origin: string, path: string) => (/^https?:\/\//.test(path) ? path : origin + path);
@@ -84,7 +84,7 @@ const untilDate = (locale: string) => (ymd: string) => {
 };
 
 // resources: every room by id (rooms stay [] without it); locale: the
-// language of the repeat line ("Cada semana el sábado"; English without it)
+// language of the repeat line and the room names ("Cada semana el sábado"; English without it)
 export function eventToJson(e: CalEvent, origin: string, calendars: Map<string, Calendar>, siteTz = '', opts: { includePrivate?: boolean; resources?: Map<string, Resource>; locale?: string } = {}): EventJson {
   return {
     id: e.id,
@@ -106,7 +106,7 @@ export function eventToJson(e: CalEvent, origin: string, calendars: Map<string,
     segments: seriesParts(e).slice(1).map((p) => ({
       from: p.from, start: p.start, end: p.end, rrule: p.rrule, repeats: describeRepeat(p.rrule, p.start, opts.locale ? untilDate(opts.locale) : undefined, opts.locale), cancelled: p.cancelled, note: p.note,
       location: p.location ? { name: p.location.name, address: p.location.address, url: p.location.url } : null,
-      rooms: roomsToJson(p.roomIds, opts.resources, opts.includePrivate),
+      rooms: roomsToJson(p.roomIds, opts.resources, opts.includePrivate, opts.locale),
     })),    exdates: e.exdates,
     cancelledDates: e.cancelledDates ?? [],
     movedDates: movedDatesToJson(e, opts.includePrivate),
@@ -121,7 +121,7 @@ export function eventToJson(e: CalEvent, origin: string, calendars: Map<string,
       .map((id) => calendars.get(id))
       .filter((c): c is Calendar => Boolean(c) && c!.visibility !== 'private')
       .map((c) => ({ id: c.id, slug: c.slug, name: c.name, color: c.color })),
-    rooms: roomsToJson(e.roomHold.resourceIds, opts.resources, opts.includePrivate),
+    rooms: roomsToJson(e.roomHold.resourceIds, opts.resources, opts.includePrivate, opts.locale),
     fields: opts.includePrivate ? e.fields : publicEventFields(e.fields),
     updatedAt: new Date(e.updatedAt).toISOString(),
   };

package/src/lib/calendar/data.ts

@@ -7,7 +7,7 @@
 // details, lib/display: published events only, private calendars when it
 // names them, bookings with the booker's name, never emails, phones or notes).
 import type { ContentRepository } from '../repo/types';
-import { roomColor, type BookingLink, type CalEvent, type Calendar, type EventLocation, type Resource, type Settings } from '../schema';
+import { roomColor, roomName, type BookingLink, type CalEvent, type Calendar, type EventLocation, type Resource, type Settings } from '../schema';
 import { eventIsListed, eventIsPublic, eventRoomIds, expandEvents, locationLine, safeColor, type OccurrenceMove } from './events';
 import { expandVEvents, loadFeed, tzParts, type CalendarEvent, type CalendarWindow } from './ics';
 import { CALENDAR, eventUrl, resourceUrl, withoutPrivateFields } from './config';
@@ -107,7 +107,7 @@ export async function collectViewEvents(
   const rooms = (ids: string[]) => ids.map((id) => resources.get(id))
     // staff views and screens with private details name every room
     .filter((r): r is Resource => Boolean(r) && (scope.audience !== 'public' || r!.showOnEvents))
-    .map((r) => ({ id: r.id, slug: r.slug, name: r.name, color: roomColor(r) }));
+    .map((r) => ({ id: r.id, slug: r.slug, name: roomName(r, scope.locale), color: roomColor(r) }));
   const words = eventStrings(scope.locale).calendar;
   for (const o of expandEvents(natives, settings, win)) {
     // rooms are per date (a moved date can change them)
@@ -176,14 +176,16 @@ export async function collectViewEvents(
         const r = byId.get(b.resourceId);
         if (!r) continue;
         const allDay = b.end - b.start >= 86_400_000 - 3_600_000;
+        // the room in the view's language (its main name without one)
+        const room = roomName(r, scope.locale);
         const title = scope.audience === 'admin' ? `${r.name} · ${b.name}`
-          : scope.audience === 'screen' ? [linkName.get(b.linkId) || r.name, b.name].filter(Boolean).join(' · ')
-          : `${words.reserved} · ${r.name}`;
+          : scope.audience === 'screen' ? [linkName.get(b.linkId) || room, b.name].filter(Boolean).join(' · ')
+          : `${words.reserved} · ${room}`;
         events.push({
           start: b.start, end: b.end, allDay, days: allDay ? Math.max(1, Math.round((b.end - b.start) / 86_400_000)) : 1,
-          title, location: r.name, description: '', cal: inScope.length, color: '#8e919a', calendarName: r.name,
+          title, location: room, description: '', cal: inScope.length, color: '#8e919a', calendarName: room,
           url: scope.audience === 'public' ? resourceUrl(r.slug) : undefined,
-          rooms: [{ id: r.id, slug: r.slug, name: r.name, color: roomColor(r) }],
+          rooms: [{ id: r.id, slug: r.slug, name: room, color: roomColor(r) }],
         });
       }
     }