From 8b6e2f146c74709ac968a68c3a9c2db402b0f403 Mon Sep 17 00:00:00 2001
From: Ben Whitmore <ben.whitmore0@gmail.com>
Date: Tue, 13 Apr 2021 13:32:01 +1200
Subject: [PATCH] fix(form-builder): empty rich text fields should not show
'undefined'
Resolves #165.
---
.../src/components/ComponentProperties.js | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/components/component-formbuilder/src/components/ComponentProperties.js b/app/components/component-formbuilder/src/components/ComponentProperties.js
index ca7debe703..b584d81eb7 100644
--- a/app/components/component-formbuilder/src/components/ComponentProperties.js
+++ b/app/components/component-formbuilder/src/components/ComponentProperties.js
@@ -41,7 +41,11 @@ const ComponentProperties = ({
{selectedComponent &&
map(components[selectedComponent], (value, key) => (
<Section key={key}>
- <Legend space>{`Field ${key === 'DoiValidation' ? components[selectedComponent][key].props.label : key}`}</Legend>
+ <Legend space>{`Field ${
+ key === 'DoiValidation'
+ ? components[selectedComponent][key].props.label
+ : key
+ }`}</Legend>
<ValidatedFieldFormik
component={elements[value.component].default}
key={`${selectedComponent}-${key}`}
@@ -116,7 +120,11 @@ const ComponentForm = ({
if (!isField)
return (
<Formik
- initialValues={fieldOrForm}
+ initialValues={{
+ description: '',
+ popupdescription: '',
+ ...fieldOrForm,
+ }}
onSubmit={values =>
updateForm({
variables: { formId: values.id, form: prepareForSubmit(values) },
@@ -135,7 +143,7 @@ const ComponentForm = ({
return (
<Formik
- initialValues={{ options: [], ...fieldOrForm }}
+ initialValues={{ options: [], description: '', ...fieldOrForm }}
key={fieldOrForm.id}
onSubmit={values =>
updateField({
--
GitLab