mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-16 07:13:29 +00:00
feat(lists): read and show the list cap on every capped list
Twelve routes answer a capped list with meta.truncated / meta.limit on the envelope, and the web client read only data, so no surface said a list had stopped short. apiGetList / apiPostList are now the one client reader of the cap and ListCapNotice the one line that shows it; every capped list on the web reads its cap and shows the notice under the list, the paged readers (side effects, illness episodes) stop on the route's answer instead of a full-page guess, and the ECG list moves its five readers onto one hook. The record activity feed sent its cap twice, in data and on the envelope; it rides the envelope alone now. A guard derives the capped routes from the tree and binds each to a client that reads its cap.
This commit is contained in:
1 parent
be79603d53
commit
dc5120b59a
49 files changed
+574
-204
No files matched your search
@@ -16,16 +16,22 @@ vi.mock("@tanstack/react-query", () => ({
|
||||
useQueryClient: () => ({}),
|
||||
}));
|
||||
|
||||
const journal = vi.hoisted(() => ({ total: 230 }));
|
||||
|
||||
vi.mock("@/lib/api/api-fetch", () => ({
|
||||
apiGet: async (url: string) => {
|
||||
apiGet: vi.fn(),
|
||||
apiGetList: async (url: string) => {
|
||||
calls.push(url);
|
||||
// The route's own paging: 50 unless asked otherwise, from offset 0.
|
||||
// The route's own paging: 50 unless asked otherwise, from offset 0, and
|
||||
// the cap it sends: a row past the page exists or it does not.
|
||||
const params = new URL(url, "http://x").searchParams;
|
||||
const offset = Number(params.get("offset") ?? 0);
|
||||
const limit = Number(params.get("limit") ?? 50);
|
||||
const total = 230;
|
||||
const count = Math.max(0, Math.min(limit, total - offset));
|
||||
return Array.from({ length: count }, (_, i) => ({ id: `e${offset + i}` }));
|
||||
const count = Math.max(0, Math.min(limit, journal.total - offset));
|
||||
return {
|
||||
data: Array.from({ length: count }, (_, i) => ({ id: `e${offset + i}` })),
|
||||
cap: { truncated: offset + count < journal.total, limit },
|
||||
};
|
||||
},
|
||||
apiPost: vi.fn(),
|
||||
apiPatch: vi.fn(),
|
||||
@@ -47,4 +53,16 @@ describe("useIllnessEpisodes", () => {
|
||||
true,
|
||||
);
|
||||
});
|
||||
|
||||
it("stops on a full last page the route says is the end", async () => {
|
||||
calls.length = 0;
|
||||
journal.total = 200;
|
||||
const options = useIllnessEpisodes(true) as unknown as {
|
||||
queryFn: () => Promise<{ id: string }[]>;
|
||||
};
|
||||
expect(await options.queryFn()).toHaveLength(200);
|
||||
// Two full pages of 100, no third request for an empty one.
|
||||
expect(calls).toHaveLength(2);
|
||||
journal.total = 230;
|
||||
});
|
||||
});
|
||||
@@ -10,7 +10,13 @@
|
||||
*/
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
|
||||
import { apiDelete, apiGet, apiPatch, apiPost } from "@/lib/api/api-fetch";
|
||||
import {
|
||||
apiDelete,
|
||||
apiGet,
|
||||
apiGetList,
|
||||
apiPatch,
|
||||
apiPost,
|
||||
} from "@/lib/api/api-fetch";
|
||||
import {
|
||||
illnessDependentKeys,
|
||||
invalidateKeys,
|
||||
@@ -37,7 +43,8 @@ const EPISODE_PAGE_SIZE = 100;
|
||||
* most), and the journal, its settings and every picker read this as the
|
||||
* whole record; a single unpaged call dropped the oldest episodes once there
|
||||
* were more than one page of them, and a person then found an old condition
|
||||
* only through search. So this reads page after page until a short one.
|
||||
* only through search. So this reads page after page until the route says
|
||||
* nothing is left.
|
||||
*/
|
||||
export function useIllnessEpisodes(includeResolved = true, enabled = true) {
|
||||
return useQuery({
|
||||
@@ -46,11 +53,13 @@ export function useIllnessEpisodes(includeResolved = true, enabled = true) {
|
||||
queryFn: async () => {
|
||||
const all: IllnessEpisodeDTO[] = [];
|
||||
for (let offset = 0; ; offset += EPISODE_PAGE_SIZE) {
|
||||
const page = await apiGet<IllnessEpisodeDTO[]>(
|
||||
const { data: page, cap } = await apiGetList<IllnessEpisodeDTO[]>(
|
||||
`/api/illness/episodes?includeResolved=${includeResolved}&limit=${EPISODE_PAGE_SIZE}&offset=${offset}`,
|
||||
);
|
||||
all.push(...page);
|
||||
if (page.length < EPISODE_PAGE_SIZE) return all;
|
||||
// The route says whether a row past this page exists, so a last page
|
||||
// that is exactly full ends the walk without one more request.
|
||||
if (!cap?.truncated) return all;
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user