@cyc-seattle/platform 1.37.1 → 1.38.1

package/README.md

@@ -11,7 +11,7 @@ app owns. The apps that run on it live in their own repos, such as
 | [`bootstrap`](stacks/bootstrap) | Service accounts and project IAM, the Pulumi state buckets and KMS keys, the org's GitHub repos and settings, and Firebase on the project                                                                                                                                                                                                                                                                                                                                                                                | A human with project Owner and `gh` `admin:org`. Never CI.                                                               |
 | [`infra`](stacks/infra)         | The VPC, the cluster subnet and its Cloud NAT on a static address, the private services peering, the prod and dev Cloud SQL instances, the DNS zones, Artifact Registry and its cleanup policy, the GKE Autopilot cluster, the shared Gateway, its address, certificates, and dev's DNS records, the `dev` and `prod` namespaces with their quotas and network policies, dev's RBAC, the prod Job alerts, the log exclusions, the public website's Firebase Hosting site, and each environment's `platform/outputs.json` | `deploy-runner`, from Actions after approval. A deployer, with `mise run deploy`, when breaking glass.                   |
 | [`smoke`](stacks/smoke)         | One `WebService` in dev, at `smoke.dev.cycsail.team`, for the integration tests                                                                                                                                                                                                                                                                                                                                                                                                                                          | `deploy-dev`, from Actions for each queued PR. A deployer, with `PULUMI_STACK=dev mise run deploy`, when breaking glass. |
-| [`backend`](stacks/backend)     | Directus, with the schema apply from `schemas/`, its roles, policies, and permission rules, the sync machine users, its OIDC client, and MCP, and the clubspot-sync and gsuite-sync CronJobs, with dev's Clubspot and Workspace fakes                                                                                                                                                                                                                                                                                    | `deploy-dev`, from Actions for each queued PR, and `deploy-runner` on a push to `main`, after `infra`.                   |
+| [`backend`](stacks/backend)     | Directus, with the schema apply from `schemas/`, its roles, policies, and permission rules, the sync and website build machine users, its OIDC client, and MCP, and the clubspot-sync and gsuite-sync CronJobs, with dev's Clubspot and Workspace fakes                                                                                                                                                                                                                                                                  | `deploy-dev`, from Actions for each queued PR, and `deploy-runner` on a push to `main`, after `infra`.                   |
 | [`authentik`](stacks/authentik) | Authentik, the sign-in at `login.<domain>`: its server and worker, database, secrets, and A record, dev's Mailpit, and its own configuration: flows, stages, policies, the Google source, the `staff` group, and the Directus OIDC and portal proxy applications                                                                                                                                                                                                                                                         | `deploy-dev`, from Actions for each queued PR, and `deploy-runner` on a push to `main`, after `backend`.                 |
 
 ## @cyc-seattle/platform

package/dist/planning/activities.js

@@ -32,7 +32,10 @@ export function scheduleActivities(ctx) {
         const span = start !== null && end !== null ? end - start : 0;
         const closedFor = closed.get(activity.date);
         if (closedFor !== undefined && activity.kind !== "travel") {
-            ctx.warn("closed_date", `${offering.name} has an activity on ${activity.date}, a closed day: ${closedFor}`, activity.key, { version_id: activity.version_id, date: activity.date });
+            ctx.warn("closed_date", `${offering.name}'s ${activity.kind} falls on ${closedFor}, a closed day`, activity.key, {
+                version_id: activity.version_id,
+                date: activity.date,
+            });
         }
         const usesBoats = activity.kind !== "travel" && activity.uses_boats;
         result.push({

package/dist/planning/staffing.js

@@ -10,6 +10,22 @@ function sum(values) {
         total += v;
     return total;
 }
+/**
+ * `n` of something, in words: "9 Sailqubes", "1 Opti". Only a one-word name is made plural, and not one that already
+ * ends in "s", such as RIBs; any other name is used as given, since adding an "s" to "Laser Radial" reads wrong.
+ */
+function countOf(n, name) {
+    const plural = n !== 1 && /^\S+$/.test(name) && !/s$/i.test(name);
+    return `${n} ${plural ? `${name}s` : name}`;
+}
+/** Names as a sentence lists them: `a`, `a and b`, or `a, b, and c`. */
+function listOf(names) {
+    return names.length <= 2 ? names.join(" and ") : `${names.slice(0, -1).join(", ")}, and ${names.at(-1)}`;
+}
+/** The offerings a block holds, by name, so a warning about it says whose it is. */
+function offeringsOf(block) {
+    return listOf([...new Set(block.members.map((a) => a.offering.name))]);
+}
 function groupBy(rows, key) {
     const groups = new Map();
     for (const row of rows)
@@ -71,7 +87,7 @@ export class Staffing {
                 continue;
             }
             if (row.date !== a.date) {
-                this.ctx.warn("block_date_mismatch", `${a.offering.name}'s activity on ${a.date} is in ${row.name}, which is on ${row.date}`, a.stored.key, { version_id: a.stored.version_id, date: a.date });
+                this.ctx.warn("block_date_mismatch", `${a.offering.name}'s ${a.kind} is in ${row.name}, which is on ${row.date}`, a.stored.key, { version_id: a.stored.version_id, date: a.date });
             }
             members.set(id, [...(members.get(id) ?? []), a]);
         }
@@ -114,7 +130,7 @@ export class Staffing {
             const block = a.stored.block_id == null ? undefined : blocks.get(a.stored.block_id);
             if (block !== undefined && sum(block.staff.map((s) => s.count)) > 0)
                 continue;
-            this.ctx.warn("unallocated_activity", `${a.offering.name}'s ${a.kind} on ${a.date} has no staff`, a.stored.key, {
+            this.ctx.warn("unallocated_activity", `${a.offering.name}'s ${a.kind} has no staff`, a.stored.key, {
                 version_id: a.stored.version_id,
                 date: a.date,
             });
@@ -146,7 +162,7 @@ export class Staffing {
         if (sailors <= 0)
             return;
         const scope = { version_id: block.row.version_id, date: block.row.date };
-        const where = `${block.row.date}, ${block.row.name}`;
+        const where = offeringsOf(block);
         let load = 0;
         let counted = 0;
         const required = [];
@@ -172,7 +188,7 @@ export class Staffing {
                 return required.some((r) => this.qualifiedFor(held, level, r)) ? s.count : 0;
             }));
             if (load > qualified + 1e-9) {
-                ctx.warn("over_capacity", `${where}: ${counted} sailors, but its staff can take ${Math.floor((qualified * counted) / load + 1e-9)}`, block.row.key, scope);
+                ctx.warn("over_capacity", `${where}: ${counted} sailors, but the staff can take ${Math.floor((qualified * counted) / load + 1e-9)}`, block.row.key, scope);
             }
         }
         if (!block.members.some((a) => a.uses_boats))
@@ -188,7 +204,7 @@ export class Staffing {
             seats += (b.count + (b.sailor_owned ?? 0)) * perBoat;
         }
         if (sailors > seats) {
-            ctx.warn("over_capacity", `${where}: ${sailors} sailors, but its boats can take ${seats}`, block.row.key, scope);
+            ctx.warn("over_capacity", `${where}: ${sailors} sailors, but the boats can take ${seats}`, block.row.key, scope);
         }
     }
     /**
@@ -201,6 +217,7 @@ export class Staffing {
         const classes = new Map(ctx.data.boat_classes.map((c) => [c.id, c]));
         const fleet = new Map(ctx.data.plan_boat_rates.map((r) => [r.boat_class_id, r.quantity]));
         const resources = new Map(ctx.data.plan_resources.map((r) => [r.key, r]));
+        const organization = ctx.data.organization.name;
         for (const [date, list] of dates) {
             const check = (code, what, have, used) => {
                 if (have == null)
@@ -209,9 +226,12 @@ export class Staffing {
                 const peak = mostAtOnce(out);
                 if (peak.total <= have)
                     return;
-                const names = peak.at.map(({ block, n }) => `${block.row.name} ${n}`).join(", ");
+                const whose = peak.at.length === 1
+                    ? `, for ${offeringsOf(peak.at[0].block)}`
+                    : `: ${listOf(peak.at.map(({ block, n }) => `${n} for ${offeringsOf(block)}`))}`;
+                const message = `${countOf(peak.total, what)} out, but ${organization} has ${have}${whose}`;
                 for (const version of new Set(peak.at.map(({ block }) => block.row.version_id))) {
-                    ctx.warn(code, `${date}: ${peak.total} ${what} out, but the organization has ${have} (${names})`, what, {
+                    ctx.warn(code, message, what, {
                         version_id: version,
                         date: date,
                     });
@@ -258,7 +278,7 @@ export class Staffing {
             const total = result.get(key) ?? { hours: 0, dates: 0 };
             result.set(key, { hours: total.hours + hours, dates: total.dates + 1 });
             for (const version of new Set(list.map((b) => b.row.version_id))) {
-                this.ctx.warn("position_double_booked", `${names.get(key) ?? key} coaches ${clash[0].row.name} and ${clash[1].row.name} at the same time on ${date}` +
+                this.ctx.warn("position_double_booked", `${names.get(key) ?? key} coaches ${clash[0].row.name} and ${clash[1].row.name} at the same time` +
                     (hours > 0 ? `, so another coach is needed for ${round2(hours)} hours` : ""), key, { version_id: version, date });
             }
         }

package/dist/schema/index.d.ts

@@ -72,6 +72,25 @@ export interface Schema {
     sync_tasks: SyncTasks[];
     version_set_members: VersionSetMembers[];
     version_sets: VersionSets[];
+    website_categories: WebsiteCategories[];
+    website_categories_faq_topics: WebsiteCategoriesFaqTopics[];
+    website_categories_files: WebsiteCategoriesFiles[];
+    website_categories_profiles: WebsiteCategoriesProfiles[];
+    website_categories_programs: WebsiteCategoriesPrograms[];
+    website_faq_topics: WebsiteFaqTopics[];
+    website_faqs: WebsiteFaqs[];
+    website_page_sections: WebsitePageSections[];
+    website_pages: WebsitePages[];
+    website_pages_faq_topics: WebsitePagesFaqTopics[];
+    website_policies: WebsitePolicies[];
+    website_policy_versions: WebsitePolicyVersions[];
+    website_profiles: WebsiteProfiles[];
+    website_programs: WebsitePrograms[];
+    website_programs_catalog_programs: WebsiteProgramsCatalogPrograms[];
+    website_programs_files: WebsiteProgramsFiles[];
+    website_settings: WebsiteSettings;
+    website_sponsor_levels: WebsiteSponsorLevels[];
+    website_sponsors: WebsiteSponsors[];
 }
 /** The chart of accounts that plans, results, and actuals book to. */
 export interface Accounts {
@@ -1107,3 +1126,224 @@ export interface VersionSets {
     /** The organization's P&L. A draft's is worked out again a moment after each change to it. A saved one's is what it showed when it was saved, worked out a moment after. One with none means working it out failed, and the logs say why. An admin can fill in a saved one's. */
     results: (string | PlanResults)[];
 }
+/** Program categories, such as Summer Sailing Camps, each with a page at /program-category/ and its slug. */
+export interface WebsiteCategories {
+    id: string;
+    /** The category's address: /program-category/clinics for clinics. */
+    slug: string;
+    title: string;
+    summary: string | null;
+    /** Open sends a program's button to Clubspot. Coming soon sends it to the newsletter. */
+    status: "open" | "closed" | "coming_soon";
+    sort: number | null;
+    image: string | null;
+    banner: string | null;
+    /** Markdown. */
+    top: string | null;
+    /** Markdown. */
+    bottom: string | null;
+    /** A quote from a family. Leave it empty for none. */
+    testimonial: string | null;
+    /** In the order the page shows them. */
+    programs: (string | WebsiteCategoriesPrograms)[];
+    faq_topics: (string | WebsiteCategoriesFaqTopics)[];
+    profiles: (string | WebsiteCategoriesProfiles)[];
+    /** Photos shown on the category's page, in order. */
+    gallery: (string | WebsiteCategoriesFiles)[];
+}
+export interface WebsiteCategoriesFaqTopics {
+    id: string;
+    category_id: string | WebsiteCategories | null;
+    topic_id: string | WebsiteFaqTopics | null;
+    sort: number | null;
+}
+export interface WebsiteCategoriesFiles {
+    id: string;
+    category_id: string | WebsiteCategories | null;
+    file_id: string | null;
+    sort: number | null;
+}
+export interface WebsiteCategoriesProfiles {
+    id: string;
+    category_id: string | WebsiteCategories | null;
+    profile_id: string | WebsiteProfiles | null;
+    sort: number | null;
+}
+export interface WebsiteCategoriesPrograms {
+    id: string;
+    category_id: string | WebsiteCategories | null;
+    program_id: string | WebsitePrograms | null;
+    sort: number | null;
+}
+/** Sets of questions and answers, which pages and program categories show. */
+export interface WebsiteFaqTopics {
+    id: string;
+    /** Such as Summer Camp Other Questions. */
+    title: string;
+    /** The heading a page shows above it, such as Registration Questions. */
+    heading: string | null;
+    /** In the order the site shows them. */
+    questions: (string | WebsiteFaqs)[];
+}
+/** One question and its answer. */
+export interface WebsiteFaqs {
+    id: string;
+    topic_id: string | WebsiteFaqTopics;
+    sort: number | null;
+    question: string;
+    /** Markdown. */
+    answer: string | null;
+}
+export interface WebsitePageSections {
+    id: string;
+    page_id: string | WebsitePages;
+    sort: number | null;
+    title: string;
+    image: string | null;
+    /** Markdown. */
+    body: string | null;
+    action_label: string | null;
+    /** A path on the site, such as /donate, or a full web address. */
+    action_url: string | null;
+}
+/** The site's fixed pages, such as Donate and Contact Us. A page's slug is its address. */
+export interface WebsitePages {
+    id: string;
+    /** The page's address: /donate for donate. The home page is home. */
+    slug: string;
+    title: string;
+    /** One or two sentences, for search engines and link previews. */
+    description: string | null;
+    banner: string | null;
+    image: string | null;
+    /** Markdown. */
+    body: string | null;
+    action_label: string | null;
+    /** A path on the site, such as /donate, or a full web address. */
+    action_url: string | null;
+    /** Blocks of text below the body, each with its own picture and button. */
+    sections: (string | WebsitePageSections)[];
+    faq_topics: (string | WebsitePagesFaqTopics)[];
+}
+export interface WebsitePagesFaqTopics {
+    id: string;
+    page_id: string | WebsitePages | null;
+    topic_id: string | WebsiteFaqTopics | null;
+    sort: number | null;
+}
+/** Policies, each at /policy/ and its slug. The site shows the latest version that has taken effect. */
+export interface WebsitePolicies {
+    id: string;
+    /** The policy's address: /policy/sick-policy for sick-policy. */
+    slug: string;
+    title: string;
+    sort: number | null;
+    in_footer: boolean;
+    versions: (string | WebsitePolicyVersions)[];
+}
+export interface WebsitePolicyVersions {
+    id: string;
+    policy_id: string | WebsitePolicies;
+    title: string;
+    effective: string;
+    /** Markdown. */
+    body: string | null;
+}
+/** The crew the site shows. Not linked to People, so a public bio can never show private details. */
+export interface WebsiteProfiles {
+    id: string;
+    name: string;
+    /** Such as Sailing Director. */
+    title: string | null;
+    sort: number | null;
+    /** Markdown. */
+    bio: string | null;
+    photo: string | null;
+    /** The lists on Our Crew this person is in. */
+    groups: ("staff" | "officers" | "coach" | "instructor")[] | null;
+}
+/** A program's page, at /program/ and its slug, and its card on each category's page. */
+export interface WebsitePrograms {
+    id: string;
+    /** The program's address: /program/opti-race-team for opti-race-team. */
+    slug: string;
+    title: string;
+    /** A hidden program has no page and no card. */
+    status: "published" | "hidden";
+    sort: number | null;
+    /** Such as the ages, under the title. */
+    subtitle: string | null;
+    /** The text on the program's card. */
+    summary: string | null;
+    card_image: string | null;
+    card_button_label: string | null;
+    /** Where the card's button goes: the program's page, or Clubspot. */
+    card_link: string | null;
+    banner: string | null;
+    /** Markdown. */
+    body: string | null;
+    registration_label: string | null;
+    /** The program's Clubspot sign-up page. */
+    registration_url: string | null;
+    /** Photos shown on the program's page, in order. */
+    gallery: (string | WebsiteProgramsFiles)[];
+    /** The programs in the catalog this page is about, for their dates and prices later. Optional. */
+    catalog_programs: (string | WebsiteProgramsCatalogPrograms)[];
+}
+export interface WebsiteProgramsCatalogPrograms {
+    id: string;
+    website_program_id: string | WebsitePrograms | null;
+    catalog_program_id: string | Programs | null;
+    sort: number | null;
+}
+export interface WebsiteProgramsFiles {
+    id: string;
+    program_id: string | WebsitePrograms | null;
+    file_id: string | null;
+    sort: number | null;
+}
+/** What every page of the website shows: the menu, the footer, and the contact details. */
+export interface WebsiteSettings {
+    id: string;
+    /** The center's name, as the site shows it. */
+    name: string;
+    /** One or two sentences about the center, for search engines and link previews. */
+    description: string | null;
+    email: string | null;
+    phone: string | null;
+    /** One line per line of the address. */
+    address: string | null;
+    /** A Google Maps link to the center. */
+    map_url: string | null;
+    /** The center's federal tax ID, which donors need. */
+    ein: string | null;
+    /** Shown in the footer, in this order. */
+    social: unknown;
+    /** Markdown. A banner across the top of every page. Leave it empty for none. */
+    announcement: string | null;
+    logo: string | null;
+    /** The round logo. */
+    badge: string | null;
+    /** The top menu: each heading and the links under it, in order. */
+    menu: unknown;
+}
+/** Sponsorship levels, on the Sponsorships page. */
+export interface WebsiteSponsorLevels {
+    id: string;
+    name: string;
+    /** In cents: 12500 is $125.00. */
+    amount_cents: number;
+    sort: number | null;
+    /** Markdown. */
+    benefits: string | null;
+    sponsors: (string | WebsiteSponsors)[];
+}
+/** Sponsors, whose logos the Sponsorships page shows. */
+export interface WebsiteSponsors {
+    id: string;
+    name: string;
+    url: string | null;
+    logo: string | null;
+    level_id: string | WebsiteSponsorLevels | null;
+    sort: number | null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyc-seattle/platform",
-  "version": "1.37.1",
+  "version": "1.38.1",
   "description": "Pulumi components for CYC's shared Google Cloud platform: WebService, the platform outputs reader, and the stacks that build the platform",
   "author": "CYC Community Sailing Center",
   "license": "Apache-2.0",