@remit/web-client 0.0.315 → 0.0.317

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.315",
+  "version": "0.0.317",
   "type": "module",
   "description": "Remit web client, published as composable primitives — the app shell, auth shells, and runtime config. A distributor imports what it composes and bundles it.",
   "exports": {

package/src/components/calendar/ChangeCalendarSuggestion.stories.tsx

@@ -37,6 +37,7 @@ const suggestion = (
 	supersededByThreadId: "",
 	createdAt: 0,
 	updatedAt: 0,
+	answerOvertakenBy: "None",
 	...overrides,
 });
 

package/src/components/calendar/calendar-app.stories.tsx

@@ -63,7 +63,9 @@ export const Empty: Story = {
 export const OpenEvent: Story = {
 	args: { url: `${STORY_WEEK}/${ROADMAP_OBJECT}` },
 	play: async () => {
-		await expect(await page().findByText("Room Zuid")).toBeVisible();
+		await expect(
+			await page().findByText("Room Zuid", {}, { timeout: 5000 }),
+		).toBeVisible();
 		await expect(
 			await page().findByRole("button", { name: "Edit" }),
 		).toBeVisible();

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

@@ -78,6 +78,7 @@ const reading = (
 	supersededByThreadId: "",
 	createdAt: 0,
 	updatedAt: 0,
+	answerOvertakenBy: "None",
 	...overrides,
 });
 

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

@@ -67,6 +67,7 @@ const pending: RemitImapCalendarSuggestionResponse = {
 	supersededByThreadId: "",
 	createdAt: 0,
 	updatedAt: 0,
+	answerOvertakenBy: "None",
 };
 
 let harness: DomHarness | undefined;

package/src/components/mail/offer-times-reply.render.test.ts

@@ -153,6 +153,7 @@ const invitation: RemitImapCalendarSuggestionResponse = {
 	supersededByThreadId: "",
 	createdAt: 0,
 	updatedAt: 0,
+	answerOvertakenBy: "None",
 };
 
 const sender: IntelligenceData = {

package/src/hooks/calendar/useCalendarSuggestions.ts

@@ -15,6 +15,7 @@ import {
 	calendarSuggestionActionOperationsAcceptCalendarSuggestionMutation,
 	calendarSuggestionActionOperationsDeclineCalendarSuggestionMutation,
 	calendarSuggestionActionOperationsDismissCalendarSuggestionMutation,
+	calendarSuggestionActionOperationsReopenCalendarSuggestionMutation,
 	calendarSuggestionOperationsListCalendarSuggestionsOptions,
 	messageCalendarSuggestionOperationsListMessageCalendarSuggestionsOptions,
 } from "@remit/api-http-client/@tanstack/react-query.gen.ts";
@@ -162,6 +163,7 @@ export interface CalendarSuggestionAnswers {
 		suggestionId: string,
 		muteSender: boolean,
 	) => Promise<SuggestionAnswer>;
+	reopen: (suggestionId: string) => Promise<SuggestionAnswer>;
 	isAnswering: boolean;
 }
 
@@ -188,6 +190,12 @@ export function useCalendarSuggestionAnswers(): CalendarSuggestionAnswers {
 		onSuccess,
 	});
 
+	const reopen = useMutation({
+		...calendarSuggestionActionOperationsReopenCalendarSuggestionMutation(),
+		meta: SUGGESTION_META,
+		onSuccess,
+	});
+
 	const acceptSuggestion = useCallback(
 		(suggestionId: string, calendarId: string) =>
 			accept
@@ -231,6 +239,14 @@ export function useCalendarSuggestionAnswers(): CalendarSuggestionAnswers {
 				.catch(refused),
 		[dismiss],
 	);
+	const reopenSuggestion = useCallback(
+		(suggestionId: string) =>
+			reopen
+				.mutateAsync({ path: { suggestionId } })
+				.then(() => ANSWERED)
+				.catch(refused),
+		[reopen],
+	);
 
 	return useMemo(
 		() => ({
@@ -239,7 +255,12 @@ export function useCalendarSuggestionAnswers(): CalendarSuggestionAnswers {
 			acceptEdited: acceptEditedSuggestion,
 			decline: declineSuggestion,
 			dismiss: dismissSuggestion,
-			isAnswering: accept.isPending || decline.isPending || dismiss.isPending,
+			reopen: reopenSuggestion,
+			isAnswering:
+				accept.isPending ||
+				decline.isPending ||
+				dismiss.isPending ||
+				reopen.isPending,
 		}),
 		[
 			acceptSuggestion,
@@ -247,9 +268,11 @@ export function useCalendarSuggestionAnswers(): CalendarSuggestionAnswers {
 			acceptEditedSuggestion,
 			declineSuggestion,
 			dismissSuggestion,
+			reopenSuggestion,
 			accept.isPending,
 			decline.isPending,
 			dismiss.isPending,
+			reopen.isPending,
 		],
 	);
 }

package/src/hooks/intelligence-calendar.render.test.ts

@@ -101,6 +101,7 @@ const invitation = (
 	supersededByThreadId: "",
 	createdAt: 0,
 	updatedAt: 0,
+	answerOvertakenBy: "None",
 });
 
 const Harness = () => {
@@ -264,19 +265,63 @@ describe("the invitation beside the open message", () => {
 		press("Stop offering invitations from Alice");
 
 		await harness?.waitFor(
-			() => harness?.text().includes("Add to calendar") === false,
-			"the card to leave once the server dismissed it",
-		);
-		assert.match(
-			harness?.text() ?? "",
-			/Nothing in this message is about a time/,
-			"answering the last card keeps the Calendar tab",
+			() => harness?.text().includes("You dismissed this") === true,
+			"the card to read back the dismissed state",
 		);
+		assert.doesNotMatch(harness?.text() ?? "", /Add to calendar/);
 		const dismissed =
 			http?.to(`/calendar-suggestions/${SUGGESTION}/dismiss`) ?? [];
 		assert.equal(dismissed.length, 1);
 		assert.deepEqual(dismissed[0].body, { muteSender: true });
 	});
+
+	for (const [label, state] of [
+		["Add to calendar", "Accepted"],
+		["Maybe", "Tentative"],
+		["Decline", "Declined"],
+		["Stop offering invitations from Alice", "Dismissed"],
+	] as const) {
+		it(`takes a ${state} answer back through the API, and asks again`, async () => {
+			await mount(
+				server((call) => (call.path.endsWith("/reopen") ? "Pending" : state)),
+			);
+			press(label);
+			await harness?.waitFor(
+				() => harness?.text().includes("Change") === true,
+				"the card to offer Change once answered",
+			);
+
+			press("Change");
+
+			await harness?.waitFor(
+				() => harness?.text().includes("Add to calendar") === true,
+				"the answers to be offered again once the server reopened it",
+			);
+			assert.equal(
+				http?.to(`/calendar-suggestions/${SUGGESTION}/reopen`).length,
+				1,
+			);
+		});
+	}
+
+	it("offers no Change on an answer its cancellation was answered over", async () => {
+		await mount((call) => {
+			if (call.path.endsWith("/calendars")) return { items: calendars };
+			if (call.path.endsWith("/messages/msg-1/calendar-suggestions"))
+				return {
+					items: [
+						{ ...invitation("Accepted"), answerOvertakenBy: "Cancellation" },
+					],
+				};
+			return { items: [] };
+		});
+
+		await harness?.waitFor(
+			() => harness?.text().includes("On your calendar") === true,
+			"the card to read back the accepted state",
+		);
+		assert.equal(harness?.text().includes("Change"), false);
+	});
 });
 
 (globalThis as { self?: typeof globalThis }).self ??= globalThis;

package/src/hooks/useIntelligenceCalendar.ts

@@ -9,6 +9,7 @@
  * outlives the message it is about.
  */
 import type { RemitImapThreadMessageResponse } from "@remit/api-http-client/types.gen.ts";
+import { CalendarAnswerOvertaken } from "@remit/domain-enums";
 import type {
 	CalendarDayEntry,
 	CalendarSlotPick,
@@ -261,6 +262,9 @@ export function useIntelligenceCalendar(
 	};
 	const pickedText =
 		date === "" ? "" : slotsAsText(date, slots, working.picked);
+	const overtaken =
+		invitation !== undefined &&
+		invitation.answerOvertakenBy !== CalendarAnswerOvertaken.None;
 
 	const actions: IntelligenceCalendarActions = {
 		onAddInvite: () => {
@@ -295,7 +299,12 @@ export function useIntelligenceCalendar(
 					answer(invitationId, "keep this on your calendar", () =>
 						answers.dismiss(invitationId, false),
 					)
-			: undefined,
+			: overtaken
+				? undefined
+				: () =>
+						answer(invitationId, "take this answer back", () =>
+							answers.reopen(invitationId),
+						),
 		onOpenNewerInvite:
 			openThread && invitation && invitation.supersededByThreadId !== ""
 				? () =>

package/src/lib/calendar-suggestion.test.ts

@@ -40,6 +40,7 @@ const suggestion = (
 	supersededByThreadId: "",
 	createdAt: 0,
 	updatedAt: 0,
+	answerOvertakenBy: "None",
 	...over,
 });
 
@@ -70,8 +71,15 @@ describe("inviteStanding", () => {
 		});
 	});
 
-	it("draws no card for one the reader waved away", () => {
-		assert.equal(inviteStanding(suggestion({ state: "Dismissed" })), undefined);
+	it("keeps a card the reader waved away, so it can be taken back", () => {
+		assert.deepEqual(inviteStanding(suggestion({ state: "Dismissed" })), {
+			state: "dismissed",
+			rsvp: "noReply",
+		});
+		assert.equal(
+			inviteStanding(suggestion({ method: "Cancel", state: "Dismissed" })),
+			undefined,
+		);
 	});
 
 	it("asks about a cancellation only until it is taken or kept", () => {

package/src/lib/calendar-suggestion.ts

@@ -61,18 +61,20 @@ export interface InviteStanding {
 /**
  * What a suggestion's state means for its card.
  *
- * A dismissed card was waved away and is gone. A cancellation asks for an
- * answer only while it is pending: once taken or kept, the event it named is
- * settled and there is nothing left to say beside the message.
+ * A dismissed card was waved away without an answer, and stays so it can be
+ * taken back. A cancellation asks for an answer only while it is pending: once
+ * taken or kept, the event it named is settled and there is nothing left to
+ * say beside the message.
  */
 export function inviteStanding(
 	suggestion: CalendarSuggestion,
 ): InviteStanding | undefined {
-	if (suggestion.state === "Dismissed") return undefined;
 	if (suggestion.method === "Cancel")
 		return suggestion.state === "Pending"
 			? { state: "cancelled", rsvp: "noReply" }
 			: undefined;
+	if (suggestion.state === "Dismissed")
+		return { state: "dismissed", rsvp: "noReply" };
 	if (suggestion.state === "Superseded")
 		return { state: "superseded", rsvp: "noReply" };
 	if (suggestion.state === "Accepted")

package/src/lib/calendar-suggestion.west.test.ts

@@ -35,6 +35,7 @@ const allDay = {
 	supersededByThreadId: "",
 	createdAt: 0,
 	updatedAt: 0,
+	answerOvertakenBy: "None",
 } as const;
 
 describe("an all-day invitation, west of where it was sent", () => {