feat(catalog): make the live catalog self-correcting and honest about failure
Gitea Actions Runner Test / test-job (push) Successful in 0s
CI / check (push) Successful in 29s
CI / tests-unit (push) Successful in 1m34s
CI / tests-integration (push) Failing after 1m34s
CI / tests-ui (push) Successful in 2m19s
CI / preflight (push) Skipped
CI / deploy (push) Skipped

The previous commit made imports update the Studio without a reload, but the
guarantee only held inside the tab that started the import and only as long as
every read succeeded. Four holes were left, and this closes them.

A session that mounted the tree before an import kept the pre-import tree for
the rest of its life, because ensureCatalogTreeLoaded() was a once-per-session
no-op. It now asks the server whether what it holds is still current. The answer
is a revision: sendCatalogUpdate() already runs after every catalog write, so it
bumps one, and clients read it on mount, on focus, on a 20s poll and from other
tabs over a BroadcastChannel. An import that finishes in another tab, another
browser or the job worker now lands here too.

A failed read used to be swallowed, which is the worst outcome available: the
rail kept showing pre-import counts as if they were current and nothing said so.
The snapshot now carries the error, the rail shows it with a retry, and the
previous tree stays on screen because stale beats empty.

Every settled import pulled the entire flat tree, which is the one payload that
grows with the size of the catalog. The revision doubles as the ETag on
mode=full, so an unchanged catalog answers 304 and the poll costs a file read.

An import could also report success for an offer the hotel will never sell: a
hidden or disabled page, an item_ids that misses the furni id, a zero amount.
importSingleFurni reads its own row back and reports each of those as a warning,
where the import report already is, instead of leaving it to surface as "the
import did not work" in the client.

Finally, the catalog items table no longer falls back to router.refresh() —
onRefresh is now required, so every mutation ends in a refresh of the caller's
own data instead of a route re-render that threw away editor state and scroll
position. useServerAction keeps its default, because 47 callers across the app
depend on it. The 750-line CatalogTree in catalog-tree.tsx was dead code that
kept its own stale tree and three more router.refresh() calls; only CatalogIcon
and LAYOUT_COLORS are still imported, so the rest is gone.

Tests: the store now covers revisions, 304s, probe failures and error recovery;
a jsdom test mounts a consumer and asserts the tree updates in place with no
navigation; the old organize-imports e2e asserted nothing about the endpoints
the code actually calls, and is replaced by one that asserts a cross-tab write
lands in the mounted categories without a reload.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
This commit is contained in:
openhandsandClaude Opus 4.8 committed 2026-09-30 15:15:34 +02:00
1 parent 28ce0f911c
commit 9550b3d66f
18 files changed
+1016 -973

No files matched your search

@@ -0,0 +1,15 @@
import { readCatalogRevision } from "@/features/catalog/server/catalog-revision";
import { apiJson, apiOk } from "@/lib/api";
import { withAdmin } from "@/lib/api-handler";
import { PERMS } from "@/lib/permissions";
/**
* The staleness probe for every open admin catalog session. Returns the
* revision `sendCatalogUpdate()` last wrote, so a client can tell whether its
* tree is current with one tiny read instead of pulling the whole tree.
*/
export const GET = withAdmin({ permission: PERMS.CATALOG_VIEW }, async () => {
const revision = await readCatalogRevision();
if (!revision) return apiJson({ ok: true, revision: null });
return apiOk({ revision }, { headers: { etag: `"${revision}"` } });
});
+16 -2
View File
@@ -1,4 +1,6 @@
import { asc, count, eq, inArray, like, or } from "drizzle-orm";
import { NextResponse } from "next/server";
import { readCatalogRevision } from "@/features/catalog/server/catalog-revision";
import { loadCatalogTotals } from "@/features/catalog/server/catalog-totals";
import { catalogFailure } from "@/features/catalog/server/errors";
import {
@@ -351,11 +353,23 @@ export const GET = withAdmin(
if (sp.get("mode") === "full") {
// Totals travel with the tree so one refresh updates both the rail and
// the stats bar. Read uncached — this response is already the fresh read.
const [pages, totals] = await Promise.all([
const [pages, totals, revision] = await Promise.all([
isBc ? getBcTreeFlat() : getTreeFlat(),
loadCatalogTotals(isBc ? "bc" : "normal"),
readCatalogRevision(),
]);
return apiOk({ pages, totals });
// `revision` doubles as the ETag: a client that saw this exact catalog
// state re-asks with `If-None-Match` and gets a 304 instead of the
// whole flat tree, which is the only part of this payload that grows
// with the size of the catalog.
const etag = revision ? `"${revision}"` : null;
if (etag && request.headers.get("if-none-match") === etag) {
return new NextResponse(null, { status: 304, headers: { etag } });
}
return apiOk(
{ pages, totals, revision },
etag ? { headers: { etag } } : undefined,
);
}
const pageIdRaw = sp.get("pageId");