4ac7b45c8a
The dashboard layout runs on every hard load, hard refresh, company switch and the 16 router.refresh() sites, and loading.tsx cannot paint until it resolves. It cost ~20 network calls in 4 sequential waves: a third getUser() round trip to Supabase Auth (after the proxy's and the route guard's), the company resolution, then 16 reads including four limit-1 probes whose only job is to decide whether to render the Webshop and Körjournal nav rows, and an entitlements read that itself ran two waves. - lib/auth/claims.ts: claimsPinned/userFromClaims extracted from require-auth.ts (unchanged) so the dashboard request context shares the exact pinning + mapping. getDashboardAuthContext verifies the JWT locally and falls back to getUser() only when claims are missing, unpinned or unverifiable: the proxy already performed the per-request revocation check before the layout runs (same semantics approved for routes on 2026-07-23). - Wave 1 (user-keyed, parallel with the company resolution): team membership, profile, user preferences and the memberships join, which now also supplies the active company's row and role, so the separate companies and company_members reads are gone. - Wave 2 (company-keyed): settings, agent profile, the switcher's settings names, entitlements in ONE wave (getCompanyEntitlements takes the team_id the join already carries and runs the grants read alongside config + subscription), and get_dashboard_nav_flags(). - supabase/migrations/20260826120000_get_dashboard_nav_flags.sql: SECURITY INVOKER, STABLE, EXECUTE for authenticated only; RLS applies inside. lib/dashboard/nav-flags.ts wraps it with the pre-RPC four-probe fallback on PGRST202/42883/42501 (self-hosted not yet migrated, deploy ordering) and degrades to hidden rows on any other error. - tests/pg/dashboard-nav-flags-rpc.pg.test.ts (6): fresh company, active vs pending WooCommerce, active Shopify, mileage trips, RLS for a member of another company, EXECUTE grants. Unit tests for the wrapper (RPC row, single-object payload, each fallback code, other errors) and for the entitlements teamId option. ~20 calls / 4 waves -> ~12 calls / 2 waves, 0 auth network calls. Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
61 lines
2.5 KiB
TypeScript
61 lines
2.5 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
|
|
export interface DashboardNavFlags {
|
|
/** An active WooCommerce/Shopify connection or already-imported webshop orders. */
|
|
hasWebshop: boolean
|
|
/** Existing mileage trips (created via UI, API or MCP). */
|
|
hasMileageTrips: boolean
|
|
}
|
|
|
|
const FALLBACK_CODES = new Set(['PGRST202', '42883', '42501'])
|
|
|
|
/**
|
|
* The two booleans that gate the Webshop and Körjournal nav rows, in one
|
|
* round trip via get_dashboard_nav_flags() (migration 20260826120000).
|
|
*
|
|
* Fallback to the four limit-1 probes the layout ran before the RPC when
|
|
* the function is not deployed yet (self-hosted instance not migrated, or
|
|
* the deploy-ordering window before the branching merge applies the
|
|
* migration) or EXECUTE is not granted: mirrors the load-bearing fallback
|
|
* in lib/company/context.ts. Any other error degrades to (false, false):
|
|
* these flags only hide nav rows, they are never load-bearing.
|
|
*/
|
|
export async function getDashboardNavFlags(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
): Promise<DashboardNavFlags> {
|
|
const rpc = await supabase.rpc('get_dashboard_nav_flags', { p_company_id: companyId })
|
|
if (!rpc.error) {
|
|
const row = (Array.isArray(rpc.data) ? rpc.data[0] : rpc.data) as
|
|
| { has_webshop?: boolean | null; has_mileage_trips?: boolean | null }
|
|
| null
|
|
| undefined
|
|
return {
|
|
hasWebshop: row?.has_webshop === true,
|
|
hasMileageTrips: row?.has_mileage_trips === true,
|
|
}
|
|
}
|
|
if (!FALLBACK_CODES.has(rpc.error.code ?? '')) {
|
|
return { hasWebshop: false, hasMileageTrips: false }
|
|
}
|
|
return getDashboardNavFlagsViaProbes(supabase, companyId)
|
|
}
|
|
|
|
/** The pre-RPC implementation, kept verbatim as the fallback. */
|
|
export async function getDashboardNavFlagsViaProbes(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
): Promise<DashboardNavFlags> {
|
|
const [woo, shopify, orders, trips] = await Promise.all([
|
|
supabase.from('woocommerce_connections').select('id').eq('company_id', companyId).eq('status', 'active').limit(1),
|
|
supabase.from('shopify_connections').select('id').eq('company_id', companyId).eq('status', 'active').limit(1),
|
|
supabase.from('webshop_orders').select('id').eq('company_id', companyId).limit(1),
|
|
supabase.from('mileage_trips').select('id').eq('company_id', companyId).limit(1),
|
|
])
|
|
return {
|
|
hasWebshop:
|
|
(woo.data?.length ?? 0) > 0 || (shopify.data?.length ?? 0) > 0 || (orders.data?.length ?? 0) > 0,
|
|
hasMileageTrips: (trips.data?.length ?? 0) > 0,
|
|
}
|
|
}
|