From 45363edb7779273da1a1b0a197646c31589473a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= Date: Mon, 3 Aug 2026 18:33:48 +0200 Subject: [PATCH 01/13] Withhold the controls a shared record refuses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nine surfaces offered a delegate an action the server declines, and the switch had never been asked about any of them. The Today rail's dismiss and the coach check-in's keep / let-go write through routes that resolve the caller, so both refuse under a switch; they now ask canManage and are absent at either grant level. A priority action with no href and no handler is no longer rendered as an inert button at all — the type carries that rule now. The Vorsorge dashboard card offered the mark-done that /checkups already withholds, and the checkups list branch inlined its own ungated copy of the button the cards branch gates, so which view a browser last chose decided whether the action appeared. Both bind canManage. The chart overlay cog persists through a route that resolves the caller and stores a preference belonging to the person rather than the record. Gated once in the control so the three chart wrappers cannot drift. Three query parameters opened sheets past a gated button: ?add= on measurements, ?new=1 on medications, and ?edit=1 on a medication detail, the last of which opens a wizard refused at both levels. A deep link is the same affordance as the control that produces it. The efficacy retarget dial rewrites a setting the owner chose. The episode documents card offered a link and an upload the vault gates on the same endpoint throughout. And the dose ledger built its own success toast, missing both the Undo suppression and the "saved to" receipt its two siblings already carry — the one a delegate met on every dose. The Coach drawer is not mounted inside a shared record, so every button calling askCoach() opened nothing. The launch provider now publishes no value there and each entry point's existing null check does the rest; the documents sheet, the one that rendered without checking, now checks. --- src/app/measurements/page.tsx | 10 ++- src/app/medications/page-client.tsx | 5 +- .../__tests__/chart-overlay-controls.test.tsx | 69 ++++++++++++++- .../charts/chart-overlay-controls.tsx | 13 ++- .../daily/__tests__/priority-card.test.tsx | 26 ++++++ src/components/daily/priority-card.tsx | 74 +++++++++++------ src/components/daily/today-hero.tsx | 17 +++- .../documents/document-detail-sheet.tsx | 9 +- .../documents/episode-documents-card.tsx | 55 +++++++----- .../vorsorge-dashboard-card.tsx | 55 +++++++----- .../vorsorge-section.tsx | 37 +++++---- .../detail/efficacy/efficacy-tab.tsx | 8 +- .../detail/medication-detail-tabs.tsx | 6 +- .../medications/dose-history-ledger.tsx | 51 ++++++++---- .../__tests__/coach-launch-context.test.tsx | 83 +++++++++++++++++-- src/lib/insights/coach-launch-context.tsx | 60 +++++++++++--- 16 files changed, 452 insertions(+), 126 deletions(-) diff --git a/src/app/measurements/page.tsx b/src/app/measurements/page.tsx index f6517480a..821d564c6 100644 --- a/src/app/measurements/page.tsx +++ b/src/app/measurements/page.tsx @@ -170,8 +170,16 @@ export default function MeasurementsPage() { } /> + {/* v1.36.x — the sheet answers the same question the header button + answers. `?add=` opens it without passing the button, and a + deep link is the same affordance as the control that produces it, so + it gets the same gate. Gating the open rather than only the param + also covers the first-paint window: `canAdd` reads true until + `/api/auth/me` settles, and a sheet opened in that frame withdraws + when the answer lands instead of standing on a form the server + refuses. */} { setDialogOpen(open); if (!open) { diff --git a/src/app/medications/page-client.tsx b/src/app/medications/page-client.tsx index 544d2a86c..5b4f4dda1 100644 --- a/src/app/medications/page-client.tsx +++ b/src/app/medications/page-client.tsx @@ -617,8 +617,11 @@ export default function MedicationsPageClient() { "Vollständig bearbeiten" reopens the wizard in edit mode from there); the list page wizard only ever creates. The wizard owns its own ResponsiveSheet shell with the sticky footer. */} + {/* v1.36.x — `?new=1` (the retired `/medications/new` route redirects + here) opens the create wizard without passing the gated Add control, + so the wizard asks the same `canAdd` the control asks. */} ({ + useAuth: () => ({ + user: { + id: "delegate", + username: "delegate", + email: null, + role: "USER", + avatarUrl: null, + modules: {}, + accountAccess: mockAccessRef.value, + }, + isAuthenticated: true, + isLoading: false, + refetch: vi.fn(), + }), +})); + +const { ChartOverlayControls, ChartOverlayControlsBody, DEFAULT_CHART_OVERLAY_PREFS, - type ChartOverlayPrefs, -} from "../chart-overlay-controls"; +} = await import("../chart-overlay-controls"); +type ChartOverlayPrefs = import("../chart-overlay-controls").ChartOverlayPrefs; /** * v1.4.18 — per-chart overlay-controls popover. @@ -48,6 +83,34 @@ describe("", () => { expect(html).toContain('aria-label="Chart overlay settings"'); }); + it("is absent inside somebody else's record, at both levels", () => { + // v1.36.x — every toggle persists through + // `PUT /api/dashboard/chart-overlay-prefs`, which resolves the caller and + // refuses under a switch, and the preference belongs to the person rather + // than to the record. Absent, not disabled: a greyed cog would still + // claim the chart is the delegate's to configure. + // + // Mutation check, run: dropping the `if (!canManage) return null` bail + // from `` → both legs go red on the trigger slot. + for (const access of ["read", "write"] as const) { + mockAccessRef.value = { + accounts: [OWNER], + active: { ...OWNER, access, canWrite: access === "write" }, + canSwitch: true, + }; + const html = renderToStaticMarkup( + withProvider( + {}} + />, + ), + ); + expect(html, `grant level: ${access}`).toBe(""); + } + mockAccessRef.value = OWN_RECORD; + }); + it("default prefs match the clean-line baseline (every toggle OFF)", () => { expect(DEFAULT_CHART_OVERLAY_PREFS).toEqual({ showTrendIndicator: false, diff --git a/src/components/charts/chart-overlay-controls.tsx b/src/components/charts/chart-overlay-controls.tsx index 93e8c19d4..d6ba6429d 100644 --- a/src/components/charts/chart-overlay-controls.tsx +++ b/src/components/charts/chart-overlay-controls.tsx @@ -13,6 +13,7 @@ import { import { Switch } from "@/components/ui/switch"; import { Label } from "@/components/ui/label"; import { Button } from "@/components/ui/button"; +import { useRecordCapabilities } from "@/hooks/use-record-capabilities"; import { useTranslations } from "@/lib/i18n/context"; import { COMPARISON_BASELINES, @@ -89,8 +90,18 @@ export function ChartOverlayControls({ onChange, triggerClassName, hasComparisonData = true, -}: ChartOverlayControlsProps): ReactElement { +}: ChartOverlayControlsProps): ReactElement | null { const { t } = useTranslations(); + // The cog is gated here rather than at each of the eight charts that mount + // it, so the three chart wrappers cannot drift apart on the same question. + // Every toggle persists through `PUT /api/dashboard/chart-overlay-prefs`, + // which resolves the caller and refuses under a switch; and the preference + // belongs to the person reading the chart, not to the record — the same + // reasoning that keeps the mood tag layout off the delegable list. So a + // delegate reads the owner's chart in its stored shape and is not offered a + // dial that would silently fail. + const { canManage } = useRecordCapabilities(); + if (!canManage) return null; return ( diff --git a/src/components/daily/__tests__/priority-card.test.tsx b/src/components/daily/__tests__/priority-card.test.tsx index d588ae69f..c3a6a5df0 100644 --- a/src/components/daily/__tests__/priority-card.test.tsx +++ b/src/components/daily/__tests__/priority-card.test.tsx @@ -111,12 +111,38 @@ describe("", () => { kind: "coach_checkin", actions: [{ labelKey: "daily.action.logDose", intent: "dose.log" }], })} + onAction={() => {}} />, ); expect(html).toContain(" { + // v1.36.x — the caller withholds `onAction` inside somebody else's + // record. The mutating half of the rail must then be absent, not an + // inert button: `TodayHero` passes no handler at either grant level, and + // a rendered control that calls nothing is worse than one that 403s. + const html = render( + , + ); + expect(html).not.toContain("Log dose"); + // Navigation is untouched — reading is never what a delegation withholds. + expect(html).toContain('href="/checkups"'); + }); + it("resolves action label keys through the active locale", () => { const html = render( void; /** @@ -129,7 +134,13 @@ export function PriorityCard({ }: PriorityCardProps) { const { t } = useTranslations(); const Icon = KIND_ICON[item.kind]; - const actions = item.actions.slice(0, 3); + // Navigation always survives; a mutating action survives only when somebody + // is there to run it. That is what removes the whole non-navigation half of + // this card inside a record the caller may not change, without this file + // learning anything about grants. + const actions = item.actions + .filter((action) => action.href || onAction) + .slice(0, 3); const hue = KIND_HUE[item.kind]; // S12 — the quiet "reached" moment: the milestone card swaps the generic // fade-in for the `.milestone-reached` treatment (a soft `--success` halo @@ -187,15 +198,23 @@ export function PriorityCard({ ) : null} {actions.length > 0 ? (
- {actions.map((action) => ( - - ))} + {actions.map((action) => + action.href ? ( + + ) : onAction ? ( + + ) : null, + )}
) : null} @@ -203,6 +222,26 @@ export function PriorityCard({ ); } +/** A navigation action. Always offered — reading is never delegated away. */ +function ActionLink({ href, label }: { href: string; label: string }) { + return ( + + {label} + + ); +} + +/** + * A mutating action. `onAction` is required rather than optional so the type + * carries the rule: this button cannot be rendered without the handler that + * makes it do something. + */ function ActionButton({ action, label, @@ -211,22 +250,9 @@ function ActionButton({ }: { action: PriorityItemAction; label: string; - onAction?: (intent: string) => void; + onAction: (intent: string) => void; pending?: boolean; }) { - if (action.href) { - return ( - - {label} - - ); - } return ( - + {canManage ? ( + <> + + {/* The upload affordance is a deep link into the vault with + this episode pre-filtered. The vault's own upload control + is `canManage`-gated, so an ungated link here would send a + delegate to a page with nothing to press. */} + + + ) : null} {hasMore ? ( + {canManage ? ( + + ) : null} ); diff --git a/src/components/measurement-reminders/vorsorge-section.tsx b/src/components/measurement-reminders/vorsorge-section.tsx index 3f0fa6413..c5412c6da 100644 --- a/src/components/measurement-reminders/vorsorge-section.tsx +++ b/src/components/measurement-reminders/vorsorge-section.tsx @@ -983,21 +983,28 @@ function VorsorgeCard({
- + {/* The same gate the cards branch applies through + `primaryButton`. The list branch used to inline its own + ungated copy, and which branch a person sees is a per-browser + preference that survives the switch — so the identical action + was offered or withheld depending on a view toggle. */} + {canManage ? ( + + ) : null} {headerActions}
diff --git a/src/components/medications/detail/efficacy/efficacy-tab.tsx b/src/components/medications/detail/efficacy/efficacy-tab.tsx index 8d0ac882b..bba726adc 100644 --- a/src/components/medications/detail/efficacy/efficacy-tab.tsx +++ b/src/components/medications/detail/efficacy/efficacy-tab.tsx @@ -36,6 +36,7 @@ import { queryKeys } from "@/lib/query-keys"; import { apiGet, apiPut } from "@/lib/api/api-fetch"; import { useTranslations, useFormatters } from "@/lib/i18n/context"; import { useAuth } from "@/hooks/use-auth"; +import { useRecordCapabilities } from "@/hooks/use-record-capabilities"; import { DEFAULT_TIMEZONE } from "@/lib/tz/format"; import type { MedicationEfficacyDTO, @@ -388,6 +389,11 @@ function RetargetControl({ onChanged: () => void; }) { const { t } = useTranslations(); + // Repointing what a medication is judged against rewrites a setting the + // owner chose — not an admitted create, and `PUT .../efficacy/target` + // resolves the caller, so it is refused at both grant levels. The Wirkung + // tab itself stays readable; only the dial goes. + const { canManage } = useRecordCapabilities(); const [value, setValue] = useState(""); const [busy, setBusy] = useState(false); @@ -437,7 +443,7 @@ function RetargetControl({ } }; - if (items.length === 0) return null; + if (!canManage || items.length === 0) return null; return (
- void runUndoIntake({ - medication: { id: medicationId, name: medicationName }, - eventId, - t, - queryClient, - }), - }, + description: t("recordSharing.toast.savedTo", { + name: recordName, + }), } - : undefined, + : eventId + ? { + action: { + label: t("medications.intakeUndo"), + onClick: () => + void runUndoIntake({ + medication: { id: medicationId, name: medicationName }, + eventId, + t, + queryClient, + }), + }, + } + : undefined, ); await invalidateKeys(queryClient, [ ...medicationDependentKeys, @@ -314,7 +329,15 @@ export function DoseHistoryLedger({ setMarking(null); } }, - [marking, medicationId, medicationName, queryClient, queryKey, t], + [ + marking, + medicationId, + medicationName, + queryClient, + queryKey, + recordName, + t, + ], ); /** diff --git a/src/lib/insights/__tests__/coach-launch-context.test.tsx b/src/lib/insights/__tests__/coach-launch-context.test.tsx index 0fbe78781..a4054c979 100644 --- a/src/lib/insights/__tests__/coach-launch-context.test.tsx +++ b/src/lib/insights/__tests__/coach-launch-context.test.tsx @@ -1,11 +1,7 @@ -import { describe, it, expect } from "vitest"; +import { describe, it, expect, vi } from "vitest"; import { renderToStaticMarkup } from "react-dom/server"; -import { - CoachLaunchProvider, - resolveLaunchState, - useCoachLaunch, -} from "../coach-launch-context"; +import type { AccountAccess } from "@/lib/sharing/account-access-view"; /** * v1.4.27 R3d MB4 — Coach launch context smoke contract. @@ -19,8 +15,48 @@ import { * 3. The hook returns `null` when called outside the provider — * consumers degrade gracefully (e.g. the launch button renders * nothing rather than crashing). + * 4. v1.36.x — the provider publishes nothing inside somebody else's + * record, so (3) also covers every consumer under a switch. The shell + * mounts no drawer there, and a launch call that opened nothing was a + * button that silently did nothing on every page that offers one. + * + * Mutation check, run: dropping the `inSharedRecord` arm from the provider's + * value memo → "publishes nothing inside somebody else's record" goes red + * with the full context shape in the diff. */ +const OWNER = { + accountId: "acct-owner", + username: "owner", + displayName: "Margarethe", + access: "write" as const, + canWrite: true, +}; + +const mockAccessRef: { value: AccountAccess } = { + value: { accounts: [OWNER], active: null, canSwitch: true }, +}; + +vi.mock("@/hooks/use-auth", () => ({ + useAuth: () => ({ + user: { + id: "delegate", + username: "delegate", + email: null, + role: "USER", + avatarUrl: null, + modules: {}, + accountAccess: mockAccessRef.value, + }, + isAuthenticated: true, + isLoading: false, + refetch: vi.fn(), + }), +})); + +const { CoachLaunchProvider, resolveLaunchState, useCoachLaunch } = + await import("../coach-launch-context"); + function Probe({ output }: { output: string[] }) { const launch = useCoachLaunch(); if (!launch) { @@ -72,6 +108,41 @@ describe("CoachLaunchProvider", () => { expect(html).toContain('data-slot="child-mount"'); expect(html).toContain("child"); }); + + it("publishes nothing inside somebody else's record, at both levels", () => { + for (const access of ["read", "write"] as const) { + mockAccessRef.value = { + accounts: [OWNER], + active: { ...OWNER, access, canWrite: access === "write" }, + canSwitch: true, + }; + const output: string[] = []; + renderToStaticMarkup( + + + , + ); + // The whole recorded value, not a boolean: a failure prints the shape + // that leaked rather than `false !== true`. + expect(output, `grant level: ${access}`).toEqual(["null"]); + } + mockAccessRef.value = { accounts: [OWNER], active: null, canSwitch: true }; + }); + + it("still renders its children there — only the launch value is withheld", () => { + mockAccessRef.value = { + accounts: [OWNER], + active: OWNER, + canSwitch: true, + }; + const html = renderToStaticMarkup( + +
child
+
, + ); + mockAccessRef.value = { accounts: [OWNER], active: null, canSwitch: true }; + expect(html).toContain('data-slot="child-mount"'); + }); }); /** diff --git a/src/lib/insights/coach-launch-context.tsx b/src/lib/insights/coach-launch-context.tsx index c8f1cbd12..fc5689729 100644 --- a/src/lib/insights/coach-launch-context.tsx +++ b/src/lib/insights/coach-launch-context.tsx @@ -10,6 +10,7 @@ import { type ReactNode, } from "react"; +import { useRecordCapabilities } from "@/hooks/use-record-capabilities"; import type { CoachScopeSource, CoachScopeWindow } from "@/lib/ai/coach/types"; /** @@ -191,7 +192,30 @@ export interface CoachLaunchProviderProps { children: ReactNode; } +/** + * Owns the drawer's launch state — and publishes it only where a drawer + * exists to receive it. + * + * v1.36.x — the shell stopped mounting `` inside somebody + * else's record, and this provider kept answering: `askCoach()` set an open + * flag that nothing was reading, so every per-page Coach entry point became a + * button that did nothing at all. A control that errors tells a person where + * they stand; one that silently does nothing tells them the product is + * broken. + * + * The gate lives here, on the publisher, rather than in `useCoachLaunch()`. + * Six components read this context and five already treat `null` as "no Coach + * here", so withholding the value fixes all of them at once and a seventh + * inherits the rule. Putting it in the hook instead would drag the account + * query into every one of those components for an answer that is the same in + * all of them. + * + * Nothing is taken away by this: `/insights` and `/coach` are not + * shared-record destinations, so the Coach is outside what sharing covers to + * begin with. + */ export function CoachLaunchProvider({ children }: CoachLaunchProviderProps) { + const { inSharedRecord } = useRecordCapabilities(); const [open, setOpen] = useState(false); const [closeIntent, setCloseIntent] = useState(null); const [prefill, setPrefill] = useState(null); @@ -277,20 +301,24 @@ export function CoachLaunchProvider({ children }: CoachLaunchProviderProps) { [], ); - const value = useMemo( - () => ({ - open, - closeIntent, - prefill, - autoSend, - scope, - documentId, - workoutId, - askCoach, - registerScope, - setOpen: handleSetOpen, - }), + const value = useMemo( + () => + inSharedRecord + ? null + : { + open, + closeIntent, + prefill, + autoSend, + scope, + documentId, + workoutId, + askCoach, + registerScope, + setOpen: handleSetOpen, + }, [ + inSharedRecord, closeIntent, open, prefill, @@ -316,6 +344,12 @@ export function CoachLaunchProvider({ children }: CoachLaunchProviderProps) { * `` so consumer components can degrade gracefully * (e.g. the hero strip's "Ask the coach" action stays disabled until * the provider mounts). + * + * v1.36.x — also `null` inside somebody else's record, and by the same + * mechanism: the provider publishes nothing there (see its own docblock), so + * every consumer's existing `if (!launch) return null` becomes right without + * being told. Kept as a plain context read on purpose — the answer is decided + * once, in the provider, rather than by a hook that six components call. */ export function useCoachLaunch(): CoachLaunchValue | null { return useContext(CoachLaunchContext); From e26a8f3824721eac8f0e85744e9c196e26acdbcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= Date: Mon, 3 Aug 2026 18:38:23 +0200 Subject: [PATCH 02/13] Render the withheld controls in the affordance suite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Three of the newly gated surfaces are query-backed, so the suite gains a query client and a cache seed rather than a hook mock: the component under test stays the real one. Each leg asserts the rail, the card and the reminder row are still THERE — only the mutating control is gone. Breaking each gate in turn puts every leg red. --- .../delegated-write-affordances.test.tsx | 192 +++++++++++++++++- 1 file changed, 189 insertions(+), 3 deletions(-) diff --git a/src/components/__tests__/delegated-write-affordances.test.tsx b/src/components/__tests__/delegated-write-affordances.test.tsx index ae1f4e03d..10f672f5a 100644 --- a/src/components/__tests__/delegated-write-affordances.test.tsx +++ b/src/components/__tests__/delegated-write-affordances.test.tsx @@ -18,9 +18,16 @@ * read-only legs for the intake row and the card menu go red. * - `DeleteButton` dropping its `canManage` bail → "no row delete inside * somebody else's record" goes red. + * - `TodayHero` passing `onDismiss` / `onAction` unconditionally → the rail + * legs go red, printing the dismiss control and the check-in buttons. + * - `VorsorgeDashboardCard` dropping its `canManage` bail → the mark-done + * leg goes red. + * - `EpisodeDocumentsCard` dropping its `canManage` bail → the link + + * upload leg goes red. */ 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 type { AccountAccess } from "@/lib/sharing/account-access-view"; @@ -59,7 +66,9 @@ vi.mock("@/hooks/use-auth", () => ({ email: null, role: "USER", avatarUrl: null, - modules: {}, + // The episode-documents card renders only for an account with the + // vault switched on; every other surface here ignores the map. + modules: { inboundDocuments: true }, accountAccess: mockAccessRef.value, }, isAuthenticated: true, @@ -68,16 +77,56 @@ vi.mock("@/hooks/use-auth", () => ({ }), })); +// The Vorsorge summary pushes to the check-in page for a screening reminder. +// Nothing below clicks, so a stub router is enough to let it mount. +vi.mock("next/navigation", () => ({ + useRouter: () => ({ push: vi.fn(), replace: vi.fn() }), + usePathname: () => "/", + useSearchParams: () => new URLSearchParams(), +})); + +// Never resolves inside the synchronous render, so every query below stays +// pending and each component paints its own loading branch. The controls this +// file is about live outside that branch. +vi.mock("@/lib/api/api-fetch", () => ({ + apiGet: () => new Promise(() => {}), + apiPost: () => new Promise(() => {}), + apiPut: () => new Promise(() => {}), + apiPatch: () => new Promise(() => {}), + apiDelete: () => new Promise(() => {}), +})); + import { DeleteButton } from "@/components/data-list/delete-button"; import { SelectionActionBar } from "@/components/data-list/selection-action-bar"; import { MedicationCardMenu } from "@/components/medications/medication-card-menu"; import { MedicationIntakeActions } from "@/components/medications/card-parts/medication-intake-actions"; import { visibleCaptureKinds } from "@/components/layout/capture-picker"; +import { TodayHero } from "@/components/daily/today-hero"; +import { VorsorgeDashboardCard } from "@/components/measurement-reminders/vorsorge-dashboard-card"; +import { EpisodeDocumentsCard } from "@/components/documents/episode-documents-card"; +import { queryKeys } from "@/lib/query-keys"; +import type { DailyDigest } from "@/lib/daily/digest"; +import type { MeasurementReminder } from "@/hooks/use-measurement-reminders"; -function render(access: AccountAccess, node: React.ReactNode): string { +function render( + access: AccountAccess, + node: React.ReactNode, + /** + * Seed the cache a query-backed component reads, so it paints its populated + * branch inside a synchronous render instead of its skeleton. Cheaper and + * truer than mocking the hook: the component under test is the real one. + */ + seed?: (client: QueryClient) => void, +): string { mockAccessRef.value = access; + const queryClient = new QueryClient({ + defaultOptions: { queries: { retry: false } }, + }); + seed?.(queryClient); return renderToStaticMarkup( - {node}, + + {node} + , ); } @@ -167,6 +216,143 @@ describe("the medication card menu", () => { }); }); +/* -------------------------------------------------------------------------- */ +/* The Today rail */ +/* -------------------------------------------------------------------------- */ + +const DIGEST: DailyDigest = { + generatedAt: "2026-08-03T06:00:00.000Z", + phase: "final", + sleepPending: false, + score: null, + topSignal: null, + briefingLead: "A steady week so far.", + line: "A steady week so far.", + justIn: null, + reactionLine: null, + worthALook: [ + { + kind: "milestone", + itemKey: "milestone:steps-10k", + title: "Ten thousand steps", + actions: [], + }, + { + kind: "coach_checkin", + title: "Still worth keeping?", + actions: [ + { + labelKey: "daily.action.checkinKeep", + intent: "coach.plan.keep:plan-1", + }, + { + labelKey: "daily.action.viewCheckups", + intent: "checkup.view", + href: "/checkups", + }, + ], + }, + ], +}; + +describe("the Today rail's mutating affordances", () => { + const node = ; + + it("offers the dismiss and the check-in answer in the caller's own record", () => { + const html = render(OWN_RECORD, node); + expect(html).toContain('data-slot="priority-card-dismiss"'); + expect(html).toContain("Keep it"); + }); + + it("withholds both inside somebody else's record, at either level", () => { + // Dismissing an observation and answering a coach check-in are neither of + // them an admitted create, and both write through routes that resolve the + // CALLER — so a delegate tapping either would file it against their own + // record if the route allowed it, and gets a 403 because it does not. + for (const access of [READ_ONLY, WRITABLE]) { + const html = render(access, node); + expect(html).not.toContain('data-slot="priority-card-dismiss"'); + expect(html).not.toContain("Keep it"); + // The rail itself stays: reading what is worth a look is the point of + // opening somebody's record, and the navigation action survives with it. + expect(html).toContain('data-slot="today-hero-rail"'); + expect(html).toContain('href="/checkups"'); + } + }); +}); + +/* -------------------------------------------------------------------------- */ +/* Vorsorge */ +/* -------------------------------------------------------------------------- */ + +const REMINDER: MeasurementReminder = { + id: "rem-1", + label: "Dental check-up", + measurementType: null, + intervalDays: 180, + rrule: null, + anchorDate: null, + endsOn: null, + origin: "VORSORGE", + notifyHour: 9, + location: null, + nextDueAt: "2026-08-10T09:00:00.000Z", + lastSatisfiedAt: null, + enabled: true, + createdAt: "2026-01-01T00:00:00.000Z", + updatedAt: "2026-01-01T00:00:00.000Z", +}; + +describe("the Vorsorge summary's mark-done", () => { + const node = ; + const seed = (client: QueryClient) => + client.setQueryData(queryKeys.measurementReminders(), [REMINDER]); + + it("is offered in the caller's own record", () => { + const html = render(OWN_RECORD, node, seed); + expect(html).toContain("Dental check-up"); + expect(html).toContain("Done"); + }); + + it("is absent inside somebody else's record, at either level", () => { + // `/checkups` already withheld this exact action; the dashboard summary + // offering it was the inconsistency that showed nobody had asked. + for (const access of [READ_ONLY, WRITABLE]) { + const html = render(access, node, seed); + expect(html).toContain("Dental check-up"); + expect(html).not.toContain("Done"); + } + }); +}); + +/* -------------------------------------------------------------------------- */ +/* Documents on an illness episode */ +/* -------------------------------------------------------------------------- */ + +describe("linking a document to an illness episode", () => { + const node = ; + + it("offers the link and the upload in the caller's own record", () => { + const html = render(OWN_RECORD, node); + expect(html).toContain(">Link<"); + expect(html).toContain("Upload"); + }); + + it("offers neither inside somebody else's record, at either level", () => { + // Both write through `POST /api/documents/inbound/bulk`, which the vault + // gates on the same answer throughout — the episode side of the same link + // had no gate at all, and the upload deep-linked to a page whose own + // upload control is already withheld. + for (const access of [READ_ONLY, WRITABLE]) { + const html = render(access, node); + expect(html).not.toContain(">Link<"); + expect(html).not.toContain("Upload"); + // The card itself stays — reading the episode's documents is a read. + expect(html).toContain('data-slot="episode-documents-card"'); + } + }); +}); + describe("the capture picker's kinds", () => { const ALL = ["measurement", "medication", "mood", "water"] as const; From ebf032158e17cc9bb90c0408680fa435b002e34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= Date: Mon, 3 Aug 2026 18:47:42 +0200 Subject: [PATCH 03/13] Give the intake toast one decision, and stop admitting two writes nothing calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Three surfaces record a dose and all three had to reach the same two conclusions inside somebody else's record: name the record, and drop an Undo the server refuses. Two learned it and the dose ledger did not, because the ternary was written out three times. It is written once now, in the file the other two already share, with its own test. POST /api/allergies and POST /api/family-history leave the frozen delegable write set. The argument that admitted them still stands — an allergy is the single most useful thing a caregiver can contribute — but the only surface that posts to either lives in Settings, which a switch closes, so no delegate could reach the form at any level. That is a permission frozen ahead of the caller for it, and the list is built the other way round on purpose. Both delegable READ arms stay. A caregiver reading the allergy list is what the feature is for; only the contribute step waits, and it comes back in the same diff as the surface that offers it. --- e2e/account-sharing.spec.ts | 29 +++++++ e2e/delegated-writes.spec.ts | 22 +++++ src/__tests__/delegable-surface-guard.test.ts | 21 +++-- .../success-affordance-guard.test.ts | 4 +- src/app/api/allergies/route.ts | 37 ++++++-- src/app/api/family-history/route.ts | 23 +++-- .../__tests__/use-medication-intake.test.ts | 65 ++++++++++++++ .../medications/dose-history-ledger.tsx | 39 ++++----- .../medications/use-medication-intake.ts | 87 +++++++++++++------ 9 files changed, 262 insertions(+), 65 deletions(-) diff --git a/e2e/account-sharing.spec.ts b/e2e/account-sharing.spec.ts index b7e0a7984..61fa91c58 100644 --- a/e2e/account-sharing.spec.ts +++ b/e2e/account-sharing.spec.ts @@ -386,6 +386,35 @@ test.describe("account sharing", () => { ).toBeVisible(); }); + test("a query parameter opens nothing the button withholds", async ({ + page, + }) => { + // Three deep links reach a create sheet without passing the control that + // normally opens it. A parameter that opens a sheet is the same affordance + // as the button, and the SSR suite cannot reach any of them: it holds the + // paint of a component, never a URL. + await page.goto("/measurements?add=WEIGHT"); + await expect( + page.locator('[data-slot="shared-record-banner"]'), + ).toBeVisible(); + await expect( + page.locator('[data-slot="responsive-sheet-content"]'), + ).toHaveCount(0); + // And the button it stands in for is gone too, so nothing on this page + // offers the form by either route. + await expect( + page.getByRole("button", { name: /add measurement/i }), + ).toHaveCount(0); + + await page.goto("/medications?new=1"); + await expect( + page.locator('[data-slot="shared-record-banner"]'), + ).toBeVisible(); + await expect( + page.locator('[data-slot="medication-wizard-dialog"]'), + ).toHaveCount(0); + }); + test("revoking from the owner's browser drops the delegate out", async ({ page, }) => { diff --git a/e2e/delegated-writes.spec.ts b/e2e/delegated-writes.spec.ts index 34bd0c476..e045f9448 100644 --- a/e2e/delegated-writes.spec.ts +++ b/e2e/delegated-writes.spec.ts @@ -180,6 +180,28 @@ test.describe("delegated writes", () => { ); }); + test("a deep link opens exactly what the level admits", async ({ page }) => { + // The gate binds to the level the server resolved, not to a blanket + // "somebody else's record" flag. Both halves matter and only a browser + // can show either: the SSR suite holds a component's paint, never a URL. + // + // Admitted: entering a reading, so `?add=` opens the same sheet the + // header button opens. + await page.goto("/measurements?add=WEIGHT"); + await expect( + page.locator('[data-slot="shared-record-banner"]'), + ).toBeVisible(); + await expect( + page.locator('[data-slot="responsive-sheet-content"]').first(), + ).toBeVisible(); + + // Also admitted: adding a medication with its schedule. + await page.goto("/medications?new=1"); + await expect( + page.locator('[data-slot="medication-wizard-dialog"]'), + ).toBeVisible(); + }); + test("the owner sees that somebody else was in their record", async () => { await ownerPage.goto("/settings/access"); const rows = ownerPage.locator('[data-slot="record-activity-row"]'); diff --git a/src/__tests__/delegable-surface-guard.test.ts b/src/__tests__/delegable-surface-guard.test.ts index 532eb962a..144a4c6b7 100644 --- a/src/__tests__/delegable-surface-guard.test.ts +++ b/src/__tests__/delegable-surface-guard.test.ts @@ -428,11 +428,11 @@ const DELEGABLE_ROUTES: Record = { "app/api/biomarkers/[id]/route.ts": "One biomarker of the record, fetch-then-guard against the resolved user.", "app/api/allergies/route.ts": - "The record's allergy list — the single most useful thing a caregiver can read, and a plain list of the owner's own rows.", + "The record's allergy list — the single most useful thing a caregiver can read, and a plain list of the owner's own rows. The POST beside it is NOT delegable and is deliberately absent from the write literal below: the only surface that posts to it lives under `/settings`, which a switch closes, so admitting the write would freeze a permission ahead of any caller for it. The route comment carries the argument.", "app/api/allergies/[id]/route.ts": "One allergy of the record, fetch-then-guard against the resolved user.", "app/api/family-history/route.ts": - "The record's family history. The payload describes the owner's relatives, so it is the one admitted read where third-party health information is present by design rather than by accident; a caregiver reading it is the use the feature exists for, and the row is stored as the owner's.", + "The record's family history. The payload describes the owner's relatives, so it is the one admitted read where third-party health information is present by design rather than by accident; a caregiver reading it is the use the feature exists for, and the row is stored as the owner's. Its POST is not delegable, for the reason its allergy sibling gives plus one of its own — see the route comment.", "app/api/family-history/[id]/route.ts": "One family-history entry of the record, fetch-then-guard against the resolved user.", "app/api/mental-health/assessments/route.ts": @@ -512,6 +512,17 @@ const DELEGABLE_ROUTES: Record = { * thirty-one read-only delegable modules do not do, and it is the difference * the identifier matcher above cannot see. * + * v1.36.x — `POST /api/allergies` and `POST /api/family-history` left this + * list, and the removal is worth reading before either is proposed again. The + * argument for admitting them was never wrong; what they lacked was a caller. + * The only surface in the product that posts to either lives in Settings → + * Anamnese, and a switch closes `/settings` — so a delegate could not reach + * the form at any grant level, and the two entries were a permission frozen + * ahead of the surface that would exercise it. Both delegable READ arms stay: + * a caregiver reading the allergy list is what the feature is for. Whoever + * builds a caregiver-reachable medical-history surface adds them back in the + * same diff, which is the two-ended change this list is meant to hold to. + * * Every member also has to call `auditLog`, asserted below. That is not a * stylistic preference. The decision not to add a `writtenBy` column to eleven * tables rests entirely on the audit trail carrying the actor, and `auditLog` @@ -528,10 +539,6 @@ const DELEGABLE_WRITE_ROUTES: Record = { "Entering a lab result. The free-text path may mint a biomarker, and mints it into the RECORD's catalogue — a result added to somebody's record that left the marker on the helper's account would be worse than useless to the owner.", "app/api/biomarkers/route.ts": "Adding an analyte to the record's catalogue. A name the record already tracks is the ordinary 409 from the same `(userId, name)` uniqueness the owner would hit themselves.", - "app/api/allergies/route.ts": - "Adding an allergy. The cleanest admission in the set: a plain statement about the record's own body, and the single most useful thing a caregiver can contribute.", - "app/api/family-history/route.ts": - "Adding a family-history entry. Third-party health data by design — the row describes the record's relatives — and it is stored as the record's own, which is exactly how the delegable read arm already serves it.", "app/api/illness/episodes/route.ts": "Opening an illness episode. The module gate runs against the RECORD before the write, so a delegate cannot create an episode inside a record whose owner switched the module off.", "app/api/custom-metrics/[id]/entries/route.ts": @@ -569,7 +576,7 @@ const ACTOR_ROUTES: Record = { * stay a formality by accident: every addition has to be counted here as well * as listed above, which is one more place a careless admission has to pass. */ -const FROZEN_ENTRY_COUNT = 57; +const FROZEN_ENTRY_COUNT = 55; /** * The two surfaces that authenticate a Bearer token outside `requireAuth` — diff --git a/src/__tests__/success-affordance-guard.test.ts b/src/__tests__/success-affordance-guard.test.ts index 23bc53a73..ac13ec592 100644 --- a/src/__tests__/success-affordance-guard.test.ts +++ b/src/__tests__/success-affordance-guard.test.ts @@ -256,7 +256,9 @@ const PINNED_AFFORDANCES: Record< "toast.success": 2, }, "src/components/medications/take-all-due.ts": { "toast.success": 1 }, - "src/components/medications/use-medication-intake.ts": { "toast.success": 5 }, + // v1.36.x — one fewer: the log-intake path's three-armed toast collapsed + // into the shared `intakeToastOptions` decision plus a single call pair. + "src/components/medications/use-medication-intake.ts": { "toast.success": 4 }, "src/components/medications/wizard/medication-wizard-dialog.tsx": { "toast.success": 1, }, diff --git a/src/app/api/allergies/route.ts b/src/app/api/allergies/route.ts index f29719ded..8225b7e0d 100644 --- a/src/app/api/allergies/route.ts +++ b/src/app/api/allergies/route.ts @@ -11,7 +11,7 @@ import { NextRequest } from "next/server"; import { prisma } from "@/lib/db"; -import { apiHandler, requireRecordAuth } from "@/lib/api-handler"; +import { apiHandler, requireAuth, requireRecordAuth } from "@/lib/api-handler"; import { annotate } from "@/lib/logging/context"; import { auditLog } from "@/lib/auth/audit"; import { @@ -67,10 +67,37 @@ export const GET = apiHandler(async (request: NextRequest) => { export const POST = apiHandler(withIdempotency<[NextRequest]>(postAllergy)); async function postAllergy(request: NextRequest): Promise { - // v1.36.x — a delegated write, and the cleanest of them: the row is a plain - // statement about the record's own body, and the caller appears in the audit - // trail rather than in the row. - const { user } = await requireRecordAuth("write"); + // v1.36.x — the GET above is delegable and this is not, which is the + // opposite of where the classification landed and worth the paragraph. + // + // Nothing about the row changed: it is still a plain statement about the + // record's own body, still the single most useful thing a caregiver could + // contribute, and the argument for admitting it still holds. What it does + // not have is a caller. The only place in the product that posts here is the + // allergy manager in Settings → Anamnese, and `/settings/*` is not a + // shared-record destination — the shell shows the "not part of what was + // shared" panel there, so no delegate can reach the form at any level. + // + // An admitted write with no reachable surface is the one-ended change this + // repository keeps rediscovering (CLAUDE.md, "A two-ended change carries + // both ends"): the permission ships, the consumer is the follow-up, and + // nothing in the gate notices because every other check proves the other + // end. The frozen list is built the other way round on purpose — its own + // actor-surface note says the rest "arrive as their own diffs; naming them + // before they exist would freeze a guess." + // + // So this arm waits for the surface that would exercise it, and the two + // land together. Choosing that surface is design work, not a fix: allergies + // and family history have exactly one home today, that home is a personal + // account surface a switch rightly closes, and bolting a second copy onto a + // shared page would split one concept across two places. Re-admitting is + // one line here plus one entry in `delegable-surface-guard.test.ts` plus the + // paragraph that argues it — which is exactly the reviewed diff that guard + // exists to force. + // + // The half that was always the point is untouched: a caregiver can still + // READ the allergy list inside the record. + const { user } = await requireAuth(); const { data: rawBody, error: jsonError } = await safeJson(request, { maxBytes: 16 * 1024, diff --git a/src/app/api/family-history/route.ts b/src/app/api/family-history/route.ts index d560de87e..f3b3e22bb 100644 --- a/src/app/api/family-history/route.ts +++ b/src/app/api/family-history/route.ts @@ -12,7 +12,7 @@ import { NextRequest } from "next/server"; import { prisma } from "@/lib/db"; -import { apiHandler, requireRecordAuth } from "@/lib/api-handler"; +import { apiHandler, requireAuth, requireRecordAuth } from "@/lib/api-handler"; import { annotate } from "@/lib/logging/context"; import { auditLog } from "@/lib/auth/audit"; import { @@ -62,11 +62,22 @@ export const POST = apiHandler( ); async function postFamilyHistory(request: NextRequest): Promise { - // v1.36.x — a delegated write, and the one where third-party health data is - // present by design: the row describes the record's relatives. It is stored - // as the record's own, exactly as the delegable READ arm above already - // serves it, and the audit trail names who entered it. - const { user } = await requireRecordAuth("write"); + // v1.36.x — not a delegated write, though the GET above is delegable. The + // reasoning is written out at the sibling arm in `api/allergies/route.ts` + // and is the same here: the only surface that posts to either route is the + // manager in Settings → Anamnese, and `/settings/*` is closed inside a + // shared record, so no delegate can reach the form at any level. An + // admitted write with no reachable caller is a permission frozen ahead of + // the surface that would exercise it. + // + // This arm carried an extra reason to wait. The row describes the record's + // RELATIVES, so it is the one admitted write where third-party health + // information is present by design — and frequently the delegate is that + // relative, asserting a condition about themselves into somebody else's + // record. The classification admitted it and named the discomfort. Landing + // it together with the surface that offers it means the copy on that surface + // can say whose statement the row is, which no route comment can. + const { user } = await requireAuth(); const { data: rawBody, error: jsonError } = await safeJson(request, { maxBytes: 16 * 1024, diff --git a/src/components/medications/__tests__/use-medication-intake.test.ts b/src/components/medications/__tests__/use-medication-intake.test.ts index 8a5572b38..b73ca1e8d 100644 --- a/src/components/medications/__tests__/use-medication-intake.test.ts +++ b/src/components/medications/__tests__/use-medication-intake.test.ts @@ -3,6 +3,7 @@ import type { QueryClient } from "@tanstack/react-query"; import { toast } from "sonner"; import { + intakeToastOptions, runLogIntake, runRecordIntake, runUndoIntake, @@ -475,3 +476,67 @@ describe("runUndoIntake — shared soft-delete", () => { expect(toast.success).not.toHaveBeenCalled(); }); }); + +/** + * v1.36.x — the one decision every intake surface shares. + * + * Three surfaces record a dose and all three showed the same success toast: + * the cards, the log-intake dialog, and the dose-history ledger. Two of them + * learned to name the record and drop Undo inside somebody else's; the ledger + * built its own copy of the ternary and learned neither, so a delegate met a + * dead Undo on every dose they marked. This is the copy that is left. + * + * Whole objects rather than field probes: when one person's record is being + * separated from another's, a failure should print what would have been shown + * rather than `false !== true`. + * + * Mutation check, run: making `intakeToastOptions` ignore `recordName` → the + * two shared-record legs go red, printing the Undo action they returned. + */ +describe("intakeToastOptions — the shared toast decision", () => { + const onUndo = vi.fn(); + + it("carries an Undo in the caller's own record", () => { + expect( + intakeToastOptions({ recordName: null, eventId: "evt-1", t, onUndo }), + ).toEqual({ + action: { + label: "medications.intakeUndo", + onClick: expect.any(Function), + }, + }); + }); + + it("names the record and offers no Undo inside somebody else's", () => { + expect( + intakeToastOptions({ + recordName: "Margarethe", + eventId: "evt-1", + t, + onUndo, + }), + ).toEqual({ description: "recordSharing.toast.savedTo:Margarethe" }); + }); + + it("still names the record when the write returned no event id", () => { + // The two arms are not alternatives: the receipt is owed either way, and + // an absent event id must not fall through to a bare "Saved". + expect( + intakeToastOptions({ + recordName: "Margarethe", + eventId: undefined, + t, + onUndo, + }), + ).toEqual({ description: "recordSharing.toast.savedTo:Margarethe" }); + }); + + it("carries nothing when there is neither a record to name nor an undo", () => { + expect( + intakeToastOptions({ recordName: null, eventId: undefined, t, onUndo }), + ).toBeUndefined(); + expect( + intakeToastOptions({ recordName: null, eventId: "evt-1", t }), + ).toBeUndefined(); + }); +}); diff --git a/src/components/medications/dose-history-ledger.tsx b/src/components/medications/dose-history-ledger.tsx index 5cd248af9..aa6b73e4f 100644 --- a/src/components/medications/dose-history-ledger.tsx +++ b/src/components/medications/dose-history-ledger.tsx @@ -94,7 +94,10 @@ import { refetchInactiveDailyReads, } from "@/lib/query-keys"; import type { DoseHistoryStatus } from "@/lib/medications/scheduling/dose-history"; -import { runUndoIntake } from "@/components/medications/use-medication-intake"; +import { + intakeToastOptions, + runUndoIntake, +} from "@/components/medications/use-medication-intake"; import { IntakeEditDialog } from "@/components/medications/intake-edit-dialog"; import { LedgerAddDialog } from "@/components/medications/dose-history-add-dialog"; import { @@ -291,26 +294,20 @@ export function DoseHistoryLedger({ : "medications.intakeToastTaken", { name: medicationName }, ), - recordName - ? { - description: t("recordSharing.toast.savedTo", { - name: recordName, - }), - } - : eventId - ? { - action: { - label: t("medications.intakeUndo"), - onClick: () => - void runUndoIntake({ - medication: { id: medicationId, name: medicationName }, - eventId, - t, - queryClient, - }), - }, - } - : undefined, + // The shared decision, not a fourth copy of it: name the record it + // landed in, and withhold an Undo the server would refuse there. + intakeToastOptions({ + recordName, + eventId, + t, + onUndo: (id) => + void runUndoIntake({ + medication: { id: medicationId, name: medicationName }, + eventId: id, + t, + queryClient, + }), + }), ); await invalidateKeys(queryClient, [ ...medicationDependentKeys, diff --git a/src/components/medications/use-medication-intake.ts b/src/components/medications/use-medication-intake.ts index f9ef5dfab..bf1abbdaa 100644 --- a/src/components/medications/use-medication-intake.ts +++ b/src/components/medications/use-medication-intake.ts @@ -29,6 +29,54 @@ interface MedicationIntakeIdentity { name: string; } +/** + * What rides alongside a successful intake toast — and the one place that + * decides it. + * + * Three surfaces record a dose: the medication cards through + * {@link runRecordIntake}, the log-intake dialog through {@link runLogIntake}, + * and the dose-history ledger, which builds its own POST because it also has + * an optimistic cache patch to make. All three showed the same success toast + * and all three had to reach the same two conclusions: + * + * - inside somebody else's record, name the record. "Saved" alone is the one + * confirmation a person acting for somebody else does not need. + * - and drop Undo there. A delegate may record a dose and may not remove + * one, so an Undo they can see is an Undo the server refuses. + * + * Two of the three learned that; the ledger did not, which is a delegate + * meeting a dead Undo on every dose they mark. Three copies of one ternary is + * how that happens, so there is one now. + */ +export function intakeToastOptions(input: { + /** The record the dose landed in, or null in the caller's own. */ + recordName: string | null | undefined; + /** The created event, when the POST returned one. */ + eventId: string | undefined; + t: Translator; + /** Reverse the write. Omitted where the caller offers no undo at all. */ + onUndo?: (eventId: string) => void; +}): + | { description: string } + | { action: { label: string; onClick: () => void } } + | undefined { + const { recordName, eventId, t, onUndo } = input; + if (recordName) { + return { + description: t("recordSharing.toast.savedTo", { name: recordName }), + }; + } + if (eventId && onUndo) { + return { + action: { + label: t("medications.intakeUndo"), + onClick: () => onUndo(eventId), + }, + }; + } + return undefined; +} + /** * v1.12.2 — the take / skip + Undo intake orchestration shared by the * generic {@link MedicationCard} and the {@link Glp1MedicationCard}. @@ -146,20 +194,12 @@ export async function runRecordIntake(deps: { : "medications.intakeToastTaken", { name: medication.name }, ), - recordName - ? { - description: t("recordSharing.toast.savedTo", { - name: recordName, - }), - } - : eventId - ? { - action: { - label: t("medications.intakeUndo"), - onClick: () => void undoIntake(eventId), - }, - } - : undefined, + intakeToastOptions({ + recordName, + eventId, + t, + onUndo: (id) => void undoIntake(id), + }), ); await invalidateMedicationReads(queryClient); onRecorded?.(eventId, skipped); @@ -248,17 +288,14 @@ export async function runLogIntake(deps: { // a real Undo action to attach; keeps the no-undo call signature // identical to the pre-fix behaviour (existing unit tests assert the // single-argument call). - if (recordName) { - toast.success(message, { - description: t("recordSharing.toast.savedTo", { name: recordName }), - }); - } else if (eventId && undoIntake) { - toast.success(message, { - action: { - label: t("medications.intakeUndo"), - onClick: () => void undoIntake(eventId), - }, - }); + const options = intakeToastOptions({ + recordName, + eventId, + t, + onUndo: undoIntake ? (id) => void undoIntake(id) : undefined, + }); + if (options) { + toast.success(message, options); } else { toast.success(message); } From 0b1a6c1b09a4a011e821bc15fb2bd1ebe7497eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= Date: Mon, 3 Aug 2026 19:12:11 +0200 Subject: [PATCH 04/13] Make the delegated-write journey actually run Every test in e2e/delegated-writes.spec.ts had been skipping since the day the invitation form shipped its level control. The skip guard looked for data-slot="grant-invite-level"; the control landed as "grant-invite-access-option". The file said out loud what to change and nobody changed it, so a quiet skip and a passing suite read the same in a CI summary. Two assertions inside it had never been executed and were both wrong: the header button reads "Add", not "Add measurement", and the form opens on blood pressure, which has no `value` field. Fixed against stable attributes rather than viewport text, with data-slot="measurement-add" added to the control the journey clicks. Adds the deep-link leg the SSR suite cannot hold: a query parameter is the same affordance as the button, and ?add= / ?new=1 open exactly what the resolved level admits. --- e2e/account-sharing.spec.ts | 29 --------------------- e2e/delegated-writes.spec.ts | 49 +++++++++++++++++++++-------------- src/app/measurements/page.tsx | 1 + 3 files changed, 31 insertions(+), 48 deletions(-) diff --git a/e2e/account-sharing.spec.ts b/e2e/account-sharing.spec.ts index 61fa91c58..b7e0a7984 100644 --- a/e2e/account-sharing.spec.ts +++ b/e2e/account-sharing.spec.ts @@ -386,35 +386,6 @@ test.describe("account sharing", () => { ).toBeVisible(); }); - test("a query parameter opens nothing the button withholds", async ({ - page, - }) => { - // Three deep links reach a create sheet without passing the control that - // normally opens it. A parameter that opens a sheet is the same affordance - // as the button, and the SSR suite cannot reach any of them: it holds the - // paint of a component, never a URL. - await page.goto("/measurements?add=WEIGHT"); - await expect( - page.locator('[data-slot="shared-record-banner"]'), - ).toBeVisible(); - await expect( - page.locator('[data-slot="responsive-sheet-content"]'), - ).toHaveCount(0); - // And the button it stands in for is gone too, so nothing on this page - // offers the form by either route. - await expect( - page.getByRole("button", { name: /add measurement/i }), - ).toHaveCount(0); - - await page.goto("/medications?new=1"); - await expect( - page.locator('[data-slot="shared-record-banner"]'), - ).toBeVisible(); - await expect( - page.locator('[data-slot="medication-wizard-dialog"]'), - ).toHaveCount(0); - }); - test("revoking from the owner's browser drops the delegate out", async ({ page, }) => { diff --git a/e2e/delegated-writes.spec.ts b/e2e/delegated-writes.spec.ts index e045f9448..42d7a972c 100644 --- a/e2e/delegated-writes.spec.ts +++ b/e2e/delegated-writes.spec.ts @@ -9,19 +9,22 @@ * * ## Why it gates itself instead of seeding a WRITE grant directly * - * The grant level is chosen in the invitation form, which is another chunk's - * work. Rather than mint a WRITE row behind the UI's back — which would prove - * the journey works for a grant no person can create — the journey looks for - * the level control and stands down when it is not there yet. + * The grant level is chosen in the invitation form. Rather than mint a WRITE + * row behind the UI's back — which would prove the journey works for a grant + * no person can create — the journey looks for the level control and stands + * down when it is not there yet. * - * **To enable this once the invite form ships its level control:** if it lands - * under a different `data-slot` than the constant below, change that one - * string. Nothing else in this file assumes anything about the control except - * that picking WRITE and submitting mints a WRITE grant. + * That guard was written against a `data-slot` the form never shipped under + * (`grant-invite-level`; the control landed as `grant-invite-access-option`), + * so from the day the control arrived until 2026-08-03 every test in this file + * skipped and the whole delegated-write journey ran nowhere. The file said out + * loud what to change and nobody changed it, which is the standing lesson + * about a check that cannot fail: the skip is quiet, and a quiet skip and a + * passing suite look identical in a CI summary. * - * The skip is deliberately loud rather than silent: it names the missing - * control, so a run where the control exists and the journey still does not - * execute reads as a bug in this file rather than as an absence upstream. + * The constant is the real one now. If it moves again, change that one string: + * nothing else here assumes anything about the control except that choosing + * WRITE and submitting mints a WRITE grant. * * ## What this spec cannot cover * @@ -45,10 +48,10 @@ import { * The invitation form's grant-level control. The journey runs when this is on * the page and stands down when it is not. One string, one place. */ -const GRANT_LEVEL_SLOT = "grant-invite-level"; +const GRANT_LEVEL_SLOT = "grant-invite-access-option"; /** The value the level control carries for a grant that may add entries. */ -const WRITE_LEVEL_VALUE = "write"; +const WRITE_LEVEL_VALUE = "WRITE"; test.describe("delegated writes", () => { // One journey in order, like the read-only sibling: each step is the next @@ -110,9 +113,11 @@ test.describe("delegated writes", () => { await expect(submit).toBeEnabled({ timeout: 1000 }); }).toPass({ timeout: 15_000 }); - await ownerPage - .locator(`[data-slot="${GRANT_LEVEL_SLOT}"]`) - .selectOption(WRITE_LEVEL_VALUE); + const writeOption = ownerPage.locator( + `[data-slot="${GRANT_LEVEL_SLOT}"][data-access="${WRITE_LEVEL_VALUE}"]`, + ); + await writeOption.click(); + await expect(writeOption).toHaveAttribute("data-selected", "true"); // Read the posted body: a level control that renders and sends a hardcoded // level would pass every render assertion and ship a read-only grant. @@ -125,7 +130,7 @@ test.describe("delegated writes", () => { access?: string; }; expect( - posted.access?.toLowerCase(), + posted.access, "the invitation must carry the level the owner chose", ).toBe(WRITE_LEVEL_VALUE); }); @@ -162,8 +167,14 @@ test.describe("delegated writes", () => { res.request().method() === "POST" && res.url().endsWith("/api/measurements"), ); - await page.getByRole("button", { name: /add measurement/i }).click(); - await page.locator('input[name="value"], #value').first().fill("71.5"); + // Stable attributes and the form's real fields, neither of which this + // step had. It looked for a button named "Add measurement" (the header + // reads "Add") and then for a `value` input (the form opens on blood + // pressure, which has three). Both were wrong from the day they were + // written and nobody found out, because the whole file was skipping. + await page.locator('[data-slot="measurement-add"]').click(); + await page.locator("#sys").fill("124"); + await page.locator("#dia").fill("78"); await page.getByRole("button", { name: /^save$/i }).click(); expect((await post).status(), "the write must be accepted").toBeLessThan( 300, diff --git a/src/app/measurements/page.tsx b/src/app/measurements/page.tsx index 821d564c6..3f753ed8e 100644 --- a/src/app/measurements/page.tsx +++ b/src/app/measurements/page.tsx @@ -157,6 +157,7 @@ export default function MeasurementsPage() { actions={ canAdd ? (