@acms-subir/core 0.3.52 → 0.3.54

package/src/pages/members/events/new.astro

@@ -6,16 +6,17 @@ import { currentUser } from '../../../server';
 import { readForm } from '../../../lib/forms/http';
 import { MEMBERS, memberEventsPath, submitEventRequest } from '../../../lib/calendar/requests';
 import { blankEventForm, eventRequestInput, memberEventFields, readEventForm } from '../../../lib/calendar/member-form';
-import { failure, keepPrivate, notFound, redirectTo, signInRedirect } from '../_http';
+import { failure, keepPrivate, memberLanguage, notFound, redirectTo, signInRedirect } from '../_http';
 
 // "Request an event": a draft the member hosts, waiting for the team's
 // approval (submitEventRequest checks who may ask and what they sent).
 if (!MEMBERS.enabled) return notFound();
 const user = await currentUser(Astro);
-if (!user) return signInRedirect(Astro.url);
+if (!user) return signInRedirect(Astro.url, Astro.locals);
 keepPrivate(Astro.response.headers);
 const repo = await getRepo(Astro.locals);
-const home = memberEventsPath();
+const { w, lang, here } = memberLanguage(Astro, await repo.getSettings());
+const home = here(memberEventsPath());
 const fields = memberEventFields();
 const calendars = (await repo.listCalendars()).filter((c) => c.kind === 'native' && c.visibility === 'public');
 
@@ -28,7 +29,7 @@ if (Astro.request.method === 'POST') {
     await submitEventRequest(repo, user, eventRequestInput(values), { url: Astro.url, locals: Astro.locals });
     return redirectTo(`${home}?sent=1`);
   } catch (err) {
-    const f = failure(err);
+    const f = failure(err, w, lang);
     error = f.message;
     Astro.response.status = f.status;
   }
@@ -36,13 +37,13 @@ if (Astro.request.method === 'POST') {
 const canRequest = user.can('events.request');
 ---
 
-<Layout title="Request an event" user={user}>
+<Layout title={w.newTitle} user={user} w={w}>
   <div>
-    <a class="pc-mem-back" href={home}>← My events</a>
-    <div class="pc-mem-head"><h1>Request an event</h1></div>
-    <p class="pc-mem-lede">Tell the team what you’d like to host. It goes on the calendar once they approve it.</p>
+    <a class="pc-mem-back" href={home}>{w.back}</a>
+    <div class="pc-mem-head"><h1>{w.newTitle}</h1></div>
+    <p class="pc-mem-lede">{w.newLede}</p>
   </div>
   {canRequest
-    ? <EventForm values={values} calendars={calendars} fields={fields} op="submit" submitLabel="Submit for approval" error={error} />
-    : <p class="pc-bk-error" role="alert">Your role doesn’t include “Request events”. Ask the site’s team if you need it.</p>}
+    ? <EventForm values={values} calendars={calendars} fields={fields} op="submit" submitLabel={w.submit} error={error} w={w} lang={lang} />
+    : <p class="pc-bk-error" role="alert">{w.noRequestRole}</p>}
 </Layout>

package/src/server/index.ts

@@ -300,3 +300,56 @@ export async function declineEventRequest(repo: Repo, who: Who, eventId: string,
 export async function setHostedOccurrence(repo: Repo, who: Who, eventId: string, occurrenceKey: string, cancelled: boolean, context: WriteContext): Promise<CalEvent> {
   return (await requests()).setHostedOccurrence(internal(repo), who, eventId, occurrenceKey, cancelled, context);
 }
+
+// ---- hosts moving dates ------------------------------------------------------
+// A host moves one date of an event they host (no permission beyond being in
+// hostIds). acms({ members: { hostMoves } }) decides how: 'direct' (default)
+// moves it at once while its rooms are free (409 room-taken otherwise, and
+// the same move can then be sent with requestDateMove); 'approve' turns every
+// host move into a request. Requests are RequestRecord rows (kind 'move')
+// that staff who can publish approve or decline; both sides are emailed.
+
+const hostRequests = () => import('../lib/calendar/host-requests');
+export type { HostMoveResult, MoveRequestData } from '../lib/calendar/host-requests';
+export type { RequestRecord } from '../lib/schema';
+
+/** A host moves one date: `{ moved }` at once, or `{ request }` when moves need approval. Errors as moveOccurrence's, plus `code` room-not-allowed (a room the event doesn't use and nobody may request). */
+export async function moveHostedDate(repo: Repo, who: Who, eventId: string, occurrenceKey: string, input: import('../lib/calendar/moves').MoveInput, context: WriteContext): Promise<import('../lib/calendar/host-requests').HostMoveResult> {
+  return (await hostRequests()).moveHostedDate(internal(repo), who, eventId, occurrenceKey, input, context);
+}
+
+/** A host puts a date they moved back where the series has it: at once, or as a request. */
+export async function moveHostedDateBack(repo: Repo, who: Who, eventId: string, occurrenceKey: string, context: WriteContext): Promise<import('../lib/calendar/host-requests').HostMoveResult> {
+  return (await hostRequests()).moveHostedDateBack(internal(repo), who, eventId, occurrenceKey, context);
+}
+
+/**
+ * A host asks staff to move one date (`input`), or to move it back (null),
+ * with an optional `message` for staff. Checked like the move, except that a
+ * taken room is allowed: staff decide. Asking again about the same date
+ * replaces the waiting request. Staff are emailed.
+ */
+export async function requestDateMove(repo: Repo, who: Who, eventId: string, occurrenceKey: string, input: import('../lib/calendar/moves').MoveInput | null, message: string, context: WriteContext): Promise<import('../lib/schema').RequestRecord> {
+  return (await hostRequests()).requestDateMove(internal(repo), who, eventId, occurrenceKey, input, message, context);
+}
+
+/** A host's own date requests (waiting, approved, declined and withdrawn), newest first. */
+export async function listMyDateRequests(repo: Repo, who: Who, eventId?: string): Promise<import('../lib/schema').RequestRecord[]> {
+  if (!who) return [];
+  return (await hostRequests()).myDateRequests(internal(repo), who.id, eventId);
+}
+
+/** A host withdraws a waiting date request of theirs. */
+export async function withdrawDateRequest(repo: Repo, who: Who, requestId: string): Promise<void> {
+  return (await hostRequests()).withdrawDateRequest(internal(repo), who, requestId);
+}
+
+/** Staff ("Publish content"): approve a host's date move. It runs as them (room clashes come back as warnings) and is recorded as the host's. Pass `seen`, the request's `updatedAt` you showed. */
+export async function approveDateRequest(repo: Repo, who: Who, requestId: string, context: WriteContext, seen?: number): Promise<{ request: import('../lib/schema').RequestRecord; moved: import('../lib/calendar/moves').MoveResult }> {
+  return (await hostRequests()).approveDateRequest(internal(repo), who, requestId, context, seen);
+}
+
+/** Staff: decline a host's date request, with a note the host reads. */
+export async function declineDateRequest(repo: Repo, who: Who, requestId: string, reply: string, context: WriteContext, seen?: number): Promise<import('../lib/schema').RequestRecord> {
+  return (await hostRequests()).declineDateRequest(internal(repo), who, requestId, reply, context, seen);
+}

package/src/styles/forms.css

@@ -81,6 +81,7 @@
 .fb.is-preview .fb-canvas { border: 0; }
 .fb-wide .fb-canvas:has(> .fb-float) { padding-top: 48px; }
 .fb-float { position: absolute; top: 8px; right: 10px; z-index: 3; display: flex; gap: 2px; padding: 2px; border-radius: 10px; background: color-mix(in srgb, var(--panel-2) 85%, transparent); }
+.fb-float-l { right: auto; left: 10px; }
 .fb-paper {
   /* the public form's tokens, mapped onto the admin palette */
   --ink: var(--text); --line-2: var(--line-strong); --btn: var(--text); --btn-ink: var(--bg); --accent-text: var(--accent-deep);
@@ -195,6 +196,13 @@
 .fb-choice.dragging input { box-shadow: var(--shadow-pop); }
 .fb-choice input { min-height: 34px; }
 .fb-choice-add { margin: 2px 0 0; font-size: 12px; color: var(--muted); }
+/* another language: the main language's words above each box, choices side by side */
+.fb-src { display: block; padding: 6px 9px; border-radius: var(--r-sm); background: var(--panel-2); color: var(--text-2); font-size: 12.5px; line-height: 1.45; white-space: pre-line; overflow-wrap: anywhere; max-height: 7.5em; overflow: auto; }
+.fb-src > span { display: block; font-size: 10.5px; font-weight: 600; text-transform: uppercase; letter-spacing: 0.06em; color: var(--muted); margin-bottom: 1px; }
+.fb-tr-choices { display: grid; gap: 6px; }
+.fb-tr-choice { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1.4fr); gap: 8px; align-items: center; }
+.fb-tr-choice > span { font-size: 12.5px; color: var(--text-2); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.fb-tr-choice input { min-height: 34px; }
 
 /* menus */
 .fb-more, .fb-q-more { position: relative; flex: none; }

package/src/virtual.d.ts

@@ -22,7 +22,7 @@ declare module 'virtual:acms-config' {
     // resolved by integration.mjs (lib/roles.ts and lib/permissions/catalog.ts read them)
     roles?: { key: string; label: string; summary: string; admin: boolean; home: string }[];
     permissions?: { key: string; label: string; description: string; defaults: string[]; sensitive: boolean }[];
-    members?: { enabled: boolean; base: string; notify: string[] };
+    members?: { enabled: boolean; base: string; notify: string[]; hostMoves?: 'direct' | 'approve' };
     announcements?: { enabled: boolean; base: string; pages: boolean; topics: Partial<Record<'event' | 'registration' | 'help' | 'info', string>> };
     // set in astro:config:setup (lib/origin-check.ts): off only when the site turned security.checkOrigin off
     originCheck?: { enabled: boolean; signedRoutes: string[] };