Skip to content
Snippets Groups Projects
Commit c7ed86f7 authored by Ben Whitmore's avatar Ben Whitmore
Browse files

fix(form-builder): fix page crash on form deletion

Closes #42
parent f6d37ad8
No related branches found
No related tags found
No related merge requests found
...@@ -53,6 +53,7 @@ const FormBuilderLayout = ({ ...@@ -53,6 +53,7 @@ const FormBuilderLayout = ({
key="delete-form" key="delete-form"
onClick={e => { onClick={e => {
e.preventDefault() e.preventDefault()
e.stopPropagation()
deleteForm({ deleteForm({
variables: { formId: form.id }, variables: { formId: form.id },
}) })
...@@ -93,7 +94,8 @@ const FormBuilderLayout = ({ ...@@ -93,7 +94,8 @@ const FormBuilderLayout = ({
<Columns> <Columns>
<Form> <Form>
<Tabs <Tabs
activeKey={`${activeFormId}`} activeKey={activeFormId ?? 'new'}
key={activeFormId}
onChange={tab => { onChange={tab => {
setActiveFormId(tab) setActiveFormId(tab)
setActiveFieldId(null) setActiveFieldId(null)
......
...@@ -69,7 +69,7 @@ const FormBuilderPage = () => { ...@@ -69,7 +69,7 @@ const FormBuilderPage = () => {
useEffect(() => { useEffect(() => {
if (!loading && data) { if (!loading && data) {
if (data.getForms.length) { if (data.getForms.length) {
setActiveFormId(data.getForms[0].id) setActiveFormId(prevFormId => prevFormId ?? data.getForms[0].id)
} else { } else {
setActiveFormId('new') setActiveFormId('new')
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment