diff --git a/messages/en.json b/messages/en.json index 73425ae02..77687842b 100644 --- a/messages/en.json +++ b/messages/en.json @@ -1372,6 +1372,40 @@ "title": "Personal thresholds", "description": "Override target ranges for every metric." }, + "sources": { + "title": "Sources", + "description": "Pick which ingest source wins when more than one records the same metric for the same day.", + "cardTitle": "Source priority by metric", + "help": "When more than one source delivers the same value on the same day (e.g. Withings and Apple Health both report 1,200 steps), the top source counts as the canonical reading. Other sources stay stored for the audit trail.", + "resetDefaults": "Reset to defaults", + "moveUp": "Move up", + "moveDown": "Move down", + "saveSuccess": "Source priority saved.", + "saveError": "Saving the source priority failed.", + "resetSuccess": "Source priority reset to defaults.", + "metrics": { + "steps": "Steps", + "activeEnergy": "Active energy", + "walkingRunningDistance": "Walking + running distance", + "flightsClimbed": "Flights climbed", + "sleep": "Sleep", + "weight": "Weight", + "bloodPressure": "Blood pressure", + "pulse": "Pulse", + "bodyFat": "Body fat", + "bodyTemperature": "Body temperature", + "spo2": "Oxygen saturation", + "hrv": "Heart-rate variability", + "restingHeartRate": "Resting heart rate", + "vo2Max": "VO2 max" + }, + "sourceLabels": { + "WITHINGS": "Withings", + "APPLE_HEALTH": "Apple Health", + "MANUAL": "Manual entry", + "IMPORT": "Import" + } + }, "ai": { "title": "AI Insights", "description": "Provider, model, key." @@ -2799,6 +2833,23 @@ "coach": { "cta": "Ask Coach" }, + "edit": { + "openLabel": "Edit target range for {metric}", + "title": "Edit target range — {metric}", + "description": "Adjust the in-range band used across charts, insights and the doctor report. Values are in {unit}.", + "derivedHint": "This card is derived from other metrics. Edit the underlying targets (e.g. blood pressure or weight) instead.", + "minLabel": "Min", + "maxLabel": "Max", + "systolicMin": "Systolic min", + "systolicMax": "Systolic max", + "diastolicMin": "Diastolic min", + "diastolicMax": "Diastolic max", + "boundsHint": "Allowed range: {min}–{max} {unit}", + "resetToDefault": "Reset to default", + "saveSuccess": "Target range updated", + "saveError": "Could not save the target range", + "resetSuccess": "Target range reset to default" + }, "mood": { "stability": { "stable": "stable", diff --git a/src/app/api/medications/[id]/glp1/route.ts b/src/app/api/medications/[id]/glp1/route.ts index d213f416d..39966061b 100644 --- a/src/app/api/medications/[id]/glp1/route.ts +++ b/src/app/api/medications/[id]/glp1/route.ts @@ -136,13 +136,18 @@ export const POST = apiHandler( return apiError("Medication not found", 404); } - const body = (await request.json().catch(() => null)) as Glp1PostBody | null; + const body = (await request + .json() + .catch(() => null)) as Glp1PostBody | null; if (!body) return apiError("Invalid body", 400); if (body.doseChange) { const { effectiveFrom, doseValue, doseUnit, note } = body.doseChange; if (!effectiveFrom || typeof doseValue !== "number" || !doseUnit) { - return apiError("doseChange.effectiveFrom + doseValue + doseUnit required", 422); + return apiError( + "doseChange.effectiveFrom + doseValue + doseUnit required", + 422, + ); } const created = await prisma.medicationDoseChange.create({ data: { diff --git a/src/components/insights/therapy-timeline.tsx b/src/components/insights/therapy-timeline.tsx index 9ca296e78..af1c28271 100644 --- a/src/components/insights/therapy-timeline.tsx +++ b/src/components/insights/therapy-timeline.tsx @@ -5,7 +5,10 @@ import { ArrowDown, ArrowUp, Pill, Syringe } from "lucide-react"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { useTranslations, useFormatters } from "@/lib/i18n/context"; -import { describeInjectionSite, type InjectionSiteKey } from "@/lib/medications/injection-sites"; +import { + describeInjectionSite, + type InjectionSiteKey, +} from "@/lib/medications/injection-sites"; /** * v1.4.25 W4d — therapy-timeline view for /insights/medikamente. @@ -142,11 +145,16 @@ function renderEntryLine( const drug = entry.medicationName ?? ""; switch (entry.kind) { case "dose-change": { - const arrow = entry.doseDelta === "up" ? : entry.doseDelta === "down" ? : null; + const arrow = + entry.doseDelta === "up" ? ( + + ) : entry.doseDelta === "down" ? ( + + ) : null; return ( {drug} {t("insights.therapyTimeline.doseTo")}{" "} - + {entry.doseValue} {entry.doseUnit} {arrow && <> {arrow}} @@ -170,14 +178,16 @@ function renderEntryLine( return ( {drug} · {sign} - {entry.inventoryDelta} {t("insights.therapyTimeline.pens")} ({entry.reason}) + {entry.inventoryDelta} {t("insights.therapyTimeline.pens")} ( + {entry.reason}) ); } case "side-effect": { return ( - {t("insights.therapyTimeline.sideEffects")}: {(entry.tags ?? []).join(", ")} + {t("insights.therapyTimeline.sideEffects")}:{" "} + {(entry.tags ?? []).join(", ")} ); } diff --git a/src/components/medications/glp1-medication-card.tsx b/src/components/medications/glp1-medication-card.tsx index 6a3ee1b60..5a1214624 100644 --- a/src/components/medications/glp1-medication-card.tsx +++ b/src/components/medications/glp1-medication-card.tsx @@ -216,7 +216,9 @@ export function Glp1MedicationCard({ const lastSite = recentInjections.find((i) => i.injectionSite)?.injectionSite ?? null; const recommendedNextSite = nextInjectionSite( - recentInjections.map((r) => r.injectionSite).filter(Boolean) as InjectionSiteKey[], + recentInjections + .map((r) => r.injectionSite) + .filter(Boolean) as InjectionSiteKey[], ); const inventory = details?.inventory ?? null; @@ -225,8 +227,10 @@ export function Glp1MedicationCard({ if (!medication.lastTakenAt) return null; const d = new Date(medication.lastTakenAt); const days = diffDays(d, now); - if (days === 0) return `${t("medications.today")}, ${formatTime(medication.lastTakenAt)}`; - if (days === -1) return `${t("medications.yesterday")}, ${formatTime(medication.lastTakenAt)}`; + if (days === 0) + return `${t("medications.today")}, ${formatTime(medication.lastTakenAt)}`; + if (days === -1) + return `${t("medications.yesterday")}, ${formatTime(medication.lastTakenAt)}`; return formatDateTime(medication.lastTakenAt); } @@ -318,20 +322,22 @@ export function Glp1MedicationCard({ {/* Rotation hint — only when we have a last + recommended site different from it. The picker on the dashboard tile owns mode-switching; the card just nudges. */} - {lastSite && recommendedNextSite && recommendedNextSite !== lastSite && ( -
-

- {t("medications.glp1RotationLast", { - site: t(`medications.site${siteSuffix(lastSite)}`), - })} -

-

- {t("medications.glp1RotationSuggested", { - site: t(`medications.site${siteSuffix(recommendedNextSite)}`), - })} -

-
- )} + {lastSite && + recommendedNextSite && + recommendedNextSite !== lastSite && ( +
+

+ {t("medications.glp1RotationLast", { + site: t(`medications.site${siteSuffix(lastSite)}`), + })} +

+

+ {t("medications.glp1RotationSuggested", { + site: t(`medications.site${siteSuffix(recommendedNextSite)}`), + })} +

+
+ )} {/* Inventory line — only when dosesPerUnit + at least one inventory event recorded. Low-stock gets a warning badge. */} @@ -357,7 +363,9 @@ export function Glp1MedicationCard({
setShowHistory((e.target as HTMLDetailsElement).open)} + onToggle={(e) => + setShowHistory((e.target as HTMLDetailsElement).open) + } > {t("medications.glp1DoseHistory")} diff --git a/src/components/medications/injection-site-picker.tsx b/src/components/medications/injection-site-picker.tsx index 0ad1579bf..735dd3470 100644 --- a/src/components/medications/injection-site-picker.tsx +++ b/src/components/medications/injection-site-picker.tsx @@ -60,9 +60,21 @@ export function InjectionSitePicker({ aria-label="Body outline" > {/* Head */} - + {/* Neck */} - + {/* Torso */} {/* Arms */} - - + + {/* Thighs */} - - - - + + + + {/* Belt line */} - + {/* Navel reference */} @@ -130,7 +180,7 @@ export function InjectionSitePicker({ onChange(site); } }} - className="cursor-pointer focus:outline-none focus-visible:stroke-2 focus-visible:stroke-current" + className="cursor-pointer focus:outline-none focus-visible:stroke-current focus-visible:stroke-2" /> ); diff --git a/src/components/medications/medication-form.tsx b/src/components/medications/medication-form.tsx index 52eb36459..f3d659149 100644 --- a/src/components/medications/medication-form.tsx +++ b/src/components/medications/medication-form.tsx @@ -377,7 +377,10 @@ export function MedicationForm({ */ function applyWeeklyPreset(weekday: number) { try { - localStorage.setItem("medication-form:last-weekly-weekday", String(weekday)); + localStorage.setItem( + "medication-form:last-weekly-weekday", + String(weekday), + ); } catch { /* private mode — silent */ } diff --git a/src/components/mood/mood-form.tsx b/src/components/mood/mood-form.tsx index b4245de35..d5f2d4320 100644 --- a/src/components/mood/mood-form.tsx +++ b/src/components/mood/mood-form.tsx @@ -25,6 +25,24 @@ const MOOD_LEVELS = [ { value: "LAUSIG", score: 1, labelKey: "mood.levelLausig" }, ] as const; +/** + * v1.4.25 W4d — curated GLP-1 side-effect chip strip. Tapping a chip + * appends the localised tag string to the existing free-text tag input + * (comma-separated). The list is intentionally short — these are the + * symptoms clinicians most often ask about at GLP-1 follow-up visits + * (cf. PMC GLP-1 adverse-effects review). Generic mood entries that + * never touch the chips keep their tag input byte-identical to v1.4.24. + */ +const GLP1_SIDE_EFFECT_KEYS = [ + "medications.sideEffectTagNausea", + "medications.sideEffectTagConstipation", + "medications.sideEffectTagDiarrhea", + "medications.sideEffectTagFatigue", + "medications.sideEffectTagAppetiteLoss", + "medications.sideEffectTagHeartburn", + "medications.sideEffectTagHeadache", +] as const; + interface MoodFormProps { onSuccess?: () => void; onCancel?: () => void; @@ -159,6 +177,53 @@ export function MoodForm({ onSuccess, onCancel }: MoodFormProps) { onChange={(e) => setTagsInput(e.target.value)} placeholder={t("mood.tagsPlaceholder")} /> + {/* v1.4.25 W4d — GLP-1 side-effect quick-tags. Tapping a chip + appends the localised label to the free-text tag list. + Always visible for now (cheap UX; the Coach side-effect + aggregator filters on the canonical English tag set so the + German labels still register correctly). */} +
+

+ {t("medications.sideEffectTagsHelp")} +

+
+ {GLP1_SIDE_EFFECT_KEYS.map((key) => { + const label = t(key); + const tags = tagsInput + .split(",") + .map((p) => p.trim().toLowerCase()); + const isActive = tags.includes(label.toLowerCase()); + return ( + + ); + })} +
+
{error && ( diff --git a/src/components/targets/__tests__/target-card.test.tsx b/src/components/targets/__tests__/target-card.test.tsx index 84e4487d6..bea7f2455 100644 --- a/src/components/targets/__tests__/target-card.test.tsx +++ b/src/components/targets/__tests__/target-card.test.tsx @@ -120,4 +120,61 @@ describe("", () => { expect(html).toContain("stable"); expect(html).not.toMatch(/>0\.6 { + it("renders the edit cog with an aria-label for the rich-data card", () => { + const html = render({ + target: fullDataTarget, + aiEnabled: true, + onAskCoach: vi.fn(), + }); + expect(html).toContain('data-slot="target-edit-cog"'); + expect(html).toContain('data-target-type="WEIGHT"'); + expect(html).toContain("Edit target range for Weight"); + }); + + it("STILL renders the cog when the target is in insufficient-data mode", () => { + // Consistency rule: target-config UI must always be reachable, + // even when the consistency strip is hidden. + const html = render({ + target: sparseTarget, + aiEnabled: true, + onAskCoach: vi.fn(), + }); + expect(html).toContain('data-slot="target-edit-cog"'); + expect(html).toContain('data-target-type="PULSE"'); + }); + + it("renders the cog when the AI provider is disabled (gate is independent)", () => { + // The Coach CTA depends on aiEnabled; the edit cog does not. + const html = render({ + target: fullDataTarget, + aiEnabled: false, + onAskCoach: vi.fn(), + }); + expect(html).toContain('data-slot="target-edit-cog"'); + expect(html).not.toContain('data-slot="target-coach-cta"'); + }); + + it("renders the cog button with adequate touch target (min-h-11 + min-w-11)", () => { + // Mobile-first: tap target ≥ 44 px so the cog isn't an + // accessibility hazard on smaller phones. + const html = render({ + target: fullDataTarget, + aiEnabled: true, + onAskCoach: vi.fn(), + }); + expect(html).toMatch( + /data-slot="target-edit-cog"[^>]*class="[^"]*min-h-11[^"]*"/, + ); + expect(html).toMatch( + /data-slot="target-edit-cog"[^>]*class="[^"]*min-w-11[^"]*"/, + ); + }); + }); }); diff --git a/src/components/targets/__tests__/target-edit-sheet.test.tsx b/src/components/targets/__tests__/target-edit-sheet.test.tsx new file mode 100644 index 000000000..d64379473 --- /dev/null +++ b/src/components/targets/__tests__/target-edit-sheet.test.tsx @@ -0,0 +1,198 @@ +import { describe, expect, it, vi } from "vitest"; +import { renderToStaticMarkup } from "react-dom/server"; +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; + +import { I18nProvider } from "@/lib/i18n/context"; +import { TargetEditSheet } from "../target-edit-sheet"; + +/** + * v1.4.25 W3f — target-edit dialog. SSR-style assertions because the + * Radix Dialog body is portalled at runtime; we only check the + * outer Dialog wiring + the body-mount toggle. + * + * Branches covered: + * 1. open=false → renders no portal markup at all (Dialog content + * not mounted; query hooks never instantiated). + * 2. open=true (editable metric) → the Dialog wrapper is present; + * the inner body would render the input rows if it weren't + * portalled (we can't see inside but we CAN assert the body + * mount path doesn't throw). + * 3. open=true (derived metric like BMI) → same, with the derived + * hint path exercised. + * + * A separate `focus-management` test asserts the open=true mount + * doesn't crash under React's strict-mode render. + */ + +function withProviders(node: React.ReactNode) { + const client = new QueryClient({ + defaultOptions: { + queries: { retry: false, gcTime: 0 }, + mutations: { retry: false }, + }, + }); + return ( + + {node} + + ); +} + +describe("", () => { + it("renders no Dialog content when open=false (hooks never instantiate)", () => { + // Closed dialog: zero markup beyond the Radix root container. + const html = renderToStaticMarkup( + withProviders( + , + ), + ); + // Body is not mounted while closed — no data-slot for the body. + expect(html).not.toContain('data-slot="target-edit-sheet"'); + }); + + it("mounts the body without throwing for an editable metric (WEIGHT)", () => { + // Radix portals the DialogContent so it's not in SSR markup, but + // mounting the body must not throw — the QueryClientProvider above + // provides the necessary context. + expect(() => + renderToStaticMarkup( + withProviders( + , + ), + ), + ).not.toThrow(); + }); + + it("mounts the body without throwing for a BP target (two range pairs)", () => { + // BP gets BOTH sys + dia input rows. + expect(() => + renderToStaticMarkup( + withProviders( + , + ), + ), + ).not.toThrow(); + }); + + it("mounts the body without throwing for a derived metric (BMI)", () => { + // BMI is derived from weight + height — the body shows the + // explanatory hint instead of the editable inputs. + expect(() => + renderToStaticMarkup( + withProviders( + , + ), + ), + ).not.toThrow(); + }); + + it("re-renders cleanly when open flips from false → true", () => { + // Verifies the lazy-mount: closed render produces zero body + // markup; opening it instantiates the body without conflicting + // with the prior render. + const client = new QueryClient({ + defaultOptions: { queries: { retry: false, gcTime: 0 } }, + }); + const closedHtml = renderToStaticMarkup( + + + + + , + ); + expect(closedHtml).not.toContain('data-slot="target-edit-sheet"'); + + const openHtml = renderToStaticMarkup( + + + + + , + ); + // No crash; the Radix Dialog root is in the markup. + expect(openHtml).toBeTypeOf("string"); + }); + + /** + * v1.4.25 W3f — focus-management contract. The dialog's + * `onOpenAutoFocus` handler must steal focus from Radix's default + * (the close X button) and place it on the first numeric input so a + * keyboard user lands on the editable field. We verify the handler + * is wired up via the SSR output: Radix renders Dialog content + * lazily, so we check that the component compiles + the ref pattern + * doesn't throw under render (a defensive smoke; the actual focus + * shift is exercised by Playwright in the v1.4.25 verification + * phase). + */ + describe("focus management (v1.4.25 W3f)", () => { + it("does not throw when the dialog opens with a valid ref target", () => { + // The body's onOpenAutoFocus handler reads firstInputRef.current + // — this is null at SSR time. The handler is guarded by an + // `if (firstInputRef.current)` check so the SSR render never + // dereferences null. This test pins that contract: the open + // mount must not throw, even though the DOM ref isn't set yet. + const client = new QueryClient({ + defaultOptions: { queries: { retry: false, gcTime: 0 } }, + }); + expect(() => + renderToStaticMarkup( + + + + + , + ), + ).not.toThrow(); + }); + }); +}); diff --git a/src/components/targets/target-card.tsx b/src/components/targets/target-card.tsx index 681a47a08..db33a22be 100644 --- a/src/components/targets/target-card.tsx +++ b/src/components/targets/target-card.tsx @@ -1,5 +1,6 @@ "use client"; +import { useState } from "react"; import { AlertCircle, Activity, @@ -10,12 +11,14 @@ import { Moon, Percent, Scale, + Settings2, Smile, TrendingDown, TrendingUp, } from "lucide-react"; import type { LucideIcon } from "lucide-react"; +import { Button } from "@/components/ui/button"; import { Card, CardContent, CardHeader } from "@/components/ui/card"; import { Tooltip, @@ -29,6 +32,7 @@ import { moodStabilityLabel } from "@/lib/targets/mood-stability-label"; import { ConsistencyStrip } from "./consistency-strip"; import { RangeBar } from "./range-bar"; import { TargetCoachButton } from "./target-coach-button"; +import { TargetEditSheet } from "./target-edit-sheet"; import { buildTargetPrompt } from "@/lib/ai/coach/target-prompts"; import { coachScopeForTarget } from "@/lib/ai/coach/target-scope"; import type { CoachScope } from "@/lib/ai/coach/types"; @@ -331,6 +335,12 @@ export function TargetCard({ }: TargetCardProps) { const { t, locale } = useTranslations(); + // v1.4.25 W3f — per-card edit affordance. Cog top-right of every + // card opens the edit dialog; the dialog handles the read-only path + // for derived metrics (BMI, MOOD_*, MEDICATION_COMPLIANCE, + // BLOOD_PRESSURE_IN_TARGET) by showing an explanatory caption. + const [editOpen, setEditOpen] = useState(false); + const Icon = TYPE_ICONS[target.type] ?? Activity; const iconColor = TYPE_COLORS[target.type] ?? "text-primary"; const isBp = target.type === "BLOOD_PRESSURE"; @@ -397,10 +407,14 @@ export function TargetCard({ className="flex h-full flex-col" > - {/* Row 1: icon + label (left) ⋯ status pill (right on sm+, - stacked on mobile). Stacking on mobile keeps the headline - number visible at sub-380px viewports where an inline pill - would push the value below the fold. */} + {/* Row 1: icon + label (left) ⋯ status pill + edit-cog (right + on sm+, stacked on mobile). Stacking on mobile keeps the + headline number visible at sub-380px viewports where an + inline pill would push the value below the fold. + + v1.4.25 W3f — the per-card cog renders on EVERY card + (consistency rule across Dashboard → Insights → Zielwerte), + with no insufficient-data gate. */}
- {statusLabel ? ( - - - - + {statusLabel ? ( + + + + + {statusLabel} + + + + {target.range && ( +

+ {t("targets.targetRangeValue", { + min: String(target.range.min), + max: String(target.range.max), + unit: target.unit, + })} +

)} - > - {statusLabel} - - - - {target.range && (

- {t("targets.targetRangeValue", { - min: String(target.range.min), - max: String(target.range.max), - unit: target.unit, - })} + {t("targets.sourceLabel", { source: target.source })}

- )} -

- {t("targets.sourceLabel", { source: target.source })} -

- - - - ) : null} + + + + ) : null} + +
@@ -650,6 +680,19 @@ export function TargetCard({ )} + {/* v1.4.25 W3f — edit dialog mounted alongside the card. The + dialog is portalled by Radix so it isn't constrained by the + card's overflow / z-index. Only one card's dialog ever opens + at a time (each card owns its own boolean state). */} + ); } diff --git a/src/components/targets/target-edit-sheet.tsx b/src/components/targets/target-edit-sheet.tsx new file mode 100644 index 000000000..14f20cdf2 --- /dev/null +++ b/src/components/targets/target-edit-sheet.tsx @@ -0,0 +1,459 @@ +"use client"; + +import { useId, useRef, useState } from "react"; +import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; +import { toast } from "sonner"; +import { RotateCcw } from "lucide-react"; + +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, +} from "@/components/ui/dialog"; +import { Button } from "@/components/ui/button"; +import { Input } from "@/components/ui/input"; +import { Label } from "@/components/ui/label"; +import { useTranslations } from "@/lib/i18n/context"; +import { + METRIC_BOUNDS, + type ThresholdMetric, + type EffectiveRange, +} from "@/lib/analytics/effective-range"; + +/** + * v1.4.25 W3f — per-card edit affordance for the Zielwerte cards. + * + * Marc directive 2026-05-14: the per-card cog pattern (Dashboard charts → + * Insights sub-pages → now Zielwerte) must be consistent. After the W3e + * redesign the target cards lost their edit entry point — this dialog + * closes that gap. Tapping the cog top-right of any TargetCard opens + * this sheet; the user adjusts the min/max for the underlying threshold + * metric, hits Save, and every surface that consumes + * `getEffectiveRange()` (dashboard bands, doctor-report, /targets + * itself) updates on the next query refetch. + * + * Server contract: PUT /api/user/thresholds with a partial map + * `{ [metric]: { min, max } }`. The endpoint validates the values + * against `METRIC_BOUNDS` and persists them under + * `User.thresholdsJson`. The cached query `["user", "thresholds"]` is + * invalidated on success so the same dialog re-opens with the new + * values. + * + * Visual contract: a small Dialog (not a Sheet drawer) so the + * interaction reads as "I'm editing one specific metric, not a global + * settings page". Mobile-first: full-width buttons under sm:, inline + * row from sm: up. + * + * Mapping target-card type → ThresholdMetric: + * BLOOD_PRESSURE_IN_TARGET / BMI / MOOD_SCORE / MOOD_STABILITY / + * MEDICATION_COMPLIANCE / BLOOD_GLUCOSE_RANDOM + * → no editable threshold (the metric is a derived score). The + * cog still renders (consistency rule) but disables the Save + * button + shows an explanatory caption that this card derives + * from other metrics. + * BLOOD_PRESSURE + * → edits BOTH BLOOD_PRESSURE_SYS and BLOOD_PRESSURE_DIA in a + * single Save round-trip; the parent page receives the + * diastolic range from the targets API. + * Everything else maps 1:1 to the same enum literal. + */ + +const TARGET_TYPE_TO_METRIC: Record = { + WEIGHT: "WEIGHT", + PULSE: "PULSE", + SLEEP_DURATION: "SLEEP_DURATION", + BODY_FAT: "BODY_FAT", + ACTIVITY_STEPS: "ACTIVITY_STEPS", + BLOOD_GLUCOSE_FASTING: "BLOOD_GLUCOSE_FASTING", + BLOOD_GLUCOSE_POSTPRANDIAL: "BLOOD_GLUCOSE_POSTPRANDIAL", + BLOOD_GLUCOSE_RANDOM: "BLOOD_GLUCOSE_RANDOM", + BLOOD_GLUCOSE_BEDTIME: "BLOOD_GLUCOSE_BEDTIME", + // BLOOD_PRESSURE handled specially with both sys + dia. + // BMI / MOOD_SCORE / MOOD_STABILITY / MEDICATION_COMPLIANCE / + // BLOOD_PRESSURE_IN_TARGET — derived, no editable threshold. +}; + +interface CurrentRange { + min: number; + max: number; +} + +interface ThresholdsApiResponse { + effective: Record; + overrides: Partial>; +} + +export interface TargetEditSheetProps { + targetType: string; + targetLabel: string; + unit: string; + /** + * Current sys/dia ranges for BP. Threaded from the page; the dialog + * uses them to seed BOTH inputs when target.type === BLOOD_PRESSURE. + */ + initialRange: CurrentRange | null; + initialDiastolicRange?: CurrentRange | null; + open: boolean; + onOpenChange: (open: boolean) => void; +} + +export function TargetEditSheet(props: TargetEditSheetProps) { + // v1.4.25 W3f — only mount the body (and its TanStack Query hooks) + // when the dialog is open. This keeps the parent + // test-friendly: existing tests can render the card without + // standing up a QueryClientProvider, and the hooks only execute + // once the user actually clicks the cog. + return ( + + {props.open ? : null} + + ); +} + +function TargetEditSheetBody({ + targetType, + targetLabel, + unit, + initialRange, + initialDiastolicRange, + onOpenChange, +}: TargetEditSheetProps) { + const { t } = useTranslations(); + const queryClient = useQueryClient(); + + const isBp = targetType === "BLOOD_PRESSURE"; + const metric = TARGET_TYPE_TO_METRIC[targetType] ?? null; + const isDerivedMetric = !isBp && metric == null; + + // Lazy-load the thresholds payload so the dialog also catches any + // already-persisted override even when the seeded `initialRange` + // came from the targets API (which can paint a different in-band + // tone vs. the persisted override). The body only mounts when the + // dialog is open, so we don't need a separate `enabled` flag. + const { data: thresholdsData } = useQuery({ + queryKey: ["user", "thresholds"], + queryFn: async () => { + const res = await fetch("/api/user/thresholds"); + if (!res.ok) throw new Error("failed"); + const json = await res.json(); + return json.data as ThresholdsApiResponse; + }, + }); + + // Seed input strings from override → initialRange → default bound. + // We use strings so the user can type a partial number (e.g. "12") without + // the input snapping back to a parsed value. + const seedRange = (m: ThresholdMetric | null, fallback: CurrentRange | null) => { + if (m && thresholdsData?.overrides?.[m]) { + return thresholdsData.overrides[m]!; + } + if (fallback) return fallback; + if (m) { + const bounds = METRIC_BOUNDS[m]; + return { min: bounds.min, max: bounds.max }; + } + return { min: 0, max: 100 }; + }; + + const primary = seedRange( + isBp ? "BLOOD_PRESSURE_SYS" : metric, + initialRange, + ); + const secondary = isBp + ? seedRange("BLOOD_PRESSURE_DIA", initialDiastolicRange ?? null) + : null; + + // The body only mounts when open=true (see the wrapper above), so + // the initial useState seed is already correct — no setState-inside- + // useEffect dance needed. When `thresholdsData` arrives async, we + // use it as the *displayed* fallback whenever the user hasn't typed + // anything yet, via the `??` chain below. + const [minStr, setMinStr] = useState(null); + const [maxStr, setMaxStr] = useState(null); + const [diaMinStr, setDiaMinStr] = useState(null); + const [diaMaxStr, setDiaMaxStr] = useState(null); + + // Display values: user-edited string (if any) wins, otherwise we + // surface the freshest seeded value derived from the + // `thresholdsData` query + the parent-provided `initialRange`. + const displayMin = minStr ?? String(primary.min); + const displayMax = maxStr ?? String(primary.max); + const displayDiaMin = diaMinStr ?? (secondary ? String(secondary.min) : ""); + const displayDiaMax = diaMaxStr ?? (secondary ? String(secondary.max) : ""); + + // Focus management — the first input gets focus when the dialog + // opens, matching the Dashboard chart cog's open-on-focus pattern. + const firstInputRef = useRef(null); + const dialogContentId = useId(); + + const updateMutation = useMutation({ + mutationFn: async (payload: Partial>) => { + const res = await fetch("/api/user/thresholds", { + method: "PUT", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(payload), + }); + if (!res.ok) { + const err = await res.json().catch(() => null); + throw new Error(err?.error ?? "save failed"); + } + }, + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["user", "thresholds"] }); + queryClient.invalidateQueries({ queryKey: ["insights", "targets"] }); + queryClient.invalidateQueries({ queryKey: ["analytics"] }); + queryClient.invalidateQueries({ queryKey: ["insights"] }); + toast.success(t("targets.edit.saveSuccess")); + onOpenChange(false); + }, + onError: (err) => + toast.error(err instanceof Error ? err.message : t("targets.edit.saveError")), + }); + + const resetMutation = useMutation({ + mutationFn: async () => { + if (isBp) { + // Reset BOTH sys + dia. + for (const m of ["BLOOD_PRESSURE_SYS", "BLOOD_PRESSURE_DIA"] as const) { + const res = await fetch(`/api/user/thresholds?metric=${m}`, { + method: "DELETE", + }); + if (!res.ok) throw new Error("reset failed"); + } + return; + } + if (!metric) return; + const res = await fetch(`/api/user/thresholds?metric=${metric}`, { + method: "DELETE", + }); + if (!res.ok) throw new Error("reset failed"); + }, + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["user", "thresholds"] }); + queryClient.invalidateQueries({ queryKey: ["insights", "targets"] }); + queryClient.invalidateQueries({ queryKey: ["analytics"] }); + queryClient.invalidateQueries({ queryKey: ["insights"] }); + toast.success(t("targets.edit.resetSuccess")); + onOpenChange(false); + }, + onError: () => toast.error(t("targets.edit.saveError")), + }); + + const busy = updateMutation.isPending || resetMutation.isPending; + + const minNum = parseFloat(displayMin); + const maxNum = parseFloat(displayMax); + const diaMinNum = parseFloat(displayDiaMin); + const diaMaxNum = parseFloat(displayDiaMax); + + const primaryBounds = isBp + ? METRIC_BOUNDS.BLOOD_PRESSURE_SYS + : metric + ? METRIC_BOUNDS[metric] + : null; + const secondaryBounds = isBp ? METRIC_BOUNDS.BLOOD_PRESSURE_DIA : null; + + const primaryValid = + primaryBounds != null && + Number.isFinite(minNum) && + Number.isFinite(maxNum) && + minNum >= primaryBounds.min && + maxNum <= primaryBounds.max && + minNum < maxNum; + + const secondaryValid = + !isBp || + (secondaryBounds != null && + Number.isFinite(diaMinNum) && + Number.isFinite(diaMaxNum) && + diaMinNum >= secondaryBounds.min && + diaMaxNum <= secondaryBounds.max && + diaMinNum < diaMaxNum); + + const canSave = !isDerivedMetric && primaryValid && secondaryValid && !busy; + + const handleSave = () => { + if (!canSave) return; + if (isBp) { + updateMutation.mutate({ + BLOOD_PRESSURE_SYS: { min: minNum, max: maxNum }, + BLOOD_PRESSURE_DIA: { min: diaMinNum, max: diaMaxNum }, + }); + return; + } + if (!metric) return; + updateMutation.mutate({ [metric]: { min: minNum, max: maxNum } }); + }; + + const hasOverride = isBp + ? Boolean( + thresholdsData?.overrides?.BLOOD_PRESSURE_SYS || + thresholdsData?.overrides?.BLOOD_PRESSURE_DIA, + ) + : metric + ? Boolean(thresholdsData?.overrides?.[metric]) + : false; + + return ( + { + // Defer to the first input ref so the user lands on the min + // field rather than the close X (default Radix behaviour + // focuses the first focusable child). + if (firstInputRef.current) { + event.preventDefault(); + firstInputRef.current.focus(); + firstInputRef.current.select(); + } + }} + aria-describedby={dialogContentId} + > + + + {t("targets.edit.title", { metric: targetLabel })} + + + {isDerivedMetric + ? t("targets.edit.derivedHint") + : t("targets.edit.description", { unit })} + + + + {!isDerivedMetric && primaryBounds && ( +
+
+
+ + setMinStr(e.target.value)} + disabled={busy} + data-slot="target-edit-min-input" + /> +
+
+ + setMaxStr(e.target.value)} + disabled={busy} + data-slot="target-edit-max-input" + /> +
+
+ + {isBp && secondaryBounds && ( +
+
+ + setDiaMinStr(e.target.value)} + disabled={busy} + data-slot="target-edit-dia-min-input" + /> +
+
+ + setDiaMaxStr(e.target.value)} + disabled={busy} + data-slot="target-edit-dia-max-input" + /> +
+
+ )} + +

+ {t("targets.edit.boundsHint", { + min: String(primaryBounds.min), + max: String(primaryBounds.max), + unit: primaryBounds.unit, + })} +

+
+ )} + + + {hasOverride ? ( + + ) : ( + + + ); +} diff --git a/src/lib/ai/coach/glp1-snapshot.ts b/src/lib/ai/coach/glp1-snapshot.ts index 8b4428151..dfd2328d3 100644 --- a/src/lib/ai/coach/glp1-snapshot.ts +++ b/src/lib/ai/coach/glp1-snapshot.ts @@ -330,7 +330,12 @@ export async function buildGlp1SnapshotBlock( const dows = sched ? parseDaysOfWeek(sched.daysOfWeek) : []; const schedule: ScheduleEntry | null = sched ? { - cadence: dows.length === 1 ? "weekly" : dows.length === 0 ? "daily" : "custom", + cadence: + dows.length === 1 + ? "weekly" + : dows.length === 0 + ? "daily" + : "custom", daysOfWeek: dows, windowStart: sched.windowStart, windowEnd: sched.windowEnd, diff --git a/src/lib/doctor-report-data.ts b/src/lib/doctor-report-data.ts index 342af7e62..db0fd6846 100644 Binary files a/src/lib/doctor-report-data.ts and b/src/lib/doctor-report-data.ts differ diff --git a/src/lib/doctor-report-pdf-core.ts b/src/lib/doctor-report-pdf-core.ts index f80bfa562..e70959718 100644 --- a/src/lib/doctor-report-pdf-core.ts +++ b/src/lib/doctor-report-pdf-core.ts @@ -473,7 +473,11 @@ export function buildDoctorReportPdfDocument( doc.setFontSize(9); doc.setFont("helvetica", "normal"); - if (data.glp1.weightDeltaKg !== null && data.glp1.weightStartKg !== null && data.glp1.weightEndKg !== null) { + if ( + data.glp1.weightDeltaKg !== null && + data.glp1.weightStartKg !== null && + data.glp1.weightEndKg !== null + ) { doc.text( t("doctorReport.glp1WeightSummary", { start: num(data.glp1.weightStartKg, 1), @@ -572,7 +576,9 @@ export function buildDoctorReportPdfDocument( const seRows = data.glp1.sideEffects.map((s) => [s.tag, String(s.count)]); autoTable(doc, { startY: y, - head: [[t("doctorReport.colGlp1SideEffect"), t("doctorReport.colCount")]], + head: [ + [t("doctorReport.colGlp1SideEffect"), t("doctorReport.colCount")], + ], body: seRows, theme: "grid", styles: { diff --git a/src/lib/medications/__tests__/injection-sites.test.ts b/src/lib/medications/__tests__/injection-sites.test.ts index c66359213..28a1ddd4f 100644 --- a/src/lib/medications/__tests__/injection-sites.test.ts +++ b/src/lib/medications/__tests__/injection-sites.test.ts @@ -53,7 +53,9 @@ describe("injection-sites", () => { describe("describeInjectionSite()", () => { it("returns the right i18n key per site", () => { - expect(describeInjectionSite("ABDOMEN_LEFT")).toBe("medications.siteAbdomenLeft"); + expect(describeInjectionSite("ABDOMEN_LEFT")).toBe( + "medications.siteAbdomenLeft", + ); expect(describeInjectionSite("UPPER_ARM_RIGHT")).toBe( "medications.siteUpperArmRight", );