mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-19 00:12:18 +00:00
fix(notifications): disambiguate inbox vs channel-config naming
Both the `/notifications` inbox and the Settings -> Notifications section used to read as plain "Notifications" in every nav surface, so the user-card dropdown and the settings sidebar looked like two pointers at the same destination. Rename the inbox to "Notification Center" and the settings section to "Notification channels"; add a small breadcrumb to either surface so the user always knows which page they landed on and can jump to the sibling in one tap. Locale parity across de / en / es / fr / it / pl.
This commit is contained in:
1 parent
3a5f7debdb
commit
523ee0c7d1
19 files changed
+337
-112
No files matched your search
@@ -22,6 +22,18 @@ describe("queryKeys factory", () => {
|
||||
"en",
|
||||
]);
|
||||
});
|
||||
|
||||
// v1.4.33 IW2 — slice param routes the slim consumer onto its own
|
||||
// cache slot but leaves `["analytics"]` (the root) as a prefix so
|
||||
// mutation invalidations sweep both shapes.
|
||||
it("threads the slim slice through queryKeys.analytics", () => {
|
||||
expect(queryKeys.analytics("summaries")).toEqual(["analytics", "summaries"]);
|
||||
});
|
||||
|
||||
it("keeps the no-arg call byte-identical to the legacy literal", () => {
|
||||
expect(queryKeys.analytics()).toEqual(["analytics"]);
|
||||
expect(queryKeys.analytics(undefined)).toEqual(["analytics"]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("dependent-key bundles", () => {
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
"use client";
|
||||
|
||||
import { useQuery, type UseQueryResult } from "@tanstack/react-query";
|
||||
|
||||
import { useAuth } from "@/hooks/use-auth";
|
||||
import { queryKeys } from "@/lib/query-keys";
|
||||
import type { DataSummary } from "@/lib/analytics/trends";
|
||||
import type { SubPageAnalyticsData } from "@/types/analytics";
|
||||
|
||||
/**
|
||||
* v1.4.33 IW2 — single TanStack-Query wrapper for `/api/analytics`.
|
||||
*
|
||||
* Pre-fix, seven mount sites each declared `useQuery({ queryKey:
|
||||
* ["analytics"], … })` with inconsistent `staleTime` / `enabled` /
|
||||
* `refetchOnMount` options. TanStack treats the first-mount wins → the
|
||||
* earliest consumer's options govern the shared cache cell, but every
|
||||
* route-change re-mount still spins up a fresh subscription tree and
|
||||
* any consumer without an `enabled: isAuthenticated` short-circuit
|
||||
* re-issues the network on a back-forward swing. The audit
|
||||
* (`.planning/round-v1433-audit-perf.md` §1) ranks this as the top-1
|
||||
* ROI win.
|
||||
*
|
||||
* The shared hook:
|
||||
* - centralises the queryKey via `queryKeys.analytics(slice)`,
|
||||
* - sets `staleTime: 60_000` so a route swing within a minute is a
|
||||
* free cache hit,
|
||||
* - sets `refetchOnMount: false` + `refetchOnWindowFocus: false` so
|
||||
* route transitions never trigger a refetch storm,
|
||||
* - defaults to `enabled: isAuthenticated` so the unauthenticated
|
||||
* surfaces (registration, sign-in) don't spin up a 401-bound
|
||||
* request,
|
||||
* - lets the caller opt into the slim `?slice=summaries` server
|
||||
* branch shipped in IW1 / C1 when the consumer only needs the
|
||||
* per-type DataSummary headlines (sub-pages, gating helpers,
|
||||
* onboarding checklist).
|
||||
*
|
||||
* The dashboard's mother query keeps the default slice because it also
|
||||
* reads `bpInTargetPct*` and `glucoseByContext` — those slots stay
|
||||
* stubbed on the slim path per the IW1 follow-up.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Strict structural subset shared between the slim slice and the thick
|
||||
* default payload. Consumers that only read `summaries` should type
|
||||
* the hook return as `AnalyticsSlicePayload` (or import
|
||||
* `SubPageAnalyticsData` directly — same shape, kept aliased for
|
||||
* call-site clarity).
|
||||
*/
|
||||
export type AnalyticsSlicePayload = SubPageAnalyticsData;
|
||||
|
||||
/**
|
||||
* Discriminator for the server-side slice. `undefined` (the default)
|
||||
* routes onto the thick payload; `"summaries"` routes onto IW1's
|
||||
* `?slice=summaries` branch.
|
||||
*/
|
||||
export type AnalyticsSlice = "summaries" | undefined;
|
||||
|
||||
/**
|
||||
* The unwrapped `data` field returned by the API. Typed as a wide
|
||||
* shape so the dashboard's `bpInTargetPct*` / `glucoseByContext`
|
||||
* consumers can narrow without a runtime cast. The slim slice fills
|
||||
* the optional thick fields with `null` / empty so call-site reads
|
||||
* remain undefined-safe.
|
||||
*/
|
||||
export interface AnalyticsRawPayload {
|
||||
summaries: Record<string, DataSummary>;
|
||||
// Thick-only fields — present on the default slice, stubbed on the
|
||||
// slim branch. Optional so the type covers both shapes.
|
||||
bpInTargetPct?: number | null;
|
||||
bpInTargetPct7d?: number | null;
|
||||
bpInTargetPct30d?: number | null;
|
||||
bpInTargetPctAllTime?: number | null;
|
||||
bpInTargetPctPriorMonth?: number | null;
|
||||
bpInTargetPctPriorYear?: number | null;
|
||||
glucoseByContext?: Record<string, unknown>;
|
||||
correlations?: unknown;
|
||||
healthScore?: unknown;
|
||||
sleepStages?: unknown;
|
||||
// Keep the contract open — additive server fields don't need a
|
||||
// type bump every release.
|
||||
[key: string]: unknown;
|
||||
}
|
||||
|
||||
export interface UseAnalyticsQueryOptions {
|
||||
/**
|
||||
* `"summaries"` — hit IW1's slim slice (2 SQL passes, no
|
||||
* correlations / health-score / bp-in-target / sleep-stages).
|
||||
* Omit (or pass `undefined`) for the thick default payload.
|
||||
*/
|
||||
slice?: AnalyticsSlice;
|
||||
/**
|
||||
* Optional override for the auth gate. Defaults to
|
||||
* `isAuthenticated`. The Insights mother page can pass extra
|
||||
* disabled-flag composition without losing the auth gate.
|
||||
*/
|
||||
enabled?: boolean;
|
||||
}
|
||||
|
||||
async function fetchAnalytics(
|
||||
slice: AnalyticsSlice,
|
||||
): Promise<AnalyticsRawPayload> {
|
||||
const url =
|
||||
slice === "summaries" ? "/api/analytics?slice=summaries" : "/api/analytics";
|
||||
const res = await fetch(url);
|
||||
if (!res.ok) {
|
||||
throw new Error(`Failed to load analytics (${res.status})`);
|
||||
}
|
||||
const json = (await res.json()) as { data: AnalyticsRawPayload };
|
||||
return json.data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Shared hook. Returns the raw `data` payload typed as
|
||||
* `AnalyticsRawPayload`. Consumers can narrow at the call site (e.g.
|
||||
* `const summaries = query.data?.summaries;`).
|
||||
*/
|
||||
export function useAnalyticsQuery(
|
||||
options: UseAnalyticsQueryOptions = {},
|
||||
): UseQueryResult<AnalyticsRawPayload, Error> {
|
||||
const { isAuthenticated } = useAuth();
|
||||
const slice = options.slice;
|
||||
const enabled =
|
||||
options.enabled !== undefined ? options.enabled : isAuthenticated;
|
||||
|
||||
return useQuery({
|
||||
queryKey: queryKeys.analytics(slice),
|
||||
queryFn: () => fetchAnalytics(slice),
|
||||
enabled,
|
||||
staleTime: 60_000,
|
||||
refetchOnMount: false,
|
||||
refetchOnWindowFocus: false,
|
||||
});
|
||||
}
|
||||
+11
-1
@@ -16,7 +16,17 @@ export const queryKeys = {
|
||||
measurements: () => ["measurements"] as const,
|
||||
moodEntries: () => ["mood-entries"] as const,
|
||||
|
||||
analytics: () => ["analytics"] as const,
|
||||
/**
|
||||
* v1.4.33 IW2 — the analytics queryKey now optionally carries a
|
||||
* `slice` discriminator so the dashboard tile-strip can subscribe to
|
||||
* the slim `?slice=summaries` server slice (IW1 / C1) without
|
||||
* colliding with the thick-payload consumers on the Insights tree.
|
||||
* Calling `queryKeys.analytics()` without a slice keeps the legacy
|
||||
* shape `["analytics"]` so mutation invalidations and the bulk-key
|
||||
* lists below stay byte-identical.
|
||||
*/
|
||||
analytics: (slice?: "summaries") =>
|
||||
(slice ? (["analytics", slice] as const) : (["analytics"] as const)),
|
||||
moodAnalytics: () => ["mood-analytics"] as const,
|
||||
|
||||
insightsRoot: () => ["insights"] as const,
|
||||
|
||||
Reference in new issue
Block a user