@remit/web-client 0.0.102 → 0.0.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.102",
+  "version": "0.0.103",
   "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/SelectionWizardHost.search-entry.test.ts

@@ -0,0 +1,41 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { describe, it } from "node:test";
+import { fileURLToPath } from "node:url";
+
+/**
+ * A filter made from a search belongs to the account the search ran over (#524).
+ * The surface hands its account to the host on the props; a search entry that
+ * reads past it writes the rule against whichever account happens to be first in
+ * the list, and the mail the user was looking at is never filtered.
+ *
+ * Which account wins is decided — and tested — in
+ * `../../lib/organize/search-to-rule.test.ts`. What is read off the source here
+ * is that the host asks that question with the surface's account in hand, which
+ * is the wiring the bug lived in and which no unit of the resolver can prove.
+ * The host wires routing, history and several data hooks together, so it is read
+ * rather than rendered, as this package's other component-level rules are (see
+ * `SelectionWizardHost.run-exit.test.ts`).
+ */
+
+const here = dirname(fileURLToPath(import.meta.url));
+const source = readFileSync(resolve(here, "SelectionWizardHost.tsx"), "utf8");
+
+const host = source.match(
+	/export function SelectionWizardHost\(([\s\S]*)$/,
+)?.[1];
+
+describe("the search entry's account", () => {
+	it("is resolved with the account the surface handed over", () => {
+		assert.ok(host, "the host is gone");
+		const call = host.match(/searchRuleAccountId\(([\s\S]*?)\)/)?.[1];
+		assert.ok(call, "the search entry resolves no account of its own");
+		assert.match(call, /\bprops\.accountId\b/);
+	});
+
+	it("never reaches past it for the first configured account", () => {
+		assert.ok(host, "the host is gone");
+		assert.doesNotMatch(host, /accounts\[0\]/);
+	});
+});

package/src/components/mail/SelectionWizardHost.tsx

@@ -62,6 +62,7 @@ import {
 	normalizeClauseValue,
 	SUPPORTED_CLAUSE_FIELDS,
 } from "@/lib/organize/rule-model";
+import { searchRuleAccountId } from "@/lib/organize/search-to-rule";
 import type { OrganizeMatchPredicate } from "@/lib/organize/sender-fallback";
 import { useWizardEntryValue, useWizardStep } from "@/lib/wizard-history";
 
@@ -1003,9 +1004,9 @@ function SelectionWizardSession({
  *
  * The URL says which affordance opened the wizard, and that decides two things
  * and no more: which step it opens on, and whether the query seeds the clauses.
- * A search entry ticks nothing and its rule belongs to the account the query
- * names, so the selection the bar would have handed over is not the one it
- * walks.
+ * A search entry ticks nothing, so the selection the bar would have handed over
+ * is not the one it walks; its rule belongs to the account the surface handed
+ * over, and to the one the query names when it names one (#524).
  */
 export function SelectionWizardHost(props: SelectionWizardHostProps) {
 	const fromSearch = useWizardEntryValue() === "search";
@@ -1024,7 +1025,11 @@ export function SelectionWizardHost(props: SelectionWizardHostProps) {
 			{...(conversion
 				? {
 						verb: "organize" as const,
-						accountId: conversion.targetAccountId ?? accounts[0]?.accountId,
+						accountId: searchRuleAccountId(
+							conversion,
+							props.accountId,
+							accounts,
+						),
 						selection: EMPTY_SELECTION,
 						crossAccount: false,
 						escalated: undefined,

package/src/lib/organize/search-to-rule.test.ts

@@ -2,7 +2,7 @@ import assert from "node:assert/strict";
 import { describe, it } from "node:test";
 import { isConvertible } from "@remit/ui";
 import { parseSearchTokens, type SearchTokenContext } from "../search-tokens";
-import { convertSearchToRule } from "./search-to-rule";
+import { convertSearchToRule, searchRuleAccountId } from "./search-to-rule";
 
 const CONTEXT: SearchTokenContext = {
 	mailboxesByName: new Map([["archive", "mbx-archive"]]),
@@ -124,3 +124,39 @@ describe("convertSearchToRule — nothing left to make a filter from", () => {
 		assert.equal(isConvertible(convert("in:archive receipts")), true);
 	});
 });
+
+describe("searchRuleAccountId — whose account the filter belongs to", () => {
+	const ACCOUNTS = [{ accountId: "acc-first" }, { accountId: "acc-work" }];
+
+	it("uses the account the surface is showing for an ordinary search", () => {
+		assert.equal(
+			searchRuleAccountId(convert("invoice"), "acc-work", ACCOUNTS),
+			"acc-work",
+		);
+	});
+
+	it("lets an account: facet name a different account than the surface", () => {
+		assert.equal(
+			searchRuleAccountId(
+				convert("account:work invoice"),
+				"acc-other",
+				ACCOUNTS,
+			),
+			"acc-work",
+		);
+	});
+
+	it("falls back to the first configured account only when nothing names one", () => {
+		assert.equal(
+			searchRuleAccountId(convert("invoice"), undefined, ACCOUNTS),
+			"acc-first",
+		);
+	});
+
+	it("has no account to give when none is configured", () => {
+		assert.equal(
+			searchRuleAccountId(convert("invoice"), undefined, []),
+			undefined,
+		);
+	});
+});

package/src/lib/organize/search-to-rule.ts

@@ -1,3 +1,4 @@
+import type { RemitImapAccountResponse } from "@remit/api-http-client/types.gen.ts";
 import type {
 	DroppedFacet,
 	DroppedFacetType,
@@ -103,3 +104,17 @@ export const convertSearchToRule = (
 		droppedSemantic: keptTerms && searchHadSemanticReach,
 	};
 };
+
+/**
+ * Which account a rule converted from a search belongs to (#524). A query names
+ * one only through an explicit `account:` facet, which an ordinary search does
+ * not carry; without it the rule belongs to the account whose mail the search
+ * ran over, which is the account the surface handed over. Only a surface that
+ * has no single account of its own leaves the first configured one to answer.
+ */
+export const searchRuleAccountId = (
+	conversion: SearchConversion,
+	surfaceAccountId: string | undefined,
+	accounts: readonly Pick<RemitImapAccountResponse, "accountId">[],
+): string | undefined =>
+	conversion.targetAccountId ?? surfaceAccountId ?? accounts[0]?.accountId;