@remit/web-client 0.0.232 → 0.0.233

package/src/components/calendar/CalendarWorkspace.tsx

@@ -10,11 +10,14 @@ import {
 	segmentClassName,
 } from "@remit/ui";
 import { Loader2 } from "lucide-react";
-import { useId, useState } from "react";
+import { type ReactNode, useId, useState } from "react";
 import { CalendarViewPlaceholder } from "@/components/calendar/CalendarViewPlaceholder";
 import { NavMenuButton } from "@/components/mail/NavMenuButton";
 import { ErrorState } from "@/components/ui/ErrorState";
-import { calendarViewMountsGrid } from "@/lib/calendar-route";
+import {
+	calendarViewMountsAgenda,
+	calendarViewMountsGrid,
+} from "@/lib/calendar-route";
 
 /**
  * The calendar's own pane: the toolbar that moves it and whatever the current
@@ -38,6 +41,12 @@ export interface CalendarWorkspaceProps {
 	date: string;
 	events: CalendarEventData[];
 	colorByCalendarId: Record<string, CalendarColorId>;
+	/**
+	 * The strip, at the one zoom that draws it. A slot rather than something
+	 * built here because it loads its own days over a rolling range, and this
+	 * pane holds no events and knows no router.
+	 */
+	agenda: ReactNode;
 	/** The first read of this window is still out; the grid has nothing yet. */
 	isLoading?: boolean;
 	/**
@@ -89,6 +98,7 @@ export function CalendarWorkspace({
 	date,
 	events,
 	colorByCalendarId,
+	agenda,
 	isLoading = false,
 	error,
 	onRetry,
@@ -150,43 +160,51 @@ export function CalendarWorkspace({
 				</CalendarDateNav>
 			</div>
 
-			<div className="min-h-0 flex-1">
-				{error !== undefined && error !== null ? (
-					<div className="flex h-full items-center justify-center">
-						<ErrorState
-							title="Couldn't load this week"
-							error={error}
-							onRetry={onRetry}
+			{/* The strip rolls its own range, so it answers for its own days: the
+			    week this pane read is not what it is drawing, and gating it on that
+			    read would blank a strip that has everything it needs. It also
+			    scrolls itself, so it gets a column to fill rather than a box. */}
+			{calendarViewMountsAgenda(view) ? (
+				<div className="flex min-h-0 flex-1 flex-col">{agenda}</div>
+			) : (
+				<div className="min-h-0 flex-1">
+					{error !== undefined && error !== null ? (
+						<div className="flex h-full items-center justify-center">
+							<ErrorState
+								title="Couldn't load this week"
+								error={error}
+								onRetry={onRetry}
+							/>
+						</div>
+					) : isLoading ? (
+						<div
+							role="status"
+							aria-label="Loading the calendar"
+							className="flex h-full items-center justify-center bg-surface"
+						>
+							<Loader2 className="size-6 animate-spin text-fg-subtle" />
+						</div>
+					) : calendarViewMountsGrid(view) ? (
+						<CalendarGrid
+							view={view}
+							date={date}
+							events={events}
+							colorByCalendarId={colorByCalendarId}
+							density={density}
+							selectedEventId={selectedEventId}
+							timeZone={timeZone}
+							now={now}
+							onSelectEvent={onSelectEvent}
+							onPickSlot={onPickSlot}
+							onRangeChange={(measuredTitle) =>
+								setMeasured({ key: addressKey, title: measuredTitle })
+							}
 						/>
-					</div>
-				) : isLoading ? (
-					<div
-						role="status"
-						aria-label="Loading the calendar"
-						className="flex h-full items-center justify-center bg-surface"
-					>
-						<Loader2 className="size-6 animate-spin text-fg-subtle" />
-					</div>
-				) : calendarViewMountsGrid(view) ? (
-					<CalendarGrid
-						view={view}
-						date={date}
-						events={events}
-						colorByCalendarId={colorByCalendarId}
-						density={density}
-						selectedEventId={selectedEventId}
-						timeZone={timeZone}
-						now={now}
-						onSelectEvent={onSelectEvent}
-						onPickSlot={onPickSlot}
-						onRangeChange={(measuredTitle) =>
-							setMeasured({ key: addressKey, title: measuredTitle })
-						}
-					/>
-				) : (
-					<CalendarViewPlaceholder view={view} />
-				)}
-			</div>
+					) : (
+						<CalendarViewPlaceholder view={view} />
+					)}
+				</div>
+			)}
 		</div>
 	);
 }

package/src/components/calendar/agenda-address.render.test.ts

@@ -0,0 +1,389 @@
+/**
+ * The strip and the address, bound together.
+ *
+ * Three claims, and every one of them is about the URL rather than about
+ * pixels: the strip opens on the day the path names, reaching an end asks for
+ * more days rather than replacing the ones on screen, and the day the reader
+ * scrolls to is written by `replace` — scrolling is not somewhere they went, so
+ * Back belongs to the screen they arrived from and not to every row they
+ * passed. The last one is the reason this suite drives the real router instead
+ * of a callback: a `push` here would bury the way out under a fortnight of
+ * history entries.
+ */
+import assert from "node:assert/strict";
+import { afterEach, describe, it } from "node:test";
+import {
+	calendarEventOperationsListCalendarEventsQueryKey,
+	calendarFreeBusyOperationsListCalendarFreeBusyQueryKey,
+	calendarOperationsListCalendarsQueryKey,
+} from "@remit/api-http-client/@tanstack/react-query.gen.ts";
+import {
+	type AnyRouter,
+	createMemoryHistory,
+	createRootRoute,
+	createRoute,
+	createRouter,
+	Outlet,
+	RouterProvider,
+} from "@tanstack/react-router";
+import { act, createElement, type ReactNode } from "react";
+import {
+	calendarWindow,
+	datesInRange,
+	extendRangeEnd,
+	extendRangeStart,
+	rangeAround,
+	weekWindowsOver,
+} from "@/hooks/calendar";
+import { useCalendarData } from "@/hooks/useCalendarData";
+import { useCalendarAddress, useCalendarNavigation } from "@/routing";
+import { createDomHarness, type DomHarness } from "@/test-support/dom";
+import {
+	calendarSearchSchema,
+	calendarViewMountsAgenda,
+} from "../../lib/calendar-route";
+import { stringifySearch } from "../../lib/search-params";
+import { AgendaView } from "./AgendaView";
+
+const DATE = "2026-06-10";
+const WORK = "cal_work";
+const HOME = "cal_home";
+
+const TO_WEEK = "to week";
+
+// The router reads `self` at construction; the shared jsdom globals stop at
+// `window`.
+(globalThis as { self?: typeof globalThis }).self ??= globalThis;
+
+let harness: DomHarness | undefined;
+
+afterEach(() => {
+	harness?.close();
+	harness = undefined;
+});
+
+/** The zoom switch's own binding, beside the strip the route mounts. */
+function CalendarLayout() {
+	const { goToView } = useCalendarNavigation();
+	return createElement(
+		"div",
+		null,
+		createElement(
+			"button",
+			{
+				type: "button",
+				"aria-label": TO_WEEK,
+				onClick: () => goToView("week"),
+			},
+			"Week",
+		),
+		createElement(AgendaView, {
+			density: "comfortable",
+			onPickSlot: () => undefined,
+		}),
+	);
+}
+
+const testRouter = (
+	path: string,
+	component: () => ReactNode = CalendarLayout,
+): AnyRouter => {
+	const rootRoute = createRootRoute({ component: Outlet });
+	const viewRoute = createRoute({
+		getParentRoute: () => rootRoute,
+		path: "/calendar/$view/$date",
+		validateSearch: calendarSearchSchema,
+		component,
+	});
+	// The strip reads whether an event is open, which is a child of this route.
+	const eventRoute = createRoute({
+		getParentRoute: () => viewRoute,
+		path: "$calendarObjectId",
+		component: Outlet,
+	});
+	const instanceRoute = createRoute({
+		getParentRoute: () => eventRoute,
+		path: "$recurrenceId",
+		component: Outlet,
+	});
+	const composerRoute = createRoute({
+		getParentRoute: () => viewRoute,
+		path: "new",
+		component: Outlet,
+	});
+	const routeTree = rootRoute.addChildren([
+		viewRoute.addChildren([
+			eventRoute.addChildren([instanceRoute]),
+			composerRoute,
+		]),
+	]);
+	return createRouter({
+		routeTree,
+		// A list of ticked calendars is repeated params, which is how the app
+		// spells one and what a hand-written link says.
+		stringifySearch,
+		history: createMemoryHistory({ initialEntries: [path] }),
+	}) as unknown as AnyRouter;
+};
+
+/** How many times a case reaches an end, and so how far the strip can go. */
+const REACHES = 8;
+
+/** Every week the strip can reach, given that many pulls at either end. */
+const reachableWeeks = () => {
+	let range = rangeAround(DATE);
+	for (let reach = 0; reach < REACHES; reach += 1) {
+		range = extendRangeEnd(extendRangeStart(range));
+	}
+	return weekWindowsOver(datesInRange(range));
+};
+
+/**
+ * Every week the strip can ask for, answered from the cache. A week nobody
+ * seeded would fire a real request, and what these cases are about is which
+ * weeks get asked for, not what comes back.
+ */
+const seed = (dom: DomHarness) => {
+	dom.queryClient.setQueryData(calendarOperationsListCalendarsQueryKey(), {
+		items: [],
+	});
+	for (const window of reachableWeeks()) {
+		dom.queryClient.setQueryData(
+			calendarEventOperationsListCalendarEventsQueryKey({ query: window }),
+			{ items: [] },
+		);
+		dom.queryClient.setQueryData(
+			calendarFreeBusyOperationsListCalendarFreeBusyQueryKey({
+				query: window,
+			}),
+			{ items: [] },
+		);
+	}
+};
+
+interface Mounted {
+	dom: DomHarness;
+	router: AnyRouter;
+	pushes: number;
+	replaces: number;
+}
+
+const mount = async (path = `/calendar/agenda/${DATE}`): Promise<Mounted> => {
+	const dom = createDomHarness();
+	harness = dom;
+	seed(dom);
+
+	const router = testRouter(path);
+	const counted = { pushes: 0, replaces: 0 };
+	const { push, replace } = router.history;
+	router.history.push = (...args: Parameters<typeof push>) => {
+		counted.pushes += 1;
+		return push(...args);
+	};
+	router.history.replace = (...args: Parameters<typeof replace>) => {
+		counted.replaces += 1;
+		return replace(...args);
+	};
+
+	await router.load();
+	dom.renderApp(createElement(RouterProvider, { router }));
+	await dom.flush();
+
+	return {
+		dom,
+		router,
+		get pushes() {
+			return counted.pushes;
+		},
+		get replaces() {
+			return counted.replaces;
+		},
+	};
+};
+
+/** The one element the strip scrolls; jsdom has no layout, only the event. */
+const scroller = (dom: DomHarness): Element => {
+	const found = dom.query(".overflow-y-auto");
+	if (!found) throw new Error("the strip rendered no scroller");
+	return found;
+};
+
+const scroll = (dom: DomHarness) => {
+	dom.dispatch(scroller(dom), new Event("scroll", { bubbles: false }));
+};
+
+describe("the day the address names", () => {
+	it("is the day the strip opens on", async () => {
+		const { dom } = await mount();
+		assert.match(dom.text(), /Wednesday/, "the header names another day");
+	});
+
+	it("asks for the weeks around it, one request each", async () => {
+		const { dom } = await mount();
+		const asked = eventWindows(dom);
+		const expected = weekWindowsOver(datesInRange(rangeAround(DATE)));
+		assert.deepEqual(
+			asked.map((window) => window.from).sort(),
+			expected.map((window) => window.from).sort(),
+		);
+		for (const window of asked) {
+			const days =
+				(Date.parse(window.to) - Date.parse(window.from)) / 86_400_000;
+			assert.equal(days, 7, "a read covered more than one week");
+		}
+	});
+});
+
+describe("reaching an end of the strip", () => {
+	it("asks for more days without giving up the ones on screen", async () => {
+		const { dom } = await mount();
+		const before = dom.text();
+		assert.doesNotMatch(before, /17 May/);
+
+		scroll(dom);
+		await dom.flush();
+
+		const after = dom.text();
+		assert.match(after, /17 May/, "the days before the window did not arrive");
+		assert.match(after, /9 Jun/, "the days it opened with were thrown away");
+	});
+
+	it("adds week keys rather than widening the one it holds", async () => {
+		const { dom } = await mount();
+		const opening = eventWindows(dom).map((window) => window.from);
+
+		scroll(dom);
+		await dom.flush();
+
+		const after = eventWindows(dom).map((window) => window.from);
+		for (const from of opening) {
+			assert.ok(after.includes(from), `${from} was given up to fetch more`);
+		}
+		assert.ok(after.length > opening.length, "no week was added");
+		assert.ok(
+			after.some((from) => from < opening[0]),
+			"nothing reached further back than the week it opened with",
+		);
+	});
+
+	it("never grows a single read past what the server will answer", async () => {
+		const { dom } = await mount();
+		for (let reach = 0; reach < 6; reach += 1) {
+			scroll(dom);
+			await dom.flush();
+		}
+		for (const window of eventWindows(dom)) {
+			const days =
+				(Date.parse(window.to) - Date.parse(window.from)) / 86_400_000;
+			assert.equal(days, 7, `a read covered ${days} days`);
+		}
+	});
+});
+
+describe("the day the reader scrolled to", () => {
+	it("is written to the path, so a reload comes back to it", async () => {
+		const { dom, router } = await mount();
+		scroll(dom);
+		await dom.wait(600);
+		await dom.flush();
+
+		assert.match(router.state.location.pathname, /^\/calendar\/agenda\//);
+		assert.notEqual(
+			router.state.location.pathname,
+			`/calendar/agenda/${DATE}`,
+			"scrolling left the address on the day it opened",
+		);
+	});
+
+	it("replaces rather than pushes, so Back is still the way out", async () => {
+		const mounted = await mount();
+		scroll(mounted.dom);
+		await mounted.dom.wait(600);
+		await mounted.dom.flush();
+
+		assert.ok(mounted.replaces > 0, "the address was never written");
+		assert.equal(mounted.pushes, 0, "scrolling stacked up history entries");
+	});
+});
+
+describe("dropping into the grid and back out", () => {
+	it("keeps the day and the calendars the reader was looking at", async () => {
+		const { dom, router } = await mount();
+		await act(async () => {
+			await router.navigate({
+				to: "/calendar/$view/$date",
+				params: { view: "agenda", date: DATE },
+				search: { calendarId: [HOME, WORK] },
+			});
+		});
+		await dom.flush();
+
+		dom.click(dom.byLabel(TO_WEEK));
+		await dom.flush();
+
+		assert.equal(router.state.location.pathname, `/calendar/week/${DATE}`);
+		assert.deepEqual(router.state.location.search.calendarId, [HOME, WORK]);
+	});
+});
+
+/**
+ * The layout's own read, bound exactly as the route binds it. Mounted without
+ * the strip, so any window in the cache came from here.
+ */
+function LayoutOnly() {
+	const { view, date, calendarIds } = useCalendarAddress();
+	useCalendarData({
+		view,
+		date,
+		calendarIds,
+		enabled: !calendarViewMountsAgenda(view),
+	});
+	return createElement("div", { "data-testid": "layout-only" });
+}
+
+describe("the layout's own week, at a zoom that does not draw it", () => {
+	const mountLayout = async (view: string): Promise<DomHarness> => {
+		const dom = createDomHarness();
+		harness = dom;
+		seed(dom);
+		const router = testRouter(`/calendar/${view}/${DATE}`, LayoutOnly);
+		await router.load();
+		dom.renderApp(createElement(RouterProvider, { router }));
+		await dom.flush();
+		return dom;
+	};
+
+	it("reads the week the grid draws", async () => {
+		const dom = await mountLayout("week");
+		assert.deepEqual(
+			eventWindows(dom).map((window) => window.from),
+			[calendarWindow("week", DATE).from],
+		);
+	});
+
+	/*
+	 * The strip fetches its own weeks, so this read renders nothing — and the
+	 * address rewrites on every scroll, so leaving it on would ask again, with
+	 * its two neighbours prefetched, all the way down the strip.
+	 */
+	it("asks for nothing at all at the agenda zoom", async () => {
+		const dom = await mountLayout("agenda");
+		assert.deepEqual(eventWindows(dom), []);
+	});
+});
+
+/** The windows the strip currently has `/calendar-events` open on. */
+const eventWindows = (dom: DomHarness): { from: string; to: string }[] =>
+	dom.queryClient
+		.getQueryCache()
+		.getAll()
+		.filter((query) => query.isActive())
+		.map(
+			(query) =>
+				query.queryKey[0] as {
+					_id?: string;
+					query?: { from: string; to: string };
+				},
+		)
+		.filter((key) => key?._id === "calendarEventOperationsListCalendarEvents")
+		.flatMap((key) => (key.query ? [key.query] : []));