slotlock 0.5.2 → 0.5.3

package/dashboard.js

@@ -102,7 +102,8 @@ const CONTENT_SECURITY_POLICY = "default-src 'none'; script-src 'self'; style-sr
  * in the database (a READ COMMITTED transaction, under a per-tenant lock).
  */
 export function createSlotlockDashboardResources(store) {
-    const by = (actor) => (actor === undefined ? {} : { actor });
+    // Every change here is the dashboard's, made by the person signed in (actor) when known.
+    const by = (actor) => actor === undefined ? { origin: 'dashboard' } : { origin: 'dashboard', actor };
     return {
         list: (tenantRef) => store.withTenant(tenantRef, (tenant) => tenant.listResources({ tenantRef, limit: SLOTLOCK_DASHBOARD_MAX_RESOURCES + 1 })),
         add: (tenantRef, externalRef, timezone, actor) => store.withTenant(tenantRef, (tenant) => tenant.createResource({
@@ -120,6 +121,7 @@ export function createSlotlockDashboardResources(store) {
         agenda: (tenantRef, window, limit) => store.withTenant(tenantRef, (tenant) => tenant.listAgenda({ tenantRef, window, limit })),
         recentChanges: (tenantRef, limit) => store.withTenant(tenantRef, (tenant) => tenant.listRecentChanges({ tenantRef, limit })),
         setRules: (tenantRef, id, rules, actor) => store.withTenant(tenantRef, (tenant) => tenant.setResourceBookingRules({ tenantRef, id, rules }), by(actor)),
+        ruleDefaults: (tenantRef) => store.withTenant(tenantRef, (tenant) => tenant.getBookingRuleDefaults({ tenantRef })),
         setPool: (tenantRef, id, pool, actor) => store.withTenant(tenantRef, (tenant) => tenant.setResourcePool({ tenantRef, id, pool }), by(actor)),
         waitlist: {
             list: (tenantRef, limit) => store.withTenant(tenantRef, (tenant) => tenant.listWaitlist({ tenantRef, limit })),
@@ -128,7 +130,9 @@ export function createSlotlockDashboardResources(store) {
                 // An offered entry's hold went with it: offer that time to the next, as the API does.
                 if (left) {
                     await store
-                        .withTenant(tenantRef, (tenant) => tenant.offerWaitlist({ tenantRef, limit: 20 }))
+                        .withTenant(tenantRef, (tenant) => tenant.offerWaitlist({ tenantRef, limit: 20 }), {
+                        origin: 'maintenance',
+                    })
                         .catch(() => undefined);
                 }
                 return left;
@@ -311,6 +315,8 @@ const RULE_NAMES = Object.freeze({
     minNoticeMinutes: 'Minimum notice',
     maxAdvanceDays: 'Book up to',
     slotStepMinutes: 'Start step',
+    stepOffsetMinutes: 'Step offset',
+    bufferBeforeMinutes: 'Buffer before',
     turnaroundMinutes: 'Turnaround',
     checkInMinutes: 'Check-in release',
 });
@@ -319,12 +325,53 @@ const RULE_FIELDS = Object.freeze({
     minNoticeMinutes: 'min_notice_minutes',
     maxAdvanceDays: 'max_advance_days',
     slotStepMinutes: 'slot_step_minutes',
+    stepOffsetMinutes: 'step_offset_minutes',
+    bufferBeforeMinutes: 'buffer_before_minutes',
     turnaroundMinutes: 'turnaround_minutes',
     checkInMinutes: 'check_in_minutes',
 });
+/** How the inherited-rules note names each rule, with its unit. */
+const INHERITED_NAMES = Object.freeze({
+    ...RULE_NAMES,
+    maxAdvanceDays: 'Book up to (days ahead)',
+    enforceHours: 'Only inside bookable hours',
+    requireCertain: 'Only in time its calendar syncs have read today',
+});
+/**
+ * The rules a resource takes from defaults, each with where it comes from: a rule its pool's
+ * defaults set, else one the tenant's set, where its own rules do not. Without the defaults, the
+ * rules that apply less its own, from "defaults".
+ */
+function inheritedRules(resource, defaults) {
+    const own = resource.bookingRules ?? {};
+    const levels = defaults
+        ? [
+            ['every resource', defaults.tenant],
+            [`pool ${resource.pool ?? ''}`, resource.pool === undefined ? undefined : defaults.pools[resource.pool]],
+        ]
+        : [['defaults', resource.effectiveBookingRules]];
+    const inherited = new Map();
+    for (const [from, rules] of levels) {
+        for (const [name, value] of Object.entries(rules ?? {})) {
+            if (own[name] === undefined)
+                inherited.set(name, { value, from });
+        }
+    }
+    return inherited;
+}
+function inheritedNote(inherited) {
+    if (inherited.size === 0)
+        return html ``;
+    const parts = [...inherited].map(([name, { value, from }]) => typeof value === 'boolean'
+        ? `${INHERITED_NAMES[name]}${value ? '' : ': off'} (${from})`
+        : `${INHERITED_NAMES[name]} ${value.toLocaleString('en')} (${from})`);
+    return html `<p class="fine">Inherited: ${parts.join('; ')}.</p>`;
+}
 const icon = (paths) => new Html(`<svg class="icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false">${paths}</svg>`);
 const ICONS = Object.freeze({
-    mark: new Html('<svg class="mark" viewBox="0 0 64 64" aria-hidden="true" focusable="false"><path d="M8 46 L26 14 L56 44"></path></svg>'),
+    mark: new Html(
+    // The Slotlock mark: a padlock whose body holds one booked slot (the site's logo, without the wordmark).
+    '<svg class="mark" viewBox="0 0 85.32 77.12" aria-hidden="true" focusable="false"><path class="mark-ink" d="M13.13 34.46L72.2 34.46C79.45 34.46 85.32 40.33 85.32 47.58L85.32 63.99C85.32 71.24 79.45 77.12 72.2 77.12L13.13 77.12C5.88 77.12 0 71.24 0 63.99L0 47.58C0 40.33 5.88 34.46 13.13 34.46ZM22.97 39.38L22.97 19.69C22.97 8.82 31.79 0 42.66 0C53.54 0 62.35 8.82 62.35 19.69L62.35 39.38L56.61 39.38L56.61 19.69C56.61 11.99 50.36 5.74 42.66 5.74C34.96 5.74 28.71 11.99 28.71 19.69L28.71 39.38Z"></path><path class="mark-slot" d="M19.69 52.51L65.63 52.51C67.45 52.51 68.91 53.98 68.91 55.79C68.91 57.6 67.45 59.07 65.63 59.07L19.69 59.07C17.88 59.07 16.41 57.6 16.41 55.79C16.41 53.98 17.88 52.51 19.69 52.51Z"></path></svg>'),
     overview: icon('<path d="M4 13h6V4H4zM14 20h6v-9h-6zM4 20h6v-3H4zM14 7h6V4h-6z"/>'),
     resources: icon('<rect x="3" y="5" width="18" height="16" rx="2"/><path d="M3 10h18M8 3v4M16 3v4"/>'),
     keys: icon('<circle cx="8" cy="15" r="4"/><path d="M11 12l9-9M16 7l3 3"/>'),
@@ -1011,17 +1058,33 @@ ${current ? html `<p class="fine">Membership is read from GitHub when you sign i
             return notFound(session);
         const start = new Date(now());
         const window = { start, end: new Date(start.getTime() + AGENDA_DAYS * DAY_MS) };
-        const [agenda, changes, keys] = await Promise.all([
+        const [agenda, changes, keys, defaults] = await Promise.all([
             options.resources.agenda?.(tenantRef, window, AGENDA_LIMIT),
             options.resources.recentChanges?.(tenantRef, 100),
             options.keys.list({ tenantRef }),
+            options.resources.ruleDefaults?.(tenantRef),
         ]);
         const byId = new Map([[resource.id, resource]]);
         const mine = agenda?.filter((entry) => entry.resourceId === resource.id);
         const activity = changes?.filter((change) => change.resourceId === resource.id).slice(0, 10);
         const token = csrfToken(session);
         const rules = resource.bookingRules ?? {};
-        const field = (name, label, unit) => html `<label>${label}<span class="unit-input"><input type="number" inputmode="numeric" min="${String(RULE_LIMITS[name][0])}" max="${String(RULE_LIMITS[name][1])}" name="${RULE_FIELDS[name]}" value="${rules[name] === undefined ? '' : String(rules[name])}"><span>${unit}</span></span></label>`;
+        const inherited = inheritedRules(resource, defaults);
+        const field = (name, label, unit) => {
+            const from = inherited.get(name);
+            return html `<label>${label}<span class="unit-input"><input type="number" inputmode="numeric" min="${String(RULE_LIMITS[name][0])}" max="${String(RULE_LIMITS[name][1])}" name="${RULE_FIELDS[name]}" value="${rules[name] === undefined ? '' : String(rules[name])}"${from ? html ` placeholder="${String(from.value)}"` : html ``}><span>${unit}</span></span></label>`;
+        };
+        // On or off: a checkbox, or, once a default sets it (or the resource turned it off), a choice
+        // of the default, on or off, so a resource can turn an inherited rule off.
+        const toggle = (name, key, label) => {
+            const from = inherited.get(name);
+            if (from === undefined && rules[name] !== false) {
+                return html `<label class="choice"><input type="checkbox" name="${key}" value="1"${rules[name] ? html ` checked` : html ``}> ${label}</label>`;
+            }
+            const chosen = (value) => (rules[name] === value ? html ` selected` : html ``);
+            const fallback = from ? `As its default (${from.value ? 'on' : 'off'}, ${from.from})` : 'Off';
+            return html `<label>${label}<select name="${key}"><option value=""${chosen(undefined)}>${fallback}</option><option value="1"${chosen(true)}>On</option><option value="0"${chosen(false)}>Off</option></select></label>`;
+        };
         const content = html `${noticeOf(notice)}
 <p><a class="back" href="${root}/resources">Resources</a></p>
 ${pageHead(resourceName(resource, resource.id))}
@@ -1039,12 +1102,15 @@ ${options.resources.setRules
 ${field('minNoticeMinutes', 'Minimum notice', 'min')}
 ${field('maxAdvanceDays', 'Book up to', 'days ahead')}
 ${field('slotStepMinutes', 'Start on a step of', 'min')}
+${field('stepOffsetMinutes', 'Steps start past each step by', 'min')}
+${field('bufferBeforeMinutes', 'Kept free before each booking', 'min')}
 ${field('turnaroundMinutes', 'Turnaround after each booking', 'min')}
 ${field('checkInMinutes', 'Release if not checked in after', 'min')}
 </div>
-<label class="choice"><input type="checkbox" name="enforce_hours" value="1"${rules.enforceHours ? html ` checked` : html ``}> Only inside bookable hours</label>
-<label class="choice"><input type="checkbox" name="require_certain" value="1"${rules.requireCertain ? html ` checked` : html ``}> Only in time its calendar syncs have read today</label>
-<p class="fine">Leave a field empty for no rule.</p>
+${toggle('enforceHours', 'enforce_hours', 'Only inside bookable hours')}
+${toggle('requireCertain', 'require_certain', 'Only in time its calendar syncs have read today')}
+${inheritedNote(inherited)}
+<p class="fine">Leave a field empty for no rule${inherited.size > 0 ? ' of its own' : ''}.</p>
 <button class="primary" type="submit">Save rules</button>
 </form>
 </section>`
@@ -1086,10 +1152,17 @@ ${activity ? html `<section class="panel"><h2>Activity</h2>${activityPanel(activ
             }
             rules[name] = Number(value);
         }
-        if (form.get('enforce_hours') === '1')
-            rules.enforceHours = true;
-        if (form.get('require_certain') === '1')
-            rules.requireCertain = true;
+        // '1' on, '0' off (over a default that is on), anything else not set.
+        const choice = (key) => {
+            const value = form.get(key);
+            return value === '1' ? true : value === '0' ? false : undefined;
+        };
+        const enforceHours = choice('enforce_hours');
+        if (enforceHours !== undefined)
+            rules.enforceHours = enforceHours;
+        const requireCertain = choice('require_certain');
+        if (requireCertain !== undefined)
+            rules.requireCertain = requireCertain;
         try {
             await options.resources.setRules(tenantOf(session), id, Object.keys(rules).length === 0 ? null : rules, personOf(session));
         }
@@ -1371,6 +1444,7 @@ ${entries.length === 0
         const principal = assistantPrincipal(session);
         return invokeSlotlockAgentOperation({
             operation,
+            origin: 'dashboard-assistant',
             input,
             request: new Request(`${origin}${root}/assistant`, {
                 signal: AbortSignal.timeout(assistantTimeout),
@@ -2195,6 +2269,7 @@ ${org ? html `<p>For the organization <strong>${org.login}</strong>.</p>` : html
                 name: form.get('name') ?? '',
                 scopes,
                 createdBy: personOf(session),
+                origin: 'dashboard',
                 ...(typeof days === 'number' ? { expiresAt: new Date(now() + days * DAY_MS) } : {}),
             });
             return shownOncePage(session, created.key, created.apiKey, false);
@@ -2210,17 +2285,23 @@ ${org ? html `<p>For the organization <strong>${org.login}</strong>.</p>` : html
             throw error;
         }
     }
+    /** A key change in the session's tenant, recorded as the person's, from the dashboard. */
+    const asPerson = (session) => ({
+        tenantRef: tenantOf(session),
+        actor: personOf(session),
+        origin: 'dashboard',
+    });
     async function changeKey(session, form, change) {
         const id = form.get('id') ?? '';
         if (!UUID_PATTERN.test(id))
             return keysPage(session, 404, 'That key is not one of yours.');
         if (change === 'rotate') {
-            const rotated = await options.keys.rotate({ tenantRef: tenantOf(session), id });
+            const rotated = await options.keys.rotate({ ...asPerson(session), id });
             if (!rotated)
                 return keysPage(session, 404, 'That key is not an active key of yours.');
             return shownOncePage(session, rotated.key, rotated.apiKey, true);
         }
-        const revoked = await options.keys.revoke({ tenantRef: tenantOf(session), id });
+        const revoked = await options.keys.revoke({ ...asPerson(session), id });
         if (!revoked)
             return keysPage(session, 404, 'That key is not one of yours.');
         return redirect(303, `${root}/keys`);
@@ -2467,7 +2548,9 @@ a:hover { text-decoration: underline; }
 code, pre, input[readonly] { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 12.5px; }
 .icon { width: 16px; height: 16px; flex: none; fill: none; stroke: currentColor; stroke-width: 1.75; stroke-linecap: round; stroke-linejoin: round; }
 .icon .fill { fill: currentColor; stroke: none; }
-.mark { width: 18px; height: 18px; flex: none; fill: none; stroke: var(--accent); stroke-width: 7; stroke-linecap: round; stroke-linejoin: round; }
+.mark { width: 20px; height: 18px; flex: none; }
+.mark-ink { fill: currentColor; }
+.mark-slot { fill: #FF5B2E; }
 .brand { display: inline-flex; align-items: center; gap: 8px; color: var(--ink); font-weight: 650; font-size: 15px; letter-spacing: -0.01em; }
 .brand:hover { text-decoration: none; }
 .app { display: grid; grid-template-columns: 240px minmax(0, 1fr); min-height: 100vh; background: linear-gradient(to right, var(--side) 239px, var(--line) 239px, var(--line) 240px, var(--paper) 240px); }

package/ddl.d.ts

@@ -76,7 +76,7 @@ export declare const SLOTLOCK_TENANT_CONTEXT_SETTING = "slotlock.tenant_ref";
  * `slotlock.rls_policy_contracts` and `slotlock.deployment_lifted_row_security` are
  * deployment-only and deliberately absent.
  */
-export declare const SLOTLOCK_TENANT_TABLES: readonly ["resources", "reservations", "reservation_tombstones", "reservation_conflict_archive", "calendar_events", "calendar_event_attendees", "calendar_event_reminders", "calendar_event_exceptions", "calendar_event_occurrences", "calendar_event_tombstones", "calendar_event_commands", "calendar_coverage", "hold_commands", "outbox", "outbox_pruned", "webhook_endpoints", "waitlist_entries", "assistant_settings", "assistant_conversations"];
+export declare const SLOTLOCK_TENANT_TABLES: readonly ["resources", "reservations", "reservation_tombstones", "reservation_conflict_archive", "calendar_events", "calendar_event_attendees", "calendar_event_reminders", "calendar_event_exceptions", "calendar_event_occurrences", "calendar_event_tombstones", "calendar_event_commands", "calendar_coverage", "hold_commands", "outbox", "outbox_pruned", "webhook_endpoints", "waitlist_entries", "booking_rule_defaults", "assistant_settings", "assistant_conversations"];
 /**
  * Build the grants for the application role: USAGE on the `slotlock` schema, DML on the store's
  * tables and EXECUTE on the API key and dashboard functions. Nothing else: no ownership, DDL,