From 5b70bbfefafed10d865dcb1e40bdf61683477815 Mon Sep 17 00:00:00 2001 From: Cesar Alcazar Date: Mon, 19 Oct 2026 17:33:43 -0600 Subject: [PATCH] bdf9cupe3: Add expert text search and category browse to the left column --- src/app/api/experts/search/route.ts | 21 ++++ src/app/globals.css | 18 +++- src/components/App.tsx | 2 + src/components/ExpertSearch.tsx | 136 ++++++++++++++++++++++++++ src/lib/experts-search-client.ts | 30 ++++++ src/lib/experts-search.ts | 144 ++++++++++++++++++++++++++++ tests/expert-search.test.ts | 114 ++++++++++++++++++++++ 7 files changed, 463 insertions(+), 2 deletions(-) create mode 100644 src/app/api/experts/search/route.ts create mode 100644 src/components/ExpertSearch.tsx create mode 100644 src/lib/experts-search-client.ts create mode 100644 src/lib/experts-search.ts create mode 100644 tests/expert-search.test.ts diff --git a/src/app/api/experts/search/route.ts b/src/app/api/experts/search/route.ts new file mode 100644 index 0000000..b002665 --- /dev/null +++ b/src/app/api/experts/search/route.ts @@ -0,0 +1,21 @@ +import { NextResponse } from "next/server"; +import { browseCategory, searchExperts } from "@/lib/experts-search"; + +// GET /api/experts/search?q= or ?category= +// Same-origin proxy for Minnect's PUBLIC expert list. EXPERTS ONLY: it never +// calls a user-search endpoint. Public fields only. No session needed. +// Upstream failure -> 502 { error: "experts_unavailable" }. + +export const runtime = "nodejs"; + +export async function GET(req: Request) { + const url = new URL(req.url); + const q = (url.searchParams.get("q") ?? "").trim().slice(0, 80); + const category = (url.searchParams.get("category") ?? "").trim().slice(0, 80); + if (!q && !category) return NextResponse.json({ experts: [] }); + const result = q ? await searchExperts(q) : await browseCategory(category); + if (!result.ok) { + return NextResponse.json({ error: result.error }, { status: result.status }); + } + return NextResponse.json({ experts: result.experts }); +} diff --git a/src/app/globals.css b/src/app/globals.css index 5112f2a..dc98707 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -83,7 +83,7 @@ button:disabled { opacity: .5; cursor: not-allowed; } /* 3-column signed-in layout: nav | feed | rails. Wraps on narrow widths. */ .columns { display: flex; flex-wrap: wrap; gap: 16px; align-items: flex-start; max-width: 1240px; margin: 0 auto; padding: 0 16px; } .col-left { flex: 0 0 180px; position: sticky; top: 72px; padding-top: 16px; } -.col-left ul { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 4px; } +.col-left > ul { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 4px; } .col-left a { display: block; padding: 10px 12px; border-radius: 8px; color: var(--ink); text-decoration: none; font-weight: 500; } .col-left a[aria-current="page"] { background: var(--ink); color: #fff; } .col-center { flex: 1 1 400px; min-width: 0; } @@ -105,9 +105,23 @@ button:disabled { opacity: .5; cursor: not-allowed; } .minnect-audio { width: 100%; height: 36px; } @media (max-width: 959px) { .col-left { flex: 1 1 100%; position: static; padding-top: 8px; } - .col-left ul { flex-direction: row; } + .col-left > ul { flex-direction: row; } .col-center { flex: 1 1 100%; order: 3; } .col-right { flex: 1 1 100%; order: 2; position: static; max-height: none; overflow: visible; padding-top: 0; } .col-right .rail-list { flex-direction: row; overflow-x: auto; padding-bottom: 8px; } .col-right .rail-card { flex: 0 0 260px; } } + +/* Expert search + category chips (left column). Squared corners, monochrome + red. */ +.expert-search { margin-top: 16px; } +.expert-search summary { font-weight: 700; font-size: 16px; cursor: pointer; padding: 4px 0; } +.expert-search form { display: flex; flex-direction: column; } +.expert-search input { border-radius: 0; width: 100%; } +.chips { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 12px; } +.chip { margin: 0; padding: 6px 10px; border-radius: 0; background: #fff; color: var(--ink); border: 1px solid var(--ink); font-size: 13px; } +.chip[aria-pressed="true"] { background: var(--red); border-color: var(--red); color: #fff; } +.search-results { margin-top: 12px; } +.search-note { margin: 0; font-size: 14px; color: var(--grey); } +@media (max-width: 959px) { + .col-left .expert-search { flex-basis: 100%; } +} diff --git a/src/components/App.tsx b/src/components/App.tsx index 9233a2a..804e83a 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -7,6 +7,7 @@ import { SignInForm } from "./SignInForm"; import { Logo } from "./Logo"; import { Feed } from "./Feed"; import { DiscoverRails } from "./DiscoverRails"; +import { ExpertSearch } from "./ExpertSearch"; type State = { kind: "loading" } | { kind: "out" } | { kind: "in"; person: Person }; @@ -53,6 +54,7 @@ export function App() {
  • Feed
+
setState({ kind: "out" })} /> diff --git a/src/components/ExpertSearch.tsx b/src/components/ExpertSearch.tsx new file mode 100644 index 0000000..eb7e30d --- /dev/null +++ b/src/components/ExpertSearch.tsx @@ -0,0 +1,136 @@ +"use client"; + +import { useEffect, useRef, useState } from "react"; +import type { DiscoverCategory } from "@/lib/discover"; +import { fetchDiscover } from "@/lib/discover-client"; +import type { ExpertResult } from "@/lib/experts-search"; +import { fetchExperts } from "@/lib/experts-search-client"; +import { initials } from "@/lib/feed-model"; + +export type SearchStatus = "idle" | "loading" | "ready" | "error"; + +export interface ExpertSearchViewProps { + query: string; + onQuery: (q: string) => void; + categories: DiscoverCategory[]; + activeCategory: string | null; + onCategory: (name: string | null) => void; + status: SearchStatus; + results: ExpertResult[]; + defaultOpen?: boolean; +} + +export function ExpertSearchView(p: ExpertSearchViewProps) { + return ( +
+ Find experts +
e.preventDefault()}> + + p.onQuery(e.target.value)} + /> +
+ {p.categories.length > 0 ? ( +
+ {p.categories.map((c) => ( + + ))} +
+ ) : null} +
+ {p.status === "loading" ?

Searching...

: null} + {p.status === "error" ?

Search is unavailable. Try again.

: null} + {p.status === "ready" && p.results.length === 0 ? ( +

No experts found.

+ ) : null} + {p.status === "ready" && p.results.length > 0 ? ( +
    + {p.results.map((e) => ( +
  • + {e.pictureUrl ? ( + // eslint-disable-next-line @next/next/no-img-element + + ) : ( + + )} +
    + {e.displayName || "Expert"} + {e.byline ? {e.byline} : null} + {e.rating !== null ? ★ {e.rating.toFixed(1)} : null} +
    +
    • + ))} +
+ ) : null} +
+
+ ); +} + +const DEBOUNCE_MS = 300; + +export function ExpertSearch() { + const [query, setQuery] = useState(""); + const [category, setCategory] = useState(null); + const [categories, setCategories] = useState([]); + const [status, setStatus] = useState("idle"); + const [results, setResults] = useState([]); + const [open, setOpen] = useState(true); + const seq = useRef(0); + + useEffect(() => { + setOpen(window.matchMedia("(min-width: 960px)").matches); + let live = true; + fetchDiscover().then( + (d) => { if (live) setCategories(d.categories); }, + () => {}, + ); + return () => { live = false; }; + }, []); + + useEffect(() => { + const q = query.trim(); + const mine = ++seq.current; + if (!q && !category) { + setStatus("idle"); + setResults([]); + return; + } + setStatus("loading"); + const t = setTimeout(() => { + fetchExperts(q ? { q } : { category: category ?? undefined }).then( + (r) => { if (seq.current === mine) { setResults(r); setStatus("ready"); } }, + () => { if (seq.current === mine) { setResults([]); setStatus("error"); } }, + ); + }, q ? DEBOUNCE_MS : 0); + return () => clearTimeout(t); + }, [query, category]); + + return ( + + ); +} diff --git a/src/lib/experts-search-client.ts b/src/lib/experts-search-client.ts new file mode 100644 index 0000000..6bc88ce --- /dev/null +++ b/src/lib/experts-search-client.ts @@ -0,0 +1,30 @@ +// Browser-side reader for the same-origin GET /api/experts/search route. +import type { ExpertResult } from "./experts-search"; + +export class ExpertSearchError extends Error { + constructor() { + super("experts_unavailable"); + } +} + +export async function fetchExperts( + query: { q?: string; category?: string }, + fetchImpl: typeof fetch = fetch, +): Promise { + const params = new URLSearchParams(); + if (query.q) params.set("q", query.q); + else if (query.category) params.set("category", query.category); + let res: Response; + try { + res = await fetchImpl(`/api/experts/search?${params}`, { credentials: "same-origin" }); + } catch { + throw new ExpertSearchError(); + } + if (!res.ok) throw new ExpertSearchError(); + try { + const body = (await res.json()) as Record; + return Array.isArray(body.experts) ? (body.experts as ExpertResult[]) : []; + } catch { + throw new ExpertSearchError(); + } +} diff --git a/src/lib/experts-search.ts b/src/lib/experts-search.ts new file mode 100644 index 0000000..3eac8ad --- /dev/null +++ b/src/lib/experts-search.ts @@ -0,0 +1,144 @@ +import { DISCOVER_BASE_URL } from "./env"; + +// Expert-only search and category browse over Minnect's PUBLIC expert list +// (GET /api/v3/experts). Never touches /api/v4/users or any user search. +// +// Upstream findings (probed 2026-10-19, unauthenticated): +// - /api/v1/individual/experts/search?query= ignores `query` (returns all +// experts) and its payload carries KYC/payment/rate fields. NOT used. +// - /api/v3/experts?search=&limit=N filters by name/byline and returns a +// lean public payload (id, names, slug, byline, picture, categories). Used. +// - /api/v3/experts has no category filter and ignores `page`. Category browse +// therefore filters the first CATEGORY_POOL experts of the public list by +// category name (documented limitation, cached in memory for a few minutes). + +export interface ExpertCategory { + id: string | number; + name: string; +} + +export interface ExpertResult { + id: string | number; + slug: string | null; + displayName: string; + pictureUrl: string | null; + byline: string | null; + rating: number | null; + categories: ExpertCategory[]; +} + +export type ExpertSearchResult = + | { ok: true; experts: ExpertResult[] } + | { ok: false; status: 502; error: "experts_unavailable" }; + +export const SEARCH_LIMIT = 20; +export const CATEGORY_POOL = 300; +const CACHE_MS = 5 * 60 * 1000; + +type Rec = Record; +const rec = (v: unknown): Rec => + v && typeof v === "object" && !Array.isArray(v) ? (v as Rec) : {}; +const str = (v: unknown): string | null => + typeof v === "string" && v.trim() ? v : null; +const num = (v: unknown): number | null => + typeof v === "number" && Number.isFinite(v) ? v : null; +const id = (v: unknown): string | number | null => + typeof v === "string" && v ? v : typeof v === "number" ? v : null; + +/** Explicit allow-list: nothing outside these fields can reach the browser. */ +export function mapExpertResult(raw: unknown): ExpertResult | null { + const r = rec(raw); + const eid = id(r.id); + if (eid === null) return null; + const categories: ExpertCategory[] = []; + if (Array.isArray(r.categories)) { + for (const c of r.categories) { + const cr = rec(c); + const cid = id(cr.id); + const name = str(cr.name)?.trim(); + if (cid !== null && name) categories.push({ id: cid, name }); + } + } + return { + id: eid, + slug: str(r.slug), + displayName: [str(r.first_name), str(r.last_name)].filter(Boolean).join(" "), + pictureUrl: str(r.url_picture), + byline: str(r.byline), + rating: num(r.rating), + categories, + }; +} + +export function mapExpertList(body: unknown): ExpertResult[] { + const data = rec(body).data; + if (!Array.isArray(data)) return []; + const out: ExpertResult[] = []; + for (const e of data) { + const m = mapExpertResult(e); + if (m) out.push(m); + } + return out; +} + +const UNAVAILABLE: ExpertSearchResult = { + ok: false, + status: 502, + error: "experts_unavailable", +}; + +async function fetchList( + params: Record, + fetchImpl: typeof fetch, +): Promise { + try { + const qs = new URLSearchParams(params).toString(); + const res = await fetchImpl(`${DISCOVER_BASE_URL}/api/v3/experts?${qs}`, { + headers: { Accept: "application/json" }, + cache: "no-store", + }); + if (!res.ok) return null; + return mapExpertList(await res.json()); + } catch { + return null; + } +} + +/** Free-text expert search by name/byline. Never throws. */ +export async function searchExperts( + q: string, + fetchImpl: typeof fetch = fetch, +): Promise { + const list = await fetchList( + { search: q, limit: String(SEARCH_LIMIT), page: "1" }, + fetchImpl, + ); + return list ? { ok: true, experts: list.slice(0, SEARCH_LIMIT) } : UNAVAILABLE; +} + +let pool: { at: number; experts: ExpertResult[] } | null = null; + +/** Test hook: forget the cached pool. */ +export function resetCategoryPool(): void { + pool = null; +} + +const norm = (s: string) => s.trim().toLowerCase(); + +/** Experts (from the first CATEGORY_POOL of the public list) in a category, by name. */ +export async function browseCategory( + category: string, + fetchImpl: typeof fetch = fetch, + now: number = Date.now(), +): Promise { + if (!pool || now - pool.at > CACHE_MS) { + const list = await fetchList({ limit: String(CATEGORY_POOL), page: "1" }, fetchImpl); + if (!list) return UNAVAILABLE; + pool = { at: now, experts: list }; + } + const want = norm(category); + const experts = pool.experts + .filter((e) => e.categories.some((c) => norm(c.name) === want)) + .slice(0, SEARCH_LIMIT); + return { ok: true, experts }; +} diff --git a/tests/expert-search.test.ts b/tests/expert-search.test.ts new file mode 100644 index 0000000..5b64beb --- /dev/null +++ b/tests/expert-search.test.ts @@ -0,0 +1,114 @@ +import { beforeEach, describe, expect, it, vi } from "vitest"; +import { createElement } from "react"; +import { renderToStaticMarkup } from "react-dom/server"; +import { GET } from "@/app/api/experts/search/route"; +import { mapExpertResult, resetCategoryPool } from "@/lib/experts-search"; +import { fetchExperts } from "@/lib/experts-search-client"; +import { ExpertSearchView, type ExpertSearchViewProps } from "@/components/ExpertSearch"; + +const raw = (o: Record = {}) => ({ + id: "e1", first_name: "Jane", last_name: "Doe", slug: "JaneDoe", byline: "Coach", + url_picture: "https://img/j.jpg", rating: 4.5, transfer_method_setup: true, + categories: [{ id: 42, name: "Business " }, { id: 44, name: "Coaching" }], + email: "j@x.com", phone: "555", dob: "1990", kyc_status: "ok", stripe_account_set: true, + quick_question_rate: 5, is_blocking: false, user_id: "u1", ...o, +}); + +async function call(url: string, impl: (u: string) => Response) { + const orig = globalThis.fetch; + const spy = vi.fn(async (u: unknown, _init?: unknown) => impl(String(u))); + globalThis.fetch = spy as unknown as typeof fetch; + try { + return { res: await GET(new Request(url)), spy }; + } finally { + globalThis.fetch = orig; + } +} +const ok = (data: unknown[]) => new Response(JSON.stringify({ status: "success", data })); + +beforeEach(() => resetCategoryPool()); + +describe("mapExpertResult", () => { + it("keeps only public fields", () => { + const m = mapExpertResult(raw())!; + expect(Object.keys(m).sort()).toEqual( + ["byline", "categories", "displayName", "id", "pictureUrl", "rating", "slug"], + ); + expect(m.displayName).toBe("Jane Doe"); + expect(m.categories[0].name).toBe("Business"); + const s = JSON.stringify(m); + for (const bad of ["j@x.com", "555", "1990", "kyc", "stripe", "is_blocking", "u1"]) { + expect(s).not.toContain(bad); + } + }); + it("drops items without an id", () => expect(mapExpertResult({ first_name: "x" })).toBeNull()); +}); + +describe("GET /api/experts/search", () => { + it("returns empty for no query without calling upstream", async () => { + const { res, spy } = await call("http://x/api/experts/search", () => ok([])); + expect(await res.json()).toEqual({ experts: [] }); + expect(spy).not.toHaveBeenCalled(); + }); + it("text search hits the v3 experts search, never a user endpoint, with no auth", async () => { + const { res, spy } = await call("http://x/api/experts/search?q=pat", () => ok([raw()])); + const json = await res.json(); + expect(json.experts).toHaveLength(1); + expect(JSON.stringify(json)).not.toContain("j@x.com"); + const url = String(spy.mock.calls[0][0]); + expect(url).toContain("/api/v3/experts?"); + expect(url).toContain("search=pat"); + expect(url).not.toMatch(/\/api\/v4\/users|\/admin\//); + expect(JSON.stringify(spy.mock.calls[0][1])).not.toMatch(/authorization/i); + }); + it("category browse filters the pool by category name and caches it", async () => { + const list = [raw(), raw({ id: "e2", categories: [{ id: 9, name: "Media" }] })]; + const { res, spy } = await call("http://x/api/experts/search?category=business", () => ok(list)); + expect((await res.json()).experts.map((e: { id: string }) => e.id)).toEqual(["e1"]); + const again = await call("http://x/api/experts/search?category=Media", () => ok(list)); + expect((await again.res.json()).experts.map((e: { id: string }) => e.id)).toEqual(["e2"]); + expect(spy).toHaveBeenCalledTimes(1); + expect(again.spy).not.toHaveBeenCalled(); + }); + it("upstream failure -> 502", async () => { + const { res } = await call("http://x/api/experts/search?q=a", () => new Response("no", { status: 500 })); + expect(res.status).toBe(502); + expect(await res.json()).toEqual({ error: "experts_unavailable" }); + }); +}); + +describe("fetchExperts", () => { + it("calls the same-origin route and rejects on failure", async () => { + const f = vi.fn(async (_u: string) => new Response(JSON.stringify({ experts: [mapExpertResult(raw())] }))); + expect(await fetchExperts({ q: "a b" }, f as unknown as typeof fetch)).toHaveLength(1); + expect(f.mock.calls[0][0]).toBe("/api/experts/search?q=a+b"); + const bad = vi.fn(async (_u: string) => new Response("", { status: 502 })); + await expect(fetchExperts({ category: "Media" }, bad as unknown as typeof fetch)).rejects.toThrow(); + expect(bad.mock.calls[0][0]).toBe("/api/experts/search?category=Media"); + }); +}); + +const view = (o: Partial = {}) => + renderToStaticMarkup(createElement(ExpertSearchView, { + query: "", onQuery: () => {}, categories: [{ id: 1, name: "Business", icon: null, sortOrder: 1 }], + activeCategory: null, onCategory: () => {}, status: "idle", results: [], defaultOpen: true, ...o, + })); + +describe("ExpertSearchView", () => { + it("labels the input and renders category buttons", () => { + const h = view(); + expect(h).toContain(''); + expect(h).toContain('id="expert-q"'); + expect(h).toMatch(/]*type="button"[^>]*aria-pressed="false"[^>]*>Business<\/button>/); + }); + it("marks the active category pressed", () => { + expect(view({ activeCategory: "Business" })).toContain('aria-pressed="true"'); + }); + it("renders results, empty and error states", () => { + const r = mapExpertResult(raw())!; + expect(view({ status: "ready", results: [r] })).toContain("Jane Doe"); + expect(view({ status: "ready", results: [] })).toContain("No experts found."); + expect(view({ status: "error" })).toContain('role="alert"'); + expect(view({ status: "idle" })).not.toContain("data-testid=\"search-result\""); + }); +});