6d9846b1e7
* 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>
163 lines
5.5 KiB
TypeScript
163 lines
5.5 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useRef, useEffect, useCallback } from 'react'
|
|
import { useTranslations } from 'next-intl'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Loader2, Check, Lock } from 'lucide-react'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import { useCanWrite } from '@/lib/hooks/use-can-write'
|
|
import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
|
|
import { cn } from '@/lib/utils'
|
|
|
|
type SaveResult =
|
|
| Record<string, unknown>
|
|
| { updates: Record<string, unknown>; onSuccess?: (data: Record<string, unknown>) => void }
|
|
|
|
interface SettingsFormWrapperProps {
|
|
children: React.ReactNode
|
|
onSave?: (formData: FormData) => SaveResult
|
|
className?: string
|
|
}
|
|
|
|
/**
|
|
* Form shell for settings sections saving to PUT /api/settings. The save
|
|
* affordance is a sticky bar that fades in only when the form is dirty
|
|
* (Fönster concept): a quiet page until you actually change something.
|
|
*/
|
|
export function SettingsFormWrapper({ children, onSave, className }: SettingsFormWrapperProps) {
|
|
const t = useTranslations('settings_company')
|
|
const { toast } = useToast()
|
|
const { canWrite } = useCanWrite()
|
|
const [isSaving, setIsSaving] = useState(false)
|
|
const [saved, setSaved] = useState(false)
|
|
const [dirty, setDirty] = useState(false)
|
|
const timerRef = useRef<ReturnType<typeof setTimeout>>(undefined)
|
|
|
|
useEffect(() => {
|
|
return () => {
|
|
if (timerRef.current) clearTimeout(timerRef.current)
|
|
}
|
|
}, [])
|
|
|
|
const handleSubmit = useCallback(async (e: React.FormEvent<HTMLFormElement>) => {
|
|
e.preventDefault()
|
|
if (!onSave) return
|
|
|
|
const formData = new FormData(e.currentTarget)
|
|
const saveResult = onSave(formData)
|
|
|
|
// Support both plain object and { updates, onSuccess } return types
|
|
const isStructured = saveResult && 'updates' in saveResult && typeof saveResult.updates === 'object'
|
|
const updates = isStructured ? saveResult.updates : saveResult
|
|
const onSuccess = isStructured ? (saveResult as { onSuccess?: (data: Record<string, unknown>) => void }).onSuccess : undefined
|
|
|
|
if (!updates || Object.keys(updates).length === 0) return
|
|
|
|
setIsSaving(true)
|
|
setSaved(false)
|
|
|
|
try {
|
|
const response = await fetch('/api/settings', {
|
|
method: 'PUT',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify(updates),
|
|
})
|
|
|
|
const result = await response.json()
|
|
|
|
if (!response.ok) {
|
|
// Surface the specific Zod field message when the API sent a
|
|
// validation_error envelope: generic "Validation failed" is useless
|
|
// to the user.
|
|
if (
|
|
result?.type === 'validation_error'
|
|
&& Array.isArray(result.errors)
|
|
&& result.errors.length > 0
|
|
) {
|
|
const messages = result.errors
|
|
.map((e: { message?: string }) => e.message)
|
|
.filter((m: unknown): m is string => typeof m === 'string' && m.length > 0)
|
|
if (messages.length > 0) {
|
|
throw new Error(messages.join(' • '))
|
|
}
|
|
}
|
|
throw new Error(result.error || t('wrapper_save_failed_default'))
|
|
}
|
|
|
|
onSuccess?.(result.data ?? updates)
|
|
setDirty(false)
|
|
setSaved(true)
|
|
timerRef.current = setTimeout(() => setSaved(false), 2000)
|
|
} catch (error) {
|
|
toast({
|
|
title: t('wrapper_save_failed_title'),
|
|
description: error instanceof Error ? getUserErrorMessage(error) : t('wrapper_try_again'),
|
|
variant: 'destructive',
|
|
})
|
|
}
|
|
|
|
setIsSaving(false)
|
|
}, [onSave, toast, t])
|
|
|
|
const barVisible = dirty || isSaving || saved
|
|
|
|
return (
|
|
<form
|
|
onSubmit={handleSubmit}
|
|
onInput={() => setDirty(true)}
|
|
// Radix Switch renders a button, so toggling it fires no form input
|
|
// event; catch those clicks too or switch-only changes never reveal
|
|
// the save bar.
|
|
onClickCapture={(e) => {
|
|
const el = e.target as HTMLElement
|
|
if (el.closest('[role="switch"]:not([disabled])')) setDirty(true)
|
|
}}
|
|
className={className}
|
|
>
|
|
{children}
|
|
|
|
{/* Sticky save bar: invisible until the form is dirty. The gradient
|
|
lets rows scroll away underneath without a hard edge. */}
|
|
<div
|
|
className={cn(
|
|
'sticky bottom-0 flex items-center gap-4 bg-gradient-to-t from-background via-background/95 to-transparent px-1 transition-opacity duration-200',
|
|
barVisible
|
|
? 'mt-2 pb-3 pt-6 opacity-100'
|
|
: 'pointer-events-none h-0 overflow-hidden py-0 opacity-0',
|
|
)}
|
|
aria-hidden={!barVisible}
|
|
>
|
|
<Button
|
|
type="submit"
|
|
disabled={isSaving || !canWrite}
|
|
size="sm"
|
|
tabIndex={barVisible ? 0 : -1}
|
|
title={!canWrite ? t('wrapper_readonly_tooltip') : undefined}
|
|
>
|
|
{isSaving ? (
|
|
<>
|
|
<Loader2 className="mr-2 h-3.5 w-3.5 animate-spin" />
|
|
{t('wrapper_saving')}
|
|
</>
|
|
) : !canWrite ? (
|
|
<>
|
|
<Lock className="mr-2 h-3.5 w-3.5" />
|
|
{t('wrapper_save_changes')}
|
|
</>
|
|
) : (
|
|
t('wrapper_save_changes')
|
|
)}
|
|
</Button>
|
|
{saved ? (
|
|
<span className="flex items-center gap-2 text-sm text-muted-foreground animate-in fade-in duration-200">
|
|
<Check className="h-3.5 w-3.5" />
|
|
{t('wrapper_saved')}
|
|
</span>
|
|
) : (
|
|
<span className="text-xs text-muted-foreground">{t('wrapper_unsaved')}</span>
|
|
)}
|
|
</div>
|
|
</form>
|
|
)
|
|
}
|