@remit/web-client 0.0.257 → 0.0.259

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.257",
+  "version": "0.0.259",
   "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/config-import/ConfigImportWizard.flow.test.ts

@@ -19,9 +19,7 @@ import assert from "node:assert/strict";
 import { afterEach, describe, it } from "node:test";
 import { MutationCache, QueryCache, QueryClient } from "@tanstack/react-query";
 import { createElement } from "react";
-import { ApiError } from "../../lib/api";
 import "../../lib/client";
-import { shouldEscalate, softErrorStatuses } from "../../lib/error-classifier";
 import { __resetFatalError, getCurrentFatalError } from "../../lib/fatal-error";
 import {
 	handleMutationCacheError,
@@ -196,28 +194,18 @@ describe("ConfigImportWizard — an instance that is not empty", () => {
 
 	/**
 	 * The other half of reaching that screen: the refusal must not also take the
-	 * app to the fatal page over it. That decision is `shouldEscalate` reading
-	 * the mutation's meta, and it is pinned here rather than through the wizard
-	 * because under this loader `lib/client.ts` and the generated SDK resolve
-	 * `client.gen` through two specifiers (`…/client.gen.ts` and `./client.gen.js`)
-	 * and so hold two client instances — the error interceptor registers on one
-	 * and the request goes through the other, which never happens under Vite,
-	 * where both specifiers resolve to the same module.
+	 * app to the fatal page over it. Driven through the wizard, so it holds the
+	 * whole chain — the error interceptor stamping the status on the thrown
+	 * `ApiError`, and the mutation's meta telling `shouldEscalate` to leave 409
+	 * to the caller.
 	 */
-	it("keeps the 409 off the fatal page, and still escalates a 401", () => {
-		const meta = softErrorStatuses(409);
-		assert.equal(
-			shouldEscalate(new ApiError("not empty", 409, {}), meta, "user"),
-			false,
-		);
-		assert.equal(
-			shouldEscalate(new ApiError("signed out", 401, {}), meta, "user"),
-			true,
-		);
-		assert.equal(
-			shouldEscalate(new ApiError("broken", 500, {}), meta, "user"),
-			true,
-		);
+	it("keeps the 409 off the fatal page", async () => {
+		const dom = start({ onImport: conflicted });
+		await pickFile(dom, "config.json", CONFIG);
+		dom.click(checkButton(dom));
+		await dom.flush();
+
+		assert.equal(getCurrentFatalError(), null);
 	});
 
 	it("does not record an import when the reader aborts the 409", async () => {

package/src/components/mail/DailyBrief.tsx

@@ -24,11 +24,14 @@
  * chips and the account source group, in a panel the list header's caret opens
  * over the rows. `FilterPanelProvider` shares that panel's open state between
  * the caret and the sheet, the same shape `MailViewChrome` gives the mailbox and
- * Starred views. The category and the chips narrow the grouped sections
- * themselves, and the phone search takeover reads the same selection, so a
- * filter set on one surface holds on the other. Under a query the chips are
- * terms of that query — see `briefChipFilters` — so what narrows the list is
- * readable and editable in the search field.
+ * Starred views. The list draws those controls but applies none of them: the
+ * category and every chip a parameter can express travel with the section
+ * requests, and the two that cannot ("From contacts", "Today") are applied here
+ * alongside the residual tokens (#314). The phone search takeover reads the same
+ * selection and the same rows, so a filter set on one surface holds on the
+ * other. Under a query the chips are terms of that query — see
+ * `briefChipFilters` — so what narrows the list is readable and editable in the
+ * search field.
  *
  * Multi-select is the mailbox list's, not a copy of it: the same
  * `ThreadListInteraction` cursor and `useSelection` state, and the same
@@ -114,7 +117,11 @@ import {
 	matchesSearchTokens,
 	toThreadRowData,
 } from "@/lib/brief";
-import { briefCountsMatchRows, briefCriteria } from "@/lib/brief-criteria";
+import {
+	briefClientOnlyFilters,
+	briefCountsMatchRows,
+	briefCriteria,
+} from "@/lib/brief-criteria";
 import { isServerError } from "@/lib/error-classifier";
 import { junkDestination } from "@/lib/junk-destination";
 import type { ListHeaderChrome } from "@/lib/list-header-chrome";
@@ -659,11 +666,16 @@ export function DailyBrief({
 		refetchSections();
 	}, [underQuery, refetchSearch, refetchSections]);
 
-	// What the request could not carry: muted senders, the account pill, and the
+	// What the request could not carry: muted senders, the account pill, the two
+	// chips no endpoint takes a parameter for ("From contacts", "Today"), and the
 	// residual tokens (`from:`, `subject:`, `before:`, `after:`, `in:`,
 	// `account:`) that `listAllThreads` has no parameter for. Everything else was
 	// answered over the whole scope by the request itself, and the order the rows
 	// arrived in is kept — narrowing never re-sorts.
+	const clientOnlyFilters = useMemo(
+		() => briefClientOnlyFilters(requestFilters),
+		[requestFilters],
+	);
 	const narrowRows = useCallback(
 		(rows: RemitImapThreadMessageResponse[]): ThreadRowData[] =>
 			// One row per conversation, because that is what the server counted:
@@ -676,9 +688,10 @@ export function DailyBrief({
 					(t) =>
 						(selectedAccountId === "all" ||
 							t.accountId === selectedAccountId) &&
+						matchesBriefFilters(t, clientOnlyFilters) &&
 						matchesSearchTokens(t, residualTokens),
 				),
-		[selectedAccountId, residualTokens],
+		[selectedAccountId, clientOnlyFilters, residualTokens],
 	);
 
 	const briefRows = useMemo<BriefCategoryResult[]>(
@@ -826,18 +839,13 @@ export function DailyBrief({
 		[refreshState, onRefreshBrief, refreshError, hasNewMail, refreshAccountIds],
 	);
 
-	// The phone search takeover renders the account/free-text-narrowed rows,
-	// further narrowed by the same category and attribute chips the list applies.
+	// The phone search takeover renders the rows the list renders: the same
+	// requests answered the category and the chips, so a second pass here would
+	// narrow one surface by a criterion the other already applied to the whole
+	// scope.
 	const searchResults = useMemo<SearchResult[]>(
-		() =>
-			filteredRows
-				.filter(
-					(t) =>
-						(chipCategory === "all" || t.category === chipCategory) &&
-						matchesBriefFilters(t, chipFilters),
-				)
-				.map((row) => rowToSearchResult(row, resultFolderIndex)),
-		[filteredRows, chipCategory, chipFilters, resultFolderIndex],
+		() => filteredRows.map((row) => rowToSearchResult(row, resultFolderIndex)),
+		[filteredRows, resultFolderIndex],
 	);
 
 	// "Related" (semantic) spans every account here — the brief is the

package/src/components/mail/MailViewChrome.tsx

@@ -14,8 +14,8 @@
  * restores the sheet exactly as it was.
  *
  * The daily brief composes the same three parts itself — provider, header,
- * sheet — around the kit `BriefSections`, whose sheet narrows the grouped
- * sections and flattens them when scoped to one category.
+ * sheet — around the kit `BriefSections`, whose sheet reports the selection and
+ * flattens the sections when the brief is scoped to one category.
  */
 import {
 	FilterPanelProvider,

package/src/lib/brief-criteria.ts

@@ -18,6 +18,7 @@
  * the request is wider than the list and the section totals are not the list's
  * size. `briefCountsMatchRows` is how a caller knows to show no number instead.
  */
+import type { BriefFilterId } from "@remit/ui";
 import type { InboxFilterParams } from "./inbox-filters.js";
 import { inboxFilterParams } from "./inbox-filters.js";
 import type { SearchToken } from "./search-tokens.js";
@@ -34,12 +35,23 @@ export const BRIEF_TOKEN_PARAMS: readonly ThreadSearchTokenParamName[] = [
 	"attachments",
 ];
 
-/** Chips the request cannot express, so the kit applies them over the rows. */
-export const BRIEF_CLIENT_ONLY_FILTERS: readonly string[] = [
+/** Chips the request cannot express, so the caller applies them over the rows. */
+export const BRIEF_CLIENT_ONLY_FILTERS: readonly BriefFilterId[] = [
 	"contacts",
 	"today",
 ];
 
+/**
+ * The chips on screen that no request carries, as the set to apply over the rows
+ * that came back. Every other chip was answered by the server over the whole
+ * scope, and applying one of those again here would narrow one page by a
+ * criterion the request already applied to everything (#312).
+ */
+export const briefClientOnlyFilters = (
+	attributes: ReadonlySet<string>,
+): ReadonlySet<BriefFilterId> =>
+	new Set(BRIEF_CLIENT_ONLY_FILTERS.filter((id) => attributes.has(id)));
+
 /** Everything a section request narrows by except its own category. */
 export type BriefSectionParams = Omit<InboxFilterParams, "category">;
 

package/src/lib/client.test.ts

@@ -1,6 +1,9 @@
 import assert from "node:assert/strict";
 import { afterEach, describe, it } from "node:test";
+import { trashOperationsEmptyTrashMutation } from "@remit/api-http-client/@tanstack/react-query.gen.ts";
 import { trashOperationsEmptyTrash } from "@remit/api-http-client/sdk.gen.ts";
+import { QueryClient } from "@tanstack/react-query";
+import { getRuntimeConfig } from "../runtime-config";
 import { type HttpMock, mockFetch } from "../test-support/http";
 import { ApiError } from "./api";
 import "./client";
@@ -66,3 +69,46 @@ describe("the error interceptor", () => {
 		assert.equal(error.message, "Request failed with status 503");
 	});
 });
+
+/**
+ * `client.ts` reaches the generated client as `@remit/api-http-client/client.gen.ts`
+ * while the generated code reaches it as `./client.gen.js`. Both must land on
+ * one module: two would leave every generated call on the generated default
+ * base URL and outside the error interceptor, so a 409 would arrive with no
+ * status and the fatal-error classifier would escalate it. Vite dedupes; this
+ * pins the node test loader, where the flow tests run.
+ */
+describe("the client the generated code calls through", () => {
+	const emptyViaQueryLayer = (): Promise<unknown> => {
+		const { mutationFn } = trashOperationsEmptyTrashMutation();
+		assert.ok(mutationFn);
+		return mutationFn(
+			{ path: { accountId: "acc-1" } },
+			{ client: new QueryClient(), meta: undefined },
+		);
+	};
+
+	it("is the instance client.ts configured, for the SDK and the query layer", async () => {
+		answer(200, {});
+
+		await empty();
+		await emptyViaQueryLayer();
+
+		const sent = http?.calls.map((call) => call.url) ?? [];
+		assert.equal(sent.length, 2);
+		const base = `${getRuntimeConfig().apiUrl}/accounts/acc-1/trash/empty`;
+		assert.deepEqual(sent, [base, base]);
+	});
+
+	it("carries the status on a query-layer failure too", async () => {
+		answer(409, { code: "config_not_empty", message: "already configured" });
+
+		const error = await emptyViaQueryLayer().then(
+			() => undefined,
+			(reason: unknown) => reason,
+		);
+
+		assert.ok(error instanceof ApiError);
+		assert.equal(error.status, 409);
+	});
+});