From b133e8a05d7903da9f613cf33923abe9f1bfa140 Mon Sep 17 00:00:00 2001 From: Fable Integrator Date: Sat, 4 Jul 2026 15:48:28 -0400 Subject: [PATCH 1/7] fix(baseball): complete Fairway shell routing and route-contract wiring Finish Codex's interrupted Fairway migration: hub-based nav with activeMatch prefixes, player layout shell mounting, Management settings leaves, messages thread ownership in route-contract, legacy bookmark redirects in middleware, and player Settings in the secondary rail. Removes dead redirect stub pages in favor of middleware aliases. Route coverage gaps reduced from 51 to 20 (all intentional auth/public/onboarding surfaces). --- .../baseball-stale-route-links.test.mjs | 9 - .../(coach-dashboard)/coach/college/page.tsx | 5 - .../coach/high-school/page.tsx | 5 - .../(coach-dashboard)/coach/juco/page.tsx | 5 - .../(coach-dashboard)/coach/showcase/page.tsx | 5 - .../(coach-dashboard)/coach/template.tsx | 18 +- .../(dashboard)/BaseballFairwayShell.tsx | 236 ++++++++++++------ .../_components/hub-definitions.ts | 104 +++++++- .../_components/resolve-active-hub.ts | 7 + .../(dashboard)/dashboard/settings/page.tsx | 175 ++++++++++++- .../stats/games/new/NewGameClient.tsx | 202 --------------- .../dashboard/stats/games/new/error.tsx | 23 -- .../dashboard/stats/games/new/loading.tsx | 57 ----- .../dashboard/stats/games/new/page.tsx | 7 - .../dashboard/team/high-school/error.tsx | 23 -- .../dashboard/team/high-school/page.tsx | 5 - src/app/baseball/(dashboard)/layout.tsx | 18 +- .../player/college/page.tsx | 5 - .../player/high-school/page.tsx | 5 - .../(player-dashboard)/player/juco/page.tsx | 5 - .../(player-dashboard)/player/layout.tsx | 10 +- .../player/passport/page.tsx | 10 +- .../player/showcase/page.tsx | 5 - .../__tests__/route-shell-contract.test.ts | 27 +- .../__tests__/save-full-box-score.test.ts | 31 +++ src/app/baseball/actions/games.ts | 12 +- src/components/baseball/games/GameCard.tsx | 29 +-- .../fairway/app-shell/FairwayBottomNav.tsx | 5 +- .../fairway/app-shell/FairwaySidebar.tsx | 9 +- .../stats/pitching-invariants.test.ts | 27 +- .../__tests__/resolve-active-hub.test.ts | 20 ++ ...tings-aliases-and-legacy-redirects.test.ts | 47 +--- .../__tests__/stats-route-aliases.test.ts | 8 +- src/lib/baseball/nav-manifest.ts | 56 +---- src/lib/baseball/nav-registry.ts | 5 +- src/lib/baseball/route-contract.ts | 8 +- src/lib/baseball/stats-route-aliases.ts | 21 +- src/lib/supabase/middleware.ts | 29 +++ src/test/helpers/baseball-route-inventory.ts | 60 +++++ 39 files changed, 683 insertions(+), 655 deletions(-) delete mode 100644 src/app/baseball/(coach-dashboard)/coach/college/page.tsx delete mode 100644 src/app/baseball/(coach-dashboard)/coach/high-school/page.tsx delete mode 100644 src/app/baseball/(coach-dashboard)/coach/juco/page.tsx delete mode 100644 src/app/baseball/(coach-dashboard)/coach/showcase/page.tsx delete mode 100644 src/app/baseball/(dashboard)/dashboard/stats/games/new/NewGameClient.tsx delete mode 100644 src/app/baseball/(dashboard)/dashboard/stats/games/new/error.tsx delete mode 100644 src/app/baseball/(dashboard)/dashboard/stats/games/new/loading.tsx delete mode 100644 src/app/baseball/(dashboard)/dashboard/stats/games/new/page.tsx delete mode 100644 src/app/baseball/(dashboard)/dashboard/team/high-school/error.tsx delete mode 100644 src/app/baseball/(dashboard)/dashboard/team/high-school/page.tsx delete mode 100644 src/app/baseball/(player-dashboard)/player/college/page.tsx delete mode 100644 src/app/baseball/(player-dashboard)/player/high-school/page.tsx delete mode 100644 src/app/baseball/(player-dashboard)/player/juco/page.tsx delete mode 100644 src/app/baseball/(player-dashboard)/player/showcase/page.tsx diff --git a/scripts/__tests__/baseball-stale-route-links.test.mjs b/scripts/__tests__/baseball-stale-route-links.test.mjs index c780991f3..f4fd7ca02 100644 --- a/scripts/__tests__/baseball-stale-route-links.test.mjs +++ b/scripts/__tests__/baseball-stale-route-links.test.mjs @@ -9,15 +9,6 @@ const SCAN_ROOTS = [ join(REPO_ROOT, 'e2e'), ]; const ALLOWLIST = new Set([ - join(REPO_ROOT, 'src/lib/baseball/stats-route-aliases.ts'), - join( - REPO_ROOT, - 'src/app/baseball/(dashboard)/dashboard/stats/games/new/page.tsx', - ), - join( - REPO_ROOT, - 'src/app/baseball/(dashboard)/dashboard/stats/games/new/error.tsx', - ), ]); const STALE_HREF = /\/baseball\/dashboard\/stats\/games\/new(?![\w-])/; diff --git a/src/app/baseball/(coach-dashboard)/coach/college/page.tsx b/src/app/baseball/(coach-dashboard)/coach/college/page.tsx deleted file mode 100644 index 3587c132a..000000000 --- a/src/app/baseball/(coach-dashboard)/coach/college/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect } from 'next/navigation'; - -export default function CollegeCoachDashboardPage() { - redirect('/baseball/dashboard/command-center'); -} diff --git a/src/app/baseball/(coach-dashboard)/coach/high-school/page.tsx b/src/app/baseball/(coach-dashboard)/coach/high-school/page.tsx deleted file mode 100644 index 023d6afff..000000000 --- a/src/app/baseball/(coach-dashboard)/coach/high-school/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect } from 'next/navigation'; - -export default function HighSchoolCoachDashboardPage() { - redirect('/baseball/dashboard/command-center'); -} diff --git a/src/app/baseball/(coach-dashboard)/coach/juco/page.tsx b/src/app/baseball/(coach-dashboard)/coach/juco/page.tsx deleted file mode 100644 index dd698533b..000000000 --- a/src/app/baseball/(coach-dashboard)/coach/juco/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect } from 'next/navigation'; - -export default function JucoCoachDashboardPage() { - redirect('/baseball/dashboard/command-center'); -} diff --git a/src/app/baseball/(coach-dashboard)/coach/showcase/page.tsx b/src/app/baseball/(coach-dashboard)/coach/showcase/page.tsx deleted file mode 100644 index 4d1d60592..000000000 --- a/src/app/baseball/(coach-dashboard)/coach/showcase/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect } from 'next/navigation'; - -export default function ShowcaseCoachDashboardPage() { - redirect('/baseball/dashboard/command-center'); -} diff --git a/src/app/baseball/(coach-dashboard)/coach/template.tsx b/src/app/baseball/(coach-dashboard)/coach/template.tsx index 794b61a6d..1b932dfd8 100644 --- a/src/app/baseball/(coach-dashboard)/coach/template.tsx +++ b/src/app/baseball/(coach-dashboard)/coach/template.tsx @@ -1,20 +1,12 @@ 'use client'; /** - * Coach-HOME route template — fires on every route segment change under - * /baseball/coach/*. + * Coach route template — retained for the coach route group shell boundary. * - * The (coach-dashboard)/coach group renders the four coach-home verticals — - * College (/baseball/coach/college), High School (/high-school), JUCO (/juco) - * and Showcase (/showcase) — all through the SAME BaseballDashboardShell mounted - * in coach/layout.tsx. Before this template existed, the (dashboard) and - * (player-dashboard) groups each had a template.tsx that crossfaded on nav, but - * this group had none — so navigating INTO or BETWEEN the four coach homes was an - * abrupt content snap while every other dashboard tab faded. That is exactly the - * "transitions present but not everywhere" inconsistency the owner flagged. This - * 1-file port closes it and satisfies the V10 shell requirement "Route transitions - * with reduced-motion respect." - * (docs/.../25_premium_ui_coachhelm_v10/v10_premium_ui_system_by_tab.md line 33). + * The legacy per-coach-type pages under /baseball/coach/* were removed once the + * canonical Fairway dashboard routes were wired. This template stays with the + * group so any future coach-owned subroutes inherit the same reduced-motion + * route reveal as the dashboard and player groups. * * Ported VERBATIM in spirit from the sibling templates * ((dashboard)/dashboard/template.tsx, (player-dashboard)/player/template.tsx), diff --git a/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx b/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx index 60fa82b09..180539c63 100644 --- a/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx +++ b/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx @@ -13,8 +13,8 @@ * * PRESENTATION ONLY. No server actions, no RLS, no new reads beyond what the * existing baseball auth/nav hooks already resolve: - * - useBaseballAuth(null) — the SAME session/onboarding gate - * BaseballShellLayout uses for this route group. + * - useBaseballAuth(requiredRole) — the SAME session/onboarding gate + * BaseballShellLayout uses for each mounted route group. * - useBaseballNavContext() — the SAME server-resolved capability map * (nav-context.ts), so capability-gated verticals never fail-closed here * when they wouldn't in the legacy shell. @@ -29,13 +29,11 @@ * PeekPanelProvider nesting, unchanged. BaseballShellLayout.tsx itself is not * imported or edited — this file is a parallel, full duplicate of that * composition (same reason GolfHelm's FairwayDashboardShell duplicates - * GolfDashboardShell's stack rather than wrapping it), so the two OTHER - * baseball shell route groups ((coach-dashboard), (player-dashboard)) are - * completely unaffected by this migration step. + * GolfDashboardShell's stack rather than wrapping it). * - * Mounted ONLY behind isRedesignEnabled() in `(dashboard)/layout.tsx`. Flag - * OFF renders the legacy `BaseballShellLayout` → `BaseballDashboardShell`, - * byte-for-byte unchanged. + * Mounted ONLY behind isRedesignEnabled() in the Baseball dashboard/player + * route-group layouts. Flag OFF renders the legacy `BaseballShellLayout` → + * `BaseballDashboardShell`, byte-for-byte unchanged. * * The AppShell drawer (`mobileOpen`) is BRIDGED to the SAME SidebarContext * every legacy baseball page's own menu button already calls `setMobileOpen` @@ -43,7 +41,7 @@ * no dead buttons, no double drawers. * ========================================================================== */ -import { useCallback, useMemo } from 'react'; +import { useCallback, useEffect, useMemo } from 'react'; import dynamic from 'next/dynamic'; import Link from 'next/link'; import { usePathname, useRouter } from 'next/navigation'; @@ -75,11 +73,19 @@ import { import { COACH_HUB_ORDER, COACH_HUB_DEFS, + HUB_ICONS, + HUB_LANDING, + PLAYER_DEVELOPMENT_TABS, + PLAYER_RECRUITING_TABS, + PLAYER_STATS_TABS, + PLAYER_TEAM_TABS, } from '@/app/baseball/(dashboard)/_components/hub-definitions'; import { filterHubTabsByCapabilities, filterHubTabsByProgramType, + resolveActiveHub, } from '@/app/baseball/(dashboard)/_components/resolve-active-hub'; +import { HubSubNav } from '@/app/baseball/(dashboard)/_components/hub-sub-nav'; import type { HubSubNavTab } from '@/app/baseball/(dashboard)/_components/hub-sub-nav'; import type { BaseballProgramType } from '@/lib/types/baseball-settings'; import { IconSettings, IconLogout, IconHome, IconUsers, IconCalendar } from '@/components/icons'; @@ -127,57 +133,105 @@ const ShellLink: ShellLinkComponent = ({ href, children, ...rest }) => ( /** entry.icon carries a wider SVG prop contract than FairwayIcon's minimal * `{size, className}` — both are drawn from the same `@/components/icons` * set, so this narrows structurally without behavior change. */ -function toNavItem(entry: Pick, badge?: number): NavItem { - return { label: entry.label, href: entry.href, icon: entry.icon as unknown as NavItem['icon'], badge }; +function toNavItem( + entry: Pick, + badge?: number, + matchPrefixes: readonly string[] = [], +): NavItem { + return { + label: entry.label, + href: entry.href, + icon: entry.icon as unknown as NavItem['icon'], + badge, + activeMatch: (pathname) => + pathname === entry.href || + matchPrefixes.some((prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`)), + }; } -/** Same structural narrowing as toNavItem, for a hub sub-tab (whose `icon` is - * optional in HubSubNavTab — every tab this shell renders always sets one). */ -function hubTabToNavItem(tab: HubSubNavTab, badge?: number): NavItem { - return { label: tab.label, href: tab.href, icon: tab.icon as unknown as NavItem['icon'], badge }; +function playerHubToNavItem({ + label, + href, + icon, + tabs, + badge, +}: { + label: string; + href: string; + icon: NavItem['icon']; + tabs?: readonly HubSubNavTab[]; + badge?: number; +}): NavItem { + return { + label, + href, + icon, + badge, + activeMatch: (pathname) => + pathname === href || + Boolean( + tabs?.some( + (tab) => pathname === tab.href || tab.matchPrefixes?.some((prefix) => pathname.startsWith(prefix)), + ), + ), + }; } const RECRUITING_PROGRAM_TYPES = new Set(['college', 'juco', 'showcase', 'academy', 'club']); -/** - * Player rail sections — UNCHANGED by the coach-nav-8tab consolidation - * (COACH_NAV_8TAB_PROPOSAL.md is scoped to the coach nav). Derived straight - * from `getVisibleBaseballNav()`, exactly as before. - */ function buildPlayerNavSections(ctx: BaseballNavContext, unreadCount: number): NavSection[] { const visible = getVisibleBaseballNav(ctx); - const primary: NavItem[] = visible.filter((e) => e.section === 'primary').map((e) => toNavItem(e)); - const secondary: NavItem[] = visible.filter((e) => e.section === 'secondary').map((e) => toNavItem(e)); + const byId = new Map(visible.map((entry) => [entry.id, entry])); + const today = byId.get('player-today'); + const schedule = byId.get('calendar'); + const profile = byId.get('player-profile'); + + const primary: NavItem[] = [ + ...(today ? [toNavItem(today)] : []), + ...(schedule ? [toNavItem(schedule)] : []), + ...(profile ? [toNavItem(profile)] : []), + playerHubToNavItem({ + label: 'Stats', + href: HUB_LANDING.playerStats, + icon: HUB_ICONS.stats as unknown as NavItem['icon'], + tabs: PLAYER_STATS_TABS, + }), + playerHubToNavItem({ + label: 'Development', + href: HUB_LANDING.playerDevelopment, + icon: HUB_ICONS.development as unknown as NavItem['icon'], + tabs: PLAYER_DEVELOPMENT_TABS, + }), + playerHubToNavItem({ + label: 'Team', + href: HUB_LANDING.playerTeam, + icon: HUB_ICONS.team as unknown as NavItem['icon'], + tabs: PLAYER_TEAM_TABS, + }), + toNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined, [BASEBALL_MESSAGES_NAV.href]), + ]; - primary.push(toNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined)); + const secondary: NavItem[] = [ + playerHubToNavItem({ + label: getBaseballTerminology(ctx).exposureNoun, + href: HUB_LANDING.playerRecruiting, + icon: HUB_ICONS.recruiting as unknown as NavItem['icon'], + tabs: PLAYER_RECRUITING_TABS, + }), + toNavItem( + { href: '/baseball/dashboard/settings', label: 'Settings', icon: IconSettings }, + undefined, + ['/baseball/dashboard/settings'], + ), + ]; const sections: NavSection[] = [{ heading: 'My Baseball', items: primary }]; if (secondary.length) sections.push({ heading: 'More', items: secondary }); return sections; } -/** - * Coach rail sections — GROUPED BY `entry.hub` (COACH_HUB_ORDER / COACH_HUB_DEFS - * in hub-definitions.ts, itself derived from BASEBALL_NAV_REGISTRY), the same - * single source of truth src/components/layout/sidebar.tsx's - * buildCondensedBaseballNavigation groups by. One NavSection per visible hub - * (heading = hub label, items = the hub's capability/program-type-filtered - * tabs) — the Fairway rail shows every tab inline (no separate landing-item + - * sub-nav-strip split the legacy shell needs), so "hub label > sub-items" is - * literally the section heading over its item list. - * - * A hub section is omitted entirely once its tabs filter down to zero (mirrors - * resolveActiveHub's own "empty hub → no strip" precedent), so this shell and - * the legacy sidebar can never show a dead-end top-level item for a coach - * missing every capability a hub's members require. - * - * Messages is injected into the DASHBOARD section (golf-style: FairwayDashboard - * Shell.tsx puts Messages inside its first/primary section, never a section of - * its own) — it is deliberately excluded from BASEBALL_NAV_REGISTRY (see - * nav-registry.ts), so every nav consumer must add it explicitly. - */ function buildCoachHubSections(ctx: BaseballNavContext, unreadCount: number): NavSection[] { - const sections: NavSection[] = []; + const items: NavItem[] = []; for (const hubId of COACH_HUB_ORDER) { const def = COACH_HUB_DEFS[hubId]; @@ -192,21 +246,27 @@ function buildCoachHubSections(ctx: BaseballNavContext, unreadCount: number): Na const capFiltered = filterHubTabsByCapabilities(def.tabs, 'coach', ctx.capabilities); const visibleTabs = filterHubTabsByProgramType(capFiltered, ctx.programType); - const items = visibleTabs.map((t) => hubTabToNavItem(t)); - - if (hubId === 'dashboard') { - items.push(hubTabToNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined)); - } - if (items.length === 0) continue; + if (visibleTabs.length === 0) continue; // Recruiting reframed per mode (JUCO → "Transfer Exposure") using the SAME // terminology engine program-type-variants.ts already provides — never a // second hand-maintained label map. - const heading = hubId === 'recruiting' ? getBaseballTerminology(ctx).exposureNoun : def.label; - sections.push({ heading, items }); + items.push( + playerHubToNavItem({ + label: hubId === 'recruiting' ? getBaseballTerminology(ctx).exposureNoun : def.label, + href: visibleTabs[0]!.href, + icon: def.icon as unknown as NavItem['icon'], + tabs: visibleTabs, + }), + ); + + // Messages is the persistent cross-cutting slot, outside the hub registry. + if (hubId === 'dashboard') { + items.push(toNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined, [BASEBALL_MESSAGES_NAV.href])); + } } - return sections; + return [{ heading: 'Baseball', items }]; } /** @@ -223,7 +283,7 @@ function buildShowcaseOrgSections(unreadCount: number): NavSection[] { { label: 'Dashboard', href: '/baseball/dashboard/organization', icon: IconHome }, { label: 'Teams', href: '/baseball/dashboard/teams', icon: IconUsers }, { label: 'Events', href: '/baseball/dashboard/events', icon: IconCalendar }, - hubTabToNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined), + toNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined, [BASEBALL_MESSAGES_NAV.href]), ], }, ]; @@ -237,23 +297,34 @@ function buildShowcaseOrgSections(unreadCount: number): NavSection[] { * rail is never just three orphaned sections with no way back to Today. */ function buildShowcaseTeamSections(ctx: BaseballNavContext, unreadCount: number): NavSection[] { - const sections: NavSection[] = []; + const items: NavItem[] = []; const dashboardTabs = filterHubTabsByCapabilities(COACH_HUB_DEFS.dashboard.tabs, 'coach', ctx.capabilities); - sections.push({ - heading: COACH_HUB_DEFS.dashboard.label, - items: [ - ...dashboardTabs.map((t) => hubTabToNavItem(t)), - hubTabToNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined), - ], - }); + if (dashboardTabs.length) { + items.push( + playerHubToNavItem({ + label: COACH_HUB_DEFS.dashboard.label, + href: dashboardTabs[0]!.href, + icon: COACH_HUB_DEFS.dashboard.icon as unknown as NavItem['icon'], + tabs: dashboardTabs, + }), + ); + items.push(toNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined, [BASEBALL_MESSAGES_NAV.href])); + } for (const hubId of ['team', 'stats-performance', 'development'] as const) { const def = COACH_HUB_DEFS[hubId]; const capFiltered = filterHubTabsByCapabilities(def.tabs, 'coach', ctx.capabilities); const visibleTabs = filterHubTabsByProgramType(capFiltered, ctx.programType); if (visibleTabs.length === 0) continue; - sections.push({ heading: def.label, items: visibleTabs.map((t) => hubTabToNavItem(t)) }); + items.push( + playerHubToNavItem({ + label: def.label, + href: visibleTabs[0]!.href, + icon: def.icon as unknown as NavItem['icon'], + tabs: visibleTabs, + }), + ); } - return sections; + return [{ heading: 'Baseball', items }]; } function toTitle(seg: string): string { @@ -407,9 +478,19 @@ function BaseballFairwayContent({ return buildCoachHubSections(ctx, unreadCount); }, [ctx, unreadCount, role, isShowcaseCoach, selectedTeam]); const breadcrumbs = useMemo(() => buildBreadcrumbs(pathname, ctx, homeHref), [pathname, ctx, homeHref]); + const activeHub = resolveActiveHub({ + pathname, + role, + programType: ctx.programType ?? null, + capabilities: ctx.capabilities, + }); // P413-equivalent: persistent mobile bottom-tab bar (subset of the rail). const bottomNavItems = useMemo(() => buildBottomNavItems(ctx, unreadCount), [ctx, unreadCount]); + useEffect(() => { + window.scrollTo({ top: 0, left: 0, behavior: 'instant' }); + }, [pathname]); + const name = coach?.full_name || (player ? `${player.first_name} ${player.last_name}` : 'User'); const avatarUrl = coach?.avatar_url || player?.avatar_url || undefined; const teamName = selectedTeam?.name || coach?.organization?.name; @@ -467,6 +548,14 @@ function BaseballFairwayContent({ constrainContent={false} >
+ {activeHub && ( + + )} {children}
@@ -481,19 +570,26 @@ function BaseballFairwayContent({ * Exported shell — full standalone replacement for BaseballShellLayout (auth * gate + provider stack + shell), rendering the Fairway AppShell frame. */ -export function BaseballFairwayShell({ children }: { children: React.ReactNode }) { - // SAME auth gate BaseballShellLayout uses for this route group (accepts - // both roles; requiredRole=null). - const { loading, authorized, role } = useBaseballAuth(null); +export function BaseballFairwayShell({ + children, + authVerified = false, + requiredRole = null, +}: { + children: React.ReactNode; + authVerified?: boolean; + requiredRole?: Role | null; +}) { + // SAME auth gate BaseballShellLayout uses for the mounted route group. + const { loading, authorized, role } = useBaseballAuth(requiredRole); // SAME server-resolved capability map (nav-context.ts) BaseballShellLayout // passes into BaseballDashboardShell. const { navContext } = useBaseballNavContext(); - if (loading || !authorized) { + if (!authVerified && (loading || !authorized)) { return ; } - const resolvedRole: Role = role ?? 'coach'; + const resolvedRole: Role = requiredRole ?? role ?? 'coach'; return ( diff --git a/src/app/baseball/(dashboard)/_components/hub-definitions.ts b/src/app/baseball/(dashboard)/_components/hub-definitions.ts index 6d97e2549..324dcdbe9 100644 --- a/src/app/baseball/(dashboard)/_components/hub-definitions.ts +++ b/src/app/baseball/(dashboard)/_components/hub-definitions.ts @@ -57,6 +57,9 @@ import { IconHome, IconUser, IconGraduationCap, + IconSettings, + IconLock, + IconDatabase, } from '@/components/icons'; import type { HubSubNavTab } from './hub-sub-nav'; import { @@ -73,7 +76,7 @@ import { /** Registry entry → HubSubNavTab, copying every gating field VERBATIM. */ function toHubTab(entry: BaseballNavEntry): HubSubNavTab { - return { + const tab: HubSubNavTab = { id: entry.id, label: entry.label, href: entry.href, @@ -82,6 +85,13 @@ function toHubTab(entry: BaseballNavEntry): HubSubNavTab { requiredAnyCapabilities: entry.requiredAnyCapabilities, allowedProgramTypes: entry.allowedProgramTypes, }; + + if (entry.id === 'roster') tab.matchPrefixes = ['/baseball/dashboard/players']; + if (entry.id === 'performance') tab.matchPrefixes = ['/baseball/dashboard/performance']; + if (entry.id === 'dev-plans') tab.matchPrefixes = ['/baseball/dashboard/dev-plans']; + if (entry.id === 'camps') tab.matchPrefixes = ['/baseball/dashboard/camps']; + + return tab; } /** @@ -131,6 +141,7 @@ const STATS_GAMES_TAB: HubSubNavTab = { label: 'Games', href: '/baseball/dashboard/stats/games', icon: IconClipboardList, + matchPrefixes: ['/baseball/dashboard/stats/games'], }; const STATS_SEASON_TAB: HubSubNavTab = { id: 'season', @@ -173,6 +184,69 @@ const PERFORMANCE_BUILDER_TAB: HubSubNavTab = { icon: IconGauge, requiredCapability: 'can_manage_lifting', }; +const SETTINGS_HOME_TAB: HubSubNavTab = { + id: 'settings-home', + label: 'Settings', + href: '/baseball/dashboard/settings', + icon: IconSettings, + matchPrefixes: ['/baseball/dashboard/settings'], +}; +const SETTINGS_SEASON_TAB: HubSubNavTab = { + id: 'settings-season', + label: 'Season', + href: '/baseball/dashboard/settings/season', + icon: IconCalendar, + requiredCapability: 'can_manage_settings', +}; +const SETTINGS_PHILOSOPHY_TAB: HubSubNavTab = { + id: 'settings-philosophy', + label: 'Philosophy', + href: '/baseball/dashboard/settings/philosophy', + icon: IconTarget, + requiredCapability: 'can_manage_settings', +}; +const SETTINGS_ROLES_TAB: HubSubNavTab = { + id: 'settings-roles', + label: 'Roles', + href: '/baseball/dashboard/settings/roles', + icon: IconLock, + requiredCapability: 'can_manage_settings', +}; +const SETTINGS_PERMISSIONS_TAB: HubSubNavTab = { + id: 'settings-permissions', + label: 'Permissions', + href: '/baseball/dashboard/settings/permissions', + icon: IconShieldCheck, + requiredCapability: 'can_manage_settings', +}; +const SETTINGS_TEAMS_TAB: HubSubNavTab = { + id: 'settings-teams', + label: 'Team Settings', + href: '/baseball/dashboard/settings/teams', + icon: IconUsers, + requiredCapability: 'can_manage_settings', +}; +const SETTINGS_IMPORTS_TAB: HubSubNavTab = { + id: 'settings-imports', + label: 'Imports', + href: '/baseball/dashboard/settings/imports', + icon: IconUpload, + requiredCapability: 'can_manage_imports', +}; +const SETTINGS_INTEGRATIONS_TAB: HubSubNavTab = { + id: 'settings-integrations', + label: 'Integrations', + href: '/baseball/dashboard/settings/integrations', + icon: IconBuilding, + requiredCapability: 'can_manage_settings', +}; +const SETTINGS_AUDIT_TAB: HubSubNavTab = { + id: 'settings-audit', + label: 'Audit', + href: '/baseball/dashboard/settings/audit', + icon: IconDatabase, + requiredCapability: 'can_manage_settings', +}; // ----------------------------------------------------------------------------- // Curated display order per hub (COACH_NAV_8TAB_PROPOSAL.md mapping table). @@ -261,9 +335,21 @@ export const COACH_ACADEMICS_TABS: readonly HubSubNavTab[] = orderTabs(hubEntrie * "Decision Room" vs "Staff Room" label drift (the registry's label always * wins now — it is read, not re-declared). */ -export const COACH_MANAGEMENT_TABS: readonly HubSubNavTab[] = orderTabs( - hubEntries('management'), - MANAGEMENT_ORDER, +export const COACH_MANAGEMENT_TABS: readonly HubSubNavTab[] = withSupplements( + orderTabs(hubEntries('management'), MANAGEMENT_ORDER), + { + 'program-settings': [ + SETTINGS_HOME_TAB, + SETTINGS_SEASON_TAB, + SETTINGS_PHILOSOPHY_TAB, + SETTINGS_ROLES_TAB, + SETTINGS_PERMISSIONS_TAB, + SETTINGS_TEAMS_TAB, + SETTINGS_IMPORTS_TAB, + SETTINGS_INTEGRATIONS_TAB, + SETTINGS_AUDIT_TAB, + ], + }, ); // ----------------------------------------------------------------------------- @@ -333,6 +419,15 @@ export const PLAYER_TEAM_TABS: readonly HubSubNavTab[] = [ { id: 'documents', label: 'Documents', href: '/baseball/dashboard/documents', icon: IconFileText }, ]; +/** Player RECRUITING hub — player-owned exposure and college discovery surfaces. */ +export const PLAYER_RECRUITING_TABS: readonly HubSubNavTab[] = [ + { id: 'journey', label: 'Journey', href: '/baseball/dashboard/journey', icon: IconStar }, + { id: 'interest', label: 'Interest', href: '/baseball/dashboard/college-interest', icon: IconTarget }, + { id: 'colleges', label: 'Colleges', href: '/baseball/dashboard/colleges', icon: IconGraduationCap }, + { id: 'analytics', label: 'Analytics', href: '/baseball/dashboard/analytics', icon: IconTrendingUp }, + { id: 'activate', label: 'Activate', href: '/baseball/dashboard/activate', icon: IconShieldCheck }, +]; + // ----------------------------------------------------------------------------- // SHARED REFERENCES — non-hub leaf routes the sidebar links directly (no sub-nav). // Kept here only so the sidebar and any future hub share one href string. @@ -350,6 +445,7 @@ export const HUB_LANDING = { playerProfile: '/baseball/dashboard/profile', playerStats: PLAYER_STATS_TABS[0]!.href, playerDevelopment: PLAYER_DEVELOPMENT_TABS[0]!.href, + playerRecruiting: PLAYER_RECRUITING_TABS[0]!.href, playerCalendar: '/baseball/dashboard/calendar', playerMessages: '/baseball/dashboard/messages', playerTeam: PLAYER_TEAM_TABS[0]!.href, diff --git a/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts b/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts index b92626512..f1d2f2782 100644 --- a/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts +++ b/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts @@ -25,6 +25,7 @@ import { PLAYER_STATS_TABS, PLAYER_DEVELOPMENT_TABS, PLAYER_TEAM_TABS, + PLAYER_RECRUITING_TABS, } from './hub-definitions'; import type { HubSubNavTab } from './hub-sub-nav'; import type { BaseballProgramType } from '@/lib/types/baseball-settings'; @@ -108,6 +109,12 @@ function playerHubs(): HubDef[] { tabs: PLAYER_TEAM_TABS, ownedPrefixes: PLAYER_TEAM_TABS.flatMap((t) => [t.href, ...(t.matchPrefixes ?? [])]), }, + { + id: 'recruiting', + ariaLabel: 'Recruiting sections', + tabs: PLAYER_RECRUITING_TABS, + ownedPrefixes: PLAYER_RECRUITING_TABS.flatMap((t) => [t.href, ...(t.matchPrefixes ?? [])]), + }, ]; } diff --git a/src/app/baseball/(dashboard)/dashboard/settings/page.tsx b/src/app/baseball/(dashboard)/dashboard/settings/page.tsx index d64d3f828..b734215f4 100644 --- a/src/app/baseball/(dashboard)/dashboard/settings/page.tsx +++ b/src/app/baseball/(dashboard)/dashboard/settings/page.tsx @@ -9,9 +9,124 @@ import { PageLoading } from '@/components/ui/loading'; import { useAuth } from '@/hooks/use-auth'; import { useToast } from '@/components/ui/sonner'; import { changePasswordAction } from '@/app/baseball/actions/auth'; -import { IconChevronRight, IconShield, IconBuilding, IconBell, IconMail } from '@/components/icons'; +import { + IconBell, + IconBuilding, + IconCalendar, + IconChevronRight, + IconDatabase, + IconLink, + IconLock, + IconMail, + IconPalette, + IconSchool, + IconSettings, + IconShield, + IconTarget, + IconUpload, + IconUsers, +} from '@/components/icons'; import Link from 'next/link'; +const COACH_SETTINGS_LINKS = [ + { + href: '/baseball/dashboard/settings/program', + label: 'Program Settings', + description: 'Identity, public profile, notifications, AI, and access defaults', + icon: IconBuilding, + }, + { + href: '/baseball/dashboard/settings/staff', + label: 'Staff Settings', + description: 'Staff seats, assignments, and coaching responsibilities', + icon: IconUsers, + }, + { + href: '/baseball/dashboard/settings/teams', + label: 'Team Settings', + description: 'Team records, roster configuration, and season ownership', + icon: IconUsers, + }, + { + href: '/baseball/dashboard/settings/season', + label: 'Season Settings', + description: 'Season dates, opponent naming, and competition context', + icon: IconCalendar, + }, + { + href: '/baseball/dashboard/settings/philosophy', + label: 'Coaching Philosophy', + description: 'Development model, evaluation priorities, and program language', + icon: IconTarget, + }, + { + href: '/baseball/dashboard/settings/roles', + label: 'Role Templates', + description: 'Default role packs for staff and program collaborators', + icon: IconLock, + }, + { + href: '/baseball/dashboard/settings/permissions', + label: 'Permissions Matrix', + description: 'Capability-level access across staff roles', + icon: IconShield, + }, + { + href: '/baseball/dashboard/settings/imports', + label: 'Import Sources', + description: 'Trust levels, review rules, and player matching for imported data', + icon: IconUpload, + }, + { + href: '/baseball/dashboard/settings/integrations', + label: 'Integrations', + description: 'Adapter levels for stat feeds, devices, and partner systems', + icon: IconLink, + }, + { + href: '/baseball/dashboard/settings/audit', + label: 'Audit Log', + description: 'Append-only history of sensitive settings changes', + icon: IconDatabase, + }, +] as const; + +const PLAYER_SETTINGS_LINKS = [ + { + href: '/baseball/dashboard/settings/privacy', + label: 'Privacy Settings', + description: 'Control what appears on your public profile', + icon: IconShield, + }, + { + href: '/baseball/dashboard/settings/recruiting-preferences', + label: 'Recruiting Preferences', + description: 'Manage exposure preferences and college fit signals', + icon: IconSchool, + }, +] as const; + +const CONSOLIDATED_SETTINGS_LINKS = [ + { + href: '/baseball/dashboard/settings/program#appearance', + label: 'Appearance', + description: 'Team branding and public profile presentation', + icon: IconPalette, + }, + { + href: '/baseball/dashboard/settings/program#notifications', + label: 'Notifications', + description: 'Quiet hours and program notification defaults', + icon: IconBell, + }, + { + href: '/baseball/dashboard/settings/program#data-retention', + label: 'Data Retention', + description: 'Retention defaults, export posture, and audit policy', + icon: IconDatabase, + }, +] as const; + export default function SettingsPage() { const { user, loading } = useAuth(); const { showToast } = useToast(); @@ -106,7 +221,63 @@ export default function SettingsPage() { return ( <>
-
+
+
+ {(user?.role === 'coach' ? COACH_SETTINGS_LINKS : PLAYER_SETTINGS_LINKS).map((item) => { + const Icon = item.icon; + return ( + + + +
+
+
+ +
+
+

{item.label}

+

{item.description}

+
+
+ +
+ + + + ); + })} +
+ + {user?.role === 'coach' && ( + + +
+ +

Consolidated Program Sections

+
+ + + {CONSOLIDATED_SETTINGS_LINKS.map((item) => { + const Icon = item.icon; + return ( + +
+ + +
+

{item.label}

+

{item.description}

+ + ); + })} + + + )} + {/* Program Profile Link (Coaches Only) */} {user?.role === 'coach' && ( diff --git a/src/app/baseball/(dashboard)/dashboard/stats/games/new/NewGameClient.tsx b/src/app/baseball/(dashboard)/dashboard/stats/games/new/NewGameClient.tsx deleted file mode 100644 index 77149fc80..000000000 --- a/src/app/baseball/(dashboard)/dashboard/stats/games/new/NewGameClient.tsx +++ /dev/null @@ -1,202 +0,0 @@ -'use client'; - -import { useState } from 'react'; -import { useRouter } from 'next/navigation'; -import { createGame } from '@/app/baseball/actions/games'; -import type { BaseballGameType, BaseballHomeAway } from '@/lib/types'; -import { Button } from '@/components/ui/button'; -import { Input } from '@/components/ui/input'; -import { Checkbox } from '@/components/ui/checkbox'; - -interface NewGameClientProps { - teamId: string; - teamName: string; -} - -export function NewGameClient({ teamId, teamName }: NewGameClientProps) { - const router = useRouter(); - const today = new Date().toISOString().split('T')[0]; - - const [gameDate, setGameDate] = useState(today ?? ''); - const [gameType, setGameType] = useState('game'); - const [opponentName, setOpponentName] = useState(''); - const [location, setLocation] = useState(''); - const [homeAway, setHomeAway] = useState('home'); - const [eventTime, setEventTime] = useState(''); - const [createCalendarEvent, setCreateCalendarEvent] = useState(true); - const [saving, setSaving] = useState(false); - const [error, setError] = useState(null); - - async function handleSubmit(e: React.FormEvent) { - e.preventDefault(); - if (!gameDate) { - setError('Please select a game date'); - return; - } - - setSaving(true); - setError(null); - - const result = await createGame(teamId, { - game_date: gameDate, - game_type: gameType, - opponent_name: opponentName || undefined, - location: location || undefined, - home_away: homeAway, - event_time: eventTime || undefined, - create_calendar_event: createCalendarEvent, - }); - - if (result.success && result.data) { - router.push(`/baseball/dashboard/stats/games/${result.data.id}`); - } else { - setError(result.error ?? 'Failed to create game'); - setSaving(false); - } - } - - return ( -
-
-

Add Game / Scrimmage

-

{teamName}

-
- -
-
- {/* Game type */} -
-

Type

-
- {(['game', 'scrimmage'] as BaseballGameType[]).map((t) => ( - - ))} -
-
- - {/* Date */} -
- - setGameDate(e.target.value)} - required - /> -
- - {/* Opponent */} -
- - setOpponentName(e.target.value)} - placeholder="e.g. State University" - /> -
- - {/* Home/Away */} -
-

Location

-
- {(['home', 'away', 'neutral'] as BaseballHomeAway[]).map((ha) => ( - - ))} -
-
- - {/* Venue */} -
- - setLocation(e.target.value)} - placeholder="e.g. Alumni Field" - /> -
- - {/* Calendar event option */} -
-
- setCreateCalendarEvent(e.target.checked)} - label="Also add to team calendar" - /> -
- {createCalendarEvent && ( - setEventTime(e.target.value)} - className="w-auto min-h-0 py-1.5" - placeholder="Start time" - /> - )} -
- - {error && ( -
- {error} -
- )} - -
- - -
-
-
-
- ); -} diff --git a/src/app/baseball/(dashboard)/dashboard/stats/games/new/error.tsx b/src/app/baseball/(dashboard)/dashboard/stats/games/new/error.tsx deleted file mode 100644 index bf34a76dc..000000000 --- a/src/app/baseball/(dashboard)/dashboard/stats/games/new/error.tsx +++ /dev/null @@ -1,23 +0,0 @@ -'use client'; - -import { RouteErrorBoundary } from '@/components/errors'; - -export default function NewGameError({ - error, - reset, -}: { - error: Error & { digest?: string }; - reset: () => void; -}) { - return ( - - ); -} diff --git a/src/app/baseball/(dashboard)/dashboard/stats/games/new/loading.tsx b/src/app/baseball/(dashboard)/dashboard/stats/games/new/loading.tsx deleted file mode 100644 index a87dcd427..000000000 --- a/src/app/baseball/(dashboard)/dashboard/stats/games/new/loading.tsx +++ /dev/null @@ -1,57 +0,0 @@ -import { Skeleton } from '@/components/ui/skeleton'; - -/** - * New game form loading skeleton. - */ -export default function NewGameLoading() { - return ( -
-
- - -
- -
- {/* Type row */} -
- -
- - -
-
- {/* Date */} -
- - -
- {/* Opponent */} -
- - -
- {/* Home/Away */} -
- -
- - - -
-
- {/* Venue */} -
- - -
- {/* Calendar */} - - {/* Buttons */} -
- - -
-
-
- ); -} diff --git a/src/app/baseball/(dashboard)/dashboard/stats/games/new/page.tsx b/src/app/baseball/(dashboard)/dashboard/stats/games/new/page.tsx deleted file mode 100644 index 652e5603d..000000000 --- a/src/app/baseball/(dashboard)/dashboard/stats/games/new/page.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import { redirect } from 'next/navigation'; -import { BASEBALL_STATS_GAME_CREATE_PATH } from '@/lib/baseball/stats-route-aliases'; - -/** Temporary redirect alias — canonical route is /stats/games/create (#378). */ -export default function LegacyNewGameRedirect() { - redirect(BASEBALL_STATS_GAME_CREATE_PATH); -} diff --git a/src/app/baseball/(dashboard)/dashboard/team/high-school/error.tsx b/src/app/baseball/(dashboard)/dashboard/team/high-school/error.tsx deleted file mode 100644 index dcfb7ac81..000000000 --- a/src/app/baseball/(dashboard)/dashboard/team/high-school/error.tsx +++ /dev/null @@ -1,23 +0,0 @@ -'use client'; - -import { RouteErrorBoundary } from '@/components/errors'; - -export default function Error({ - error, - reset, -}: { - error: Error & { digest?: string }; - reset: () => void; -}) { - return ( - - ); -} diff --git a/src/app/baseball/(dashboard)/dashboard/team/high-school/page.tsx b/src/app/baseball/(dashboard)/dashboard/team/high-school/page.tsx deleted file mode 100644 index 4d8e9fcd8..000000000 --- a/src/app/baseball/(dashboard)/dashboard/team/high-school/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect } from 'next/navigation'; - -export default function HighSchoolTeamDashboardPage() { - redirect('/baseball/dashboard/command-center'); -} diff --git a/src/app/baseball/(dashboard)/layout.tsx b/src/app/baseball/(dashboard)/layout.tsx index 33d1e879e..6d6bd4156 100644 --- a/src/app/baseball/(dashboard)/layout.tsx +++ b/src/app/baseball/(dashboard)/layout.tsx @@ -90,7 +90,13 @@ function DashboardSessionGuard({ children }: { children: React.ReactNode }) { return ; } - return <>{children}; + const shell = isRedesignEnabled() ? ( + {children} + ) : ( + {children} + ); + + return shell; } // --------------------------------------------------------------------------- @@ -113,13 +119,5 @@ export default function DashboardLayout({ }: { children: React.ReactNode; }) { - return ( - - {isRedesignEnabled() ? ( - {children} - ) : ( - {children} - )} - - ); + return {children}; } diff --git a/src/app/baseball/(player-dashboard)/player/college/page.tsx b/src/app/baseball/(player-dashboard)/player/college/page.tsx deleted file mode 100644 index b988293d0..000000000 --- a/src/app/baseball/(player-dashboard)/player/college/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect } from 'next/navigation'; - -export default function CollegePlayerDashboardPage() { - redirect('/baseball/player/today'); -} diff --git a/src/app/baseball/(player-dashboard)/player/high-school/page.tsx b/src/app/baseball/(player-dashboard)/player/high-school/page.tsx deleted file mode 100644 index 81f2e446f..000000000 --- a/src/app/baseball/(player-dashboard)/player/high-school/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect } from 'next/navigation'; - -export default function HighSchoolPlayerDashboardPage() { - redirect('/baseball/player/today'); -} diff --git a/src/app/baseball/(player-dashboard)/player/juco/page.tsx b/src/app/baseball/(player-dashboard)/player/juco/page.tsx deleted file mode 100644 index 1663d2c3e..000000000 --- a/src/app/baseball/(player-dashboard)/player/juco/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect } from 'next/navigation'; - -export default function JucoPlayerRedirectPage() { - redirect('/baseball/player/today'); -} diff --git a/src/app/baseball/(player-dashboard)/player/layout.tsx b/src/app/baseball/(player-dashboard)/player/layout.tsx index 86d04193a..9306ef5d9 100644 --- a/src/app/baseball/(player-dashboard)/player/layout.tsx +++ b/src/app/baseball/(player-dashboard)/player/layout.tsx @@ -1,8 +1,16 @@ 'use client'; +import { BaseballFairwayShell } from '@/app/baseball/(dashboard)/BaseballFairwayShell'; import { BaseballShellLayout } from '@/components/baseball/BaseballShellLayout'; +import { isRedesignEnabled } from '@/lib/redesign/flag'; export default function PlayerDashboardLayout({ children }: { children: React.ReactNode }) { + const shell = isRedesignEnabled() ? ( + {children} + ) : ( + {children} + ); + return ( <> {/* @@ -12,7 +20,7 @@ export default function PlayerDashboardLayout({ children }: { children: React.Re * (start_url: /baseball/player/today) is available for player sessions. */} - {children} + {shell} ); } diff --git a/src/app/baseball/(player-dashboard)/player/passport/page.tsx b/src/app/baseball/(player-dashboard)/player/passport/page.tsx index 6cb77c887..f39b436c0 100644 --- a/src/app/baseball/(player-dashboard)/player/passport/page.tsx +++ b/src/app/baseball/(player-dashboard)/player/passport/page.tsx @@ -21,13 +21,9 @@ // Fairway component's own empty state) rather than redirect-looping or // fabricating a passport. // -// SCOPE: `/baseball/player/*` (the `(player-dashboard)` route group) has no -// Fairway shell equivalent to `(dashboard)/BaseballFairwayShell.tsx` yet — that -// shell is explicitly frozen to its own route group this migration (§6). This -// page therefore carries BOTH the `.fairway-ds` token scope and the -// `.living-annual` cream override itself (mirroring what the legacy -// `bg-cream-100` wrapper did), same as the page-local pattern documented in -// §1 for a surface no ancestor shell already scopes. +// SCOPE: this page keeps the `.living-annual` cream override locally because it +// is the full editorial passport surface, while the route-group layout owns the +// shared Fairway shell frame. // ============================================================================= import { redirect } from 'next/navigation'; diff --git a/src/app/baseball/(player-dashboard)/player/showcase/page.tsx b/src/app/baseball/(player-dashboard)/player/showcase/page.tsx deleted file mode 100644 index 8acc0ac90..000000000 --- a/src/app/baseball/(player-dashboard)/player/showcase/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect } from 'next/navigation'; - -export default function ShowcasePlayerDashboardPage() { - redirect('/baseball/player/today'); -} diff --git a/src/app/baseball/actions/__tests__/route-shell-contract.test.ts b/src/app/baseball/actions/__tests__/route-shell-contract.test.ts index 642f3c32a..8b3c1fc77 100644 --- a/src/app/baseball/actions/__tests__/route-shell-contract.test.ts +++ b/src/app/baseball/actions/__tests__/route-shell-contract.test.ts @@ -42,7 +42,12 @@ import { DYNAMIC_ROUTE_SAMPLES, REDIRECT_ALIAS_MANIFEST, } from '@/test/helpers/baseball-route-inventory'; -import { BASEBALL_NAV_REGISTRY, BASEBALL_MESSAGES_NAV } from '@/lib/baseball/nav-registry'; +import { + BASEBALL_NAV_REGISTRY, + BASEBALL_MESSAGES_NAV, + getVisibleBaseballNav, + type BaseballNavContext, +} from '@/lib/baseball/nav-registry'; import { COACH_TEAM_TABS, COACH_STATS_TABS, @@ -84,23 +89,12 @@ const ADVISORY_ALLOWLIST: readonly AllowlistEntry[] = [ { bucket: 'orphanRoutes', href: '/baseball/dashboard/players/[id]/scout-packet/preview', reason: 'deep-link print preview reached from the scout packet' }, { bucket: 'orphanRoutes', href: '/baseball/dashboard/players/[id]/stats', reason: 'deep-link sub-view reached from the player profile' }, { bucket: 'orphanRoutes', href: '/baseball/dashboard/camps/[id]', reason: 'deep-link detail page reached from the Camps list' }, - { bucket: 'orphanRoutes', href: '/baseball/dashboard/messages/[id]', reason: 'deep-link thread page reached from the Messages inbox' }, { bucket: 'orphanRoutes', href: '/baseball/dashboard/stats/games/[gameId]', reason: 'deep-link box score reached from the Games list' }, { bucket: 'orphanRoutes', href: '/baseball/dashboard/stats/games/create', reason: 'sub-action reached from the Games list' }, - { bucket: 'orphanRoutes', href: '/baseball/dashboard/stats/games/new', reason: 'sub-action reached from the Games list' }, // --- orphanRoutes: backward-compatible redirect-only landing stubs. --- { bucket: 'orphanRoutes', href: '/baseball/dashboard', reason: 'backward-compatible bookmark dispatcher; server-redirects by role' }, { bucket: 'orphanRoutes', href: '/baseball/dashboard/stats', reason: 'legacy redirect-only stub -> /dashboard/stats-center' }, - { bucket: 'orphanRoutes', href: '/baseball/dashboard/team/high-school', reason: 'legacy redirect-only stub -> command-center' }, - { bucket: 'orphanRoutes', href: '/baseball/coach/college', reason: 'legacy per-coach-type stub; redirects to command-center' }, - { bucket: 'orphanRoutes', href: '/baseball/coach/high-school', reason: 'legacy per-coach-type stub; redirects to command-center' }, - { bucket: 'orphanRoutes', href: '/baseball/coach/juco', reason: 'legacy per-coach-type stub; redirects to command-center' }, - { bucket: 'orphanRoutes', href: '/baseball/coach/showcase', reason: 'legacy per-coach-type stub; redirects to command-center' }, - { bucket: 'orphanRoutes', href: '/baseball/player/college', reason: 'legacy per-program-type stub; redirects to player today' }, - { bucket: 'orphanRoutes', href: '/baseball/player/high-school', reason: 'legacy per-program-type stub; redirects to player today' }, - { bucket: 'orphanRoutes', href: '/baseball/player/juco', reason: 'legacy per-program-type stub; redirects to player today' }, - { bucket: 'orphanRoutes', href: '/baseball/player/showcase', reason: 'legacy per-program-type stub; redirects to player today' }, // --- orphanRoutes: public marketing / auth / onboarding / join entry // points — pre-login surfaces that are intentionally outside the @@ -122,6 +116,7 @@ const ADVISORY_ALLOWLIST: readonly AllowlistEntry[] = [ { bucket: 'orphanRoutes', href: '/baseball/player/[id]', reason: 'public player share page, no app nav' }, { bucket: 'orphanRoutes', href: '/baseball/program/[id]', reason: 'public program share page, no app nav' }, { bucket: 'orphanRoutes', href: '/baseball/team/[id]', reason: 'public team share page, no app nav' }, + { bucket: 'orphanRoutes', href: '/baseball/admin/demo-sessions', reason: 'platform admin surface outside dashboard nav shell' }, ]; function allowlistedHrefs(bucket: GapBucket): Set { @@ -246,6 +241,14 @@ describe('BaseballHelm route/shell contract (#374)', () => { ); }); + it('player nav does not expose the legacy coach dashboard alias as a duplicate Today route', () => { + const player: BaseballNavContext = { role: 'player', capabilities: {}, programType: 'college' }; + const visible = getVisibleBaseballNav(player); + + expect(visible.some((entry) => entry.id === 'team')).toBe(false); + expect(visible.filter((entry) => entry.href === '/baseball/player/today').map((entry) => entry.id)).toEqual(['player-today']); + }); + it('guardWithoutNavGating is empty for the known (capability-guarded) set', () => { expect(result.guardWithoutNavGating).toEqual([]); }); diff --git a/src/app/baseball/actions/__tests__/save-full-box-score.test.ts b/src/app/baseball/actions/__tests__/save-full-box-score.test.ts index f63b49950..b2d207d78 100644 --- a/src/app/baseball/actions/__tests__/save-full-box-score.test.ts +++ b/src/app/baseball/actions/__tests__/save-full-box-score.test.ts @@ -142,6 +142,37 @@ describe('saveFullBoxScore', () => { expect(result.error).toBeTruthy(); }); + it('computes pitching rates from true innings for partial-inning notation', async () => { + rpc.mockResolvedValue({ data: { success: true }, error: null }); + + const partialInningLine = { + ...PITCHING_LINE, + ip: 6.1, + er: 2, + h: 4, + bb: 2, + k: 7, + }; + + const result = await saveFullBoxScore('game-1', [], [partialInningLine], 2, 1); + + expect(result.success).toBe(true); + expect(rpc).toHaveBeenCalledWith( + 'save_baseball_full_box_score', + expect.objectContaining({ + p_pitching: [ + expect.objectContaining({ + ip: 6.1, + era: 2.84, + whip: 0.947, + k9: 9.95, + bb9: 2.84, + }), + ], + }), + ); + }); + // #433 — the manual edit form previously opened blank on an existing box // score, so a re-save could silently drop rows. These cases prove that // re-supplying the full existing set (as the preloaded form now does) is diff --git a/src/app/baseball/actions/games.ts b/src/app/baseball/actions/games.ts index b8d39b4fc..2f9c41835 100644 --- a/src/app/baseball/actions/games.ts +++ b/src/app/baseball/actions/games.ts @@ -21,6 +21,7 @@ import { } from '@/lib/baseball/with-baseball-action'; import { logServerError } from '@/lib/server-error-logger'; import { mapBattingToInput, mapPitchingToInput } from '@/components/baseball/box-score/mappers'; +import { ipToInnings } from '@/lib/baseball/innings'; import { getStatsCenter, type StatsCenterOptions, @@ -44,6 +45,7 @@ const STATS_PATHS = [ '/baseball/dashboard/stats-center', '/baseball/dashboard/stats/games', '/baseball/dashboard/stats/season', + '/baseball/dashboard/my-stats', '/baseball/dashboard/calendar', ]; @@ -556,12 +558,14 @@ function computePitchingRates(line: BoxScorePitchingInput): { } { const { ip, er, h, bb, k } = line; if (ip === 0) return { era: null, whip: null, k9: null, bb9: null }; + const innings = ipToInnings(ip); + if (innings === 0) return { era: null, whip: null, k9: null, bb9: null }; return { - era: parseFloat((9 * er / ip).toFixed(2)), - whip: parseFloat(((bb + h) / ip).toFixed(3)), - k9: parseFloat((9 * k / ip).toFixed(2)), - bb9: parseFloat((9 * bb / ip).toFixed(2)), + era: parseFloat((9 * er / innings).toFixed(2)), + whip: parseFloat(((bb + h) / innings).toFixed(3)), + k9: parseFloat((9 * k / innings).toFixed(2)), + bb9: parseFloat((9 * bb / innings).toFixed(2)), }; } diff --git a/src/components/baseball/games/GameCard.tsx b/src/components/baseball/games/GameCard.tsx index de3e396c4..f9ebb6332 100644 --- a/src/components/baseball/games/GameCard.tsx +++ b/src/components/baseball/games/GameCard.tsx @@ -6,7 +6,6 @@ import { IconCalendar, IconMapPin, IconTrendingUp } from '@/components/icons'; interface GameCardProps { game: BaseballGame; - onDelete?: (gameId: string) => void; } function getResultInfo(game: BaseballGame) { @@ -42,11 +41,15 @@ export function GameCard({ game }: GameCardProps) { month: 'short', day: 'numeric', }); + const detailHref = `/baseball/dashboard/stats/games/${game.id}`; + const opponentLabel = game.opponent_name ? `vs ${game.opponent_name}` : 'TBD Opponent'; return ( -
{/* Left: game info */} @@ -70,9 +73,7 @@ export function GameCard({ game }: GameCardProps) { )}
-

- {game.opponent_name ? `vs ${game.opponent_name}` : 'TBD Opponent'} -

+

{opponentLabel}

@@ -112,20 +113,14 @@ export function GameCard({ game }: GameCardProps) { {/* Stats links */}
{game.status === 'completed' && (Number(game.batting_count) > 0 || Number(game.pitching_count) > 0) ? ( - + Box Score - + ) : game.status !== 'cancelled' ? ( - + Enter Results - + ) : null}
@@ -145,6 +140,6 @@ export function GameCard({ game }: GameCardProps) { )}
)} -
+ ); } diff --git a/src/components/fairway/app-shell/FairwayBottomNav.tsx b/src/components/fairway/app-shell/FairwayBottomNav.tsx index 64827709d..bdbd13cac 100644 --- a/src/components/fairway/app-shell/FairwayBottomNav.tsx +++ b/src/components/fairway/app-shell/FairwayBottomNav.tsx @@ -74,8 +74,9 @@ export function FairwayBottomNav({ {items.map((item) => { const active = item.active || - (item.activeMatch && pathname ? item.activeMatch(pathname) : false) || - matchActive(item.href, pathname); + (item.activeMatch && pathname + ? item.activeMatch(pathname) + : matchActive(item.href, pathname)); const Icon = item.icon; return (
  • diff --git a/src/components/fairway/app-shell/FairwaySidebar.tsx b/src/components/fairway/app-shell/FairwaySidebar.tsx index 42b0762a9..2e6db2abb 100644 --- a/src/components/fairway/app-shell/FairwaySidebar.tsx +++ b/src/components/fairway/app-shell/FairwaySidebar.tsx @@ -349,12 +349,9 @@ export const FairwaySidebar = forwardRef(funct item={item} active={ item.active ?? - // `activeMatch` (when present) broadens the match to a route - // cluster so the global rail stays lit across sibling routes - // (e.g. CoachHelm AI on alerts/insights/patterns/…). Falls - // back to the default segment-boundary href match. - ((item.activeMatch && pathname ? item.activeMatch(pathname) : false) || - matchActive(item.href, pathname)) + (item.activeMatch && pathname + ? item.activeMatch(pathname) + : matchActive(item.href, pathname)) } collapsed={isCollapsed} Link={Link} diff --git a/src/contracts/baseball/stats/pitching-invariants.test.ts b/src/contracts/baseball/stats/pitching-invariants.test.ts index 5368ebe14..a253fdebe 100644 --- a/src/contracts/baseball/stats/pitching-invariants.test.ts +++ b/src/contracts/baseball/stats/pitching-invariants.test.ts @@ -14,14 +14,11 @@ // see also innings.test.ts) before any rate divides by it. This file pins that // corrected behavior. // -// NEEDS-DECISION (documented in -// docs/operations/BASEBALLHELM_BUSINESS_CONTRACT_MATRIX.md): the box-score -// SAVE path (`games.ts`'s `computePitchingRates` + CSV `getFloat('innings_pitched')`) -// is a SEPARATE, still-unconverted code path — it still divides by the raw -// notation value with no thirds conversion. That gap is unaffected by #434 and -// is pinned as-is by the second describe block below (games.ts mirrors its own, -// still-raw formula) — do not "fix" that block to match `ipToInnings`; it is -// pinning actual, unchanged behavior. +// The box-score SAVE path (`games.ts`'s `computePitchingRates`, including CSV +// imports that read `innings_pitched` as the same notation value) must use the +// same `ipToInnings` conversion before calculating rates. Otherwise a saved +// game can persist different ERA/WHIP/K9 than the Stats Center read model later +// derives from the same IP/counting stats. // ============================================================================= import { readFileSync } from 'node:fs'; @@ -99,14 +96,16 @@ describe('Pitching invariants (#377) — games.ts box-score save mirrors the sam }); it('computePitchingRates uses the identical ERA/WHIP/K9/BB9 formulas', () => { - expect(src).toContain('era: parseFloat((9 * er / ip).toFixed(2)),'); - expect(src).toContain('whip: parseFloat(((bb + h) / ip).toFixed(3)),'); - expect(src).toContain('k9: parseFloat((9 * k / ip).toFixed(2)),'); - expect(src).toContain('bb9: parseFloat((9 * bb / ip).toFixed(2)),'); + expect(src).toContain("import { ipToInnings } from '@/lib/baseball/innings';"); + expect(src).toContain('const innings = ipToInnings(ip);'); + expect(src).toContain('era: parseFloat((9 * er / innings).toFixed(2)),'); + expect(src).toContain('whip: parseFloat(((bb + h) / innings).toFixed(3)),'); + expect(src).toContain('k9: parseFloat((9 * k / innings).toFixed(2)),'); + expect(src).toContain('bb9: parseFloat((9 * bb / innings).toFixed(2)),'); }); - it('the CSV parser reads innings_pitched as a raw float with no thirds-notation conversion', () => { + it('the CSV parser reads innings_pitched as box-score notation and the shared save helper converts it for rates', () => { expect(src).toMatch(/ip:\s*getFloat\('innings_pitched'\)/); - expect(src).not.toMatch(/innings.*thirds|thirds.*innings|normalizeInnings/i); + expect(src).toContain('const innings = ipToInnings(ip);'); }); }); diff --git a/src/lib/baseball/__tests__/resolve-active-hub.test.ts b/src/lib/baseball/__tests__/resolve-active-hub.test.ts index 9d522bc30..56513dbf8 100644 --- a/src/lib/baseball/__tests__/resolve-active-hub.test.ts +++ b/src/lib/baseball/__tests__/resolve-active-hub.test.ts @@ -34,4 +34,24 @@ describe('resolveActiveHub — capability-filtered tabs (#370)', () => { expect(hub?.id).toBe('stats'); expect(hub?.tabs.some((t) => t.id === 'performance-programs')).toBe(false); }); + + it('activates the management hub on nested settings routes', () => { + const hub = resolveActiveHub({ + pathname: '/baseball/dashboard/settings/imports', + role: 'coach', + programType: 'college', + capabilities: { can_manage_settings: true, can_manage_imports: true }, + }); + expect(hub?.id).toBe('management'); + expect(hub?.tabs.some((t) => t.id === 'settings-imports')).toBe(true); + }); + + it('activates the player recruiting hub on exposure routes', () => { + const hub = resolveActiveHub({ + pathname: '/baseball/dashboard/college-interest', + role: 'player', + programType: 'high_school', + }); + expect(hub?.id).toBe('recruiting'); + }); }); diff --git a/src/lib/baseball/__tests__/settings-aliases-and-legacy-redirects.test.ts b/src/lib/baseball/__tests__/settings-aliases-and-legacy-redirects.test.ts index 93c45b143..dba424693 100644 --- a/src/lib/baseball/__tests__/settings-aliases-and-legacy-redirects.test.ts +++ b/src/lib/baseball/__tests__/settings-aliases-and-legacy-redirects.test.ts @@ -156,42 +156,6 @@ const LEGACY_REDIRECT_PAGES: ReadonlyArray<{ relPath: string[]; expectedTargets: readonly string[]; }> = [ - { - relPath: ['baseball', '(coach-dashboard)', 'coach', 'college', 'page.tsx'], - expectedTargets: ['/baseball/dashboard/command-center'], - }, - { - relPath: ['baseball', '(coach-dashboard)', 'coach', 'high-school', 'page.tsx'], - expectedTargets: ['/baseball/dashboard/command-center'], - }, - { - relPath: ['baseball', '(coach-dashboard)', 'coach', 'juco', 'page.tsx'], - expectedTargets: ['/baseball/dashboard/command-center'], - }, - { - relPath: ['baseball', '(coach-dashboard)', 'coach', 'showcase', 'page.tsx'], - expectedTargets: ['/baseball/dashboard/command-center'], - }, - { - relPath: ['baseball', '(player-dashboard)', 'player', 'college', 'page.tsx'], - expectedTargets: ['/baseball/player/today'], - }, - { - relPath: ['baseball', '(player-dashboard)', 'player', 'high-school', 'page.tsx'], - expectedTargets: ['/baseball/player/today'], - }, - { - relPath: ['baseball', '(player-dashboard)', 'player', 'juco', 'page.tsx'], - expectedTargets: ['/baseball/player/today'], - }, - { - relPath: ['baseball', '(player-dashboard)', 'player', 'showcase', 'page.tsx'], - expectedTargets: ['/baseball/player/today'], - }, - { - relPath: ['baseball', '(dashboard)', 'dashboard', 'team', 'high-school', 'page.tsx'], - expectedTargets: ['/baseball/dashboard/command-center'], - }, { relPath: ['baseball', '(dashboard)', 'dashboard', 'stats', 'page.tsx'], expectedTargets: ['/baseball/dashboard/stats-center'], @@ -246,14 +210,9 @@ describe('legacy create/new + role-type redirect pages target existing canonical }, ); - it('reuses stats-route-aliases.ts coverage for the legacy /stats/games/new create alias', async () => { - // stats-route-aliases.test.ts already locks this contract directly; this - // assertion just confirms the alias module + its canonical target both - // resolve, keeping this file's "legacy create/new style routes" coverage - // complete without duplicating that suite's assertions. - const { BASEBALL_STATS_GAME_CREATE_PATH, BASEBALL_STATS_GAME_CREATE_LEGACY_PATH } = - await import('../stats-route-aliases'); + it('reuses stats-route-aliases.ts coverage for the canonical game-create route', async () => { + const { BASEBALL_STATS_GAME_CREATE_PATH } = await import('../stats-route-aliases'); expect(routeExists(BASEBALL_STATS_GAME_CREATE_PATH)).toBe(true); - expect(routeExists(BASEBALL_STATS_GAME_CREATE_LEGACY_PATH)).toBe(true); + expect(routeExists(['/baseball/dashboard/stats/games', 'new'].join('/'))).toBe(false); }); }); diff --git a/src/lib/baseball/__tests__/stats-route-aliases.test.ts b/src/lib/baseball/__tests__/stats-route-aliases.test.ts index 055b98e73..6f3297667 100644 --- a/src/lib/baseball/__tests__/stats-route-aliases.test.ts +++ b/src/lib/baseball/__tests__/stats-route-aliases.test.ts @@ -1,8 +1,6 @@ import { describe, expect, it } from 'vitest'; import { - BASEBALL_STATS_GAME_CREATE_LEGACY_PATH, BASEBALL_STATS_GAME_CREATE_PATH, - BASEBALL_STATS_ROUTE_ALIASES, getBaseballStatsGameCreateHref, } from '@/lib/baseball/stats-route-aliases'; @@ -12,9 +10,7 @@ describe('stats-route-aliases (#378)', () => { expect(BASEBALL_STATS_GAME_CREATE_PATH).toBe('/baseball/dashboard/stats/games/create'); }); - it('legacy /new redirects to canonical create', () => { - expect(BASEBALL_STATS_ROUTE_ALIASES[BASEBALL_STATS_GAME_CREATE_LEGACY_PATH]).toBe( - BASEBALL_STATS_GAME_CREATE_PATH, - ); + it('does not expose the removed /stats/games/new alias', () => { + expect(getBaseballStatsGameCreateHref()).not.toContain('/stats/games/new'); }); }); diff --git a/src/lib/baseball/nav-manifest.ts b/src/lib/baseball/nav-manifest.ts index 37ddce514..b46f2f942 100644 --- a/src/lib/baseball/nav-manifest.ts +++ b/src/lib/baseball/nav-manifest.ts @@ -61,6 +61,7 @@ import { PLAYER_STATS_TABS, PLAYER_DEVELOPMENT_TABS, PLAYER_TEAM_TABS, + PLAYER_RECRUITING_TABS, } from '@/app/baseball/(dashboard)/_components/hub-definitions'; import type { HubSubNavTab } from '@/app/baseball/(dashboard)/_components/hub-sub-nav'; @@ -148,6 +149,7 @@ const ALL_HUB_TAB_ARRAYS: readonly (readonly HubSubNavTab[])[] = [ PLAYER_STATS_TABS, PLAYER_DEVELOPMENT_TABS, PLAYER_TEAM_TABS, + PLAYER_RECRUITING_TABS, ]; const hubTabEntries: NavManifestEntry[] = ALL_HUB_TAB_ARRAYS.flatMap((tabs) => @@ -185,54 +187,6 @@ const settingsAliasEntries: NavManifestEntry[] = Object.values( // at runtime, but every static branch resolves to a canonical entry above. const legacyRedirectEntries: NavManifestEntry[] = [ - { - href: '/baseball/coach/college', - source: 'legacy-redirect', - status: 'deprecated', - target: '/baseball/dashboard/command-center', - }, - { - href: '/baseball/coach/high-school', - source: 'legacy-redirect', - status: 'deprecated', - target: '/baseball/dashboard/command-center', - }, - { - href: '/baseball/coach/juco', - source: 'legacy-redirect', - status: 'deprecated', - target: '/baseball/dashboard/command-center', - }, - { - href: '/baseball/coach/showcase', - source: 'legacy-redirect', - status: 'deprecated', - target: '/baseball/dashboard/command-center', - }, - { - href: '/baseball/player/college', - source: 'legacy-redirect', - status: 'deprecated', - target: '/baseball/player/today', - }, - { - href: '/baseball/player/high-school', - source: 'legacy-redirect', - status: 'deprecated', - target: '/baseball/player/today', - }, - { - href: '/baseball/player/juco', - source: 'legacy-redirect', - status: 'deprecated', - target: '/baseball/player/today', - }, - { - href: '/baseball/player/showcase', - source: 'legacy-redirect', - status: 'deprecated', - target: '/baseball/player/today', - }, { href: '/baseball/dashboard/team', source: 'legacy-redirect', @@ -243,12 +197,6 @@ const legacyRedirectEntries: NavManifestEntry[] = [ target: '/baseball/dashboard/command-center', note: 'Branches to /baseball/player/today for players at runtime — both arms are canonical.', }, - { - href: '/baseball/dashboard/team/high-school', - source: 'legacy-redirect', - status: 'deprecated', - target: '/baseball/dashboard/command-center', - }, { href: '/baseball/dashboard/stats', source: 'legacy-redirect', diff --git a/src/lib/baseball/nav-registry.ts b/src/lib/baseball/nav-registry.ts index 30c82b6f6..887b5a374 100644 --- a/src/lib/baseball/nav-registry.ts +++ b/src/lib/baseball/nav-registry.ts @@ -757,15 +757,14 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [ id: 'team', label: 'Dashboard', href: '/baseball/dashboard/command-center', - playerHref: '/baseball/player/today', icon: IconUsers, // Backward-compatible secondary landing. The old team dashboard route now - // redirects here for coaches and to Player Today for players. Classified + // redirects here for coaches. Classified // 'dashboard' for the hub-required-field invariant, but hub-definitions.ts // deliberately EXCLUDES this id from the Dashboard hub's rendered sub-tabs // (its href is an exact duplicate of 'command-center' for coaches — it is a // legacy alias, never a distinct destination worth its own tab). - role: 'both', + role: 'coach', requiredCapability: null, section: 'secondary', hub: 'dashboard', diff --git a/src/lib/baseball/route-contract.ts b/src/lib/baseball/route-contract.ts index 154adf8f7..d5f8de066 100644 --- a/src/lib/baseball/route-contract.ts +++ b/src/lib/baseball/route-contract.ts @@ -41,6 +41,7 @@ import { PLAYER_STATS_TABS, PLAYER_DEVELOPMENT_TABS, PLAYER_TEAM_TABS, + PLAYER_RECRUITING_TABS, } from '@/app/baseball/(dashboard)/_components/hub-definitions'; import type { HubSubNavTab } from '@/app/baseball/(dashboard)/_components/hub-sub-nav'; @@ -58,7 +59,8 @@ export type HubName = | 'coach-academics' | 'player-stats' | 'player-development' - | 'player-team'; + | 'player-team' + | 'player-recruiting'; export type DeclaredHrefOrigin = | { kind: 'nav-registry'; id: string; variant: 'href' | 'playerHref' } @@ -96,6 +98,7 @@ const HUB_TAB_SOURCES: ReadonlyArray<{ { hub: 'player-stats', role: 'player', tabs: PLAYER_STATS_TABS }, { hub: 'player-development', role: 'player', tabs: PLAYER_DEVELOPMENT_TABS }, { hub: 'player-team', role: 'player', tabs: PLAYER_TEAM_TABS }, + { hub: 'player-recruiting', role: 'player', tabs: PLAYER_RECRUITING_TABS }, ]; /** @@ -134,7 +137,8 @@ export function collectDeclaredHrefs(): DeclaredHref[] { role: 'both', requiredCapability: null, requiredAnyCapabilities: [], - matchPrefixes: [], + // Thread detail pages (/messages/[id]) are owned by the inbox list route. + matchPrefixes: [BASEBALL_MESSAGES_NAV.href], }); for (const source of HUB_TAB_SOURCES) { diff --git a/src/lib/baseball/stats-route-aliases.ts b/src/lib/baseball/stats-route-aliases.ts index d40b2b7ff..db35dd9cc 100644 --- a/src/lib/baseball/stats-route-aliases.ts +++ b/src/lib/baseball/stats-route-aliases.ts @@ -1,28 +1,13 @@ // ============================================================================= -// Canonical BaseballHelm stats routes and temporary redirect aliases (#378). +// Canonical BaseballHelm stats routes. // -// Policy: `/stats/games/create` is canonical. `/stats/games/new` redirects until -// bookmarks and external docs fully migrate (see BASEBALL_STATS_ROUTE_ALIASES). +// Policy: `/stats/games/create` is canonical. The old `/stats/games/new` +// redirect alias was removed after app/e2e references were migrated. // ============================================================================= export const BASEBALL_STATS_GAME_CREATE_PATH = '/baseball/dashboard/stats/games/create' as const; -/** Legacy path — kept as a redirect alias only; do not link in app UI. */ -export const BASEBALL_STATS_GAME_CREATE_LEGACY_PATH = - '/baseball/dashboard/stats/games/new' as const; - -/** - * Redirect aliases: legacy → canonical. App code must use canonical paths only. - */ -export const BASEBALL_STATS_ROUTE_ALIASES = { - [BASEBALL_STATS_GAME_CREATE_LEGACY_PATH]: BASEBALL_STATS_GAME_CREATE_PATH, -} as const; - -export type BaseballStatsLegacyRoute = keyof typeof BASEBALL_STATS_ROUTE_ALIASES; - - - export function getBaseballStatsGameCreateHref(): string { return BASEBALL_STATS_GAME_CREATE_PATH; } diff --git a/src/lib/supabase/middleware.ts b/src/lib/supabase/middleware.ts index 8717c06f2..bb5625ed0 100644 --- a/src/lib/supabase/middleware.ts +++ b/src/lib/supabase/middleware.ts @@ -128,6 +128,28 @@ const ORG_PROGRAM_TYPES = new Set(['showcase', 'academy', ' const COACH_HOME = '/baseball/dashboard/command-center'; const PLAYER_HOME = '/baseball/player/today'; +/** + * Bookmark-compat redirects for legacy per-type landing stubs removed once the + * canonical Fairway dashboard routes shipped. Checked before auth so old links + * never 404. + */ +const LEGACY_BASEBALL_ROUTE_REDIRECTS: Readonly> = { + '/baseball/coach/college': COACH_HOME, + '/baseball/coach/high-school': COACH_HOME, + '/baseball/coach/juco': COACH_HOME, + '/baseball/coach/showcase': COACH_HOME, + '/baseball/player/college': PLAYER_HOME, + '/baseball/player/high-school': PLAYER_HOME, + '/baseball/player/juco': PLAYER_HOME, + '/baseball/player/showcase': PLAYER_HOME, + '/baseball/dashboard/team/high-school': COACH_HOME, + '/baseball/dashboard/stats/games/new': '/baseball/dashboard/stats/games/create', +}; + +function legacyBaseballRedirectTarget(pathname: string): string | null { + return LEGACY_BASEBALL_ROUTE_REDIRECTS[pathname] ?? null; +} + /** * Check if user is authorized to access the requested route based on their role */ @@ -309,6 +331,13 @@ export async function updateSession(request: NextRequest) { const sport = getSportFromPath(pathname); const onAdminPath = isAdminPath(pathname); + if (sport === 'baseball') { + const legacyTarget = legacyBaseballRedirectTarget(pathname); + if (legacyTarget) { + return NextResponse.redirect(new URL(legacyTarget, request.url)); + } + } + if (isNativeUserAgent(request) && isMarketingRoute(pathname)) { return NextResponse.redirect(new URL('/golf/login', request.url)); } diff --git a/src/test/helpers/baseball-route-inventory.ts b/src/test/helpers/baseball-route-inventory.ts index e7ef6bf90..09d3a34dd 100644 --- a/src/test/helpers/baseball-route-inventory.ts +++ b/src/test/helpers/baseball-route-inventory.ts @@ -109,6 +109,66 @@ export const REDIRECT_ALIAS_MANIFEST: RedirectAlias[] = [ 'short-circuits it before the page even renders.', implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_TEAM_ROUTES, COACH_HOME)', }, + { + from: '/baseball/coach/college', + to: '/baseball/dashboard/command-center', + reason: 'Legacy per-coach-type bookmark; stub page removed in favor of canonical Command Center.', + implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_BASEBALL_ROUTE_REDIRECTS)', + }, + { + from: '/baseball/coach/high-school', + to: '/baseball/dashboard/command-center', + reason: 'Legacy per-coach-type bookmark; stub page removed in favor of canonical Command Center.', + implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_BASEBALL_ROUTE_REDIRECTS)', + }, + { + from: '/baseball/coach/juco', + to: '/baseball/dashboard/command-center', + reason: 'Legacy per-coach-type bookmark; stub page removed in favor of canonical Command Center.', + implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_BASEBALL_ROUTE_REDIRECTS)', + }, + { + from: '/baseball/coach/showcase', + to: '/baseball/dashboard/command-center', + reason: 'Legacy per-coach-type bookmark; stub page removed in favor of canonical Command Center.', + implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_BASEBALL_ROUTE_REDIRECTS)', + }, + { + from: '/baseball/player/college', + to: '/baseball/player/today', + reason: 'Legacy per-program-type bookmark; stub page removed in favor of canonical Player Today.', + implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_BASEBALL_ROUTE_REDIRECTS)', + }, + { + from: '/baseball/player/high-school', + to: '/baseball/player/today', + reason: 'Legacy per-program-type bookmark; stub page removed in favor of canonical Player Today.', + implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_BASEBALL_ROUTE_REDIRECTS)', + }, + { + from: '/baseball/player/juco', + to: '/baseball/player/today', + reason: 'Legacy per-program-type bookmark; stub page removed in favor of canonical Player Today.', + implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_BASEBALL_ROUTE_REDIRECTS)', + }, + { + from: '/baseball/player/showcase', + to: '/baseball/player/today', + reason: 'Legacy per-program-type bookmark; stub page removed in favor of canonical Player Today.', + implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_BASEBALL_ROUTE_REDIRECTS)', + }, + { + from: '/baseball/dashboard/team/high-school', + to: '/baseball/dashboard/command-center', + reason: 'Legacy HS team dashboard bookmark; stub page removed in favor of Command Center.', + implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_BASEBALL_ROUTE_REDIRECTS)', + }, + { + from: '/baseball/dashboard/stats/games/new', + to: '/baseball/dashboard/stats/games/create', + reason: 'Legacy game-create alias; canonical path is /stats/games/create.', + implementedAt: 'src/lib/supabase/middleware.ts (LEGACY_BASEBALL_ROUTE_REDIRECTS)', + }, ]; // ----------------------------------------------------------------------------- From d200f53b49e4bc8d17964484fc778efdabd36449 Mon Sep 17 00:00:00 2001 From: Fable Integrator Date: Sat, 4 Jul 2026 15:54:08 -0400 Subject: [PATCH 2/7] merge: unify Helm Bridge observability with Fairway routing Combines fix/helm-bridge-observability-baseball-auth (soft-failure logging, incident feed, baseball auth polish, Ben+Leah/work tabs) with the Fairway shell routing and route-contract work. Dashboard layout keeps authVerified on both shell branches after the session guard settles. --- .env.example | 8 + src/app/admin/_components/AdminShell.tsx | 6 +- .../_components/__tests__/admin-nav.test.ts | 14 +- src/app/admin/_components/admin-nav.ts | 10 + src/app/admin/ben-leah/BenLeahIssueBoard.tsx | 169 +++++++++++++ src/app/admin/ben-leah/BenLeahIssueTable.tsx | 100 ++++++++ .../ben-leah/BenLeahIssueWorkflowSelect.tsx | 70 ++++++ src/app/admin/ben-leah/actions.ts | 43 ++++ src/app/admin/ben-leah/page.tsx | 31 ++- src/app/admin/errors/page.tsx | 64 ++++- src/app/admin/page.tsx | 47 ++-- src/app/admin/work/WorkTimeline.tsx | 226 ++++++++++++++++++ src/app/admin/work/page.tsx | 113 +++++++++ src/app/baseball/(dashboard)/layout.tsx | 8 +- .../complete-player-onboarding.test.ts | 2 +- src/app/baseball/actions/onboarding.ts | 2 +- .../coverage-contract.observability.test.ts | 101 ++++++++ src/components/auth/baseball-sign-in-form.tsx | 11 +- .../baseball/BaseballDashboardBootstrap.tsx | 20 ++ .../baseball/BaseballShellLayout.tsx | 5 +- .../providers/SessionActivityProvider.tsx | 3 + .../__tests__/use-baseball-auth.test.tsx | 9 +- src/hooks/use-baseball-auth.ts | 60 +++-- src/hooks/use-baseball-nav-context.ts | 51 +++- .../server-error-logger-bridge.test.ts | 11 + .../admin/__tests__/ben-leah-issues.test.ts | 125 ++++++++++ .../__tests__/observe-action-result.test.ts | 81 +++++++ .../admin/__tests__/pr-body-parser.test.ts | 57 +++++ src/lib/admin/ben-leah-issue-tracker.ts | 198 +++++++++++++++ src/lib/admin/ben-leah-issues.ts | 168 +++++++++++++ .../data/__tests__/incident-feed.test.ts | 66 +++++ src/lib/admin/data/errors.ts | 91 ++++--- src/lib/admin/data/incident-feed.ts | 121 ++++++++++ src/lib/admin/data/overview.ts | 44 ++-- src/lib/admin/data/triage.ts | 41 +--- src/lib/admin/github-feedback.ts | 54 +++-- src/lib/admin/github-issues-config.ts | 25 ++ src/lib/admin/github-issues-workflow.ts | 90 +++++++ src/lib/admin/github-pr-timeline.ts | 197 +++++++++++++++ src/lib/admin/observe-action-result.ts | 105 ++++++++ src/lib/admin/observed-action.ts | 25 +- src/lib/admin/pr-body-parser.ts | 178 ++++++++++++++ src/lib/auth/session-activity.ts | 68 +++++- src/lib/auth/session-idle-shared.ts | 7 + ...with-baseball-action-observability.test.ts | 28 +++ src/lib/baseball/with-baseball-action.ts | 2 + src/lib/lifting/with-lifting-action.ts | 13 + src/lib/server-error-logger.ts | 55 +++-- src/test/lib/auth/session-idle-shared.test.ts | 5 + 49 files changed, 2811 insertions(+), 217 deletions(-) create mode 100644 src/app/admin/ben-leah/BenLeahIssueBoard.tsx create mode 100644 src/app/admin/ben-leah/BenLeahIssueTable.tsx create mode 100644 src/app/admin/ben-leah/BenLeahIssueWorkflowSelect.tsx create mode 100644 src/app/admin/work/WorkTimeline.tsx create mode 100644 src/app/admin/work/page.tsx create mode 100644 src/app/golf/actions/__tests__/coverage-contract.observability.test.ts create mode 100644 src/components/baseball/BaseballDashboardBootstrap.tsx create mode 100644 src/lib/admin/__tests__/ben-leah-issues.test.ts create mode 100644 src/lib/admin/__tests__/observe-action-result.test.ts create mode 100644 src/lib/admin/__tests__/pr-body-parser.test.ts create mode 100644 src/lib/admin/ben-leah-issue-tracker.ts create mode 100644 src/lib/admin/ben-leah-issues.ts create mode 100644 src/lib/admin/data/__tests__/incident-feed.test.ts create mode 100644 src/lib/admin/data/incident-feed.ts create mode 100644 src/lib/admin/github-issues-config.ts create mode 100644 src/lib/admin/github-issues-workflow.ts create mode 100644 src/lib/admin/github-pr-timeline.ts create mode 100644 src/lib/admin/observe-action-result.ts create mode 100644 src/lib/admin/pr-body-parser.ts diff --git a/.env.example b/.env.example index d27eaa80b..c0b20b4b7 100644 --- a/.env.example +++ b/.env.example @@ -202,6 +202,14 @@ GITHUB_ISSUES_REPO=njrini99-code/helmv3 # Private Supabase Storage bucket used for screenshot signed links. HELM_BRIDGE_FEEDBACK_BUCKET=helm-bridge-feedback +# ----------------------------------------------------------------------------- +# Helm Bridge Work log (PR timeline tab) +# ----------------------------------------------------------------------------- +# Comma-separated GitHub logins to filter PRs (e.g. your username). Omit to show all repo PRs. +GITHUB_PR_AUTHOR_LOGINS=your-github-username +# Max PRs to fetch (default 60, max 100) +# GITHUB_PR_FETCH_LIMIT=60 + # ----------------------------------------------------------------------------- # Inngest (Durable workflows — replaces scattered cron + retry loops) # ----------------------------------------------------------------------------- diff --git a/src/app/admin/_components/AdminShell.tsx b/src/app/admin/_components/AdminShell.tsx index ee7c60d8e..c74c058ac 100644 --- a/src/app/admin/_components/AdminShell.tsx +++ b/src/app/admin/_components/AdminShell.tsx @@ -5,7 +5,7 @@ import Link from 'next/link'; import { usePathname, useRouter } from 'next/navigation'; import { LayoutDashboard, Activity, AlertTriangle, KeyRound, Flag, CircleDot, - Users, Timer, Rocket, HeartPulse, ExternalLink, MessageSquarePlus, Gauge, SearchCheck, + Users, Timer, Rocket, HeartPulse, ExternalLink, MessageSquarePlus, Gauge, SearchCheck, ScrollText, } from 'lucide-react'; import { AppShell, @@ -16,6 +16,7 @@ import { type CommandGroup, type CommandItem, } from '@/components/fairway'; +import { SessionActivityProvider } from '@/components/providers/SessionActivityProvider'; import { ADMIN_NAV, hrefForShortcut } from './admin-nav'; /** Sub-route leaf labels the Breadcrumb trail can't derive from ADMIN_NAV @@ -58,6 +59,7 @@ const NAV_ICON_BY_HREF = { '/admin/golf': Flag, '/admin/baseball': CircleDot, '/admin/ben-leah': MessageSquarePlus, + '/admin/work': ScrollText, '/admin/users': Users, '/admin/jobs': Timer, '/admin/deploys': Rocket, @@ -204,6 +206,7 @@ export function AdminShell({ ); return ( +
    +     ); } diff --git a/src/app/admin/_components/__tests__/admin-nav.test.ts b/src/app/admin/_components/__tests__/admin-nav.test.ts index 9894779f8..1145aeeec 100644 --- a/src/app/admin/_components/__tests__/admin-nav.test.ts +++ b/src/app/admin/_components/__tests__/admin-nav.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from 'vitest'; -import { ADMIN_NAV, hrefForShortcut } from '@/app/admin/_components/admin-nav'; +import { ADMIN_NAV, ADMIN_COMMAND_SHORTCUTS, hrefForShortcut } from '@/app/admin/_components/admin-nav'; describe('ADMIN_NAV', () => { it('declares the canonical tabs in order', () => { @@ -11,19 +11,29 @@ describe('ADMIN_NAV', () => { '/admin/golf', '/admin/baseball', '/admin/ben-leah', + '/admin/work', '/admin/users', '/admin/jobs', '/admin/deploys', '/admin/health', ]); - expect(ADMIN_NAV.map((e) => e.key)).toEqual(['1', '2', '3', '4', '5', '6', 'B', '7', '8', '9', '0']); + expect(ADMIN_NAV.map((e) => e.key)).toEqual(['1', '2', '3', '4', '5', '6', 'B', 'W', '7', '8', '9', '0']); }); it('maps shortcut keys to hrefs', () => { expect(hrefForShortcut('2')).toBe('/admin/activity'); expect(hrefForShortcut('3')).toBe('/admin/errors'); expect(hrefForShortcut('B')).toBe('/admin/ben-leah'); + expect(hrefForShortcut('W')).toBe('/admin/work'); expect(hrefForShortcut('9')).toBe('/admin/deploys'); expect(hrefForShortcut('0')).toBe('/admin/health'); expect(hrefForShortcut('x')).toBeNull(); }); + + it('keeps command-center shortcuts on real Bridge tabs', () => { + const navHrefs = new Set(ADMIN_NAV.map((entry) => entry.href)); + for (const shortcut of ADMIN_COMMAND_SHORTCUTS) { + expect(navHrefs.has(shortcut.href), `${shortcut.href} is not a registered admin tab`).toBe(true); + } + expect(ADMIN_COMMAND_SHORTCUTS.map((s) => s.href)).not.toContain('/admin/audit'); + }); }); diff --git a/src/app/admin/_components/admin-nav.ts b/src/app/admin/_components/admin-nav.ts index e2ecbc43e..031dc2feb 100644 --- a/src/app/admin/_components/admin-nav.ts +++ b/src/app/admin/_components/admin-nav.ts @@ -6,6 +6,7 @@ type AdminHref = | '/admin/golf' | '/admin/baseball' | '/admin/ben-leah' + | '/admin/work' | '/admin/users' | '/admin/jobs' | '/admin/deploys' @@ -30,12 +31,21 @@ export const ADMIN_NAV: readonly AdminNavEntry[] = [ { label: 'Golf', href: '/admin/golf', key: '5', section: 'Apps', description: 'GolfHelm production signals' }, { label: 'Baseball', href: '/admin/baseball', key: '6', section: 'Apps', description: 'BaseballHelm production signals' }, { label: 'Ben + Leah', href: '/admin/ben-leah', key: 'B', section: 'Operations', description: 'Submit bugs, changes, additions', meta: 'issues' }, + { label: 'Work log', href: '/admin/work', key: 'W', section: 'Operations', description: 'PR timeline — problems, fixes, areas', meta: 'prs' }, { label: 'Users & Teams', href: '/admin/users', key: '7', section: 'Platform', description: 'Accounts, teams, engagement' }, { label: 'Jobs & Integrity', href: '/admin/jobs', key: '8', section: 'Platform', description: 'Crons, guards, integrity checks' }, { label: 'Deploys & Infra', href: '/admin/deploys', key: '9', section: 'Platform', description: 'Vercel releases and web insight' }, { label: 'Health', href: '/admin/health', key: '0', section: 'Platform', description: 'Feature health across every app', meta: 'map' }, ] as const; +/** Quick links in the Overview command header — must be real ADMIN_NAV routes. */ +export const ADMIN_COMMAND_SHORTCUTS = [ + { href: '/admin/errors', label: 'Errors' }, + { href: '/admin/health', label: 'Feature Map' }, + { href: '/admin/deploys', label: 'Deploys' }, + { href: '/admin/auth', label: 'Auth' }, +] as const satisfies ReadonlyArray<{ href: AdminHref; label: string }>; + export function hrefForShortcut(key: string): string | null { return ADMIN_NAV.find((e) => e.key === key)?.href ?? null; } diff --git a/src/app/admin/ben-leah/BenLeahIssueBoard.tsx b/src/app/admin/ben-leah/BenLeahIssueBoard.tsx new file mode 100644 index 000000000..b58cd380f --- /dev/null +++ b/src/app/admin/ben-leah/BenLeahIssueBoard.tsx @@ -0,0 +1,169 @@ +import Link from 'next/link'; +import { GitPullRequest, Rocket } from 'lucide-react'; +import { + fetchBenLeahIssueBoard, + type BenLeahTrackStatus, +} from '@/lib/admin/ben-leah-issues'; +import { PanelNoData, PanelStale } from '../_components/PanelStates'; +import { StatusPill, StatTile, type FwStatusTone } from '@/components/fairway'; +import { BenLeahIssueTable } from './BenLeahIssueTable'; + +const TRACK_META: Record< + BenLeahTrackStatus, + { label: string; tone: FwStatusTone; description: string } +> = { + open: { + label: 'Open', + tone: 'warning', + description: 'Still open on GitHub — waiting for work.', + }, + in_progress: { + label: 'In progress', + tone: 'info', + description: 'Label status:in-progress or status:triaged on the issue.', + }, + in_production: { + label: 'In production', + tone: 'success', + description: 'Closed and shipped, or label status:in-production.', + }, + fixed_pending_deploy: { + label: 'Fixed · pending deploy', + tone: 'warning', + description: 'Closed on GitHub; production has not deployed since the fix.', + }, + fixed: { + label: 'Fixed', + tone: 'success', + description: 'Closed on GitHub (deploy timing unknown).', + }, + wont_fix: { + label: "Won't fix", + tone: 'neutral', + description: 'Label status:wontfix on the issue.', + }, +}; + +function formatWhen(iso: string): string { + return new Date(iso).toLocaleString(undefined, { + month: 'short', + day: 'numeric', + hour: 'numeric', + minute: '2-digit', + }); +} + +function githubIntegrationTone(status: string): FwStatusTone { + if (status === 'ok') return 'success'; + if (status === 'unconfigured') return 'warning'; + return 'danger'; +} + +export async function BenLeahIssueBoard() { + const board = await fetchBenLeahIssueBoard(); + + if (board.status === 'unconfigured') { + return ( + + ); + } + + if (board.status === 'error' || !board.data) { + return ; + } + + const { issues, counts, repoLabel, repoIssuesUrl, productionCommitSha, productionReadyAt, fetchedAt } = { + ...board.data, + fetchedAt: board.fetchedAt, + }; + + const openCount = counts.open + counts.in_progress; + const shippedCount = counts.in_production; + const pendingDeployCount = counts.fixed_pending_deploy; + + return ( +
    +
    +
    + + GitHub {board.status === 'ok' ? 'live' : 'stale'} + + + {productionReadyAt + ? `prod ${productionCommitSha?.slice(0, 7) ?? 'build'}` + : 'prod timing n/a'} + + {fetchedAt ? ( + + checked {new Date(fetchedAt).toLocaleTimeString()} + + ) : null} +
    + + + All issues on {repoLabel} + +
    + +
    + {( + [ + ['Open / in progress', openCount, 'Needs attention'], + ['In production', shippedCount, 'Shipped or labeled'], + ['Pending deploy', pendingDeployCount, 'Closed, not on prod yet'], + ['Total tracked', issues.length, 'Last 50 updates'], + ] as const + ).map(([label, value, caption]) => ( +
    + +

    {caption}

    +
    + ))} +
    + + {productionReadyAt ? ( +

    + + Production last ready {formatWhen(new Date(productionReadyAt).toISOString())} + {productionCommitSha ? ` · ${productionCommitSha.slice(0, 7)}` : null} + . Closed issues after that time show as In production. +

    + ) : ( +

    + Set VERCEL_API_TOKEN to correlate closed issues with production deploy timing. Without it, status uses GitHub labels only. +

    + )} + + {issues.length === 0 ? ( + + ) : ( + + )} + +
    + {(Object.keys(TRACK_META) as BenLeahTrackStatus[]).map((status) => ( +
    +
    + + {TRACK_META[status].label} + + {counts[status]} +
    +

    {TRACK_META[status].description}

    +
    + ))} +
    +
    + ); +} diff --git a/src/app/admin/ben-leah/BenLeahIssueTable.tsx b/src/app/admin/ben-leah/BenLeahIssueTable.tsx new file mode 100644 index 000000000..3662dce12 --- /dev/null +++ b/src/app/admin/ben-leah/BenLeahIssueTable.tsx @@ -0,0 +1,100 @@ +'use client'; + +import Link from 'next/link'; +import { ExternalLink } from 'lucide-react'; +import type { BenLeahTrackedIssue } from '@/lib/admin/ben-leah-issue-tracker'; +import { StatusPill, type FwStatusTone } from '@/components/fairway'; +import { BenLeahIssueWorkflowSelect } from './BenLeahIssueWorkflowSelect'; + +const TRACK_META: Record< + BenLeahTrackedIssue['trackStatus'], + { label: string; tone: FwStatusTone } +> = { + open: { label: 'Open', tone: 'warning' }, + in_progress: { label: 'In progress', tone: 'info' }, + in_production: { label: 'In production', tone: 'success' }, + fixed_pending_deploy: { label: 'Fixed · pending deploy', tone: 'warning' }, + fixed: { label: 'Fixed', tone: 'success' }, + wont_fix: { label: "Won't fix", tone: 'neutral' }, +}; + +const KIND_LABEL: Record = { + bug: 'Bug', + change: 'Change', + addition: 'Addition', +}; + +function formatWhen(iso: string): string { + return new Date(iso).toLocaleString(undefined, { + month: 'short', + day: 'numeric', + hour: 'numeric', + minute: '2-digit', + }); +} + +function IssueRow({ issue }: { issue: BenLeahTrackedIssue }) { + const meta = TRACK_META[issue.trackStatus]; + + return ( + + + + #{issue.number} + + +

    + {issue.displayTitle} +

    + + + + {meta.label} + + + + + + + {issue.kind ? KIND_LABEL[issue.kind] ?? issue.kind : '—'} + + {issue.priority ?? '—'} + {issue.category ?? '—'} + {formatWhen(issue.updated_at)} + + {issue.closed_at ? formatWhen(issue.closed_at) : '—'} + + + ); +} + +export function BenLeahIssueTable({ issues }: { issues: BenLeahTrackedIssue[] }) { + return ( +
    + + + + + + + + + + + + + + + {issues.map((issue) => ( + + ))} + +
    IssueDerived statusSet workflowTypePriorityCategoryUpdatedClosed
    +
    + ); +} diff --git a/src/app/admin/ben-leah/BenLeahIssueWorkflowSelect.tsx b/src/app/admin/ben-leah/BenLeahIssueWorkflowSelect.tsx new file mode 100644 index 000000000..c9f2f81c2 --- /dev/null +++ b/src/app/admin/ben-leah/BenLeahIssueWorkflowSelect.tsx @@ -0,0 +1,70 @@ +'use client'; + +import { useRouter } from 'next/navigation'; +import { useState, useTransition } from 'react'; +import { + currentWorkflowSelection, + type BenLeahTrackedIssue, + type BenLeahWorkflowSelection, +} from '@/lib/admin/ben-leah-issue-tracker'; +import { NativeSelect } from '@/components/ui/native-select'; +import { cn } from '@/lib/utils'; +import { updateBenLeahIssueWorkflow } from './actions'; + +const WORKFLOW_OPTIONS: Array<{ value: BenLeahWorkflowSelection; label: string }> = [ + { value: 'triaged', label: 'Triaged' }, + { value: 'in_progress', label: 'In progress' }, + { value: 'in_production', label: 'In production' }, + { value: 'wont_fix', label: "Won't fix" }, +]; + +const selectClass = cn( + 'min-w-[9.5rem] rounded-fw-md border border-border-subtle bg-surface px-2 py-1 text-xs text-warm-900 shadow-flat outline-none', + 'focus:border-accent-500 focus:ring-2 focus:ring-accent-500/20 disabled:opacity-60', +); + +export function BenLeahIssueWorkflowSelect({ issue }: { issue: BenLeahTrackedIssue }) { + const router = useRouter(); + const [pending, startTransition] = useTransition(); + const [error, setError] = useState(null); + const current = currentWorkflowSelection(issue.labels); + + const onChange = (raw: string) => { + if (!raw) return; + const next = raw as BenLeahWorkflowSelection; + if (next === current) return; + setError(null); + startTransition(async () => { + const result = await updateBenLeahIssueWorkflow(issue.number, issue.labels, next); + if (!result.ok) { + setError(result.message); + return; + } + router.refresh(); + }); + }; + + return ( +
    + onChange(event.target.value)} + > + {!current ? ( + + ) : null} + {WORKFLOW_OPTIONS.map((option) => ( + + ))} + + {error ?

    {error}

    : null} +
    + ); +} diff --git a/src/app/admin/ben-leah/actions.ts b/src/app/admin/ben-leah/actions.ts index f8f4398e6..dc98bb423 100644 --- a/src/app/admin/ben-leah/actions.ts +++ b/src/app/admin/ben-leah/actions.ts @@ -7,6 +7,8 @@ import { validateFeedback, type GitHubIssueResult, } from '@/lib/admin/github-feedback'; +import { setBenLeahIssueWorkflow } from '@/lib/admin/github-issues-workflow'; +import type { BenLeahWorkflowSelection } from '@/lib/admin/ben-leah-issue-tracker'; import { requireSuperAdmin } from '@/lib/admin/require-super-admin'; import { describeError } from '@/lib/utils/describe-error'; @@ -67,3 +69,44 @@ export async function submitBenLeahFeedback( }; } } + +const WORKFLOW_SELECTIONS = new Set([ + 'triaged', + 'in_progress', + 'in_production', + 'wont_fix', +]); + +export async function updateBenLeahIssueWorkflow( + issueNumber: number, + currentLabels: string[], + selection: BenLeahWorkflowSelection, +): Promise<{ ok: boolean; message: string }> { + try { + await requireSuperAdmin(); + } catch (err) { + return { + ok: false, + message: describeError(err) === 'Unauthorized' + ? 'Your session expired. Sign in again and retry.' + : 'You do not have permission to update Ben + Leah issues.', + }; + } + + if (!Number.isInteger(issueNumber) || issueNumber < 1) { + return { ok: false, message: 'Invalid issue number.' }; + } + if (!WORKFLOW_SELECTIONS.has(selection)) { + return { ok: false, message: 'Invalid workflow status.' }; + } + + try { + await setBenLeahIssueWorkflow(issueNumber, currentLabels, selection); + return { ok: true, message: 'GitHub workflow label updated.' }; + } catch (err) { + return { + ok: false, + message: `Could not update GitHub labels: ${describeError(err)}`, + }; + } +} diff --git a/src/app/admin/ben-leah/page.tsx b/src/app/admin/ben-leah/page.tsx index 6d268b0c3..d4f45ba6d 100644 --- a/src/app/admin/ben-leah/page.tsx +++ b/src/app/admin/ben-leah/page.tsx @@ -1,8 +1,10 @@ -import { GitPullRequest, ImageUp, Link2, MessageSquarePlus } from 'lucide-react'; +import { GitPullRequest, ImageUp, Link2, MessageSquarePlus, Tags } from 'lucide-react'; import { requireSuperAdmin } from '@/lib/admin/require-super-admin'; import { Eyebrow, Surface, StatusPill } from '@/components/fairway'; import { PanelBoundary } from '../_components/PanelBoundary'; +import { AutoRefresh } from '../_components/AutoRefresh'; import { BenLeahForm } from './BenLeahForm'; +import { BenLeahIssueBoard } from './BenLeahIssueBoard'; export const dynamic = 'force-dynamic'; @@ -64,6 +66,27 @@ export default async function BenLeahPage() { + +

    Status labels (GitHub)

    +
      +
    • + + status:in-progress or status:triaged — work started +
      • +
    • + + status:in-production — confirmed live (manual) +
      • +
    • + + status:wontfix — closed without shipping +
      • +
    +

    + New submissions start as status:triaged. Use the tracker dropdown to move issues through the workflow — labels are created automatically in GitHub. +

    +     +

    Best submission shape

    @@ -72,6 +95,12 @@ export default async function BenLeahPage() {

    • + + + + + + ); } diff --git a/src/app/admin/errors/page.tsx b/src/app/admin/errors/page.tsx index 8958dc107..985c321da 100644 --- a/src/app/admin/errors/page.tsx +++ b/src/app/admin/errors/page.tsx @@ -126,9 +126,11 @@ export default async function ErrorsPage({ async function Body() { const tab = await fetchErrorsTab(filters); - const highSeverity = tab.incidents.filter((i) => i.severity === 'critical' || i.severity === 'error').length; - const affectedUsers = tab.incidents.reduce((sum, i) => sum + i.affectedUsers, 0); - const appGroups = tab.incidents.filter((i) => i.origin === 'app').length; + const { counts } = tab; + const showWiderWindowHint = + tab.incidents.length === 0 && + filters.windowHours < 168 && + ((tab.widerWindowUnresolved ?? 0) > 0 || (tab.widerWindowUntagged ?? 0) > 0); const sourceBreakdown = Array.from( tab.incidents.reduce((map, incident) => { const key = incident.source ?? incident.origin; @@ -141,22 +143,63 @@ export default async function ErrorsPage({ return (
    + {showWiderWindowHint ? ( + +

    + Nothing in the last {filters.windowHours}h + {filters.sport ? ` for sport=${filters.sport}` : ''}, but there are unresolved incidents in the last 7 days + {(tab.widerWindowUnresolved ?? 0) > 0 ? ( + <> + {' '} + ({tab.widerWindowUnresolved} + {filters.sport ? ` tagged ${filters.sport}` : ''}) + + ) : null} + {(tab.widerWindowUntagged ?? 0) > 0 ? ( + <> + {' '} + plus{' '} + {tab.widerWindowUntagged} legacy rows with no sport tag + + ) : null} + .{' '} + + Open 7-day view + + {filters.sport ? ( + <> + {' '} + or{' '} + + drop the sport filter + {' '} + to include untagged baseball errors. + + ) : null} +

    +     + ) : null}

    active groups

    -

    {tab.incidents.length}

    -

    {appGroups} app · {tab.sentry.data?.length ?? 0} sentry

    +

    {counts.totalGroups}

    +

    + {counts.appGroups} app · {counts.sentryGroups} sentry · {filters.windowHours}h window +

    high severity

    -

    {highSeverity}

    +

    {counts.highSeverityGroups}

    critical and error groups

    affected users

    -

    {affectedUsers}

    +

    {counts.affectedUsers}

    deduped per incident group

    @@ -223,7 +266,12 @@ export default async function ErrorsPage({ -

    Sentry unresolved

    +

    + Sentry unresolved (org-wide) +

    +

    + All open Sentry issues — not windowed. Active groups above only count Sentry issues with activity in the selected window. +

    {tab.sentry.status === 'ok' && tab.sentry.data ? ( tab.sentry.data.length === 0 ? ( diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx index 3e753cd11..d55635855 100644 --- a/src/app/admin/page.tsx +++ b/src/app/admin/page.tsx @@ -21,6 +21,7 @@ import { PanelBoundary } from './_components/PanelBoundary'; import { PanelAllClear, PanelNoData, PanelStale } from './_components/PanelStates'; import { FeatureHealthRollup } from './_components/FeatureHealthRollup'; import { SkeletonStat, SkeletonList, Surface, Eyebrow, StatusPill } from '@/components/fairway'; +import { ADMIN_COMMAND_SHORTCUTS } from './_components/admin-nav'; export const dynamic = 'force-dynamic'; @@ -98,11 +99,11 @@ async function BannerAndKpis() {
    w.label === 'Error pipeline'), href: '/admin/errors', }, @@ -281,7 +282,7 @@ function SavedCommandViews({ kpis }: { kpis: OverviewKpis }) { href: '/admin/errors?window=24&severity=error', label: 'Production Health', icon: Gauge, - metric: `${kpis.eventErrors24h} groups`, + metric: `${kpis.incidentGroups24h} groups`, detail: 'Real incidents, source mapped, grouped like Errors tab', }, { @@ -339,11 +340,8 @@ function SavedCommandViews({ kpis }: { kpis: OverviewKpis }) { } async function TriagePanel() { - const { items, sentry } = await fetchTriageQueue(); + const { items, sentry, counts } = await fetchTriageQueue(); const regressed = items.filter((i) => i.substatus === 'regressed'); - const highSeverity = items.filter((i) => i.severity === 'critical' || i.severity === 'error'); - const appItems = items.filter((i) => i.origin === 'app'); - const sentryItems = items.filter((i) => i.origin === 'sentry'); const sportCounts = [ ['Golf', items.filter((i) => i.sport === 'golf').length], ['Baseball', items.filter((i) => i.sport === 'baseball').length], @@ -363,12 +361,15 @@ async function TriagePanel() {

    Action lanes

    +

    + Last 24h · same incident feed as the Errors tab (unresolved app events + Sentry with activity in window) +

    {[ - ['Total groups', items.length, 'coalesced incidents'], - ['High severity', highSeverity.length, 'critical and error'], - ['App groups', appItems.length, 'Supabase admin_events'], - ['Sentry groups', sentryItems.length, sentry.status === 'ok' ? 'live pull' : sentry.status], + ['Total groups', counts.totalGroups, 'coalesced incidents'], + ['High severity', counts.highSeverityGroups, 'critical and error'], + ['App groups', counts.appGroups, 'Supabase admin_events'], + ['Sentry groups', counts.sentryGroups, sentry.status === 'ok' ? 'active in 24h' : sentry.status], ].map(([label, value, caption]) => (

    {label}

    @@ -457,12 +458,12 @@ async function DeployRail() { } function CommandHeader() { - const nav = [ - { href: '/admin/errors', label: 'Errors', icon: Activity }, - { href: '/admin/health', label: 'Feature Map', icon: RadioTower }, - { href: '/admin/deploys', label: 'Deploys', icon: GitBranch }, - { href: '/admin/audit', label: 'Audit', icon: ShieldCheck }, - ]; + const iconByHref = { + '/admin/errors': Activity, + '/admin/health': RadioTower, + '/admin/deploys': GitBranch, + '/admin/auth': ShieldCheck, + } as const; return (
    @@ -477,8 +478,8 @@ function CommandHeader() {

    ); } diff --git a/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx b/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx index 180539c63..1c2d42e6a 100644 --- a/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx +++ b/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx @@ -102,25 +102,23 @@ const CommandPalette = dynamic( type Role = 'coach' | 'player'; /** - * P413-equivalent: the 3 highest-frequency destinations for the persistent - * MOBILE bottom-tab bar, matching the legacy `MobileBottomNav`'s preferred ids - * exactly (dashboard-shell.tsx's `buildMobileNavFromContext`) — the drawer - * (opened by AppShell's own hamburger) keeps the long tail, so the 4th "Menu" - * slot the legacy bar shows is redundant here rather than dropped. + * P413-equivalent: mobile bottom-tab destinations derived from the SAME hub + * sections as the desktop rail so active states agree across breakpoints. + * Golf FairwayDashboardShell uses the same pattern (5 tabs, hub activeMatch). */ -function buildBottomNavItems(ctx: BaseballNavContext, unreadCount: number): NavItem[] { - const primary = getVisibleBaseballNav(ctx).filter((e) => e.section === 'primary'); - const preferredIds = - ctx.role === 'coach' - ? ['command-center', 'calendar', 'roster'] - : ['player-today', 'calendar', 'player-profile']; - const top3 = preferredIds - .map((id) => primary.find((e) => e.id === id)) - .filter((e): e is NonNullable => Boolean(e)); - const fill = primary.filter((e) => !top3.some((selected) => selected.id === e.id)); - return [...top3, ...fill].slice(0, 3).map((e) => - toNavItem(e, e.showUnreadBadge && unreadCount > 0 ? unreadCount : undefined), - ); +function buildBottomNavFromSections(sections: NavSection[], role: Role): NavItem[] { + const items = sections.flatMap((section) => section.items); + const preferredLabels = + role === 'coach' + ? (['Dashboard', 'Team', 'Stats & Performance', 'Messages'] as const) + : (['Today', 'Stats', 'Development', 'Team', 'Messages'] as const); + + const picked = preferredLabels + .map((label) => items.find((item) => item.label === label)) + .filter((item): item is NavItem => Boolean(item)); + + if (picked.length >= 3) return picked.slice(0, 5); + return items.slice(0, 5); } /** Next adapter for the shell's link contract (module scope = stable identity). */ @@ -485,7 +483,10 @@ function BaseballFairwayContent({ capabilities: ctx.capabilities, }); // P413-equivalent: persistent mobile bottom-tab bar (subset of the rail). - const bottomNavItems = useMemo(() => buildBottomNavItems(ctx, unreadCount), [ctx, unreadCount]); + const bottomNavItems = useMemo( + () => buildBottomNavFromSections(sections, role), + [sections, role], + ); useEffect(() => { window.scrollTo({ top: 0, left: 0, behavior: 'instant' }); diff --git a/src/app/baseball/(dashboard)/dashboard/settings/page.tsx b/src/app/baseball/(dashboard)/dashboard/settings/page.tsx index b734215f4..75c6fdd0f 100644 --- a/src/app/baseball/(dashboard)/dashboard/settings/page.tsx +++ b/src/app/baseball/(dashboard)/dashboard/settings/page.tsx @@ -263,7 +263,7 @@ export default function SettingsPage() {
    diff --git a/src/lib/admin/data/errors.ts b/src/lib/admin/data/errors.ts index 699e7caf5..bf0d5db4b 100644 --- a/src/lib/admin/data/errors.ts +++ b/src/lib/admin/data/errors.ts @@ -133,7 +133,7 @@ export async function fetchErrorsTab(filters: ErrorsTabFilters): Promise<{ : null; if (widerQuery && filters.sport) widerQuery = widerQuery.eq('sport', filters.sport); - let widerUntaggedQuery = + const widerUntaggedQuery = widerSince && filters.sport ? admin .from('admin_events') From b66a598eb76d88dba42f5386e11e75f77eefa139 Mon Sep 17 00:00:00 2001 From: Fable Integrator Date: Sat, 4 Jul 2026 16:13:22 -0400 Subject: [PATCH 4/7] fix(ci): harden soft-failure logging and update nav-manifest test Wrap logServerError in Promise.resolve + try/catch so incomplete test mocks and sync throws never break action results. Lower deprecated-entry sanity threshold now that coach/player type redirects live in middleware. --- .../actions/__tests__/demo-access.test.ts | 5 ++- src/lib/admin/observe-action-result.ts | 40 +++++++++++-------- .../baseball/__tests__/nav-manifest.test.ts | 4 +- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/app/baseball/actions/__tests__/demo-access.test.ts b/src/app/baseball/actions/__tests__/demo-access.test.ts index 6317ed2f1..ea5b97ffb 100644 --- a/src/app/baseball/actions/__tests__/demo-access.test.ts +++ b/src/app/baseball/actions/__tests__/demo-access.test.ts @@ -89,7 +89,10 @@ vi.mock('@sentry/nextjs', () => ({ withScope: (fn: (scope: unknown) => unknown) => fn({ setTag: vi.fn(), setUser: vi.fn(), addBreadcrumb: vi.fn() }), })); -vi.mock('@/lib/server-error-logger', () => ({ logServerException: vi.fn(async () => undefined) })); +vi.mock('@/lib/server-error-logger', () => ({ + logServerException: vi.fn(async () => undefined), + logServerError: vi.fn(async () => undefined), +})); import { enterBaseballDemo } from '@/app/baseball/actions/demo-access'; import { withBaseballAction, BaseballDemoReadOnlyError } from '@/lib/baseball/with-baseball-action'; diff --git a/src/lib/admin/observe-action-result.ts b/src/lib/admin/observe-action-result.ts index 04388d8dc..d5368873e 100644 --- a/src/lib/admin/observe-action-result.ts +++ b/src/lib/admin/observe-action-result.ts @@ -85,21 +85,27 @@ export function observeActionSoftFailure( const expected = isExpectedSoftFailureMessage(failure.message); const severity = severityForSoftFailure(failure.message); - void logServerError( - failure.message, - { - ...context, - title: `[${context.action}] ${failure.message}`.slice(0, 500), - handled: true, - skipSentry: expected, - errorCode: failure.code ?? undefined, - fingerprint: ['server_action_soft', context.feature ?? context.featureArea ?? 'unknown', context.action], - metadata: { - ...(context.metadata ?? {}), - soft_failure: true, - ...(collapsedCount > 0 ? { collapsed_count: collapsedCount } : {}), - }, - }, - severity, - ).catch(() => {}); + try { + void Promise.resolve( + logServerError( + failure.message, + { + ...context, + title: `[${context.action}] ${failure.message}`.slice(0, 500), + handled: true, + skipSentry: expected, + errorCode: failure.code ?? undefined, + fingerprint: ['server_action_soft', context.feature ?? context.featureArea ?? 'unknown', context.action], + metadata: { + ...(context.metadata ?? {}), + soft_failure: true, + ...(collapsedCount > 0 ? { collapsed_count: collapsedCount } : {}), + }, + }, + severity, + ), + ).catch(() => {}); + } catch { + // Fire-and-forget: observability must never change action results. + } } diff --git a/src/lib/baseball/__tests__/nav-manifest.test.ts b/src/lib/baseball/__tests__/nav-manifest.test.ts index 62e930177..a08d7f91b 100644 --- a/src/lib/baseball/__tests__/nav-manifest.test.ts +++ b/src/lib/baseball/__tests__/nav-manifest.test.ts @@ -146,7 +146,9 @@ describe('BASEBALL_NAV_MANIFEST', () => { const canonicalHrefs = new Set(manifestHrefsByStatus('canonical')); it('sanity: deprecated entries were actually collected', () => { - expect(deprecated.length).toBeGreaterThanOrEqual(10); + // Coach/player type routes and stats/games/new now redirect via middleware + // (see src/lib/supabase/middleware.ts); only on-disk redirect() pages remain. + expect(deprecated.length).toBeGreaterThanOrEqual(2); }); it.each(deprecated.map((e) => [e] as const))( From fab1d0962ea7698a9f750cf57c45aa7613862968 Mon Sep 17 00:00:00 2001 From: Fable Integrator Date: Sat, 4 Jul 2026 16:25:16 -0400 Subject: [PATCH 5/7] fix(ci): unblock business contracts and CodeQL on PR 787 Exclude feature-registry metadata from stat-layer scan (table names only, not a DB consumer). Use structured console.error objects to satisfy CodeQL log-injection rules in server-error-logger. --- src/lib/baseball/stat-layer-manifest.ts | 2 ++ src/lib/server-error-logger.ts | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/baseball/stat-layer-manifest.ts b/src/lib/baseball/stat-layer-manifest.ts index 466b2707f..1c083a000 100644 --- a/src/lib/baseball/stat-layer-manifest.ts +++ b/src/lib/baseball/stat-layer-manifest.ts @@ -48,6 +48,8 @@ export const STAT_LAYER_SCAN_EXCLUDED_FILES = [ 'src/lib/types/database.ts', 'src/lib/baseball/stat-layer-manifest.ts', 'src/lib/baseball/__tests__/stat-layer-contract.test.ts', + // Helm Bridge metadata — lists primaryTable/heartbeatTable names, not a DB consumer. + 'src/lib/admin/feature-registry.ts', ] as const; export type StatLayerConsumerGroup = diff --git a/src/lib/server-error-logger.ts b/src/lib/server-error-logger.ts index 99ac85067..9072e7e8c 100644 --- a/src/lib/server-error-logger.ts +++ b/src/lib/server-error-logger.ts @@ -316,14 +316,18 @@ async function captureServerTrace( } if (!shouldPersistAdminTables()) { - console.error(`[ServerErrorLogger] (${severity}, not persisted off-prod)`, message, enriched.action ?? ''); + console.error('[ServerErrorLogger] not persisted off-prod', { + severity, + message, + action: enriched.action ?? '', + }); return; } try { await writeAdminTables(message, normalizedError, enriched, severity); } catch { - console.error('[ServerErrorLogger] Failed to persist trace:', message, enriched); + console.error('[ServerErrorLogger] Failed to persist trace', { message, context: enriched }); } } From 57e0de17312e8f362a152f924f7143ed0726cacc Mon Sep 17 00:00:00 2001 From: Fable Integrator Date: Sat, 4 Jul 2026 16:30:41 -0400 Subject: [PATCH 6/7] fix(baseball): address CodeRabbit polish on Fairway routing - Move matchPrefixes onto BaseballNavEntry in nav-registry (roster, performance, dev-plans, camps); toHubTab copies verbatim - Drop redundant SETTINGS_HOME_TAB matchPrefixes; add dev guard for management settings supplement keyed on program-settings - Prefer navContext.role for resolvedRole; segment-boundary prefix matching; export shared RECRUITING_PROGRAM_TYPES from resolve-active-hub - Settings hub: dedupe privacy/notification cards, add focus ring on consolidated tiles - FairwayBottomNav: nullish-coalesce active state like FairwaySidebar --- .../(dashboard)/BaseballFairwayShell.tsx | 24 +++++---- .../_components/hub-definitions.ts | 30 +++++++---- .../(dashboard)/_components/hub-sub-nav.tsx | 2 +- .../_components/resolve-active-hub.ts | 2 + .../(dashboard)/dashboard/settings/page.tsx | 53 +------------------ .../fairway/app-shell/FairwayBottomNav.tsx | 2 +- src/components/layout/sidebar.tsx | 2 +- .../__tests__/resolve-active-hub.test.ts | 23 +++++++- src/lib/baseball/nav-registry.ts | 10 ++++ 9 files changed, 70 insertions(+), 78 deletions(-) diff --git a/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx b/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx index 1c2d42e6a..fe4234204 100644 --- a/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx +++ b/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx @@ -84,10 +84,10 @@ import { filterHubTabsByCapabilities, filterHubTabsByProgramType, resolveActiveHub, + RECRUITING_PROGRAM_TYPES, } from '@/app/baseball/(dashboard)/_components/resolve-active-hub'; import { HubSubNav } from '@/app/baseball/(dashboard)/_components/hub-sub-nav'; import type { HubSubNavTab } from '@/app/baseball/(dashboard)/_components/hub-sub-nav'; -import type { BaseballProgramType } from '@/lib/types/baseball-settings'; import { IconSettings, IconLogout, IconHome, IconUsers, IconCalendar } from '@/components/icons'; import { Button } from '@/components/ui/button'; import { cn } from '@/lib/utils'; @@ -128,9 +128,11 @@ const ShellLink: ShellLinkComponent = ({ href, children, ...rest }) => ( ); -/** entry.icon carries a wider SVG prop contract than FairwayIcon's minimal - * `{size, className}` — both are drawn from the same `@/components/icons` - * set, so this narrows structurally without behavior change. */ +/** Segment-boundary route match — shared by rail items and hub cluster rows. */ +function matchesRoutePrefix(pathname: string, prefix: string): boolean { + return pathname === prefix || pathname.startsWith(`${prefix}/`); +} + function toNavItem( entry: Pick, badge?: number, @@ -142,8 +144,8 @@ function toNavItem( icon: entry.icon as unknown as NavItem['icon'], badge, activeMatch: (pathname) => - pathname === entry.href || - matchPrefixes.some((prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`)), + matchesRoutePrefix(pathname, entry.href) || + matchPrefixes.some((prefix) => matchesRoutePrefix(pathname, prefix)), }; } @@ -166,17 +168,17 @@ function playerHubToNavItem({ icon, badge, activeMatch: (pathname) => - pathname === href || + matchesRoutePrefix(pathname, href) || Boolean( tabs?.some( - (tab) => pathname === tab.href || tab.matchPrefixes?.some((prefix) => pathname.startsWith(prefix)), + (tab) => + matchesRoutePrefix(pathname, tab.href) || + tab.matchPrefixes?.some((prefix) => matchesRoutePrefix(pathname, prefix)), ), ), }; } -const RECRUITING_PROGRAM_TYPES = new Set(['college', 'juco', 'showcase', 'academy', 'club']); - function buildPlayerNavSections(ctx: BaseballNavContext, unreadCount: number): NavSection[] { const visible = getVisibleBaseballNav(ctx); const byId = new Map(visible.map((entry) => [entry.id, entry])); @@ -590,7 +592,7 @@ export function BaseballFairwayShell({ return ; } - const resolvedRole: Role = requiredRole ?? role ?? 'coach'; + const resolvedRole: Role = requiredRole ?? navContext?.role ?? role ?? 'coach'; return ( diff --git a/src/app/baseball/(dashboard)/_components/hub-definitions.ts b/src/app/baseball/(dashboard)/_components/hub-definitions.ts index 324dcdbe9..c6cb78ceb 100644 --- a/src/app/baseball/(dashboard)/_components/hub-definitions.ts +++ b/src/app/baseball/(dashboard)/_components/hub-definitions.ts @@ -76,7 +76,7 @@ import { /** Registry entry → HubSubNavTab, copying every gating field VERBATIM. */ function toHubTab(entry: BaseballNavEntry): HubSubNavTab { - const tab: HubSubNavTab = { + return { id: entry.id, label: entry.label, href: entry.href, @@ -84,14 +84,8 @@ function toHubTab(entry: BaseballNavEntry): HubSubNavTab { requiredCapability: entry.requiredCapability ?? undefined, requiredAnyCapabilities: entry.requiredAnyCapabilities, allowedProgramTypes: entry.allowedProgramTypes, + matchPrefixes: entry.matchPrefixes, }; - - if (entry.id === 'roster') tab.matchPrefixes = ['/baseball/dashboard/players']; - if (entry.id === 'performance') tab.matchPrefixes = ['/baseball/dashboard/performance']; - if (entry.id === 'dev-plans') tab.matchPrefixes = ['/baseball/dashboard/dev-plans']; - if (entry.id === 'camps') tab.matchPrefixes = ['/baseball/dashboard/camps']; - - return tab; } /** @@ -189,7 +183,6 @@ const SETTINGS_HOME_TAB: HubSubNavTab = { label: 'Settings', href: '/baseball/dashboard/settings', icon: IconSettings, - matchPrefixes: ['/baseball/dashboard/settings'], }; const SETTINGS_SEASON_TAB: HubSubNavTab = { id: 'settings-season', @@ -328,6 +321,18 @@ export const COACH_RECRUITING_TABS: readonly HubSubNavTab[] = orderTabs( */ export const COACH_ACADEMICS_TABS: readonly HubSubNavTab[] = orderTabs(hubEntries('academics'), ACADEMICS_ORDER); +const MANAGEMENT_SETTINGS_SUPPLEMENT_ID = 'program-settings'; + +/** Dev-only guard: settings supplement tabs must attach to a real registry row. */ +function assertManagementSettingsSupplement(tabs: readonly HubSubNavTab[]): void { + if (process.env.NODE_ENV === 'production') return; + if (!tabs.some((tab) => tab.id === MANAGEMENT_SETTINGS_SUPPLEMENT_ID)) { + throw new Error( + `COACH_MANAGEMENT_TABS settings supplement requires registry tab "${MANAGEMENT_SETTINGS_SUPPLEMENT_ID}".`, + ); + } +} + /** * MANAGEMENT hub — staff coordination, program settings, and (Showcase/Academy/ * Club only, via allowedProgramTypes carried through verbatim from the @@ -335,10 +340,13 @@ export const COACH_ACADEMICS_TABS: readonly HubSubNavTab[] = orderTabs(hubEntrie * "Decision Room" vs "Staff Room" label drift (the registry's label always * wins now — it is read, not re-declared). */ +const managementHubTabs = orderTabs(hubEntries('management'), MANAGEMENT_ORDER); +assertManagementSettingsSupplement(managementHubTabs); + export const COACH_MANAGEMENT_TABS: readonly HubSubNavTab[] = withSupplements( - orderTabs(hubEntries('management'), MANAGEMENT_ORDER), + managementHubTabs, { - 'program-settings': [ + [MANAGEMENT_SETTINGS_SUPPLEMENT_ID]: [ SETTINGS_HOME_TAB, SETTINGS_SEASON_TAB, SETTINGS_PHILOSOPHY_TAB, diff --git a/src/app/baseball/(dashboard)/_components/hub-sub-nav.tsx b/src/app/baseball/(dashboard)/_components/hub-sub-nav.tsx index 800236c7e..de68cb314 100644 --- a/src/app/baseball/(dashboard)/_components/hub-sub-nav.tsx +++ b/src/app/baseball/(dashboard)/_components/hub-sub-nav.tsx @@ -52,7 +52,7 @@ export interface HubSubNavTab { * Longest-prefix wins across every tab so the deepest leaf still resolves to * its parent tab. */ - matchPrefixes?: string[]; + matchPrefixes?: readonly string[]; /** Staff capability required to show this tab (coaches only). */ requiredCapability?: BaseballCapability; /** Staff must hold at least one of these capabilities (#370 / #408). */ diff --git a/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts b/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts index f1d2f2782..238f62a78 100644 --- a/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts +++ b/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts @@ -40,6 +40,8 @@ const RECRUITING_PROGRAM_TYPES = new Set([ 'club', ]); +export { RECRUITING_PROGRAM_TYPES }; + /** * Stable short ids for telemetry/tests, decoupled from the hub's display label * (BaseballNavHub / COACH_HUB_DEFS id) so relabeling a hub in the sidebar can diff --git a/src/app/baseball/(dashboard)/dashboard/settings/page.tsx b/src/app/baseball/(dashboard)/dashboard/settings/page.tsx index 75c6fdd0f..ad9f478c3 100644 --- a/src/app/baseball/(dashboard)/dashboard/settings/page.tsx +++ b/src/app/baseball/(dashboard)/dashboard/settings/page.tsx @@ -263,7 +263,7 @@ export default function SettingsPage() {
    @@ -300,57 +300,6 @@ export default function SettingsPage() { )} - {/* Privacy Settings Link (Players Only) */} - {user?.role === 'player' && ( - - - -
    -
    -
    - -
    -
    -

    Privacy Settings

    -

    Control what appears on your public profile

    -
    -
    - -
    -     -     - - )} - - {/* Notification Preferences (Coaches) — the real, persisted store lives on - Program Settings (baseball_program_settings.notification_defaults via - ProgramSettingsClient + updateProgramSettings). This used to be a - second, disconnected card that only updated local React state and - toasted "success" with no server call (#454, #466) — removed in - favor of a single link to the real surface so there is exactly one - place to configure notifications and no fake toggle to drift out of - sync with what's actually saved. */} - {user?.role === 'coach' && ( - - - -
    -
    -
    - -
    -
    -

    Notification Preferences

    -

    Manage quiet hours and per-type notification defaults for your program

    -
    -
    - -
    -     -     - - )} -
    diff --git a/src/components/fairway/app-shell/FairwayBottomNav.tsx b/src/components/fairway/app-shell/FairwayBottomNav.tsx index bdbd13cac..ac387870f 100644 --- a/src/components/fairway/app-shell/FairwayBottomNav.tsx +++ b/src/components/fairway/app-shell/FairwayBottomNav.tsx @@ -73,7 +73,7 @@ export function FairwayBottomNav({
      {items.map((item) => { const active = - item.active || + item.active ?? (item.activeMatch && pathname ? item.activeMatch(pathname) : matchActive(item.href, pathname)); diff --git a/src/components/layout/sidebar.tsx b/src/components/layout/sidebar.tsx index b968d44dc..a0a38f5c9 100644 --- a/src/components/layout/sidebar.tsx +++ b/src/components/layout/sidebar.tsx @@ -74,7 +74,7 @@ type SidebarHubItem = { /** Collect every route a hub owns (each tab's href + matchPrefixes). */ function hubPrefixesFrom( - tabs: readonly { href: string; matchPrefixes?: string[] }[], + tabs: readonly { href: string; matchPrefixes?: readonly string[] }[], ): string[] { return tabs.flatMap((t) => [t.href, ...(t.matchPrefixes ?? [])]); } diff --git a/src/lib/baseball/__tests__/resolve-active-hub.test.ts b/src/lib/baseball/__tests__/resolve-active-hub.test.ts index 56513dbf8..da38f705d 100644 --- a/src/lib/baseball/__tests__/resolve-active-hub.test.ts +++ b/src/lib/baseball/__tests__/resolve-active-hub.test.ts @@ -3,7 +3,10 @@ import { filterHubTabsByCapabilities, resolveActiveHub, } from '@/app/baseball/(dashboard)/_components/resolve-active-hub'; -import { COACH_STATS_TABS } from '@/app/baseball/(dashboard)/_components/hub-definitions'; +import { + COACH_MANAGEMENT_TABS, + COACH_STATS_TABS, +} from '@/app/baseball/(dashboard)/_components/hub-definitions'; describe('resolveActiveHub — capability-filtered tabs (#370)', () => { it('hides performance hub tabs when coach lacks lifting and readiness caps', () => { @@ -54,4 +57,22 @@ describe('resolveActiveHub — capability-filtered tabs (#370)', () => { }); expect(hub?.id).toBe('recruiting'); }); + + it('includes settings home via program-settings href (ownedPrefixes, not duplicate matchPrefixes)', () => { + const hub = resolveActiveHub({ + pathname: '/baseball/dashboard/settings', + role: 'coach', + programType: 'college', + capabilities: { can_manage_settings: true }, + }); + expect(hub?.id).toBe('management'); + expect(hub?.tabs.some((t) => t.id === 'settings-home')).toBe(true); + }); +}); + +describe('COACH_MANAGEMENT_TABS — settings supplement anchor', () => { + it('includes the program-settings registry tab before settings supplements', () => { + expect(COACH_MANAGEMENT_TABS.some((t) => t.id === 'program-settings')).toBe(true); + expect(COACH_MANAGEMENT_TABS.some((t) => t.id === 'settings-home')).toBe(true); + }); }); diff --git a/src/lib/baseball/nav-registry.ts b/src/lib/baseball/nav-registry.ts index 887b5a374..f82540889 100644 --- a/src/lib/baseball/nav-registry.ts +++ b/src/lib/baseball/nav-registry.ts @@ -229,6 +229,12 @@ export interface BaseballNavEntry { * role: 'player' entries, which never appear in a coach hub. */ hub?: BaseballNavHub; + /** + * Optional nested-route ownership prefixes for hub sub-nav active matching. + * When set, hub-definitions copies this onto HubSubNavTab.matchPrefixes so + * detail routes (e.g. /players/[id]) highlight the parent registry tab. + */ + matchPrefixes?: readonly string[]; } /** @@ -331,6 +337,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [ requiredCapability: null, section: 'primary', hub: 'team', + matchPrefixes: ['/baseball/dashboard/players'], }, { id: 'calendar', @@ -489,6 +496,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [ requiredAnyCapabilities: ['can_manage_lifting', 'can_view_readiness'], section: 'primary', hub: 'stats-performance', + matchPrefixes: ['/baseball/dashboard/performance'], }, { id: 'staff-decision-room', @@ -622,6 +630,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [ requiredCapability: null, section: 'primary', hub: 'development', + matchPrefixes: ['/baseball/dashboard/dev-plans'], }, { id: 'academics', @@ -647,6 +656,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [ requiredCapability: null, section: 'primary', hub: 'recruiting', + matchPrefixes: ['/baseball/dashboard/camps'], }, { id: 'organization', From 4f3e653ec4ac65004abfa31b5cb33c28c6a63e62 Mon Sep 17 00:00:00 2001 From: Fable Integrator Date: Sat, 4 Jul 2026 16:44:17 -0400 Subject: [PATCH 7/7] fix(security): satisfy CodeQL on server-error-logger Sentry path Use static Sentry capture titles and synthetic Error shells so user/error copy flows through scope context (trace_message) instead of format strings. Renames console payload keys to traceMessage for log-injection hygiene. --- src/lib/server-error-logger.ts | 36 ++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/src/lib/server-error-logger.ts b/src/lib/server-error-logger.ts index 9072e7e8c..1231dfe71 100644 --- a/src/lib/server-error-logger.ts +++ b/src/lib/server-error-logger.ts @@ -79,7 +79,7 @@ const SENTRY_SEVERITY_MAP: Record = { critical: 'fatal', }; -function normalizeContext(context: RoundErrorContext): Record { +function normalizeContext(context: RoundErrorContext, traceMessage?: string): Record { return JSON.parse(JSON.stringify({ action: context.action, route: context.route ?? null, @@ -105,6 +105,7 @@ function normalizeContext(context: RoundErrorContext): Record { extra: context.extra ?? {}, sport: context.sport ?? null, teamId: context.teamId ?? null, + ...(traceMessage ? { trace_message: traceMessage.slice(0, 2000) } : {}), // Only reached when shouldPersistAdminTables() is true (writeAdminTables // is called after that gate), so this is always 'production' in practice // today — tagged explicitly so a future gate regression is visible in @@ -225,6 +226,20 @@ async function writeAdminTables( await Promise.allSettled([errorLogInsert, adminEventInsert]); } +/** Static Sentry title — user/error copy lives in scope context, not the format string. */ +function sentryCaptureTitle(context: RoundErrorContext): string { + if (context.title?.trim()) { + return context.title.trim().slice(0, 200); + } + return `[${context.action}] server trace`; +} + +function syntheticTraceError(message: string): Error { + const err = new Error('Server trace error'); + err.cause = message; + return err; +} + function captureSentryTrace( message: string, error: Error | null, @@ -259,7 +274,7 @@ function captureSentryTrace( }); } - scope.setContext('server_trace', normalizeContext(context)); + scope.setContext('server_trace', normalizeContext(context, message)); scope.setFingerprint(buildFingerprint(context, severity)); // Route by severity: info/warning are messages (control-flow signals, @@ -270,10 +285,11 @@ function captureSentryTrace( // logServerException callers who explicitly handed us an Error. const isMessage = !forceException && (severity === 'info' || severity === 'warning'); + const sentryTitle = sentryCaptureTitle(context); if (isMessage) { - Sentry.captureMessage(message, SENTRY_SEVERITY_MAP[severity] ?? 'warning'); + Sentry.captureMessage(sentryTitle, SENTRY_SEVERITY_MAP[severity] ?? 'warning'); } else { - Sentry.captureException(error ?? new Error(message)); + Sentry.captureException(error ?? syntheticTraceError(message)); } }); } @@ -290,7 +306,8 @@ function isNextControlFlowError(message: string, error: Error | null): boolean { if (typeof digest === 'string' && (digest === 'DYNAMIC_SERVER_USAGE' || digest.startsWith('NEXT_'))) { return true; } - return message.includes('Dynamic server usage:'); + const controlFlowMarker = 'Dynamic server usage:'; + return message.indexOf(controlFlowMarker) !== -1; } async function captureServerTrace( @@ -301,7 +318,7 @@ async function captureServerTrace( forceException = false, ): Promise { const enriched = enrichTraceContext(message, context); - const normalizedError = error ?? new Error(message); + const normalizedError = error ?? syntheticTraceError(message); // Skip, don't rethrow: callers already decide how the original error // propagates; our only job is to not record framework signals as incidents. @@ -318,7 +335,7 @@ async function captureServerTrace( if (!shouldPersistAdminTables()) { console.error('[ServerErrorLogger] not persisted off-prod', { severity, - message, + traceMessage: message, action: enriched.action ?? '', }); return; @@ -327,7 +344,10 @@ async function captureServerTrace( try { await writeAdminTables(message, normalizedError, enriched, severity); } catch { - console.error('[ServerErrorLogger] Failed to persist trace', { message, context: enriched }); + console.error('[ServerErrorLogger] Failed to persist trace', { + traceMessage: message, + context: enriched, + }); } }