@acms-subir/core 0.3.43 → 0.3.45

package/src/pages/api/v1/rooms/free.ts

@@ -0,0 +1,7 @@
+import { roomFree } from '../../../../lib/mobile/calendar';
+import { privateRoute } from '../../../../lib/mobile/route';
+import { methodNotAllowed } from '../../../../lib/mobile/http';
+export { preflight as OPTIONS } from '../../../../lib/mobile/http';
+// never cached: a room taken a minute ago must not read as free
+export const GET = privateRoute(roomFree);
+export const ALL = () => methodNotAllowed('GET, OPTIONS');

package/src/server/index.ts

@@ -36,6 +36,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 interface ListEventsOptions {
   /** only published events (default: every event except archived ones) */
@@ -171,6 +172,42 @@ export async function restoreOccurrence(repo: Repo, eventId: string, occurrenceK
   return restore(internal(repo), eventId, occurrenceKey, { url: context.url, locals: context.locals });
 }
 
+// ---- 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
+// results carry names: show them to staff only.
+
+/**
+ * Other events holding the same rooms as this one at overlapping times, setup
+ * and cleanup included, soonest first. Pass an event id, or a CalEvent with
+ * unsaved values (it's checked as if published). Looks `horizonDays` ahead
+ * (default 366) from `now`. Clashes are warnings: both events keep the room.
+ * Throws an Error with `status` 404 for an unknown event id.
+ */
+export async function eventRoomClashes(repo: Repo, event: string | CalEvent, opts: { horizonDays?: number; now?: Date | number } = {}): Promise<import('../lib/booking/holds').EventClash[]> {
+  const r = internal(repo);
+  const e = typeof event === 'string' ? await r.getEvent(event) : event;
+  if (!e) throw Object.assign(new Error('Event not found.'), { status: 404 });
+  const { eventClashes } = await import('../lib/booking/holds');
+  return (await eventClashes(r, await r.getSettings(), e, { horizonDays: opts.horizonDays, now: opts.now === undefined ? undefined : +opts.now })).clashes;
+}
+
+/**
+ * Everything that takes these rooms (Resource ids) in [from, to), soonest
+ * first: events holding them (setup and cleanup included), pending and
+ * confirmed bookings, staff blocks and the rooms' busy calendars. `ignore`
+ * leaves out one event, or one date of it by occurrence key, such as the date
+ * you're about to move. An empty list means they're all free.
+ */
+export async function roomBusy(repo: Repo, q: { roomIds: string[]; from: Date | number; to: Date | number; ignore?: { eventId: string; key?: string } }): Promise<import('../lib/booking/holds').BusySlot[]> {
+  const from = +q.from, to = +q.to;
+  if (!Number.isFinite(from) || !Number.isFinite(to) || to <= from) throw new RangeError('roomBusy needs a "to" after "from".');
+  if (to - from > MAX_WINDOW) throw new RangeError('roomBusy windows are at most 400 days.');
+  const r = internal(repo);
+  const { roomBusy: busy } = await import('../lib/booking/holds');
+  return busy(r, await r.getSettings(), { resourceIds: q.roomIds, from, to, ignore: q.ignore });
+}
+
 // ---- members' event requests ------------------------------------------
 // The rules behind the built-in "My events" pages (acms({ members })), for a
 // site that builds its own. Each takes the person acting (currentUser()) and

package/src/styles/admin.css

@@ -1392,6 +1392,9 @@ em.manual { color: var(--amber); }
 .res-grid > div > .card + .card, .res-side > .card + .card { margin-top: 16px; }
 .res-side { display: flex; flex-direction: column; gap: 0; }
 .res-side > .btn { margin-top: 14px; align-self: flex-start; }
+.res-color { display: flex; align-items: center; gap: 12px; margin-top: 4px; }
+.res-color input[type='color'] { width: 44px; height: 30px; padding: 2px; border: 1px solid var(--line); border-radius: var(--r-sm); background: var(--panel); cursor: pointer; }
+.res-color .check-row { margin: 0; }
 .card-pad { padding: 16px 18px; }
 .card-head { display: flex; justify-content: space-between; align-items: baseline; gap: 10px; margin-bottom: 12px; }
 .card-head b { font-size: 14.5px; }

package/src/styles/editor.css

@@ -1039,6 +1039,8 @@
 .rh-conflict > b { display: block; margin-bottom: 4px; }
 .rh-bk { display: flex; flex-direction: column; padding: 5px 0; border-top: 1px solid color-mix(in srgb, var(--amber) 25%, transparent); }
 .rh-bk small, .rh-more { color: var(--text-2); font-size: 11.5px; }
+.rh-clash .rh-bk a { color: inherit; font-weight: 600; }
+.rh-clash > .rh-more:last-child { display: block; margin-top: 6px; }
 .rh-acts { display: flex; gap: 6px; flex-wrap: wrap; margin-top: 8px; }
 .rh-acts.end { justify-content: flex-end; }
 .rh-cancel textarea, .rh-msg { width: 100%; margin-top: 8px; padding: 7px 9px; border: 1px solid var(--line-strong); border-radius: 8px; background: var(--bg); color: var(--text); font: inherit; font-size: 12.5px; resize: vertical; }