Header: show Civi stage label prominently; restore current_stage readonly in Stage 0

- New STAGE_OPTION_GROUP_ID constant (=75) added to config and consumed
  by both the in-card readonly and the header. Because the field carries
  optionGroupId, /api/data auto-includes the Stage option group in its
  parallel fetch (via the existing optionGroupIds derivation).
- SubmissionContextHeader: dropped the small inline 'Stage Organizing'
  line. Replaced with an uppercase 'Current stage' eyebrow next to the
  progress dots, followed by a display-font 20/24px leaf-toned label
  underneath. Resolves the stored option value ('Organizing') to its
  Civi option label ('Stage 1 — Convene & Prepare') via the new
  resolveStageLabel helper; falls back to the raw value if the option
  group hasn't loaded.
- Stage 0 'Check-in (organizing)' section: re-added a current_stage
  readonly field at the top. With optionGroupId set, FieldRenderer's
  readonly branch resolves the value to the Civi label for display.
This commit is contained in:
Joel Brock
2026-05-13 12:09:24 -07:00
parent 74a85d38fe
commit 04e69ca04c
2 changed files with 44 additions and 11 deletions

View File

@@ -17,6 +17,7 @@ function sectionForField(
return undefined; return undefined;
} }
import { evaluate } from "@/lib/conditional"; import { evaluate } from "@/lib/conditional";
import { STAGE_OPTION_GROUP_ID } from "@/config/form";
import { StageSection } from "./StageSection"; import { StageSection } from "./StageSection";
import { loadDraft, saveDraft, clearDraft } from "@/lib/draft"; import { loadDraft, saveDraft, clearDraft } from "@/lib/draft";
@@ -283,7 +284,7 @@ export function EngagementForm({ config, cid, cs }: EngagementFormProps) {
<form onSubmit={handleSubmit(onSubmit, onInvalid)} className="space-y-5" noValidate> <form onSubmit={handleSubmit(onSubmit, onInvalid)} className="space-y-5" noValidate>
<SubmissionContextHeader <SubmissionContextHeader
orgName={load.data.orgName} orgName={load.data.orgName}
currentStage={load.data.currentStage} currentStageLabel={resolveStageLabel(load.data.currentStage, load.data.options)}
currentRank={currentRank} currentRank={currentRank}
/> />
@@ -339,11 +340,11 @@ export function EngagementForm({ config, cid, cs }: EngagementFormProps) {
function SubmissionContextHeader({ function SubmissionContextHeader({
orgName, orgName,
currentStage, currentStageLabel,
currentRank, currentRank,
}: { }: {
orgName: string; orgName: string;
currentStage: string; currentStageLabel: string;
currentRank: number; currentRank: number;
}) { }) {
return ( return (
@@ -352,17 +353,34 @@ function SubmissionContextHeader({
<h1 className="mt-1 font-display text-3xl font-medium leading-tight tracking-tight text-ink sm:text-[34px]"> <h1 className="mt-1 font-display text-3xl font-medium leading-tight tracking-tight text-ink sm:text-[34px]">
{orgName} {orgName}
</h1> </h1>
<div className="mt-3 flex items-center gap-3"> <div className="mt-4 flex items-center gap-3">
<StageProgress currentRank={currentRank} /> <StageProgress currentRank={currentRank} />
<span className="text-sm text-ink-soft"> <span className="text-[10px] uppercase tracking-[0.16em] font-medium text-ink-mute">
<span className="text-ink-mute">Stage</span>{" "} Current stage
<span className="font-medium text-leaf-800">{currentStage || "—"}</span>
</span> </span>
</div> </div>
<p className="mt-1.5 font-display text-xl sm:text-2xl font-medium leading-tight tracking-tight text-leaf-800">
{currentStageLabel || "—"}
</p>
</header> </header>
); );
} }
/**
* Resolve a Stage option-value (e.g. "Organizing") to its Civi option label
* (e.g. "Stage 1 — Convene & Prepare"). Falls back to the raw value if the
* option group hasn't loaded or the value isn't in the group.
*/
function resolveStageLabel(
value: string,
options: Record<number, { value: string; label: string }[]> | undefined,
): string {
if (!value) return "";
const group = options?.[STAGE_OPTION_GROUP_ID];
if (!group) return value;
return group.find((o) => o.value === value)?.label ?? value;
}
/** /**
* Six small dots representing the six stages, with the current rank filled * Six small dots representing the six stages, with the current rank filled
* and earlier ranks marked as visited. Quietly conveys progression without * and earlier ranks marked as visited. Quietly conveys progression without

View File

@@ -34,6 +34,13 @@ const visibleAtOrAfter = (...stages: string[]): VisibilityRule => ({
values: stages, values: stages,
}); });
/**
* Option group ID for the `Stage` option group on `client.crm.fci.coop`.
* Used to resolve the current stage value (e.g. "Organizing") to its Civi
* label (e.g. "Stage 1 — Convene & Prepare") for display.
*/
export const STAGE_OPTION_GROUP_ID = 75;
// CiviCRM custom group machine names per the APIv4 inventory. // CiviCRM custom group machine names per the APIv4 inventory.
const G0 = "Check_in_data__organizing_"; const G0 = "Check_in_data__organizing_";
const G1 = "Stage_1"; const G1 = "Stage_1";
@@ -50,10 +57,18 @@ const stage0: StageSectionConfig = {
intro: intro:
"Core check-in fields. These are visible at every stage and capture the data we follow over time across the lifecycle of the co-op.", "Core check-in fields. These are visible at every stage and capture the data we follow over time across the lifecycle of the co-op.",
fields: [ fields: [
// `current_stage` is still tracked in form state (it gates every Stage // current_stage is a UI-only readonly field. Its value is the Civi
// 15 visibleWhen rule and feeds the journey rail), but it is no longer // option *value* (e.g. "Organizing") sourced by /api/data from the
// rendered as an in-card field — the SubmissionContextHeader displays // most recent stage-bearing Check-in (organizing) activity. Setting
// the activity-derived Stage value as readonly above the cards. // `optionGroupId` makes the readonly renderer resolve the value to
// its Civi option *label* (e.g. "Stage 1 — Convene & Prepare") for
// display. The form never writes Stage back to the activity.
{
name: "current_stage",
label: "Current stage",
type: "readonly",
optionGroupId: STAGE_OPTION_GROUP_ID,
},
{ {
name: "Peer_Group_Participation", name: "Peer_Group_Participation",
label: "Peer Group Participation", label: "Peer Group Participation",