@terrafirmagreg-team/guide 1.2.7 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrafirmagreg-team/guide",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "type": "module",
   "description": "Guide/books section",
   "license": "LGPL-3.0-only",
@@ -23,16 +23,16 @@
   },
   "dependencies": {
     "@terrafirmagreg-team/data": "^1.2.2",
-    "@terrafirmagreg-team/discussions": "^1.2.5",
-    "@terrafirmagreg-team/dump": "^1.2.3",
+    "@terrafirmagreg-team/discussions": "^1.2.6",
+    "@terrafirmagreg-team/dump": "^1.2.4",
     "@terrafirmagreg-team/game": "^1.2.4",
-    "@terrafirmagreg-team/kit": "^1.2.8",
-    "@terrafirmagreg-team/mdx": "^1.2.3",
-    "@terrafirmagreg-team/preview": "^1.2.2",
-    "@terrafirmagreg-team/search": "^1.2.4",
+    "@terrafirmagreg-team/kit": "^1.2.9",
+    "@terrafirmagreg-team/mdx": "^1.2.4",
+    "@terrafirmagreg-team/preview": "^1.2.3",
+    "@terrafirmagreg-team/search": "^1.2.5",
     "@terrafirmagreg-team/sites": "^1.2.1",
-    "@terrafirmagreg-team/translate": "^1.2.5",
-    "@terrafirmagreg-team/ui": "^1.2.6",
+    "@terrafirmagreg-team/translate": "^1.2.6",
+    "@terrafirmagreg-team/ui": "^1.2.7",
     "fumadocs-core": "16.17.10",
     "lucide-react": "^1.63.0"
   },

package/src/components/views/browser.tsx

@@ -6,7 +6,11 @@ import {
   useAsyncResult,
   useAsyncValue,
 } from '@terrafirmagreg-team/ui/hooks/use-async-value';
+import { useLastResult } from '@terrafirmagreg-team/ui/hooks/use-last-result';
 import { useVersionedDataset } from '@terrafirmagreg-team/kit/hooks/use-versioned-dataset';
+import { useDumpRetryNonce } from '@terrafirmagreg-team/kit/hooks/use-dump-status';
+import { DumpUnavailable } from '@terrafirmagreg-team/kit/components/views/unavailable';
+import { StaleBadge } from '@terrafirmagreg-team/kit/components/dump-status/stale-badge';
 import { useLangMap } from '@terrafirmagreg-team/game/hooks/use-lang-map';
 import { useResolvedLang } from '@terrafirmagreg-team/translate/hooks/use-resolved-lang';
 import { useTranslations } from '@terrafirmagreg-team/translate/hooks/use-translations';
@@ -63,9 +67,13 @@ export function GuideBrowser({
     [params],
   );
   const source = getGuideSource();
-  const books = useAsyncResult(
-    () => source.books(dataset, lang),
-    [dataset, lang],
+  const nonce = useDumpRetryNonce();
+  const books = useLastResult(
+    useAsyncResult(
+      () => source.books(dataset, lang),
+      [dataset, lang, nonce],
+    ),
+    dataset.id,
   );
   const langMap = useLangMap(dataset, lang);
   const messages = useMemo<GuideMessages>(
@@ -107,20 +115,23 @@ export function GuideBrowser({
     if (canonical) router.replace(canonical);
   }, [canonical, router]);
 
-  const payload = useAsyncResult(
-    langMap && bookId
-      ? () =>
-          source.payload(
-            dataset,
-            lang,
-            bookId,
-            entryId,
-            categoryId,
-            langMap,
-            messages,
-          )
-      : undefined,
-    [dataset, lang, bookId, entryId, categoryId, langMap, messages],
+  const payload = useLastResult(
+    useAsyncResult(
+      langMap && bookId
+        ? () =>
+            source.payload(
+              dataset,
+              lang,
+              bookId,
+              entryId,
+              categoryId,
+              langMap,
+              messages,
+            )
+        : undefined,
+      [dataset, lang, bookId, entryId, categoryId, langMap, messages, nonce],
+    ),
+    `${dataset.id}:${bookId ?? ''}`,
   );
 
   useEffect(() => {
@@ -131,11 +142,11 @@ export function GuideBrowser({
 
   const unavailable = (
     <WorkspaceBody>
-      <EmptyState variant="missing">
+      <DumpUnavailable>
         {t('Guide data is temporarily unavailable. Try again later.', {
           note: 'guide.unavailable',
         })}
-      </EmptyState>
+      </DumpUnavailable>
     </WorkspaceBody>
   );
 
@@ -156,6 +167,11 @@ export function GuideBrowser({
       </WorkspaceBody>
     );
   }
-  return <GuidePageView payload={payload.value} langMap={langMap} />;
+  return (
+    <div className="relative flex-1">
+      {books.stale || payload.stale ? <StaleBadge /> : null}
+      <GuidePageView payload={payload.value} langMap={langMap} />
+    </div>
+  );
 }
 

package/src/hooks/use-left-sidebar-tree.ts

@@ -5,6 +5,7 @@ import type * as PageTree from 'fumadocs-core/page-tree';
 import { useLocationSearchParams } from '@terrafirmagreg-team/ui/hooks/page/use-location-search';
 import { useResolvedLang } from '@terrafirmagreg-team/translate/hooks/use-resolved-lang';
 import { useLastValue } from '@terrafirmagreg-team/ui/hooks/use-last-value';
+import { skeletonTree } from '@terrafirmagreg-team/ui/lib/tree';
 import { useGuideTree } from '@terrafirmagreg-team/guide/hooks/use-tree';
 import { guideQueryFromParams } from '@terrafirmagreg-team/guide/lib/nav/query';
 import { parseSectionLocation } from '@terrafirmagreg-team/sites/location';
@@ -19,10 +20,8 @@ export function useGuideLeftSidebarTree(tree: PageTree.Root): PageTree.Root {
     () => (datasetId ? { id: datasetId, version } : undefined),
     [datasetId, version],
   );
-  const runtime = useLastValue(
-    useGuideTree(dataset, lang, bookId),
-    dataset?.id ?? '',
-  );
+  const result = useGuideTree(dataset, lang, bookId);
+  const runtime = useLastValue(result.value, dataset?.id ?? '');
+  if (!runtime && result.pending) return skeletonTree();
   return runtime ?? tree;
 }
-

package/src/hooks/use-tree.ts

@@ -2,7 +2,8 @@
 import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import type * as PageTree from 'fumadocs-core/page-tree';
-import { useAsyncValue } from '@terrafirmagreg-team/ui/hooks/use-async-value';
+import { useAsyncResult } from '@terrafirmagreg-team/ui/hooks/use-async-value';
+import { useDumpRetryNonce } from '@terrafirmagreg-team/kit/hooks/use-dump-status';
 import { loadClientGuideBook } from '@terrafirmagreg-team/guide/lib/client/books';
 import { listGuideBooks } from '@terrafirmagreg-team/guide/lib/book/list';
 import { guideTreeChildren } from '@terrafirmagreg-team/guide/components/tree/children';
@@ -12,8 +13,9 @@ export function useGuideTree(
   dataset: DatasetRef | undefined,
   lang: Lang,
   bookId: string | undefined,
-): PageTree.Root | undefined {
-  return useAsyncValue(
+): { value: PageTree.Root | undefined; pending: boolean; error: unknown } {
+  const nonce = useDumpRetryNonce();
+  return useAsyncResult(
     dataset
       ? async () => {
           const summaries = await listGuideBooks(dataset, lang);
@@ -29,7 +31,6 @@ export function useGuideTree(
           } satisfies PageTree.Root;
         }
       : undefined,
-    [dataset, lang, bookId],
+    [dataset, lang, bookId, nonce],
   );
 }
-