Skip to content

Fix disableClear bug in Transit IP form; don't add duplicate IPs to list #2480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
charliepark wants to merge 1 commit into from
Closed

Fix disableClear bug in Transit IP form; don't add duplicate IPs to list #2480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions app/forms/network-interface-edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,16 @@ export function EditNetworkInterfaceForm({
const form = useForm({ defaultValues })
const transitIps = form.watch('transitIps') || []

const transitIpsForm = useForm({ defaultValues: { transitIp: '' } })
const addTransitIpForm = useForm({ defaultValues: { transitIp: '' } })
const addTransitIpFieldValue = addTransitIpForm.watch('transitIp').trim()

const submitTransitIp = () => {
const transitIp = transitIpsForm.getValues('transitIp')
if (!transitIp) return
form.setValue('transitIps', [...transitIps, transitIp])
transitIpsForm.reset()
if (!addTransitIpFieldValue) return
// only add the IP if it isn't already in the list of transit IPs
if (!transitIps.includes(addTransitIpFieldValue)) {
form.setValue('transitIps', [...transitIps, addTransitIpFieldValue])
}
addTransitIpForm.reset()
}

return (
Expand Down Expand Up @@ -100,7 +103,7 @@ export function EditNetworkInterfaceForm({
<TextFieldInner
id="transitIp"
name="transitIp"
control={transitIpsForm.control}
control={addTransitIpForm.control}
onKeyDown={(e) => {
if (e.key === KEYS.enter) {
e.preventDefault() // prevent full form submission
Expand All @@ -111,8 +114,8 @@ export function EditNetworkInterfaceForm({
</div>
<MiniTable.ClearAndAddButtons
addButtonCopy="Add Transit IP"
disableClear={!!transitIpsForm.formState.dirtyFields.transitIp}
onClear={transitIpsForm.reset}
disableClear={!addTransitIpFieldValue}
onClear={() => addTransitIpForm.reset({ transitIp: '' })}
onSubmit={submitTransitIp}
/>
</div>
Expand Down