@acms-subir/core 0.3.3-next.20260929113209 → 0.3.4

package/src/components/booking/BookingFlow.astro

@@ -7,6 +7,7 @@ import type { Booking, BookingLink, Resource, Settings } from '../../lib/schema'
 import { bookingLinkUrl, resourceUrl } from '../../lib/calendar/config';
 import { describeLength, describeLink, linkLengths, openDays, slotsForDay, ymd, type AvailabilityContext } from '../../lib/booking/availability';
 import { addMonths, fmt, monthCells, slotLabel } from '../../lib/booking/view';
+import { confirmsInstantly, linkApproval } from '../../lib/booking/approval';
 
 interface Props {
   resource: Resource;
@@ -21,6 +22,8 @@ interface Props {
 }
 const { resource, link, ctx, settings, url, error = '', values = {}, embed = false, reschedule = null } = Astro.props;
 const tz = ctx.resource.timezone || settings.timezone || 'UTC';
+// "rules" links usually confirm at once, but may not — promise only what's certain
+const instant = confirmsInstantly(linkApproval(link, settings));
 const f = fmt(settings, tz);
 const today = ymd(ctx.now, tz);
 const lengths = linkLengths(link);
@@ -51,7 +54,7 @@ const q = (patch: Record<string, string | number | undefined>) => {
 };
 const rules = [
   describeLink(link),
-  link.autoConfirm ? 'Confirmed instantly' : 'Needs approval',
+  instant ? 'Confirmed instantly' : 'Needs approval',
   link.bufferBefore || link.bufferAfter ? `Includes ${[link.bufferBefore && `${link.bufferBefore} min setup`, link.bufferAfter && `${link.bufferAfter} min cleanup`].filter(Boolean).join(' + ')}` : '',
 ].filter(Boolean);
 const val = (k: string) => values[k] ?? '';
@@ -142,8 +145,8 @@ const val = (k: string) => values[k] ?? '';
             ))}
           </>
         )}
-        <button class="pc-bk-submit" type="submit">{reschedule ? 'Move my booking' : link.autoConfirm ? 'Confirm booking' : 'Request booking'}</button>
-        {!link.autoConfirm && !reschedule && <p class="pc-bk-fine">We’ll email you once it’s approved. Nothing is final until then.</p>}
+        <button class="pc-bk-submit" type="submit">{reschedule ? 'Move my booking' : instant ? 'Confirm booking' : 'Request booking'}</button>
+        {!instant && !reschedule && <p class="pc-bk-fine">We’ll email you once it’s approved. Nothing is final until then.</p>}
       </form>
     </section>
   )}

package/src/components/calendar/BookingsHead.astro

@@ -0,0 +1,51 @@
+---
+// Shared header for the Bookings home: Requests (what came in) and Rooms &
+// people (what can be booked) are two tabs of one place, with the same ⚙ and
+// "New ▾" as the Schedule. Extra page actions go in the default slot.
+interface Props {
+  active: 'requests' | 'rooms';
+  sub: string;
+  pending: number;
+  rooms: number;
+  // on the Requests page the menu opens its dialogs in place
+  inPlace?: boolean;
+}
+const { active, sub, pending, rooms, inPlace = false } = Astro.props;
+const gear = 'M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6zM19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 1 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 1 1-2.83-2.83l.06-.06A1.65 1.65 0 0 0 4.68 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 1 1 2.83-2.83l.06.06A1.65 1.65 0 0 0 9 4.68a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 1 1 2.83 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z';
+---
+
+<div class="page-head bk-head">
+  <div>
+    <h1>Bookings</h1>
+    <p class="sub">{sub}</p>
+  </div>
+  <div class="page-actions">
+    <slot />
+    <a class="btn ico" href="/admin/calendar/settings#bookings" title="Calendar settings" aria-label="Calendar settings"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d={gear} /></svg></a>
+    <details class="newmenu">
+      <summary class="btn primary">New <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><path d="M6 9l6 6 6-6" /></svg></summary>
+      <div class="newmenu-pop" role="menu">
+        {inPlace
+          ? <button type="button" role="menuitem" data-modal="bk-add">Booking <small>for someone</small></button>
+          : <a role="menuitem" href="/admin/calendar/bookings?add=1">Booking <small>for someone</small></a>}
+        {inPlace
+          ? <button type="button" role="menuitem" data-modal="bk-block">Block time <small>room closed, time off</small></button>
+          : <a role="menuitem" href="/admin/calendar/bookings?block=1">Block time <small>room closed, time off</small></a>}
+        {active === 'rooms'
+          ? <button type="button" role="menuitem" data-modal="new-resource">Room or person</button>
+          : <a role="menuitem" href="/admin/calendar/resources?new=1">Room or person</a>}
+      </div>
+    </details>
+  </div>
+</div>
+<nav class="ptabs" aria-label="Bookings">
+  <a href="/admin/calendar/bookings" aria-current={active === 'requests' ? 'page' : undefined}>Requests{pending > 0 && <small class="attn">{pending} {pending === 1 ? 'needs' : 'need'} approval</small>}</a>
+  <a href="/admin/calendar/resources" aria-current={active === 'rooms' ? 'page' : undefined}>Rooms &amp; people<small>{rooms}</small></a>
+</nav>
+
+<script>
+  document.addEventListener('click', (e) => {
+    const m = document.querySelector<HTMLDetailsElement>('details.newmenu[open]');
+    if (m && (!(e.target instanceof Node) || !m.contains(e.target) || (e.target as Element).closest('[role=menuitem]'))) m.open = false;
+  });
+</script>