Merge pull request #4 from DevelopmentFinanceObservatory/release/website

Sync dfo-website@aabd42253459

Author: jm-rivera

db/schema.ts

@@ -91,7 +91,6 @@ export const shareRef = pgTable(
         specId: text('spec_id').notNull(),
         identity: jsonb('identity').notNull(),
         variableText: text('variable_text'),
-        resolvedStatVarDcids: jsonb('resolved_stat_var_dcids'),
         contentVersion: text('content_version'),
         // Null for a live share and for snapshots stored before the column.
         artifactDigest: text('artifact_digest'),

src/app/(site)/page.tsx

@@ -1,5 +1,4 @@
 import BuildTools from '@/components/organisms/BuildTools/BuildTools';
-import BuiltWith from '@/components/organisms/BuiltWith/BuiltWith';
 import CreateCanvas from '@/components/organisms/CreateCanvas/CreateCanvas';
 import DownloadDataset from '@/components/organisms/DownloadDataset/DownloadDataset';
 import Hero from '@/components/organisms/Hero/Hero';
@@ -29,7 +28,9 @@ const Home = async () => {
             <CreateCanvas />
             <DownloadDataset catalogue={catalogue} />
             <BuildTools />
-            <BuiltWith />
+            {/* "Get inspired by what others are building" is out until there
+                is real work to show: the component stays in
+                components/organisms/BuiltWith, ready to mount again. */}
         </main>
     );
 };

src/app/api/download-pin/route.ts

@@ -11,8 +11,7 @@ import { searchApiBase } from '@/lib/searchApi';
 // its own timeout (see lib/search/snapshot).
 const CAPTURE_POLL_DEADLINE_MS = 50_000;
 
-// POST /api/download-pin { specId, contentVersion, definition,
-// resolvedStatVarDcids } → 204
+// POST /api/download-pin { specId, contentVersion, definition } → 204
 // The search page posts here after a download's mint returns, without waiting
 // on the answer. The route pins one artifact per version: the first the
 // version lists, minted when it lists none. That keeps the version link in
@@ -70,7 +69,6 @@ export const POST = async (req: NextRequest) => {
                 specId: body.specId,
                 contentVersion: body.contentVersion,
                 definition: body.definition,
-                resolvedStatVarDcids: body.resolvedStatVarDcids,
                 principal,
                 pollDeadlineMs: CAPTURE_POLL_DEADLINE_MS,
             }),

src/app/api/share/route.ts

@@ -4,46 +4,36 @@ import { NextResponse } from 'next/server';
 import { getUser } from '@/lib/auth/session';
 import type { SavedConversation } from '@/lib/chat/history';
 import { createShare, ShareKind } from '@/lib/chat/shareStore';
-import {
-    createSearchShare,
-    isSearchSharePart,
-    type SearchShareMode,
-} from '@/lib/search/searchShare';
+import { createSearchShare } from '@/lib/search/searchShare';
+import { readSearchShareRequest } from '@/lib/search/searchShareRequest';
 
 const KINDS: ShareKind[] = ['conversation', 'canvas', 'card'];
-const MODES: SearchShareMode[] = ['live', 'snapshot'];
 
 // POST /api/share { kind: 'search', mode, query, parts } → { id }
 // A search result's link: dataset references only, no numbers. The search
 // page is public, so an account is optional here (the share is simply
 // unowned without one).
 const shareSearch = async (body: any) => {
-    const parts = Array.isArray(body?.parts) ? body.parts : [];
-    const query = typeof body?.query === 'string' ? body.query.trim().slice(0, 500) : '';
+    const request = readSearchShareRequest(body);
 
-    if (
-        !MODES.includes(body?.mode) ||
-        !query ||
-        parts.length === 0 ||
-        !parts.every(isSearchSharePart)
-    ) {
+    if (!request) {
         return NextResponse.json({ error: 'bad_request' }, { status: 400 });
     }
 
     const user = await getUser();
 
     try {
         return NextResponse.json(
-            await createSearchShare(user?.id ?? null, body.mode, query, parts),
+            await createSearchShare(user?.id ?? null, request.mode, request.query, request.parts),
         );
     } catch (error) {
         // The platform refused the register/mint — say which, don't store a
         // link that can't open. The log names the datasets and the cause.
         const { message, cause } = error as Error;
 
         console.error('share: search share capture failed', {
-            mode: body.mode,
-            specIds: parts.map((part: { specId: string }) => part.specId),
+            mode: request.mode,
+            specIds: request.parts.map((part) => part.specId),
             error: message,
             cause: cause instanceof Error ? cause.message : undefined,
         });

src/app/s/[id]/download/preparing/PreparingDownload.tsx

@@ -69,7 +69,6 @@ const PreparingDownload = ({
                         specId,
                         contentVersion: manifest.content_version,
                         definition: null,
-                        resolvedStatVarDcids: undefined,
                     });
                 }
 

src/components/organisms/DataSearch/DataSearch.module.scss

@@ -514,7 +514,7 @@ span.slotMarked {
 }
 
 // Pinned to .slotMenuBody's own scroll area so a long list (hundreds of CRS
-// donor/recipient rows) doesn't scroll Apply out of reach; background
+// provider/recipient rows) doesn't scroll Apply out of reach; background
 // matches the menu so a scrolling row underneath doesn't show through.
 .multiSelectApply {
     position: sticky;
@@ -752,7 +752,7 @@ span.slotMarked {
     color: var(--color-stone);
 }
 
-// A place picker or window/donor fetch that failed outright (a refused or
+// A place picker or window/provider fetch that failed outright (a refused or
 // dropped request), rather than one that simply came back with nothing —
 // the note names what the door said, the button re-runs it.
 .slotFailed {

src/components/organisms/DataSearch/DataSearch.tsx

@@ -36,7 +36,6 @@ import {
 } from '@/lib/search/catalogue';
 import { decodePermalinkState, encodePermalinkState } from '@/lib/search/permalink';
 import { track } from '@/lib/events/client';
-import { promoteFromSpec } from '@/lib/search/promote';
 import {
     createSearchShare,
     fetchSearchShare,
@@ -322,7 +321,6 @@ const DataSearch = ({ catalogue }: { catalogue: SearchCatalogue | null }) => {
                     // include_observations: without it the engine skips the
                     // materialise pass and coverage counts come back empty.
                     response_options: {
-                        include_sentence: true,
                         include_option_coverage: false,
                         include_observations: true,
                     },
@@ -725,7 +723,6 @@ const DataSearch = ({ catalogue }: { catalogue: SearchCatalogue | null }) => {
                     variableText: part.variableText,
                     specId: spec.spec_id,
                     identity: spec.identity,
-                    resolvedStatVarDcids: promoteFromSpec(spec).resolved_stat_var_dcids ?? null,
                     operations: part.part?.operations ?? [],
                     definition: spec.definition,
                 };

src/components/organisms/DataSearch/DownloadOptions.module.scss

@@ -35,7 +35,7 @@
     width: 100%;
 }
 
-// One entity column's extras under the role it plays (Donor, Recipient).
+// One entity column's extras under the role it plays (Provider, Recipient).
 .role {
     @include flex(column, flex-start, stretch);
 

src/components/organisms/DataSearch/GraphInfo.tsx

@@ -16,6 +16,11 @@ import styles from './DataSearch.module.scss';
 import { OptionRowInfo } from './SlotMenu';
 
 import Icon from '@/components/atoms/Icon/Icon';
+import {
+    definitionMembersReader,
+    type MemberSpec,
+    type MembersRead,
+} from '@/lib/search/definitionMembers';
 import { graphReader } from '@/lib/search/graphReads';
 import { graphNodeDescription } from '@/lib/search/measureMenu';
 import { notePosition, noteShown } from '@/lib/search/notePosition';
@@ -28,6 +33,8 @@ const readNoNote = () => null;
 
 const graph = graphReader({ fetchImpl: (url, init) => fetch(url, init) });
 
+const readMembers = definitionMembersReader();
+
 // The graph's own documentation for a source (the same door the Sources
 // pages read), shared by every row that asks. A source with no page (the
 // catalogue excludes it, or the read failed) resolves to null.
@@ -336,6 +343,27 @@ export const useNodeDescriptions = (dcids: string[]): (string | null)[] => {
     return useSettled(pending) ?? dcids.map(() => null);
 };
 
+// Settles to null, so a hook given no Spec reads nothing.
+const NO_MEMBERS: Promise<MembersRead | null> = Promise.resolve(null);
+
+/** The StatVars `spec` serves, from the Datasets members door, null while
+ *  unread and for a null `spec`. A caller passes the Spec only once its
+ *  panel is open, so a closed panel asks nothing. */
+export const useDefinitionMembers = (spec: MemberSpec | null): MembersRead | null => {
+    const specId = spec?.spec_id ?? null;
+    const definition = spec?.definition;
+    const digest = spec?.shape?.member_digest ?? null;
+    const pending = useMemo(
+        () =>
+            specId
+                ? readMembers({ spec_id: specId, definition, shape: { member_digest: digest } })
+                : NO_MEMBERS,
+        [specId, definition, digest],
+    );
+
+    return useSettled(pending);
+};
+
 /** Each source's description from its documentation page, and whether the
  *  catalogue has that page to link to, in order. Each reads null and false
  *  until the reads settle. */

src/components/organisms/DataSearch/SearchPanel.tsx

@@ -11,7 +11,6 @@ import { useDatasetDownload } from './useDatasetDownload';
 
 import Button from '@/components/atoms/Button/Button';
 import { usePrefersReducedMotion } from '@/hooks/usePrefersReducedMotion';
-import { promoteFromSpec } from '@/lib/search/promote';
 import { detailRows, downloadRowCount, formatCount } from '@/lib/search/view';
 
 import { SourceName } from './WhyPanel';
@@ -71,7 +70,6 @@ const SearchPanel = ({
     const download = useDatasetDownload({
         specId: spec?.spec_id,
         definition: spec?.definition,
-        resolvedStatVarDcids: spec ? promoteFromSpec(spec).resolved_stat_var_dcids : undefined,
         entities: spec?.entities,
     });