Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
feat(control-ui): standardize account scalar edits
Josué851c491c4e0d
diff --git a/control-ui/components/ControlSettingsPanel/index.tsx b/control-ui/components/ControlSettingsPanel/index.tsxindex 2463815f4..e5c8c95f9 100644--- a/control-ui/components/ControlSettingsPanel/index.tsx+++ b/control-ui/components/ControlSettingsPanel/index.tsx@@ -2,6 +2,7 @@import { type FormEvent, useEffect, useMemo, useState } from 'react'import { useSearchParams } from 'next/navigation'+import { SingleValueEditDialog } from '@clerum/frontend-components'import {hasControlAdminBridgeAlertOverrides,resetControlAdminBridgeAlerts,@@ -46,9 +47,9 @@ export function ControlSettingsPanel({ emailConfirmationStatus }: ControlSettingexpiresAt: stringcreatedAt: string} | null>(null)- const [draftEmail, setDraftEmail] = useState('')- const [draftUsername, setDraftUsername] = useState('')const [editingField, setEditingField] = useState<EditingField>(null)+ const [emailValid, setEmailValid] = useState(true)+ const [usernameValid, setUsernameValid] = useState(true)const [showPasswordModal, setShowPasswordModal] = useState(false)const [hasResettableAlerts, setHasResettableAlerts] = useState(false)const [currentPassword, setCurrentPassword] = useState('')@@ -68,8 +69,6 @@ export function ControlSettingsPanel({ emailConfirmationStatus }: ControlSettingsetEmail(loadedEmail)setUsername(loadedUsername)setPendingEmailChange(settingsResponse.me.pendingEmailChange || null)- setDraftEmail(loadedEmail)- setDraftUsername(loadedUsername)}} catch (loadError) {if (!cancelled) {@@ -107,16 +106,6 @@ export function ControlSettingsPanel({ emailConfirmationStatus }: ControlSetting}}, [])- const canSaveEmail = useMemo(- () => draftEmail.trim().length > 0 && !savingProfile && !loading,- [draftEmail, loading, savingProfile]- )-- const canSaveUsername = useMemo(- () => draftUsername.trim().length > 0 && !savingProfile && !loading,- [draftUsername, loading, savingProfile]- )-const canSavePassword = useMemo(() =>currentPassword.length > 0 &&@@ -128,16 +117,14 @@ export function ControlSettingsPanel({ emailConfirmationStatus }: ControlSettingfunction beginEditing(field: EditingField) {setProfileError('')+ setEmailValid(true)+ setUsernameValid(true)setEditingField(field)- setDraftEmail(field === 'email' ? pendingEmailChange?.email || email : email)- setDraftUsername(username)}function cancelEditing() {setEditingField(null)setProfileError('')- setDraftEmail(email)- setDraftUsername(username)}function closePasswordModal() {@@ -157,8 +144,6 @@ export function ControlSettingsPanel({ emailConfirmationStatus }: ControlSettingsetEmail(response.me.email || '')setUsername(response.me.username || '')setPendingEmailChange(response.me.pendingEmailChange || pendingEmailChange)- setDraftEmail(response.me.email || '')- setDraftUsername(response.me.username || '')setEditingField(null)await checkAuth()showToast('Username updated.', { tone: 'success' })@@ -179,7 +164,6 @@ export function ControlSettingsPanel({ emailConfirmationStatus }: ControlSettingexpiresAt: response.confirmation.expiresAt,createdAt: response.confirmation.createdAt,})- setDraftEmail(email)setEditingField(null)showToast('Confirmation email sent.', { tone: 'success' })} catch (saveError) {@@ -191,11 +175,6 @@ export function ControlSettingsPanel({ emailConfirmationStatus }: ControlSetting}}- async function handleSaveEmail() {- if (!canSaveEmail) return- await requestEmailChange(draftEmail.trim().toLowerCase())- }-async function handleResendEmailConfirmation() {if (!pendingEmailChange || savingProfile) returnawait requestEmailChange(pendingEmailChange.email)@@ -213,11 +192,6 @@ export function ControlSettingsPanel({ emailConfirmationStatus }: ControlSettingshowToast('Alerts reset.', { tone: 'success' })}- async function handleSaveUsername() {- if (!canSaveUsername) return- await saveUsername(draftUsername.trim())- }-async function handleSavePassword(event: FormEvent<HTMLFormElement>) {event.preventDefault()if (!canSavePassword) return@@ -268,127 +242,64 @@ export function ControlSettingsPanel({ emailConfirmationStatus }: ControlSetting</Button></div><div className="cu-settings-list">- <div- className={`cu-settings-row${editingField === 'username' ? ' cu-settings-row--editing' : ''}`}- >+ <div className="cu-settings-row"><div className="cu-settings-row__main"><span className="cu-settings-row__label">Username</span>- {editingField === 'username' ? (- <div className="cu-settings-row__edit">- <TextInput- aria-label="Username"- value={draftUsername}- onChange={event => setDraftUsername(event.target.value)}- disabled={savingProfile}- autoComplete="username"- />- <div className="cu-settings-row__actions">- <Button- type="button"- variant="primary"- size="sm"- disabled={!canSaveUsername}- onClick={() => void handleSaveUsername()}- >- {savingProfile ? 'Saving...' : 'Save'}- </Button>- <Button type="button" variant="ghost" size="sm" onClick={cancelEditing}>- Cancel- </Button>- </div>- </div>- ) : (- <span className="cu-settings-row__value">- {loading ? 'Loading...' : username || 'Not set'}- </span>- )}+ <span className="cu-settings-row__value">+ {loading ? 'Loading...' : username || 'Not set'}+ </span>+ </div>+ <div className="cu-settings-row__actions">+ <Button+ type="button"+ variant="secondary"+ size="sm"+ onClick={() => beginEditing('username')}+ disabled={loading || editingField !== null}+ >+ Edit+ </Button></div>- {editingField !== 'username' ? (- <div className="cu-settings-row__actions">- <Button- type="button"- variant="secondary"- size="sm"- onClick={() => beginEditing('username')}- disabled={loading || editingField !== null}- >- Edit- </Button>- </div>- ) : null}</div>- <div- className={`cu-settings-row${editingField === 'email' ? ' cu-settings-row--editing' : ''}`}- >+ <div className="cu-settings-row"><div className="cu-settings-row__main"><span className="cu-settings-row__label">Email</span>- {editingField === 'email' ? (- <div className="cu-settings-row__edit">- <TextInput- aria-label="Email"- type="email"- value={draftEmail}- onChange={event => setDraftEmail(event.target.value)}- disabled={savingProfile}- autoComplete="email"- />- <div className="cu-settings-row__actions">- <Button- type="button"- variant="primary"- size="sm"- disabled={!canSaveEmail}- onClick={() => void handleSaveEmail()}- >- {savingProfile ? 'Saving...' : 'Save'}- </Button>- <Button type="button" variant="ghost" size="sm" onClick={cancelEditing}>- Cancel- </Button>- </div>- </div>- ) : (- <>- <span className="cu-settings-row__value">- {loading- ? 'Loading...'- : pendingEmailChange && !email- ? `Confirmation sent to ${pendingEmailChange.email}`- : email || 'No email set'}- </span>- {pendingEmailChange && email ? (- <span className="cu-settings-row__hint">- Confirmation pending for {pendingEmailChange.email}.- </span>- ) : null}- </>- )}+ <span className="cu-settings-row__value">+ {loading+ ? 'Loading...'+ : pendingEmailChange && !email+ ? `Confirmation sent to ${pendingEmailChange.email}`+ : email || 'No email set'}+ </span>+ {pendingEmailChange && email ? (+ <span className="cu-settings-row__hint">+ Confirmation pending for {pendingEmailChange.email}.+ </span>+ ) : null}</div>- {editingField !== 'email' ? (- <div className="cu-settings-row__actions">+ <div className="cu-settings-row__actions">+ <Button+ type="button"+ variant="secondary"+ size="sm"+ onClick={() => beginEditing('email')}+ disabled={loading || editingField !== null}+ >+ Edit+ </Button>+ {pendingEmailChange ? (<Buttontype="button"- variant="secondary"+ variant="ghost"size="sm"- onClick={() => beginEditing('email')}- disabled={loading || editingField !== null}+ onClick={() => void handleResendEmailConfirmation()}+ disabled={loading || savingProfile}>- Edit+ Resend confirmation</Button>- {pendingEmailChange ? (- <Button- type="button"- variant="ghost"- size="sm"- onClick={() => void handleResendEmailConfirmation()}- disabled={loading || savingProfile}- >- Resend confirmation- </Button>- ) : null}- </div>- ) : null}+ ) : null}+ </div></div></div>{emailConfirmationStatus === 'confirmed' ? (@@ -486,6 +397,64 @@ export function ControlSettingsPanel({ emailConfirmationStatus }: ControlSetting</div></div>+ <SingleValueEditDialog+ open={editingField === 'username'}+ initialValue={username}+ title="Edit username"+ description="Choose the username shown for this Control UI admin account."+ pending={savingProfile}+ error={editingField === 'username' ? profileError : undefined}+ isValid={usernameValid}+ onDismiss={cancelEditing}+ onSave={nextUsername => void saveUsername(nextUsername.trim())}+ renderEditor={({ value, onChange, disabled }) => (+ <Field label="Username" htmlFor="settings-username" required>+ <TextInput+ id="settings-username"+ aria-label="Username"+ value={value}+ onChange={event => {+ const nextValue = event.target.value+ setUsernameValid(nextValue.trim().length > 0)+ onChange(nextValue)+ }}+ disabled={disabled}+ autoComplete="username"+ />+ </Field>+ )}+ />++ <SingleValueEditDialog+ open={editingField === 'email'}+ initialValue={pendingEmailChange?.email || email}+ title="Change email"+ description="We will send a confirmation link before replacing your current email."+ pending={savingProfile}+ error={editingField === 'email' ? profileError : undefined}+ isValid={emailValid}+ saveLabel="Send confirmation"+ onDismiss={cancelEditing}+ onSave={nextEmail => void requestEmailChange(nextEmail.trim().toLowerCase())}+ renderEditor={({ value, onChange, disabled }) => (+ <Field label="Email" htmlFor="settings-email" required>+ <TextInput+ id="settings-email"+ aria-label="Email"+ type="email"+ value={value}+ onChange={event => {+ const nextValue = event.target.value+ setEmailValid(nextValue.trim().length > 0)+ onChange(nextValue)+ }}+ disabled={disabled}+ autoComplete="email"+ />+ </Field>+ )}+ />+{showPasswordModal ? (<divclassName="cu-modal-backdrop"diff --git a/control-ui/components/__tests__/ControlSettingsPanel.test.tsx b/control-ui/components/__tests__/ControlSettingsPanel.test.tsxnew file mode 100644index 000000000..93c28b5ee--- /dev/null+++ b/control-ui/components/__tests__/ControlSettingsPanel.test.tsx@@ -0,0 +1,139 @@+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'+import { cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react'+import {+ getControlUISettingsMe,+ requestControlUISettingsEmailChange,+ updateControlUISettingsUsername,+} from '@lib/api'+import { ControlSettingsPanel } from '../ControlSettingsPanel'++const checkAuth = vi.fn()+const showToast = vi.fn()++vi.mock('next/navigation', () => ({+ useSearchParams: () => new URLSearchParams(),+}))++vi.mock('../AuthContext', () => ({+ useAuth: () => ({ checkAuth, logout: vi.fn() }),+}))++vi.mock('../AdminBridgeAlerts', () => ({+ hasControlAdminBridgeAlertOverrides: () => false,+ resetControlAdminBridgeAlerts: vi.fn(),+}))++vi.mock('../ConfirmDialog', () => ({+ useConfirmDialog: () => ({ confirm: vi.fn(), confirmDialog: null }),+}))++vi.mock('../ThemeContext', () => ({+ useTheme: () => ({ setThemeMode: vi.fn(), themeMode: 'dark' }),+}))++vi.mock('../Toast', () => ({+ useToast: () => ({ showToast }),+}))++vi.mock('@lib/api', () => ({+ getControlUISettingsMe: vi.fn(),+ requestControlUISettingsEmailChange: vi.fn(),+ updateControlUISettingsPassword: vi.fn(),+ updateControlUISettingsUsername: vi.fn(),+}))++const mockGetSettings = vi.mocked(getControlUISettingsMe)+const mockRequestEmailChange = vi.mocked(requestControlUISettingsEmailChange)+const mockUpdateUsername = vi.mocked(updateControlUISettingsUsername)++function accountRow(label: string): HTMLElement {+ const row = screen.getByText(label).closest('.cu-settings-row')+ if (!(row instanceof HTMLElement)) throw new Error(`Could not find ${label} settings row`)+ return row+}++describe('ControlSettingsPanel scalar dialogs', () => {+ beforeEach(() => {+ vi.clearAllMocks()+ mockGetSettings.mockResolvedValue({+ me: {+ email: '[email protected]',+ username: 'admin',+ pendingEmailChange: null,+ },+ } as Awaited<ReturnType<typeof getControlUISettingsMe>>)+ })++ afterEach(cleanup)++ it('keeps username read-only until Edit and discards dismissed drafts', async () => {+ render(<ControlSettingsPanel />)++ await screen.findByText('admin')+ expect(screen.queryByLabelText('Username')).not.toBeInTheDocument()++ fireEvent.click(within(accountRow('Username')).getByRole('button', { name: 'Edit' }))+ const dialog = screen.getByRole('dialog', { name: 'Edit username' })+ const input = within(dialog).getByLabelText('Username')+ expect(input).toHaveValue('admin')+ fireEvent.change(input, { target: { value: 'discarded-name' } })+ fireEvent.mouseDown(screen.getByTestId('dialog-backdrop'))++ expect(screen.queryByRole('dialog', { name: 'Edit username' })).not.toBeInTheDocument()+ fireEvent.click(within(accountRow('Username')).getByRole('button', { name: 'Edit' }))+ expect(screen.getByLabelText('Username')).toHaveValue('admin')+ })++ it('preserves the username draft on failure and adopts the authoritative success response', async () => {+ mockUpdateUsername+ .mockRejectedValueOnce(new Error('Username is already in use.'))+ .mockResolvedValueOnce({+ me: {+ email: '[email protected]',+ username: 'server-normalized',+ pendingEmailChange: null,+ },+ } as Awaited<ReturnType<typeof updateControlUISettingsUsername>>)+ render(<ControlSettingsPanel />)++ await screen.findByText('admin')+ fireEvent.click(within(accountRow('Username')).getByRole('button', { name: 'Edit' }))+ fireEvent.change(screen.getByLabelText('Username'), { target: { value: 'new-admin' } })+ fireEvent.click(screen.getByRole('button', { name: 'Save' }))++ expect(await screen.findByRole('alert')).toHaveTextContent('Username is already in use.')+ expect(screen.getByLabelText('Username')).toHaveValue('new-admin')++ fireEvent.click(screen.getByRole('button', { name: 'Save' }))+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ expect(mockUpdateUsername).toHaveBeenNthCalledWith(1, 'new-admin')+ expect(mockUpdateUsername).toHaveBeenNthCalledWith(2, 'new-admin')+ expect(screen.getByText('server-normalized')).toBeInTheDocument()+ expect(screen.getByText('[email protected]')).toBeInTheDocument()+ expect(checkAuth).toHaveBeenCalledTimes(1)+ })++ it('stages email selection and preserves the verification workflow on save', async () => {+ mockRequestEmailChange.mockResolvedValue({+ confirmation: {+ email: '[email protected]',+ createdAt: '2026-09-22T10:00:00.000Z',+ expiresAt: '2026-09-22T11:00:00.000Z',+ },+ } as Awaited<ReturnType<typeof requestControlUISettingsEmailChange>>)+ render(<ControlSettingsPanel />)++ await screen.findByText('[email protected]')+ fireEvent.click(within(accountRow('Email')).getByRole('button', { name: 'Edit' }))+ expect(screen.getByLabelText('Email')).toHaveValue('[email protected]')+ fireEvent.change(screen.getByLabelText('Email'), { target: { value: '[email protected]' } })+ expect(mockRequestEmailChange).not.toHaveBeenCalled()+ fireEvent.click(screen.getByRole('button', { name: 'Send confirmation' }))++ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ expect(mockRequestEmailChange).toHaveBeenCalledWith('[email protected]')+ expect(screen.getByText('[email protected]')).toBeInTheDocument()+ expect(screen.getByText('Confirmation pending for [email protected].')).toBeInTheDocument()+ expect(showToast).toHaveBeenCalledWith('Confirmation email sent.', { tone: 'success' })+ })+})diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex f00f3900c..2f7f229cf 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.608",+ "version": "0.1.609","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.608",+ "version": "0.1.609","dependencies": {"@clerum/display-field": "file:../packages/display-field","@clerum/frontend-components": "file:../packages/frontend-components",diff --git a/control-ui/package.json b/control-ui/package.jsonindex fb19480cd..38857b5dc 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.608",+ "version": "0.1.609","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",