@remit/web-client 0.0.321 → 0.0.323

package/src/lib/message-body-source.test.ts

@@ -6,6 +6,7 @@ import {
 } from "./message-body-source";
 
 const make = (overrides: Partial<RenderableBodyPart>): RenderableBodyPart => ({
+	partPath: "1",
 	mediaType: "TEXT",
 	mediaSubtype: "PLAIN",
 	contentUrl: "https://cdn.test/content/x",
@@ -75,10 +76,6 @@ describe("pickRenderablePart", () => {
 		assert.equal(pickRenderablePart([image]), null);
 	});
 
-	it("returns null on an empty list", () => {
-		assert.equal(pickRenderablePart([]), null);
-	});
-
 	it("treats casing variants of the subtype as equivalent (mailers are inconsistent)", () => {
 		const html = make({
 			mediaSubtype: "html",
@@ -95,4 +92,24 @@ describe("pickRenderablePart", () => {
 		const broken = make({ mediaSubtype: "HTML", contentUrl: "" });
 		assert.equal(pickRenderablePart([broken]), null);
 	});
+
+	it("never renders a forwarded message's body as the body carrying it", () => {
+		const outer = make({ partPath: "1", contentUrl: "https://cdn.test/outer" });
+		const forwarded = make({
+			partPath: "2",
+			mediaType: "MESSAGE",
+			mediaSubtype: "rfc822",
+			disposition: "attachment",
+			contentUrl: "https://cdn.test/forwarded",
+		});
+		const innerHtml = make({
+			partPath: "2.1",
+			mediaSubtype: "HTML",
+			contentUrl: "https://cdn.test/inner",
+		});
+		assert.deepEqual(pickRenderablePart([outer, forwarded, innerHtml]), {
+			kind: "text",
+			contentUrl: "https://cdn.test/outer",
+		});
+	});
 });

package/src/lib/message-body-source.ts

@@ -8,9 +8,12 @@
  * type without standing up jsdom or DOMPurify.
  */
 
+import { ownParts } from "@remit/data-ports/message-parts";
+
 export type BodyContentKind = "html" | "text";
 
 export interface RenderableBodyPart {
+	partPath: string;
 	mediaType: string;
 	mediaSubtype: string;
 	disposition?: string;
@@ -27,13 +30,13 @@ export interface PickedBodyPart {
  * Pick the best body part to render: prefer the first inline `text/html`,
  * fall back to the first inline `text/plain`. Multipart container rows and
  * attachment-disposition parts are ignored — they carry no renderable
- * payload at this position. Returns `null` when nothing renderable is
+ * payload at this position — and so are the parts of a forwarded message. Returns `null` when nothing renderable is
  * available so callers can show an empty-body affordance.
  */
 export const pickRenderablePart = (
 	parts: readonly RenderableBodyPart[],
 ): PickedBodyPart | null => {
-	const renderable = parts.filter(
+	const renderable = ownParts(parts).filter(
 		(p) =>
 			!p.isMultipart &&
 			p.disposition !== "attachment" &&

package/src/lib/onboarding-completion.test.ts

@@ -45,20 +45,4 @@ describe("completeOnboarding", () => {
 			"navigate",
 		]);
 	});
-
-	it("refreshes the config query", async () => {
-		let refetchedKey: unknown;
-		await completeOnboarding({
-			queryClient: {
-				refetchQueries: (filters) => {
-					refetchedKey = (filters as { queryKey?: unknown }).queryKey;
-					return Promise.resolve();
-				},
-			},
-			recordCompleted: () => {},
-			navigateToInbox: () => {},
-		});
-
-		assert.ok(refetchedKey, "refetchQueries called with a query key");
-	});
 });

package/src/lib/organize/filter-edit-model.test.ts

@@ -19,7 +19,6 @@ const filter = (
 	scope: "Standing",
 	state: "Active",
 	disabledReason: "None",
-	hasAnchor: false,
 	ruleChangedAt: 0,
 	actionChangedAt: 0,
 	matchOperator: "And",
@@ -77,21 +76,6 @@ describe("filterToRule", () => {
 		assert.equal(rule.scope, "until");
 		assert.match(rule.until ?? "", /^\d{4}-\d{2}-\d{2}$/);
 	});
-
-	it("shows a semantic anchor as an active widen chip when the deployment can serve it", () => {
-		const rule = filterToRule(filter({ hasAnchor: true }));
-		assert.ok(rule.widen);
-		assert.equal(rule.widen?.inactive, undefined);
-	});
-
-	it("marks the widen inactive on a deployment that cannot evaluate it (D4)", () => {
-		const rule = filterToRule(filter({ hasAnchor: true }), true);
-		assert.equal(rule.widen?.inactive, true);
-	});
-
-	it("carries no widen when the filter has no anchor", () => {
-		assert.equal(filterToRule(filter({ hasAnchor: false })).widen, undefined);
-	});
 });
 
 describe("expiresAtToPickedDate", () => {
@@ -109,7 +93,7 @@ describe("expiresAtToPickedDate", () => {
 });
 
 describe("ruleChangesPredicateOrAction", () => {
-	const base = filterToRule(filter({ hasAnchor: true }));
+	const base = filterToRule(filter());
 
 	it("is false for an identical rule and for a rename only", () => {
 		assert.equal(ruleChangesPredicateOrAction(base, base), false);
@@ -119,7 +103,7 @@ describe("ruleChangesPredicateOrAction", () => {
 		);
 	});
 
-	it("is true when a clause, operator, move target or widen changes", () => {
+	it("is true when a clause, operator or move target changes", () => {
 		assert.equal(
 			ruleChangesPredicateOrAction({ ...base, matchOperator: "any" }, base),
 			true,
@@ -131,10 +115,6 @@ describe("ruleChangesPredicateOrAction", () => {
 			),
 			true,
 		);
-		assert.equal(
-			ruleChangesPredicateOrAction({ ...base, widen: undefined }, base),
-			true,
-		);
 		assert.equal(
 			ruleChangesPredicateOrAction(
 				{ ...base, clauses: [{ id: "c", field: "Subject", value: "x" }] },
@@ -288,14 +268,4 @@ describe("buildUpdateFilterInput", () => {
 		assert.equal(body.scope, "Temporary");
 		assert.match(body.expiresAt ?? "", /^2027-06-01T/);
 	});
-
-	it("carries no anchor field — the editor never has one to send (reader #266)", () => {
-		const changed: FilterRule = {
-			...original,
-			scope: "until",
-			until: "2027-03-04",
-		};
-		const body = buildUpdateFilterInput(changed, original);
-		assert.equal("anchorMessageId" in body, false);
-	});
 });

package/src/lib/organize/filter-edit-model.ts

@@ -8,20 +8,15 @@ import { NO_ACTION } from "./organize-model";
 
 /**
  * The persisted filter as the chip editor's rule (RFC 038 D6). Loads the whole
- * rule the user edits: literal clauses, the match operator, the move action, the
- * scope (and, for a Temporary filter, the date it stops on), and the semantic
- * anchor as a widen chip. The anchor renders inactive when this deployment
- * cannot evaluate it (D4) — the rule then matches by its literal clauses only.
+ * rule the user edits: literal clauses, the match operator, the move action, and
+ * the scope (and, for a Temporary filter, the date it stops on).
  *
  * The scope maps `Standing` → "standing" and `Temporary` → "until"; a persisted
  * filter is never the one-time "once" scope. `moveMailboxId` and `labelId` both
  * drop the `"None"` sentinel to `undefined` so an empty select reads as "no
  * action" (issue #26).
  */
-export const filterToRule = (
-	filter: RemitImapFilterResponse,
-	semanticUnavailable = false,
-): FilterRule => {
+export const filterToRule = (filter: RemitImapFilterResponse): FilterRule => {
 	const clauses: RuleClause[] = filter.literalClauses.map((clause, index) => ({
 		id: `clause-${index}`,
 		field: clause.field,
@@ -30,9 +25,6 @@ export const filterToRule = (
 	return {
 		clauses,
 		matchOperator: filter.matchOperator === "And" ? "all" : "any",
-		widen: filter.hasAnchor
-			? { anchorCount: 1, ...(semanticUnavailable ? { inactive: true } : {}) }
-			: undefined,
 		moveMailboxId:
 			filter.actionMailboxId !== NO_ACTION ? filter.actionMailboxId : undefined,
 		labelId:
@@ -69,13 +61,12 @@ const predicateActionKey = (rule: FilterRule): string =>
 		operator: rule.matchOperator,
 		move: rule.moveMailboxId ?? null,
 		label: rule.labelId ?? null,
-		widen: rule.widen ? (rule.widen.inactive ? "inactive" : "active") : "none",
 	});
 
 /**
  * Whether the edited rule changes the predicate or the action versus the one it
  * was loaded from — the clauses, the match operator, the move target, the
- * label target, or the widen's presence. A change here is what bumps
+ * or the label target. A change here is what bumps
  * `ruleChangedAt` and offers the re-back-apply (RFC 034 Decision 3.2); the name
  * is deliberately excluded, so a cosmetic rename is not a rule change.
  */
@@ -93,7 +84,7 @@ const scopeExpiryKey = (rule: FilterRule): string =>
 /**
  * Whether the edited rule changes scope (standing ↔ until-a-date) or the date
  * itself, versus the one it was loaded from (reader #266). Scope and expiry
- * are mutable on an existing filter, unlike the anchor, and a change here
+ * are mutable on an existing filter, and a change here
  * bumps `ruleChangedAt` the same way a predicate/action change does — moving a
  * lapsed filter back to Standing (or extending its date) is the same kind of
  * "the user just reasserted this rule" moment, and re-offers the back-apply so
@@ -110,8 +101,7 @@ export const ruleChangesScopeOrExpiry = (
  * untouched (RFC 034 Decision 3.2). A predicate or action change sends the
  * operator, clauses, move target, and label target; a scope or expiry change
  * sends `scope` and, for the `until` scope, `expiresAt` (reader #266) —
- * either bumps `ruleChangedAt`. The anchor is never in the editor's gift, so
- * it never enters the patch; the partial update preserves it.
+ * either bumps `ruleChangedAt`.
  */
 export const buildUpdateFilterInput = (
 	rule: FilterRule,

package/src/lib/organize/organize-model.test.ts

@@ -53,31 +53,17 @@ describe("hasCommittableAction", () => {
 });
 
 describe("buildOrganizeInput", () => {
-	it("carries the anchor and defaults both actions to None when neither is set", () => {
-		const input = buildOrganizeInput(baseDraft({ anchorMessageId: "msg-1" }));
-		assert.equal(input.anchorMessageId, "msg-1");
+	it("defaults both actions to None when neither is set", () => {
+		const input = buildOrganizeInput(baseDraft());
 		assert.equal(input.actionMailboxId, NO_ACTION);
 		assert.equal(input.actionLabelId, NO_ACTION);
 		assert.equal(input.matchOperator, "And");
 		assert.deepEqual(input.literalClauses, []);
 	});
 
-	it("omits anchorMessageId entirely for a purely-literal input", () => {
-		const input = buildOrganizeInput(
-			baseDraft({
-				literalClauses: [{ field: "From", value: "airbnb.com" }],
-			}),
-		);
-		assert.equal("anchorMessageId" in input, false);
-	});
-
 	it("carries the move and label actions independently (issue #26)", () => {
 		const input = buildOrganizeInput(
-			baseDraft({
-				anchorMessageId: "msg-1",
-				moveMailboxId: "mbx-9",
-				labelId: "lbl-9",
-			}),
+			baseDraft({ moveMailboxId: "mbx-9", labelId: "lbl-9" }),
 		);
 		assert.equal(input.actionMailboxId, "mbx-9");
 		assert.equal(input.actionLabelId, "lbl-9");
@@ -87,7 +73,7 @@ describe("buildOrganizeInput", () => {
 describe("buildCreateFilterInput", () => {
 	it("builds a Standing filter with no expiresAt", () => {
 		const input = buildCreateFilterInput(
-			baseDraft({ anchorMessageId: "msg-1", moveMailboxId: "mbx-2" }),
+			baseDraft({ moveMailboxId: "mbx-2" }),
 			"standing",
 			"Travel",
 		);
@@ -96,7 +82,6 @@ describe("buildCreateFilterInput", () => {
 		assert.equal(input.name, "Travel");
 		assert.equal(input.actionMailboxId, "mbx-2");
 		assert.equal(input.actionLabelId, NO_ACTION);
-		assert.equal(input.anchorMessageId, "msg-1");
 	});
 
 	it("builds a Temporary filter that carries expiresAt", () => {
@@ -143,8 +128,8 @@ describe("organizeScopeFor", () => {
 		);
 	});
 
-	it("reads either widened door at scope once as all-like-these", () => {
-		assert.equal(organizeScopeFor({ mode: "similar" }), "all-like-these");
+	it("reads the properties door at scope once as all-like-these", () => {
+		assert.equal(organizeScopeFor({ mode: "properties" }), "all-like-these");
 		assert.equal(
 			organizeScopeFor({ mode: "properties", ruleScope: "once" }),
 			"all-like-these",
@@ -152,7 +137,7 @@ describe("organizeScopeFor", () => {
 	});
 
 	it("reads the two persisting scopes off the scope answer alone", () => {
-		for (const mode of ["selected", "similar", "properties"] as const) {
+		for (const mode of ["selected", "properties"] as const) {
 			assert.equal(
 				organizeScopeFor({ mode, ruleScope: "standing" }),
 				"standing",
@@ -196,24 +181,6 @@ describe("buildWizardDraft", () => {
 		}
 	});
 
-	it("anchors on the ticked messages only while the similar door is matching", () => {
-		const anchored = buildWizardDraft({
-			mode: "similar",
-			anchorMessageId: "msg-1",
-			clauses: [],
-			matchOperator: "all",
-		});
-		assert.equal(anchored.anchorMessageId, "msg-1");
-
-		const literal = buildWizardDraft({
-			mode: "properties",
-			anchorMessageId: "msg-1",
-			clauses,
-			matchOperator: "any",
-		});
-		assert.equal("anchorMessageId" in literal, false);
-	});
-
 	it("maps the wizard's operator onto the API's", () => {
 		assert.equal(
 			buildWizardDraft({ mode: "properties", clauses, matchOperator: "all" })

package/src/lib/organize/organize-model.ts

@@ -32,16 +32,23 @@ export type OrganizeScope =
 /** The `"None"` sentinel the API uses for an absent label / move action. */
 export const NO_ACTION = "None";
 
+/**
+ * The predicate a preview counts and a commit acts on: the operator and the
+ * literal clauses. The set it previews equals the set every commit scope acts on.
+ */
+export type OrganizeMatchPredicate = Pick<
+	RemitImapOrganizeInput,
+	"matchOperator" | "literalClauses"
+>;
+
 /**
  * The user's in-progress organize decision, independent of which scope they
- * land on. The anchor and predicate drive the match set; `moveMailboxId` and
+ * land on. The predicate drives the match set; `moveMailboxId` and
  * `labelId` are the two committable actions (issue #26) — independent of each
  * other, since a move is exclusive and a label is additive (RFC 034 Decision
  * 3.1).
  */
 export interface OrganizeDraft {
-	/** Semantic anchor — "mail like this one". The first selected message. */
-	anchorMessageId?: string;
 	/** How `literalClauses` combine. Ignored when there are none. */
 	matchOperator: RemitImapFilterMatchOperator;
 	/** Literal from/subject/has-words clauses (RFC 031). */
@@ -90,13 +97,12 @@ export const buildRunFilterInput = (
 /**
  * Build the read-only preview / back-apply matcher input. The action fields do
  * not affect which messages match — the preview returns exactly the set a job
- * with the same predicate would apply to — so a widen preview can pass this
- * before the user has chosen a folder or a label.
+ * with the same predicate would apply to — so a preview can pass this before
+ * the user has chosen a folder or a label.
  */
 export const buildOrganizeInput = (
 	draft: OrganizeDraft,
 ): RemitImapOrganizeInput => ({
-	...(draft.anchorMessageId ? { anchorMessageId: draft.anchorMessageId } : {}),
 	matchOperator: draft.matchOperator,
 	literalClauses: draft.literalClauses,
 	actionLabelId: draft.labelId ?? NO_ACTION,
@@ -111,9 +117,9 @@ export const buildOrganizeInput = (
 export interface WizardCommitAnswers {
 	/**
 	 * The door the match came through. An escalated predicate is not one: it has
-	 * no clauses to build a rule from and no anchor to widen, so a scope
-	 * reconstructed for it would be a rule matching everything. Typed to the
-	 * three doors so that cannot be written rather than merely not written.
+	 * no clauses to build a rule from, so a scope reconstructed for it would be a
+	 * rule matching everything. Typed to the doors so that cannot be written
+	 * rather than merely not written.
 	 */
 	mode: MatchDoor;
 	/** Absent on the verbs that never reach the scope step — those act once. */
@@ -123,7 +129,7 @@ export interface WizardCommitAnswers {
 /**
  * Which of the four commit scopes the wizard's answers add up to. Reconstructed
  * here and nowhere else, so a driver cannot invent a fifth: the ticked list at
- * scope once is `just-these`, a widened door at scope once is `all-like-these`,
+ * scope once is `just-these`, the properties door at scope once is `all-like-these`,
  * and the two persisting scopes are `standing` and `temporary`.
  */
 export const organizeScopeFor = ({
@@ -136,8 +142,6 @@ export const organizeScopeFor = ({
 };
 
 export interface WizardDraftInput extends WizardCommitAnswers {
-	/** The semantic anchor, present only while the similar door is the matcher. */
-	anchorMessageId?: string;
 	clauses: readonly RuleClause[];
 	matchOperator: MatchOperator;
 	moveMailboxId?: string;
@@ -152,15 +156,12 @@ export interface WizardDraftInput extends WizardCommitAnswers {
  * instant once there is a draft to carry it.
  */
 export const buildWizardDraft = ({
-	mode,
 	ruleScope,
-	anchorMessageId,
 	clauses,
 	matchOperator,
 	moveMailboxId,
 	until,
 }: WizardDraftInput): OrganizeDraft => ({
-	...(mode === "similar" && anchorMessageId ? { anchorMessageId } : {}),
 	matchOperator: matchOperator === "all" ? "And" : "Or",
 	literalClauses: clauses.map((clause) => ({
 		field: clause.field,
@@ -193,8 +194,5 @@ export const buildCreateFilterInput = (
 		literalClauses: draft.literalClauses,
 		actionLabelId: draft.labelId ?? NO_ACTION,
 		actionMailboxId: draft.moveMailboxId ?? NO_ACTION,
-		...(draft.anchorMessageId
-			? { anchorMessageId: draft.anchorMessageId }
-			: {}),
 	};
 };