#106 Fix issue with initialValues on edit

mitaai · Dec 30, 2020 · 97aba77 · 97aba77
1 parent 72afe57
commit 97aba77
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/components/DocumentForm/DocumentForm.js b/src/components/DocumentForm/DocumentForm.js
@@ -280,12 +280,19 @@ const DocumentForm = ({
     ? useState(deserializeHTMLToDocument({ plugins, element: txtHtml.body }))
     : useState(slateInitialValue);
 
-  const getInitialValues = (mode === 'edit' && data && (!data.uploadContentType || data.uploadContentType === ''))
-    ? {
-      ...data,
-      textSlate: deserializeHTMLToDocument({ plugins, element: txtHtml.body }),
+  let initialValues = {};
+
+  if (mode === 'edit' && data) {
+    if (!data.uploadContentType || data.uploadContentType === '') {
+      initialValues = {
+        ...data,
+        textSlate: deserializeHTMLToDocument({ plugins, element: txtHtml.body }),
+      };
+    } else {
+      initialValues = data;
     }
-    : {
+  } else {
+    initialValues = {
       textSlate: slateInitialValue,
       resourceType: 'Book',
       rightsStatus: 'Copyrighted',
@@ -294,6 +301,7 @@ const DocumentForm = ({
       groups: [],
       state: 'draft',
     };
+  }
 
   const schema = yup.object({
     title: yup.string().required('Required'),
@@ -337,7 +345,7 @@ const DocumentForm = ({
         }, 1000);
       }}
       validationSchema={schema}
-      initialValues={getInitialValues}
+      initialValues={initialValues}
       enableReinitialize
     >
       {(props) => (