* feat(onboarding): the orgnr step suggests companies as you type, SCB search, TIC on the pick Most people do not know their organisationsnummer. They left the onboarding for allabolag, searched their company name there, copied the number and pasted it back. #2421 let the field take a name, but only on Enter and behind a screen that still said "organisationsnummer", so the detour stayed. Now the field suggests companies while a name is typed (name, orgnr or "Enskild firma", city; arrow keys or click to pick), the pick fills the company like a typed orgnr, and the screen says "Vilket företag är det?" with "Företagsnamn eller organisationsnummer" as the placeholder. Why the problem occurred: the one identifier the step asked for is the one the user is least likely to remember, and the free-text path added in #2421 was invisible (copy unchanged) and had to be guessed (Enter only), because the only search index behind it was TIC, whose Lens budget cannot take a call per keystroke. What was removed or simplified: nothing is stored and no new state model: a picked suggestion is an ORG_SUBMITTED with prefill, so the existing LOOKUP_RESULT transitions (found, not found, disabled, error) decide the step exactly as for a typed number. SCB's name search already existed for the parties picker; it gained one option (sole traders) instead of a second client. No rate limiting anywhere, per the founder. Why this shape: SCB's företagsregister is free and already configured for the parties picker, so search-as-you-type costs nothing while typing; TIC runs once, on the pick, as it always did on Enter. TIC per keystroke was rejected (3000/month). SCB alone was rejected for the pick because it knows no F-skatt, VAT registration or fiscal year. The Enter path and the chip row from #2421 stay as the fallback when no row is picked. Sole traders are offered (they are half the users) but their row names the form and never prints the personnummer, and the field shows the company name after a pick for the same reason. Changes: - app/api/company/search: GET ?q= over the SCB client with sole traders included, top 6 rows plus a truncated flag; requireAuth() (no company yet), 400 for short or numeric q, 503 without SCB credentials, 502 when SCB does not answer. - lib/parties/scb/client.ts: searchByName(query, { includeSoleTraders }), legalFormCode on every candidate; the parties picker is unchanged. - lib/company-lookup: CompanySuggestion, COMPANY_SUGGEST_MAX, fetchCompanySuggestions (503 is disabled, everything else error, never throws), toCompanySuggestion (SCB legal form 49/10/61 into the TIC vocabulary mapSetupEntityType reads). - lib/onboarding-journey/reducer.ts: SUGGESTION_PICKED (orgnr, name and form as prefill, lookupPending; lookupRan stays false until TIC answers). - components/onboarding/journey: 300 ms debounced SCB search with abort of the superseded request, listbox under the field (combobox ARIA, arrow keys, Escape, Enter picks the highlighted row, otherwise the Enter path), copy switches with companySearchEnabled or ticEnabled; both journey pages pass isScbConfigured(). - messages sv+en: five strings. Tests: route (401, 400 short, 400 missing, 400 numeric, 503, happy with a sole trader, cap at 6, flood, 502); fetchCompanySuggestions (every outcome); toCompanySuggestion; reducer (pick equals typed orgnr after TIC, TIC overrides prefill, TIC off keeps the AB past form and name, unmapped form falls to the picker, sole trader confirms the name, replaces a previous orgnr, ignored off-step); SCB client sole-trader option. Fixes #2448 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YNDuYBHVu172tesKfJmcmi * fix(onboarding): the suggestion list stays visible and stands alone (skeptic on e56eb242c) Three independent refuters on the frozen commit; every refutation that stood is fixed here. - The listbox was position: absolute inside the field, but the step scrolls (.jny-qstep is overflow-y: auto), so the list was clipped to the first row and mouse picks were unreachable (measured in headless Chrome). It now renders in flow under the field, where the chip row from #2421 already lives. - After Enter on a name (the #2421 path), SEARCH_RESULT flipped lookupPending back and the debounced effect refetched SCB, laying the listbox over the chip row or next to the nomatch note. The effect is now quiet while searchHits is non-empty and for text the user already confirmed (Enter or a pick), until the text changes. - The "many matches, type more" hint only rendered inside the list, so the flood case (SCB counts over 100 rows and sends none) showed nothing. The hint now renders on its own for that case. - app/companies/new-client (byrå adds a client) renders the same journey and now passes companySearchEnabled like the other two pages. - A stale mouse highlight could commit a row from the previous text on Enter: typing resets the highlight. - Any 503 switched the picker off for the session; only the route's own SCB_NOT_CONFIGURED does now. - NOTFOUND_EDIT / CEASED_EDIT dropped only the number and kept the abandoned pick's name and form, which a later TIC error path would have written into the company. Both now drop name and form too, unless they came from BankID's CompanyRoles prefill, which is not about the number. Not changed, recorded: a sole trader picked from SCB whom TIC does not know lands on the "no company on that number" step with the name in the field; the flow continues with the SCB name prefilled. The search JSON carries the personnummer of sole-trader rows to the authenticated browser (the row prints "Enskild firma"), same class as #2421's Enter search; flagged to the founder. Refs #2448 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YNDuYBHVu172tesKfJmcmi --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
133 lines
5.0 KiB
TypeScript
133 lines
5.0 KiB
TypeScript
import { createClient } from '@/lib/supabase/server'
|
|
import { cookies } from 'next/headers'
|
|
import { redirect } from 'next/navigation'
|
|
import OnboardingJourney from '@/components/onboarding/journey/OnboardingJourney'
|
|
import {
|
|
acceptPendingInviteByToken,
|
|
hasPendingInviteForEmail,
|
|
} from '@/lib/company/pending-invites'
|
|
import type { EntityType } from '@/types'
|
|
import type { EnrichmentCompanyRole } from '@/lib/company-lookup/types'
|
|
import { mapSetupEntityType as mapTicEntityType } from '@/lib/company-lookup/entity-type-map'
|
|
import { isScbConfigured } from '@/lib/parties/scb/config'
|
|
|
|
export const dynamic = 'force-dynamic'
|
|
|
|
// Look up the user's CompanyRoles enrichment (from BankID auth) and find the
|
|
// role whose orgnr matches the incoming `?org_number=`. CompanyRoles lives on
|
|
// the TIC Identity API (separate product, separate quota from the Lens
|
|
// `/lookup` endpoint) so this is free: no Lens calls.
|
|
//
|
|
// Returns enough to pre-fill Step 1's entity-type radio + Step 2's
|
|
// company_name field. The rest (address, F-skatt, VAT) is captured by the
|
|
// user in Steps 2-4. F-skatt/VAT defaults can't be safely guessed without
|
|
// Bolagsverket data (ML 17 kap 24§ violation if we default a momsregistrerat
|
|
// bolag to false), so we make the user confirm in Step 4.
|
|
//
|
|
// Exported for unit testing.
|
|
export async function findCompanyRoleByOrgNumber(
|
|
supabase: Awaited<ReturnType<typeof createClient>>,
|
|
userId: string,
|
|
orgNumber: string,
|
|
): Promise<{ legalName: string; legalEntityType: string } | null> {
|
|
const { data } = await supabase
|
|
.from('bankid_enrichment')
|
|
.select('company_roles')
|
|
.eq('user_id', userId)
|
|
.maybeSingle()
|
|
|
|
const roles = (data?.company_roles ?? []) as EnrichmentCompanyRole[]
|
|
if (!Array.isArray(roles) || roles.length === 0) return null
|
|
|
|
const match = roles.find(
|
|
(r) => r.companyRegistrationNumber.replace(/[\s-]/g, '') === orgNumber,
|
|
)
|
|
if (!match) return null
|
|
|
|
return { legalName: match.legalName, legalEntityType: match.legalEntityType }
|
|
}
|
|
|
|
export default async function OnboardingPage({
|
|
searchParams,
|
|
}: {
|
|
searchParams: Promise<{ org_number?: string }>
|
|
}) {
|
|
const supabase = await createClient()
|
|
|
|
const { data: { user } } = await supabase.auth.getUser()
|
|
if (!user) {
|
|
redirect('/login')
|
|
}
|
|
|
|
// Invite recovery: an invitee normally never reaches this page (the client
|
|
// flows or the auth callback attach them to the company first), so landing
|
|
// here with a live invite cookie means acceptance was missed. Retry it and
|
|
// skip onboarding entirely on success; if only a pending invitation exists
|
|
// (cookie lost, e.g. confirmation opened on another device), surface a hint
|
|
// instead of silently asking the invitee to create a company.
|
|
const inviteToken = (await cookies()).get('gnubok-invite-token')?.value
|
|
if (inviteToken && (await acceptPendingInviteByToken(user, inviteToken))) {
|
|
redirect('/')
|
|
}
|
|
const hasPendingInvite = user.email
|
|
? await hasPendingInviteForEmail(user.email)
|
|
: false
|
|
|
|
const { data: teamMembership } = await supabase
|
|
.from('team_members')
|
|
.select('team_id')
|
|
.eq('user_id', user.id)
|
|
.limit(1)
|
|
.maybeSingle()
|
|
|
|
let teamId = teamMembership?.team_id
|
|
|
|
// Ensure user has a team (fallback for edge cases)
|
|
if (!teamId) {
|
|
const { data: newTeamId } = await supabase.rpc('ensure_user_team')
|
|
teamId = newTeamId
|
|
}
|
|
|
|
if (!teamId) {
|
|
redirect('/login')
|
|
}
|
|
|
|
// The BankID picker routes here with ?org_number=… for every pick. Strip
|
|
// formatting so whatever Step 2 displays matches what the rest of the flow
|
|
// will store.
|
|
const { org_number: rawOrgNumber } = await searchParams
|
|
const initialOrgNumber = rawOrgNumber ? rawOrgNumber.replace(/[\s-]/g, '') : undefined
|
|
|
|
// BankID prefill: look up the CompanyRoles row (no Lens call) to seed
|
|
// entity_type + company_name. If no role matches, everything is manual:
|
|
// same fallback as a non-BankID signup. The journey auto-submits the
|
|
// deep-linked orgnr, which runs the same single Lens lookup as manual
|
|
// entry (plan addendum 2026-07-24); on lookup failure the flow degrades
|
|
// to asking the questions with these role fields as prefill.
|
|
let initialEntityType: EntityType | undefined
|
|
let initialLegalName: string | undefined
|
|
if (initialOrgNumber) {
|
|
const match = await findCompanyRoleByOrgNumber(supabase, user.id, initialOrgNumber)
|
|
if (match) {
|
|
initialEntityType = mapTicEntityType(match.legalEntityType) ?? undefined
|
|
initialLegalName = match.legalName
|
|
}
|
|
}
|
|
|
|
return (
|
|
<OnboardingJourney
|
|
teamId={teamId}
|
|
mode="first"
|
|
initialOrgNumber={initialOrgNumber}
|
|
initialEntityType={initialEntityType}
|
|
initialLegalName={initialLegalName}
|
|
// A deep-linked orgnr is a deliberate create-this-company pick from the
|
|
// BankID list: don't distract that flow with the invite hint.
|
|
hasPendingInvite={hasPendingInvite && !initialOrgNumber}
|
|
// SCB credentials are server env: the client learns once whether the
|
|
// search-as-you-type picker exists in this environment.
|
|
companySearchEnabled={isScbConfigured()}
|
|
/>
|
|
)
|
|
}
|