diff --git a/scripts/backfill-core-fields.ts b/scripts/backfill-core-fields.ts new file mode 100644 index 0000000..67e0269 --- /dev/null +++ b/scripts/backfill-core-fields.ts @@ -0,0 +1,216 @@ +/** + * Backfill script for the "core fields" bug fix. + * + * Background + * ────────── + * The default form template marked only `firstName` / `lastName` as + * `isCore: true`. Every other field (email, cellPhone, address, …) was + * treated as non-core, so user edits in the dynamic-field form landed + * inside `ResponseCard.fieldData` (JSON) instead of the matching top-level + * column. The list view, search, integrations, and CSV export all read the + * top-level columns, so they showed stale data after edits. + * + * Likewise, `ResponseCard.name` is a denormalized display string that was + * never recomputed when `firstName` / `lastName` changed, so the table's + * Name column and any integration that reads `name` stayed stale. + * + * What this script does + * ───────────────────── + * 1. Flips `isCore = true` on every existing `FormTemplateField` whose + * `key` corresponds to a real top-level `ResponseCard` column. + * 2. Walks every `ResponseCard` and: + * a. promotes any matching keys from `fieldData` up to the top-level + * columns (only when the column is currently empty — explicit + * column values win over stale-or-newer fieldData values); + * b. recomputes `name` from `firstName` / `lastName` when it's stale + * or missing. + * + * Usage + * ───── + * npx tsx scripts/backfill-core-fields.ts # dry-run (default) + * npx tsx scripts/backfill-core-fields.ts --apply # actually write + */ + +import { PrismaClient } from "../src/generated/prisma/client.js"; +import { PrismaPg } from "@prisma/adapter-pg"; +import pg from "pg"; + +const APPLY = process.argv.includes("--apply"); + +const url = new URL(process.env.DATABASE_URL!); +url.searchParams.delete("sslmode"); +const pool = new pg.Pool({ + connectionString: url.toString(), + max: 5, + ssl: { rejectUnauthorized: false }, +}); +const prisma = new PrismaClient({ adapter: new PrismaPg(pool) }); + +const PROMOTABLE_STRING = new Set([ + "firstName", "lastName", "name", + "gender", "dateOfBirth", + "maritalStatus", "maritalStatusOther", "visitType", + "cellPhone", "homePhone", "email", + "address", "aptNumber", "city", "state", "zip", + "prayerRequests", "messageTopicsOther", "attendanceDuration", + "campusPreferenceOther", "howHeardOther", "serviceAttended", + "followUp", "notes", "serviceTime", "planningCenter", +]); +const PROMOTABLE_BOOL = new Set([ + "prayerForTeam", "prayerConfidential", + "iSaidYesBookSent", "ftGuestLetterSent", +]); +const PROMOTABLE_ARRAY = new Set([ + "messageTopics", "nextStep", "campusPreference", "howHeard", +]); +const PROMOTABLE_DATE = new Set([ + "firstTimeGuestDate", "salvationDate", +]); + +const ALL_PROMOTABLE_KEYS = new Set([ + ...PROMOTABLE_STRING, + ...PROMOTABLE_BOOL, + ...PROMOTABLE_ARRAY, + ...PROMOTABLE_DATE, +]); + +function isEmpty(v: unknown): boolean { + if (v === null || v === undefined) return true; + if (typeof v === "string") return v.trim() === ""; + if (Array.isArray(v)) return v.length === 0; + return false; +} + +async function flipIsCoreOnTemplateFields(): Promise { + console.log("\n1. Promoting FormField rows to isCore = true…"); + const candidates = await prisma.formField.findMany({ + where: { isCore: false, key: { in: Array.from(ALL_PROMOTABLE_KEYS) } }, + select: { id: true, key: true, label: true, formTemplateId: true }, + }); + console.log(` Found ${candidates.length} non-core field(s) that should be core`); + if (candidates.length === 0) return; + + for (const f of candidates.slice(0, 10)) { + console.log(` - ${f.key} (template ${f.formTemplateId})`); + } + if (candidates.length > 10) console.log(` … and ${candidates.length - 10} more`); + + if (!APPLY) return; + const ids = candidates.map((c) => c.id); + const res = await prisma.formField.updateMany({ + where: { id: { in: ids } }, + data: { isCore: true }, + }); + console.log(` Updated ${res.count} field(s)`); +} + +async function backfillResponseCards(): Promise { + console.log("\n2. Backfilling ResponseCard top-level columns from fieldData…"); + + const BATCH = 200; + let cursor: string | undefined; + let scanned = 0; + let cardsWithPromotion = 0; + let cardsWithNameFix = 0; + let totalFieldsPromoted = 0; + + // Sample logging + const sample: string[] = []; + + while (true) { + const cards = await prisma.responseCard.findMany({ + take: BATCH, + ...(cursor ? { skip: 1, cursor: { id: cursor } } : {}), + orderBy: { id: "asc" }, + }); + if (cards.length === 0) break; + + for (const card of cards) { + scanned++; + const updates: Record = {}; + + // (a) Promote fieldData keys → matching top-level columns when the + // top-level column is currently empty. + const fd = (card.fieldData as Record | null) ?? null; + if (fd && typeof fd === "object") { + const cardAsAny = card as unknown as Record; + for (const [k, v] of Object.entries(fd)) { + if (!ALL_PROMOTABLE_KEYS.has(k)) continue; + if (!isEmpty(cardAsAny[k])) continue; // don't clobber existing values + if (isEmpty(v)) continue; + + if (PROMOTABLE_STRING.has(k)) updates[k] = String(v); + else if (PROMOTABLE_BOOL.has(k)) updates[k] = Boolean(v); + else if (PROMOTABLE_ARRAY.has(k)) updates[k] = Array.isArray(v) ? v : null; + else if (PROMOTABLE_DATE.has(k)) updates[k] = new Date(String(v)); + } + } + + // (b) Recompute `name` from firstName/lastName when stale or missing. + const nextFirst = + ("firstName" in updates ? (updates.firstName as string | null) : card.firstName) ?? null; + const nextLast = + ("lastName" in updates ? (updates.lastName as string | null) : card.lastName) ?? null; + const combined = [nextFirst, nextLast].filter(Boolean).join(" ").trim(); + const desiredName = combined || null; + // Only touch `name` if we have first/last to derive from AND the current + // stored value differs. This avoids wiping a legacy name with null. + if (desiredName && desiredName !== card.name) { + updates.name = desiredName; + } + + if (Object.keys(updates).length === 0) continue; + + const promotedFieldKeys = Object.keys(updates).filter((k) => k !== "name"); + if (promotedFieldKeys.length > 0) { + cardsWithPromotion++; + totalFieldsPromoted += promotedFieldKeys.length; + } + if ("name" in updates) cardsWithNameFix++; + + if (sample.length < 5) { + sample.push( + ` - ${card.id}: ${Object.keys(updates).map((k) => `${k}=${JSON.stringify(updates[k])}`).join(", ")}` + ); + } + + if (APPLY) { + await prisma.responseCard.update({ + where: { id: card.id }, + data: updates as Parameters[0]["data"], + }); + } + } + + cursor = cards[cards.length - 1].id; + if (cards.length < BATCH) break; + } + + console.log(` Scanned ${scanned} card(s)`); + console.log(` Promotion candidates: ${cardsWithPromotion} card(s), ${totalFieldsPromoted} field(s) total`); + console.log(` Name-recompute candidates: ${cardsWithNameFix} card(s)`); + if (sample.length) { + console.log(" Sample changes:"); + for (const line of sample) console.log(line); + } +} + +async function main(): Promise { + console.log("=== ResponseCard core-fields backfill ==="); + console.log(APPLY ? "Mode: APPLY (writes enabled)" : "Mode: DRY-RUN (no writes — pass --apply to commit)"); + + await flipIsCoreOnTemplateFields(); + await backfillResponseCards(); + + console.log("\nDone."); +} + +main() + .catch((err) => { + console.error("Backfill failed:", err); + process.exitCode = 1; + }) + .finally(async () => { + await prisma.$disconnect(); + await pool.end(); + }); diff --git a/src/app/(dashboard)/cards/[id]/page.tsx b/src/app/(dashboard)/cards/[id]/page.tsx index 6b07189..0c2d3a9 100644 --- a/src/app/(dashboard)/cards/[id]/page.tsx +++ b/src/app/(dashboard)/cards/[id]/page.tsx @@ -377,6 +377,7 @@ export default function CardDetailPage() { } toast.success("Card updated"); await fetchCard(); + router.refresh(); } catch (err) { toast.error(err instanceof Error ? err.message : "Failed to save"); } finally { @@ -407,6 +408,7 @@ export default function CardDetailPage() { toast.success("Review complete — card will sync to Monday.com"); await fetchCard(); setEdits({}); + router.refresh(); } catch (err) { toast.error(err instanceof Error ? err.message : "Failed to complete review"); } finally { @@ -539,6 +541,26 @@ export default function CardDetailPage() { const reviewStatus = card.reviewStatus; const hasEdits = Object.keys(edits).length > 0 || Object.keys(fieldDataEdits).length > 0; + // Compute the header title from in-flight edits so it updates live as the + // user types. Falls back through edits → fieldData edits → card columns → + // legacy `card.name` so it works for both core and non-core templates. + const editedFirst = + "firstName" in edits + ? String(edits.firstName ?? "") + : "firstName" in fieldDataEdits + ? String(fieldDataEdits.firstName ?? "") + : (card.firstName ?? ""); + const editedLast = + "lastName" in edits + ? String(edits.lastName ?? "") + : "lastName" in fieldDataEdits + ? String(fieldDataEdits.lastName ?? "") + : (card.lastName ?? ""); + const displayName = + [editedFirst, editedLast].filter(Boolean).join(" ").trim() || + card.name || + "Unnamed Card"; + return (
@@ -592,7 +614,7 @@ export default function CardDetailPage() {
)} -
+
{canReprocess && ocrStatus !== "processing" && (