diff --git a/src/components/charts/__tests__/health-chart-mini.test.tsx b/src/components/charts/__tests__/health-chart-mini.test.tsx new file mode 100644 index 000000000..bfd86c7eb --- /dev/null +++ b/src/components/charts/__tests__/health-chart-mini.test.tsx @@ -0,0 +1,112 @@ +import { describe, it, expect, vi } from "vitest"; +import { renderToStaticMarkup } from "react-dom/server"; + +const sampleData = vi.hoisted(() => { + // 30 days of synthetic readings so HealthChart paints something + // and the controls render (the chart returns null when data is + // empty). + const out: Array<{ + date: string; + timestamp: number; + WEIGHT: number; + }> = []; + for (let i = 0; i < 30; i++) { + const ts = Date.UTC(2026, 4, 1 + i, 12, 0, 0); + out.push({ + date: new Date(ts).toDateString(), + timestamp: ts, + WEIGHT: 80 + i * 0.05, + }); + } + return out; +}); + +vi.mock("@tanstack/react-query", () => ({ + useQuery: () => ({ data: sampleData, isLoading: false }), + useQueryClient: () => ({ invalidateQueries: vi.fn() }), +})); + +vi.mock("@/hooks/use-auth", () => ({ + useAuth: () => ({ isAuthenticated: true, user: null }), +})); + +import { I18nProvider } from "@/lib/i18n/context"; +import { HealthChart } from "../health-chart"; +import { + resolveMiniRangePoints, + type DataWindow, +} from "../mini-window"; + +/** + * v1.4.16 phase B5c — chart mini-mode + windowOverride. + * + * The Oura-style RecommendationCard (B5c task 5) embeds a small + * version of the chart for the recommendation's data window. The + * embedded chart needs: + * + * 1. `mini` prop — drops the range-tab header, the Switch row, the + * personal-baseline / target-band toggles, and shrinks padding. + * The result fits inside an expanded rec card without + * overwhelming the rationale rows. + * + * 2. `windowOverride` prop — pins the chart's range to the rec's + * data window regardless of any parent context. dataWindow values + * mirror the rationale schema enum + * (last7days / last30days / last90days / allTime). + * + * Because HealthChart is heavy (TanStack Query + Recharts) we cover + * the visible-DOM contract via SSR markup snapshots — assert that + * the toggles are absent when `mini` is set, and that the parent + * passes through the override window. + */ + +function render(node: React.ReactNode) { + return renderToStaticMarkup( + {node}, + ); +} + +describe("resolveMiniRangePoints()", () => { + it.each<[DataWindow, number]>([ + ["last7days", 7], + ["last30days", 30], + ["last90days", 90], + ["allTime", 0], + ])("maps %s to %d points", (window, expected) => { + expect(resolveMiniRangePoints(window)).toBe(expected); + }); +}); + +describe("", () => { + it("does not render the range tabs / mode-switch row in mini mode", () => { + const html = render( + , + ); + // No "7d" / "30d" / "90d" range tabs. + expect(html).not.toMatch(/data-slot="chart-range-tab"/); + // No "7-day trend" toggle. + expect(html).not.toMatch(/7-day trend/i); + }); + + it("renders the range tabs when NOT in mini mode (regression guard)", () => { + const html = render(); + // Default render still shows the toggle row. + expect(html).toMatch(/7-day trend/i); + expect(html).toMatch(/data-slot="chart-range-tab"/); + }); + + it("accepts windowOverride and applies the matching range-points", () => { + const html = render( + , + ); + // The component renders without throwing; the override is + // applied by the lazy-state initializer. Final-DOM assertion: + // mini chart still emits the title. + expect(html).toContain("Weight"); + }); +}); diff --git a/src/components/charts/health-chart.tsx b/src/components/charts/health-chart.tsx index 6bfc5b128..ba4e2def5 100644 --- a/src/components/charts/health-chart.tsx +++ b/src/components/charts/health-chart.tsx @@ -38,6 +38,10 @@ import { computeWindowTrend, SPLIT_HALF_THRESHOLD_DAYS, } from "@/lib/analytics/window-trend"; +import { + resolveMiniRangePoints, + type DataWindow, +} from "./mini-window"; const TIME_RANGES_KEYS = [ { @@ -87,6 +91,20 @@ interface HealthChartProps { textColor?: string; lineOpacity?: number; }>; + /** + * v1.4.16 phase B5c — compact chart mode used by the Oura-style + * rationale card. Drops the range tabs, the moving-average / trend + * / target-band toggle row, and shrinks padding. Tooltip + gradient + * + personal-baseline behaviour stay intact so the small chart + * still tells the same visual story. + */ + mini?: boolean; + /** + * v1.4.16 phase B5c — pin the chart to a specific rationale data + * window regardless of any parent UI state. Used by the rec-card's + * mini-chart so it always renders the window the rec is based on. + */ + windowOverride?: DataWindow; } interface ChartDataPoint { @@ -259,11 +277,19 @@ export function HealthChart({ showYAxisUnit = true, valueBands, targetZones, + mini = false, + windowOverride, }: HealthChartProps) { const { isAuthenticated, user } = useAuth(); const { t } = useTranslations(); const fmt = useFormatters(); - const [rangePoints, setRangePoints] = useState(30); + // v1.4.16 B5c: when a windowOverride is supplied, seed the range + // state from it so the chart pins to that window. Mini mode also + // hides the range tabs, so the user can't change it. + const initialRangePoints = windowOverride + ? resolveMiniRangePoints(windowOverride) + : 30; + const [rangePoints, setRangePoints] = useState(initialRangePoints); const [showMA, setShowMA] = useState(false); const [showTrend, setShowTrend] = useState(false); const [showBands, setShowBands] = useState(false); @@ -697,73 +723,96 @@ export function HealthChart({ const showContextDetails = showMA || showTrend || showBands; const animationsEnabled = !prefersReducedMotion(); - return ( -
-
-
-

{title}

- {activeBucket !== "day" && ( - - {t( - activeBucket === "week" - ? "charts.bucketWeekly" - : "charts.bucketMonthly", - )} - - )} -
-
- {TIME_RANGES_KEYS.map((r) => ( - - ))} -
-
+ // v1.4.16 B5c — mini mode tunes padding + margins so the chart fits + // inside the rationale card without overwhelming the surrounding + // rows. Range tabs + toggle row are suppressed entirely; the chart + // pins to `windowOverride` (or the default 30pt) instead. + const containerClass = mini + ? "bg-card border-border rounded-md border p-2" + : "bg-card border-border rounded-xl border p-4 md:p-6"; + const chartHeightClass = mini ? "h-[140px]" : "h-[240px]"; -
-
- - + return ( +
+ {!mini && ( +
+
+

{title}

+ {activeBucket !== "day" && ( + + {t( + activeBucket === "week" + ? "charts.bucketWeekly" + : "charts.bucketMonthly", + )} + + )} +
+
+ {TIME_RANGES_KEYS.map((r) => ( + + ))} +
-
- - + )} + + {mini && ( +
+ {title}
- {valueBands?.length || targetZones?.length ? ( + )} + + {!mini && ( +
-
- ) : null} -
+
+ + +
+ {valueBands?.length || targetZones?.length ? ( +
+ + +
+ ) : null} +
+ )} - {showTrend && trendInfo.length > 0 ? ( + {!mini && showTrend && trendInfo.length > 0 ? (
{trendInfo.map((info) => ( {info} @@ -784,7 +833,7 @@ export function HealthChart({ description={t("charts.emptyStateDescription")} /> ) : ( -
+
{visibleBands.length > 0 ? (
= { + last7days: 7, + last30days: 30, + last90days: 90, + allTime: 0, +}; + +/** + * Returns the per-points range value the chart wrapper expects for a + * given rationale dataWindow enum value. + */ +export function resolveMiniRangePoints(window: DataWindow): number { + return POINTS_BY_WINDOW[window]; +}