* feat(settings): Fönster redesign - flat rows, help behind ?, dirty save bar Founder-approved concept (2026-07-25) applied to the whole settings surface, modal and full-page variants alike: - New primitives in components/settings/SettingsRows.tsx: section header (serif title + one-line intro), eyebrow groups, hairline label/control rows, flat inputs/selects/textareas, segmented control, animated reveal for gated settings, danger zone. - Every static explanation paragraph moved behind a "?" popover (HelpPopover) at row or group level; dynamic status stays visible. - Modal chrome: company kicker over serif title, fixed 920x680 window. - SettingsFormWrapper: save is a sticky bar that appears only when the form is dirty; collapses to zero height when clean. - All 11 sections converted (Konto, Abonnemang, Företag, Bokföring, Skatt, Löner, Fakturering, Mallar, Bank incl. Enable Banking-panel, Assistenten, API) with handlers, validation, role/entitlement/sandbox gates and i18n keys preserved; checkboxes became switches, cards dissolved into groups. - Fix: Escape with an open help popover closed the whole settings modal; it now closes the popover first. - New i18n keys: settings_intro.*, group labels, wrapper_unsaved (sv+en). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(settings): founder feedback round 1 on the Fönster redesign - Abonnemang paying state: status and manage split into two rows so the row no longer wraps awkwardly; the included-features list now shows for paying companies too. - Logos where the counterpart has one: BankID mark on the security row and on the Koppla BankID button, Skatteverket mark on the connection rows. - Buttons are unmistakably buttons: 27 text-labeled row actions went from ghost to outline pills; icon-only actions stay quiet. - The agent-knowledge view (Regler & profil: Dina regler, Momsprofil, Konventioner) converted to the flat row language; it was the last old-style surface inside settings. Descriptions moved behind "?", rules render as hairline rows, the per-row "Regel" chip demoted to muted text. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(settings): address review-bot findings on the Fönster redesign - SettingsFormWrapper marks the form dirty on switch clicks too: Radix Switch is a button and fires no input event, so switch-only changes (f-skatt, KU, ROT/RUT, OSS...) never revealed the save bar. - i18n: the migrated hardcoded strings got keys in both locales (fiscal-period start date/range/months, security set-password trio); dates in ApiKeysPanel/OAuthClientsPanel/CalendarFeedSettings now pass the active locale to formatDateLong. - A11y: member remove/revoke buttons and the invite role select got correct accessible names; BankNameCombobox accepts aria-label wired from its row; the pinned-fact icon exposes role img. - BankIdSettings: explicit Avbryt under the QR block so a cancelled BankID flow cannot strand isLinking. - VoucherSeriesManager: clear the skeleton when no company is resolved. Verified end to end in sandbox: switch-only dirty bar, PUT /api/settings 200 for text and switch saves, persistence across hard reload. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
288 lines
9.2 KiB
TypeScript
288 lines
9.2 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect, useCallback } from 'react'
|
|
import { useTranslations } from 'next-intl'
|
|
import { Button } from '@/components/ui/button'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import { useCompany } from '@/contexts/CompanyContext'
|
|
import {
|
|
SettingsGroup,
|
|
SettingsInput,
|
|
SettingsRowNote,
|
|
SettingsSelect,
|
|
} from '@/components/settings/SettingsRows'
|
|
import { formatDateLong } from '@/lib/utils'
|
|
import { Loader2, Plus, Trash2, Mail } from 'lucide-react'
|
|
|
|
interface CompanyMemberItem {
|
|
id: string
|
|
user_id: string
|
|
email: string
|
|
role: string
|
|
source: 'direct' | 'team'
|
|
joined_at: string
|
|
is_current_user: boolean
|
|
}
|
|
|
|
interface CompanyInvitation {
|
|
id: string
|
|
email: string
|
|
role: string
|
|
status: string
|
|
expires_at: string
|
|
created_at: string
|
|
}
|
|
|
|
export function CompanyMembersSection() {
|
|
const t = useTranslations('settings_company')
|
|
const { toast } = useToast()
|
|
const { company } = useCompany()
|
|
|
|
const roleLabels: Record<string, string> = {
|
|
owner: t('members_role_owner'),
|
|
admin: t('members_role_admin'),
|
|
member: t('members_role_member'),
|
|
viewer: t('members_role_viewer'),
|
|
}
|
|
const [isLoading, setIsLoading] = useState(true)
|
|
const [members, setMembers] = useState<CompanyMemberItem[]>([])
|
|
const [invitations, setInvitations] = useState<CompanyInvitation[]>([])
|
|
const [inviteEmail, setInviteEmail] = useState('')
|
|
const [inviteRole, setInviteRole] = useState<string>('viewer')
|
|
const [isSending, setIsSending] = useState(false)
|
|
const [removingId, setRemovingId] = useState<string | null>(null)
|
|
const [revokingId, setRevokingId] = useState<string | null>(null)
|
|
const [canInvite, setCanInvite] = useState(false)
|
|
|
|
const fetchMembers = useCallback(async () => {
|
|
try {
|
|
const res = await fetch('/api/company/members')
|
|
const data = await res.json()
|
|
if (res.ok) {
|
|
setMembers(data.data.members)
|
|
setInvitations(data.data.invitations)
|
|
setCanInvite(data.data.canInvite)
|
|
}
|
|
} catch {
|
|
// Silently fail
|
|
} finally {
|
|
setIsLoading(false)
|
|
}
|
|
}, [])
|
|
|
|
useEffect(() => {
|
|
fetchMembers()
|
|
}, [fetchMembers])
|
|
|
|
const handleInvite = async (e: React.FormEvent) => {
|
|
e.preventDefault()
|
|
const email = inviteEmail.trim().toLowerCase()
|
|
if (!email) return
|
|
|
|
setIsSending(true)
|
|
try {
|
|
const res = await fetch('/api/company/members/invite', {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify({ email, role: inviteRole }),
|
|
})
|
|
const data = await res.json()
|
|
|
|
if (!res.ok) {
|
|
toast({ title: data.error, variant: 'destructive' })
|
|
return
|
|
}
|
|
|
|
if (data.data.inviteUrl) {
|
|
console.log('[DEV] Company invite URL:', data.data.inviteUrl)
|
|
}
|
|
toast({
|
|
title: t('members_invite_sent_title'),
|
|
description: data.data.inviteUrl
|
|
? t('members_invite_sent_dev_url')
|
|
: t('members_invite_sent_description', { email }),
|
|
})
|
|
setInviteEmail('')
|
|
setInviteRole('viewer')
|
|
fetchMembers()
|
|
} catch {
|
|
toast({ title: t('members_invite_failed'), variant: 'destructive' })
|
|
} finally {
|
|
setIsSending(false)
|
|
}
|
|
}
|
|
|
|
const handleRemoveMember = async (memberId: string) => {
|
|
setRemovingId(memberId)
|
|
try {
|
|
const res = await fetch(`/api/company/members/${memberId}`, { method: 'DELETE' })
|
|
const data = await res.json()
|
|
|
|
if (!res.ok) {
|
|
toast({ title: data.error, variant: 'destructive' })
|
|
return
|
|
}
|
|
|
|
toast({ title: t('members_removed') })
|
|
fetchMembers()
|
|
} catch {
|
|
toast({ title: t('members_remove_failed'), variant: 'destructive' })
|
|
} finally {
|
|
setRemovingId(null)
|
|
}
|
|
}
|
|
|
|
const handleRevokeInvite = async (inviteId: string) => {
|
|
setRevokingId(inviteId)
|
|
try {
|
|
const res = await fetch(`/api/company/members/invite/${inviteId}`, { method: 'DELETE' })
|
|
const data = await res.json()
|
|
|
|
if (!res.ok) {
|
|
toast({ title: data.error, variant: 'destructive' })
|
|
return
|
|
}
|
|
|
|
toast({ title: t('members_invite_revoked') })
|
|
fetchMembers()
|
|
} catch {
|
|
toast({ title: t('members_invite_revoke_failed'), variant: 'destructive' })
|
|
} finally {
|
|
setRevokingId(null)
|
|
}
|
|
}
|
|
|
|
if (isLoading) {
|
|
return (
|
|
<div className="flex items-center justify-center py-8">
|
|
<Loader2 className="h-5 w-5 animate-spin text-muted-foreground" />
|
|
</div>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<SettingsGroup label={t('members_title')} help={t('members_invite_description')}>
|
|
{/* Member rows: flat hairline list, no cards. */}
|
|
{members.map((member) => (
|
|
<div
|
|
key={member.id}
|
|
className="flex items-center gap-3 border-b border-border px-1 py-3"
|
|
>
|
|
<div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-muted/60">
|
|
<span className="text-xs font-medium text-muted-foreground">
|
|
{member.email.charAt(0).toUpperCase()}
|
|
</span>
|
|
</div>
|
|
<p className="min-w-0 flex-1 truncate text-sm">
|
|
{member.email}
|
|
{member.is_current_user && (
|
|
<span className="ml-1 text-muted-foreground">{t('members_you')}</span>
|
|
)}
|
|
</p>
|
|
<span className="shrink-0 text-xs text-muted-foreground">
|
|
{roleLabels[member.role] || member.role}
|
|
{member.source === 'team' && <> · {t('members_team_badge')}</>}
|
|
</span>
|
|
{canInvite && !member.is_current_user && member.role !== 'owner' && member.source !== 'team' && (
|
|
<Button
|
|
variant="ghost"
|
|
size="icon"
|
|
className="h-8 w-8 shrink-0 text-muted-foreground hover:text-destructive"
|
|
aria-label={t('members_remove_aria')}
|
|
onClick={() => handleRemoveMember(member.id)}
|
|
disabled={removingId === member.id}
|
|
>
|
|
{removingId === member.id ? (
|
|
<Loader2 className="h-3.5 w-3.5 animate-spin" />
|
|
) : (
|
|
<Trash2 className="h-3.5 w-3.5" />
|
|
)}
|
|
</Button>
|
|
)}
|
|
</div>
|
|
))}
|
|
|
|
{/* Pending invitations continue the same list, visually quieter. */}
|
|
{invitations.map((inv) => (
|
|
<div
|
|
key={inv.id}
|
|
className="flex items-center gap-3 border-b border-border px-1 py-3"
|
|
>
|
|
<div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full border border-dashed border-border">
|
|
<Mail className="h-3.5 w-3.5 text-muted-foreground" />
|
|
</div>
|
|
<p className="min-w-0 flex-1 truncate text-sm text-muted-foreground">
|
|
{inv.email}
|
|
<span className="ml-1 text-xs">
|
|
· {t('invitations_expires', { date: formatDateLong(inv.expires_at) })}
|
|
</span>
|
|
</p>
|
|
<span className="shrink-0 text-xs text-muted-foreground">
|
|
{roleLabels[inv.role] || inv.role}
|
|
</span>
|
|
{canInvite && (
|
|
<Button
|
|
variant="ghost"
|
|
size="icon"
|
|
className="h-8 w-8 shrink-0 text-muted-foreground hover:text-destructive"
|
|
aria-label={t('members_revoke_aria')}
|
|
onClick={() => handleRevokeInvite(inv.id)}
|
|
disabled={revokingId === inv.id}
|
|
>
|
|
{revokingId === inv.id ? (
|
|
<Loader2 className="h-3.5 w-3.5 animate-spin" />
|
|
) : (
|
|
<Trash2 className="h-3.5 w-3.5" />
|
|
)}
|
|
</Button>
|
|
)}
|
|
</div>
|
|
))}
|
|
|
|
{/* Inline invite: the list's own last row instead of a separate card. */}
|
|
{canInvite && (
|
|
<form onSubmit={handleInvite} className="flex flex-col gap-3 px-1 pt-3 sm:flex-row sm:items-center">
|
|
<label htmlFor="company-invite-email" className="sr-only">
|
|
{t('members_invite_email_label')}
|
|
</label>
|
|
<SettingsInput
|
|
id="company-invite-email"
|
|
type="email"
|
|
placeholder={t('members_invite_email_placeholder')}
|
|
value={inviteEmail}
|
|
onChange={(e) => setInviteEmail(e.target.value)}
|
|
disabled={isSending}
|
|
required
|
|
className="border-border sm:flex-1"
|
|
/>
|
|
<SettingsSelect
|
|
value={inviteRole}
|
|
onChange={(e) => setInviteRole(e.target.value)}
|
|
aria-label={t('members_role_label')}
|
|
>
|
|
<option value="viewer">{t('members_role_viewer')}</option>
|
|
<option value="member">{t('members_role_member')}</option>
|
|
<option value="admin">{t('members_role_admin')}</option>
|
|
</SettingsSelect>
|
|
<Button type="submit" size="sm" disabled={isSending || !inviteEmail.trim()}>
|
|
{isSending ? (
|
|
<Loader2 className="h-4 w-4 animate-spin" />
|
|
) : (
|
|
<>
|
|
<Plus className="mr-2 h-4 w-4" />
|
|
{t('members_invite_button')}
|
|
</>
|
|
)}
|
|
</Button>
|
|
</form>
|
|
)}
|
|
|
|
<p className="px-1 pt-3">
|
|
<SettingsRowNote>
|
|
{t('members_count', { count: members.length, companyName: company?.name ?? '' })}
|
|
</SettingsRowNote>
|
|
</p>
|
|
</SettingsGroup>
|
|
)
|
|
}
|