@remit/web-client 0.0.312 → 0.0.314

package/src/components/calendar/change-suggestion-first.render.test.ts

@@ -0,0 +1,299 @@
+import assert from "node:assert/strict";
+import { after, afterEach, before, describe, it } from "node:test";
+import type {
+	RemitImapCalendarResponse,
+	RemitImapCalendarSuggestionResponse,
+} from "@remit/api-http-client/types.gen.ts";
+import {
+	type AnyRouter,
+	createMemoryHistory,
+	createRootRoute,
+	createRoute,
+	createRouter,
+	Outlet,
+	type RouteComponent,
+	RouterProvider,
+} from "@tanstack/react-router";
+import { createElement } from "react";
+import { calendarSearchSchema } from "@/lib/calendar-route";
+import { stringifySearch } from "@/lib/search-params";
+import { Route as SuggestionRoute } from "../../routes/calendar/$view.$date/suggestion.$suggestionId.js";
+import { createDomHarness, type DomHarness } from "../../test-support/dom";
+import {
+	type HttpCall,
+	type HttpMock,
+	httpError,
+	mockFetch,
+} from "../../test-support/http";
+
+(globalThis as { self?: typeof globalThis }).self ??= globalThis;
+
+const WORK = "11111111-1111-4111-8111-111111111111";
+const SUGGESTION = "22222222-2222-4222-8222-222222222222";
+const WEEK = "/calendar/week/2026-06-10";
+const ENTRY = `${WEEK}/suggestion/${SUGGESTION}`;
+
+const calendars = [
+	{
+		calendarId: WORK,
+		accountConfigId: "cfg-1",
+		urlSegment: "work",
+		displayName: "Work",
+		color: "Cal1",
+		componentSet: "VeventOnly",
+		source: "Default",
+		timezone: "Europe/Amsterdam",
+		syncSequence: 1,
+		subscriptionUrl: "",
+		subscriptionEnabled: false,
+		subscriptionCheckedAt: 0,
+		subscriptionFetchedAt: 0,
+		subscriptionError: "",
+		createdAt: 0,
+		updatedAt: 0,
+	},
+] satisfies RemitImapCalendarResponse[];
+
+const reading = (
+	overrides: Partial<RemitImapCalendarSuggestionResponse> = {},
+): RemitImapCalendarSuggestionResponse => ({
+	suggestionId: SUGGESTION,
+	accountConfigId: "cfg-1",
+	messageId: "msg-1",
+	bodyPartId: "part-1",
+	icalUid: "uid-1",
+	sequence: 0,
+	method: "Request",
+	source: "IcalendarPart",
+	state: "Pending",
+	summary: "Billing migration kickoff",
+	dtStart: "2026-06-11T12:00:00+00:00",
+	dtEnd: "2026-06-11T13:00:00+00:00",
+	allDay: false,
+	location: "Room Noord",
+	organizer: "priya@example.test",
+	zoneCertainty: "Explicit",
+	acceptedCalendarObjectId: "",
+	createdAt: 0,
+	updatedAt: 0,
+	...overrides,
+});
+
+let harness: DomHarness | undefined;
+let http: HttpMock | undefined;
+const runnerZone = process.env.TZ;
+
+before(() => {
+	process.env.TZ = "Europe/Amsterdam";
+});
+
+after(() => {
+	if (runnerZone === undefined) Reflect.deleteProperty(process.env, "TZ");
+	else process.env.TZ = runnerZone;
+});
+
+afterEach(() => {
+	harness?.close();
+	harness = undefined;
+	http?.restore();
+	http = undefined;
+});
+
+const componentOf = (route: unknown): RouteComponent => {
+	const { component } = (route as { options: { component?: RouteComponent } })
+		.options;
+	if (!component) throw new Error("the route mounts no component");
+	return component;
+};
+
+const testRouter = (): AnyRouter => {
+	const rootRoute = createRootRoute({ component: Outlet });
+	const viewRoute = createRoute({
+		getParentRoute: () => rootRoute,
+		path: "/calendar/$view/$date",
+		validateSearch: calendarSearchSchema,
+		component: Outlet,
+	});
+	const routeTree = rootRoute.addChildren([
+		viewRoute.addChildren([
+			createRoute({
+				getParentRoute: () => viewRoute,
+				path: "/",
+				component: () => null,
+			}),
+			createRoute({
+				getParentRoute: () => viewRoute,
+				path: "suggestion/$suggestionId",
+				component: componentOf(SuggestionRoute),
+			}),
+		]),
+	]);
+	return createRouter({
+		routeTree,
+		stringifySearch,
+		history: createMemoryHistory({ initialEntries: [ENTRY] }),
+	}) as unknown as AnyRouter;
+};
+
+const server = (
+	suggestion: RemitImapCalendarSuggestionResponse,
+	answer: (call: HttpCall) => Response | undefined = () => undefined,
+) => {
+	let pending = [suggestion];
+	return (call: HttpCall): unknown => {
+		if (call.path.endsWith("/calendars")) return { items: calendars };
+		if (call.path.endsWith("/calendar-suggestions")) return { items: pending };
+		if (call.path.endsWith("/accept")) {
+			const refusal = answer(call);
+			if (refusal) return refusal;
+			pending = [];
+			return { ...suggestion, state: "Accepted" };
+		}
+		return { items: [] };
+	};
+};
+
+const mount = async (respond: (call: HttpCall) => unknown) => {
+	http = mockFetch(respond);
+	const router = testRouter();
+	await router.load();
+	harness = createDomHarness();
+	harness.renderApp(createElement(RouterProvider, { router }));
+	await harness.waitFor(
+		() =>
+			(harness?.queryAll<HTMLInputElement>("input") ?? []).some(
+				(input) => input.value === "Billing migration kickoff",
+			),
+		"the editor to open seeded from the suggestion",
+	);
+	await harness.waitFor(
+		() => harness?.query("input[type=radio]:checked") !== null,
+		"the default calendar to be picked",
+	);
+	return router;
+};
+
+const fieldValue = (label: string): string => {
+	if (!harness) throw new Error("not mounted");
+	return (harness.byLabel(label) as HTMLInputElement).value;
+};
+
+const acceptedEdits = (): HttpCall[] =>
+	http?.to(`/calendar-suggestions/${SUGGESTION}/accept`) ?? [];
+
+describe("changing a suggestion before adding it", () => {
+	it("opens the editor on what the mail said, on this device's clock", async () => {
+		await mount(server(reading()));
+
+		assert.equal(fieldValue("Title"), "Billing migration kickoff");
+		assert.equal(fieldValue("Location"), "Room Noord");
+		assert.equal(fieldValue("Date"), "2026-06-11");
+		assert.equal(fieldValue("Start time"), "14:00");
+		assert.equal(fieldValue("End time"), "15:00");
+	});
+
+	it("adds the corrected event, settles the suggestion and closes the editor", async () => {
+		const router = await mount(server(reading()));
+
+		harness?.type(harness.byLabel("Title"), "Billing migration kickoff, moved");
+		harness?.type(harness.byLabel("Start time"), "16:00");
+		harness?.type(harness.byLabel("End time"), "17:30");
+		await harness?.flush();
+		harness?.click(harness.byText("button", "Add"));
+
+		await harness?.waitFor(
+			() => router.state.location.pathname === WEEK,
+			"the editor to close once the server settled the suggestion",
+		);
+		const sent = acceptedEdits();
+		assert.equal(sent.length, 1);
+		assert.deepEqual(sent[0].body, {
+			calendarId: WORK,
+			event: {
+				summary: "Billing migration kickoff, moved",
+				start: "2026-06-11T16:00:00+02:00",
+				end: "2026-06-11T17:30:00+02:00",
+				allDay: false,
+				timeZone: "Europe/Amsterdam",
+			},
+		});
+		const listings = http?.to("/calendar-suggestions") ?? [];
+		assert.ok(
+			listings.length > 1,
+			"the waiting list is read again once the suggestion is settled",
+		);
+	});
+
+	it("places a reading nobody could put on a clock, even when the time is left alone", async () => {
+		await mount(
+			server(
+				reading({
+					dtStart: "2026-06-11T09:00:00+00:00",
+					dtEnd: "2026-06-11T10:00:00+00:00",
+					zoneCertainty: "Ambiguous",
+				}),
+			),
+		);
+
+		assert.equal(fieldValue("Start time"), "09:00");
+		assert.match(harness?.text() ?? "", /time zone nothing could resolve/);
+		harness?.click(harness.byText("button", "Add"));
+		await harness?.waitFor(
+			() => acceptedEdits().length === 1,
+			"the correction to be sent",
+		);
+
+		assert.deepEqual(acceptedEdits()[0].body?.event, {
+			start: "2026-06-11T09:00:00+02:00",
+			end: "2026-06-11T10:00:00+02:00",
+			allDay: false,
+			timeZone: "Europe/Amsterdam",
+		});
+	});
+
+	it("states a refusal and keeps the editor open with what was typed", async () => {
+		const router = await mount(
+			server(reading(), () => httpError(400, "Already declined.")),
+		);
+
+		harness?.type(harness.byLabel("Title"), "Kickoff, renamed");
+		await harness?.flush();
+		harness?.click(harness.byText("button", "Add"));
+
+		await harness?.waitFor(
+			() => harness?.query('[role="alert"]') !== null,
+			"the refusal to be stated",
+		);
+		assert.match(harness?.text() ?? "", /Couldn't add this to your calendar/);
+		assert.equal(fieldValue("Title"), "Kickoff, renamed");
+		assert.equal(router.state.location.pathname, ENTRY);
+	});
+
+	it("finds a suggestion that is not on the first page of what waits", async () => {
+		http = mockFetch((call: HttpCall): unknown => {
+			if (call.path.endsWith("/calendars")) return { items: calendars };
+			if (call.path.endsWith("/calendar-suggestions"))
+				return call.url.includes("continuationToken=page-2")
+					? { items: [reading()] }
+					: {
+							items: [{ ...reading(), suggestionId: "other" }],
+							continuationToken: "page-2",
+						};
+			return { items: [] };
+		});
+		const router = testRouter();
+		await router.load();
+		harness = createDomHarness();
+		harness.renderApp(createElement(RouterProvider, { router }));
+
+		await harness.waitFor(
+			() =>
+				harness
+					?.queryAll<HTMLInputElement>("input")
+					.some((input) => input.value === "Billing migration kickoff") ===
+				true,
+			"the editor to open on the suggestion from the second page",
+		);
+		assert.doesNotMatch(harness.text(), /no longer waiting/);
+	});
+});

package/src/components/calendar/pending-suggestions.render.test.ts

@@ -69,16 +69,21 @@ const pending: RemitImapCalendarSuggestionResponse = {
 
 let harness: DomHarness | undefined;
 let http: HttpMock | undefined;
+let changedFirst: { suggestionId: string; date: string }[] = [];
 
 afterEach(() => {
 	harness?.close();
 	harness = undefined;
 	http?.restore();
 	http = undefined;
+	changedFirst = [];
 });
 
-const server = (accept: () => Response | undefined) => {
-	let waiting = [pending];
+const server = (
+	accept: () => Response | undefined,
+	reading: RemitImapCalendarSuggestionResponse = pending,
+) => {
+	let waiting = [reading];
 	return (call: HttpCall): unknown => {
 		if (call.path.endsWith("/calendars")) return { items: calendars };
 		if (call.path.endsWith("/calendar-suggestions")) return { items: waiting };
@@ -95,7 +100,12 @@ const server = (accept: () => Response | undefined) => {
 const mount = async (respond: (call: HttpCall) => unknown) => {
 	http = mockFetch(respond);
 	harness = createDomHarness();
-	harness.renderApp(createElement(PendingSuggestions));
+	harness.renderApp(
+		createElement(PendingSuggestions, {
+			onChangeFirst: (suggestionId: string, date: string) =>
+				changedFirst.push({ suggestionId, date }),
+		}),
+	);
 	await harness.waitFor(
 		() => harness?.text().includes("Quarterly review") === true,
 		"the waiting reading to be drawn",
@@ -134,4 +144,59 @@ describe("what the mail is waiting on, beside the calendar", () => {
 		assert.match(harness?.text() ?? "", /Couldn't add this to your calendar/);
 		assert.match(harness?.text() ?? "", /Quarterly review/);
 	});
+
+	it("hands the top reading to the editor on the day it falls", async () => {
+		await mount(server(() => undefined));
+		harness?.click(harness.byText("button", "Change first"));
+
+		assert.deepEqual(changedFirst, [
+			{ suggestionId: SUGGESTION, date: "2026-09-01" },
+		]);
+		assert.equal(
+			http?.to(`/calendar-suggestions/${SUGGESTION}/accept`).length,
+			0,
+		);
+	});
+
+	it("sends a reading nobody could put on a clock to the editor instead of adding it", async () => {
+		await mount(
+			server(() => undefined, { ...pending, zoneCertainty: "Ambiguous" }),
+		);
+		harness?.click(harness.byText("button", "Add"));
+
+		assert.deepEqual(
+			changedFirst.map((entry) => entry.suggestionId),
+			[SUGGESTION],
+		);
+		assert.equal(
+			http?.to(`/calendar-suggestions/${SUGGESTION}/accept`).length,
+			0,
+		);
+		assert.match(harness?.text() ?? "", /Quarterly review/);
+	});
+
+	it("applies a cancellation nobody could put on a clock, and offers no editor for it", async () => {
+		await mount(
+			server(() => undefined, {
+				...pending,
+				method: "Cancel",
+				zoneCertainty: "Ambiguous",
+			}),
+		);
+		assert.equal(
+			harness
+				?.queryAll("button")
+				.some((button) => button.textContent?.includes("Change first")),
+			false,
+		);
+
+		harness?.click(harness.byText("button", "Add"));
+		await harness?.waitFor(
+			() =>
+				(http?.to(`/calendar-suggestions/${SUGGESTION}/accept`).length ?? 0) >
+				0,
+			"the cancellation to be applied",
+		);
+		assert.deepEqual(changedFirst, []);
+	});
 });

package/src/components/compose/ComposeForm.tsx

@@ -31,7 +31,7 @@ import {
 	unwrapLanguage,
 } from "@remit/ui";
 import type { ComposeBodyMode, ComposeInsertion } from "@remit/ui/rich-text";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import type { RefObject } from "react";
 import {
 	lazy,
@@ -46,6 +46,7 @@ import {
 	type DraftForAttachment,
 	useComposeAttachments,
 } from "../../hooks/useComposeAttachments";
+import { useInlineImages } from "../../hooks/useInlineImages";
 import { useMessageBodyContent } from "../../hooks/useMessageBodyContent";
 import { useSaveDraft } from "../../hooks/useSaveDraft";
 import { useSignature } from "../../hooks/useSignature.js";
@@ -462,9 +463,7 @@ export const ComposeForm = ({
 	 * failure to `draft` (#933), so opening a Failed message and pressing Escape
 	 * would take it out of the Outbox with the reader having changed nothing. The
 	 * first run after a load records what was loaded; only a payload that differs
-	 * from it is an edit. Nothing updates it afterwards — once the reader has
-	 * touched the document, every later run saves as it always did, retries of a
-	 * failed write included.
+	 * from it is an edit.
 	 */
 	const loadedPayloadRef = useRef<string | undefined>(undefined);
 	const captureLoadedPayloadRef = useRef(false);
@@ -877,11 +876,41 @@ export const ComposeForm = ({
 		remove: removeAttachment,
 		load: loadAttachments,
 		reset: resetAttachments,
+		owns: ownsAttachment,
+		isLoaded: attachmentsLoaded,
+		refreshLinks: refreshAttachmentLinks,
+		storedContent,
+		onRemoved: onAttachmentRemoved,
 		blockingReason: attachmentBlockingReason,
 	} = useComposeAttachments({
 		ensureDraft: ensureDraftForAttachment,
 	});
 
+	const queryClient = useQueryClient();
+	const inlineImages = useInlineImages({
+		attach,
+		owns: ownsAttachment,
+		isLoaded: attachmentsLoaded,
+		storedContent,
+		refreshLinks: () => {
+			if (!outboxMessageId) return Promise.resolve();
+			return queryClient
+				.fetchQuery({
+					...outboxDetailOperationsGetOutboxMessageOptions({
+						path: { outboxMessageId },
+					}),
+					staleTime: 0,
+				})
+				.then((draft) => refreshAttachmentLinks(draft.attachments));
+		},
+		onRemoved: onAttachmentRemoved,
+		draftAttachments:
+			draftData && draftData.outboxMessageId === outboxMessageId
+				? draftData.attachments
+				: [],
+		pushError,
+	});
+
 	const attachmentDocumentRef = useRef(outboxMessageId);
 	useEffect(() => {
 		const previous = attachmentDocumentRef.current;
@@ -1086,6 +1115,7 @@ export const ComposeForm = ({
 			return;
 		}
 		if (loadedPayloadRef.current === fingerprint) return;
+		loadedPayloadRef.current = undefined;
 
 		saveDraft(payload);
 	}, [
@@ -1283,6 +1313,9 @@ export const ComposeForm = ({
 	return (
 		<ComposeFormShell
 			layout={layout}
+			onDropFiles={(files) => {
+				void attach(files);
+			}}
 			banner={
 				<>
 					{selectedAccount && selectedAccountMissingSmtp ? (
@@ -1381,6 +1414,7 @@ export const ComposeForm = ({
 					spellcheck={spellcheck}
 					insertion={pendingInsertion}
 					onInserted={setInsertedVersion}
+					inlineImages={inlineImages}
 				/>
 			</Suspense>
 		</ComposeFormShell>