fix(catalog): keep the live catalog truthful after every import path
Gitea Actions Runner Test / test-job (push) Successful in 0s
CI / check (push) Successful in 29s
CI / tests-integration (push) Failing after 1m43s
CI / tests-unit (push) Successful in 1m47s
CI / tests-ui (push) Successful in 2m33s
CI / preflight (push) Skipped
CI / deploy (push) Skipped

The live catalog store only covered part of the import surface. A durable
job settled, a sync queue drained, a .nitro upload or a clone run left the
Studio rail and the stats bar showing pre-import numbers until the page was
reloaded, and the Catalog Manager kept a second tree that never saw writes
made elsewhere in the session.

Every one of those paths now pulls the tree again, and the refresh carries
the totals with it: importing writes catalog rows server-side, so the counts
the store holds were stale for the rest of the session.

- refreshCatalogTree shares one request between concurrent callers and queues
  a single follow-up read when a write lands mid-flight, so a burst of edits
  costs at most one extra read.
- useFurnitureJobs treats its first payload as a baseline, so a page load no
  longer replays every past import as "just settled", and hands the settled
  jobs to the callback.
- The Catalog Manager pushes its own mutations into the store and re-reads its
  active tab when the store changes.
- The 30s unstable_cache on the admin totals is now tagged and invalidated from
  every catalog write, including the import worker, so it no longer survives an
  import even across a hard 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 14:45:26 +02:00
1 parent d73baf1458
commit 28ce0f911c
22 files changed
+445 -70

No files matched your search

@@ -13,6 +13,7 @@ import type { CatalogSelection } from "@/features/catalog/client/catalog-selecti
import { useCatalogNavigation } from "@/features/catalog/client/use-catalog-navigation";
import { useLatestRequest } from "@/features/catalog/client/use-latest-request";
import {
refreshCatalogTree,
seedCatalogTotals,
useLiveCatalog,
} from "@/features/catalog/client/use-live-catalog";
@@ -271,6 +272,16 @@ function CatalogManagerInner({
}
}, [dispatch, catQs, rootRequests]);
/**
* A page created, moved or deleted here changes the tree the Studio rail and
* the stats bar read from the live store. Refreshing it here keeps both views
* truthful without a route re-render; the store coalesces bursts of edits.
*/
const onTreeMutation = useCallback(() => {
void loadRootPages();
void refreshCatalogTree();
}, [loadRootPages]);
// Seed once on opening, then refresh independently of category selection.
useEffect(() => {
if (!open) return;
@@ -504,7 +515,7 @@ function CatalogManagerInner({
activeTabId={state.activeTabId}
selectedPageId={state.selectedPageId}
onSelectPage={handleSelectPage}
onTreeMutation={loadRootPages}
onTreeMutation={onTreeMutation}
nodeUpdate={null}
/>
</div>
@@ -59,6 +59,7 @@ import {
TooltipTrigger,
} from "@/components/ui/tooltip";
import { requestCatalogNavigation } from "@/features/catalog/client/use-catalog-navigation";
import { useLiveCatalog } from "@/features/catalog/client/use-live-catalog";
import { DuplicateCategoryDialog } from "@/features/catalog/components/duplicate-category-dialog";
import type { DuplicateInput } from "@/features/catalog/domain/duplicate";
import { cn } from "@/lib/utils";
@@ -213,6 +214,21 @@ export function SortableTree({
void loadTabTree();
}, [activeTabId, loadTabTree, dispatch]);
/**
* This tree is loaded per root tab, so it cannot see writes that happen
* elsewhere in the session — an import settling, or a page edited through the
* Studio. The live store is where those land; when it changes, re-read this
* tab so the dialog never shows pre-import nodes.
*/
const liveTree = useLiveCatalog().tree;
const seenLiveTree = useRef(liveTree);
useEffect(() => {
if (liveTree === seenLiveTree.current) return;
seenLiveTree.current = liveTree;
if (activeTabId === null) return;
void loadTabTree();
}, [liveTree, activeTabId, loadTabTree]);
// Ignore stale search completions when the query or catalog changes.
useEffect(() => {
const controller = new AbortController();