@remit/web-client 0.0.163 → 0.0.164

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.163",
+  "version": "0.0.164",
   "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/mail/DailyBrief.scope.test.ts

@@ -0,0 +1,76 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import type { ThreadRowData } from "@remit/ui";
+import { wizardScopeFor } from "@remit/ui";
+import { resolveBriefSelectionScope } from "./DailyBrief";
+
+/**
+ * The brief spans accounts and folders, so it resolves both from the selection
+ * itself. Which of the two a selection spans decides what the wizard's folder
+ * and rule steps can say: told to pick a single account, a selection already
+ * inside one account has nothing to act on and the flow dead-ends (#525).
+ */
+
+const row = (
+	id: string,
+	accountId: string,
+	mailboxId: string,
+): ThreadRowData => ({
+	id,
+	accountId,
+	mailboxId,
+	fromName: "Booking.com",
+	fromEmail: "noreply@booking.com",
+	subject: "Booking confirmation",
+	snippet: "Your stay is confirmed",
+	timeLabel: "Jul 2",
+});
+
+const rows: ThreadRowData[] = [
+	row("m1", "acc-personal", "mbx-inbox"),
+	row("m2", "acc-personal", "mbx-archive"),
+	row("m3", "acc-work", "mbx-inbox"),
+];
+
+const scopeOf = (...ids: string[]) =>
+	resolveBriefSelectionScope(rows, new Set(ids));
+
+describe("the scope a brief selection resolves to", () => {
+	it("carries the folder restriction when one account holds every row", () => {
+		const scope = scopeOf("m1", "m2");
+		assert.equal(scope.restriction, "spansFolders");
+		assert.equal(scope.accountId, "acc-personal");
+		assert.equal(scope.mailboxId, undefined);
+		assert.match(scope.moveDisabledHint ?? "", /spans 2 folders/);
+	});
+
+	it("reaches the folder step told about folders, not accounts", () => {
+		const scope = scopeOf("m1", "m2");
+		const wizard = wizardScopeFor(scope.accountId, scope.restriction);
+		assert.match(wizard.destination ?? "", /within one folder/);
+		assert.doesNotMatch(wizard.destination ?? "", /account/);
+		// The account is settled, so the preview behind a widened door has one to
+		// count against and the match step keeps it.
+		assert.equal(wizard.accountId, "acc-personal");
+	});
+
+	it("carries the account restriction when the rows span accounts", () => {
+		const scope = scopeOf("m1", "m3");
+		assert.equal(scope.restriction, "spansAccounts");
+		assert.equal(scope.accountId, undefined);
+		assert.match(
+			wizardScopeFor(scope.accountId, scope.restriction).destination ?? "",
+			/single account/,
+		);
+	});
+
+	it("carries no restriction from one account and one folder", () => {
+		const scope = scopeOf("m1");
+		assert.equal(scope.restriction, undefined);
+		assert.equal(scope.mailboxId, "mbx-inbox");
+		assert.equal(
+			wizardScopeFor(scope.accountId, scope.restriction).destination,
+			undefined,
+		);
+	});
+});

package/src/components/mail/DailyBrief.tsx

@@ -54,6 +54,7 @@ import {
 	partitionSpamResults,
 	RefreshButton,
 	type SearchResult,
+	type SelectionRestriction,
 	SelectionTopBar,
 	SpamResultsOffer,
 	setBriefCategoryInQuery,
@@ -185,6 +186,8 @@ export interface BriefSelectionScope {
 	accountId?: string;
 	/** Source folder, when every selected row shares one. */
 	mailboxId?: string;
+	/** Which scope the selection spans more of than those verbs can take. */
+	restriction?: SelectionRestriction;
 	/** Why folder-scoped verbs are withheld, in the toolbar's own words. */
 	moveDisabledHint?: string;
 }
@@ -214,6 +217,7 @@ export const resolveBriefSelectionScope = (
 	}
 	if (accountIds.size > 1) {
 		return {
+			restriction: "spansAccounts",
 			moveDisabledHint:
 				"Move only works within one account — clear selection or pick messages from a single account",
 		};
@@ -222,6 +226,7 @@ export const resolveBriefSelectionScope = (
 	if (mailboxIds.size > 1) {
 		return {
 			accountId,
+			restriction: "spansFolders",
 			moveDisabledHint: `Move only works within one folder — this selection spans ${mailboxIds.size} folders`,
 		};
 	}
@@ -362,7 +367,7 @@ function BriefSelectionChrome({
 					accountId={scope.accountId}
 					mailboxId={scope.mailboxId}
 					selection={wizardSelection}
-					crossAccount={scope.moveDisabledHint !== undefined}
+					selectionRestriction={scope.restriction}
 					onFinished={exitSelection}
 				/>
 			}

package/src/components/mail/FlaggedList.tsx

@@ -95,7 +95,7 @@ function StarredWizardHost({
 		<SelectionWizardHost
 			verb={verb}
 			selection={selection}
-			crossAccount
+			selectionRestriction="spansAccounts"
 			onFinished={exitSelection}
 		/>
 	);

package/src/components/mail/MessageList.tsx

@@ -1351,7 +1351,7 @@ export const MessageList = ({
 				accountId={accountId}
 				mailboxId={mailboxId}
 				selection={wizardSelection}
-				crossAccount={moveDisabledHint !== undefined}
+				selectionRestriction={moveDisabledHint ? "spansAccounts" : undefined}
 				escalated={escalatedSelection}
 				escalatedProgress={escalation.progress}
 				onFinished={exitSelection}

package/src/components/mail/SelectionWizardHost.tsx

@@ -2,8 +2,6 @@ import { mailboxOperationsListMailboxesOptions } from "@remit/api-http-client/@t
 import {
 	type ClauseDraft,
 	type ClauseEditState,
-	crossAccountDestinationReason,
-	crossAccountRuleReason,
 	derivePropertyClauses,
 	deriveSenderClauses,
 	dominantSender,
@@ -14,6 +12,7 @@ import {
 	type RuleClause,
 	type RunState,
 	type SearchConversion,
+	type SelectionRestriction,
 	SelectionWizard,
 	type StepId,
 	searchConversionNotice,
@@ -25,6 +24,7 @@ import {
 	type Verb,
 	type WizardDraft,
 	type WizardMessage,
+	wizardScopeFor,
 } from "@remit/ui";
 import { useQuery } from "@tanstack/react-query";
 import { useBlocker } from "@tanstack/react-router";
@@ -125,8 +125,12 @@ export interface SelectionWizardHostProps {
 	/** Where the selection was made, so a run invalidates the listing it changed. */
 	mailboxId?: string;
 	selection: readonly WizardSelectionMessage[];
-	/** The ticked rows span more than one account, so no rule can be created. */
-	crossAccount?: boolean;
+	/**
+	 * Which scope the ticked rows span more of than the folder and rule steps can
+	 * take. The surface that resolved the selection knows which of the two it is,
+	 * and the wizard states that one (#525).
+	 */
+	selectionRestriction?: SelectionRestriction;
 	/** Present when the selection is a predicate rather than the ticked rows. */
 	escalated?: EscalatedSelection;
 	/**
@@ -257,7 +261,7 @@ function SelectionWizardSession({
 	accountId,
 	mailboxId,
 	selection,
-	crossAccount = false,
+	selectionRestriction,
 	escalated: escalatedSelection,
 	escalatedProgress,
 	searchConversion,
@@ -451,18 +455,16 @@ function SelectionWizardSession({
 
 	// A filter, a folder, and the preview that counts a widened door all belong to
 	// one account, so a selection spanning accounts reaches none of them and is
-	// told so on the step that asks (#477 5.5, #523). The one-off scope and the
-	// ticked rows act on the messages themselves and are unaffected.
-	const accountScoped = !crossAccount && !!accountId;
-	const ruleRestriction = accountScoped ? undefined : crossAccountRuleReason;
-	const folderRestriction = accountScoped
-		? undefined
-		: crossAccountDestinationReason;
+	// told so on the step that asks (#477 5.5, #523). A selection spanning folders
+	// of one account is told about folders instead, and keeps its account: the
+	// preview behind a widened door has something to count against. The one-off
+	// scope and the ticked rows act on the messages themselves and are unaffected.
+	const wizardScope = wizardScopeFor(accountId, selectionRestriction);
 	const restrictionFor = (step: StepId): string | undefined => {
-		if (step === "folder") return folderRestriction;
+		if (step === "folder") return wizardScope.destination;
 		if (step !== "rule") return undefined;
 		return named.scope === "standing" || named.scope === "until"
-			? ruleRestriction
+			? wizardScope.rule
 			: undefined;
 	};
 	const blockedReason =
@@ -940,7 +942,7 @@ function SelectionWizardSession({
 			match={{
 				selectedCount: selection.length,
 				mode,
-				accountId: accountScoped ? accountId : undefined,
+				accountId: wizardScope.accountId,
 				onModeChange: changeMode,
 				semanticUnavailable,
 				semanticErrorDetail:
@@ -977,13 +979,13 @@ function SelectionWizardSession({
 				onSelect: (moveMailboxId) =>
 					setDraft((held) => ({ ...held, moveMailboxId })),
 				onCreateFolder: accountId ? createFolderIn : undefined,
-				restriction: folderRestriction,
+				restriction: wizardScope.destination,
 			}}
 			rule={{
 				draft: named,
 				onScopeChange: (scope) => setDraft((held) => ({ ...held, scope })),
 				onUntilChange: (until) => setDraft((held) => ({ ...held, until })),
-				restriction: ruleRestriction,
+				restriction: wizardScope.rule,
 			}}
 			name={{
 				name: named.name ?? "",
@@ -1056,7 +1058,7 @@ export function SelectionWizardHost(props: SelectionWizardHostProps) {
 							accounts,
 						),
 						selection: EMPTY_SELECTION,
-						crossAccount: false,
+						selectionRestriction: undefined,
 						escalated: undefined,
 						searchConversion: conversion,
 					}