Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions frontend/src/components/settings/OpenCodeModelDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useForm } from 'react-hook-form'
import { zodResolver } from '@hookform/resolvers/zod'
import { z } from 'zod'
import { useCallback, useEffect, useMemo } from 'react'
import { useCallback, useEffect, useMemo, useRef } from 'react'
import { Button } from '@/components/ui/button'
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog'
import { Input } from '@/components/ui/input'
Expand Down Expand Up @@ -248,13 +248,23 @@ export function OpenCodeModelDialog({
const { isValid } = form.formState
const createNewProvider = form.watch('createNewProvider')
const newProviderType = form.watch('newProviderType')
const resetKeyRef = useRef<string | null>(null)
const resetKey = editingModel
? `edit-${editingModel.providerId}-${editingModel.modelId}`
: `create-${selectedProviderId || availableProviders[0] || ''}`

useEffect(() => {
if (open) {
if (!open) {
resetKeyRef.current = null
return
}

if (resetKeyRef.current !== resetKey) {
resetKeyRef.current = resetKey
form.reset(getDefaultValues())
void form.trigger()
}
}, [open, form, getDefaultValues])
}, [open, resetKey, form, getDefaultValues])

const handleSubmit = (values: ModelFormValues) => {
const extra = parseOptionalJsonField(values.extraJson)
Expand Down
23 changes: 23 additions & 0 deletions frontend/src/components/settings/OpenCodeModelsEditor.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,29 @@ describe('OpenCodeModelDialog', () => {
expect(screen.getByText(/must use only letters, numbers/i)).toBeInTheDocument()
})
})

it('should preserve create form values when provider props refresh', async () => {
const { OpenCodeModelDialog } = await import('./OpenCodeModelDialog')
const props = {
...defaultProps,
availableProviders: ['openai'],
existingProviders: { openai: { name: 'OpenAI' } },
}
const { rerender } = render(<OpenCodeModelDialog {...props} />)

const modelIdInput = document.querySelector('input[name="modelId"]') as HTMLInputElement
fireEvent.change(modelIdInput, { target: { value: 'gpt-5' } })

rerender(
<OpenCodeModelDialog
{...props}
availableProviders={['openai']}
existingProviders={{ openai: { name: 'OpenAI' } }}
/>
)

expect(modelIdInput).toHaveValue('gpt-5')
})
})

describe('form submission', () => {
Expand Down