fixinf starwars and formdata appearance from create and edit view

Author: KittyJose

packages/tdb-dashboard/src/pages/DocumentEdit.js

@@ -16,7 +16,7 @@ export const DocumentEdit = () => {
     const [showModal, setShowModal] = useState(false) 
     const {type, docid} = useParams()
     const navigate = useNavigate()
-    
+     
     const {
         updateDocument,
         getDocument,

packages/tdb-dashboard/src/pages/DocumentNew.js

@@ -19,7 +19,8 @@ export const DocumentNew = () => {
         error,
         setError,
         getDocumentFrames,
-        createDocument
+        createDocument, 
+        formData
     } = useTDBDocuments(woqlClient)
     const navigate = useNavigate()
 
@@ -51,11 +52,12 @@ export const DocumentNew = () => {
             {showModal && <CreateChangeRequestModal showModal={showModal} type={type}  setShowModal={setShowModal}  updateViewMode={setChangeRequestBranch}/>}
             {error && <ErrorMessageReport error={error} setError={setError}/>}
             {currentChangeRequest &&  frames &&  
-                <NewDocumentComponent
+                <NewDocumentComponent 
                     SearchComponent={DocumentSearchComponent}
                     frames={frames}
                     createDocument={callCreateDocument}
                     type={type}
+                    jsonContent={formData}
                     closeButtonClick={closeButtonClick}
                 />     
             }

packages/tdb-documents-ui-template/src/EditDocumentComponent.js

@@ -43,7 +43,7 @@ export const EditDocumentComponent = ({type,updateDocument,selectedDocument,fram
             <FrameViewer frame={frames}
                 type={type}
                 mode={CONST.EDIT_DOCUMENT}
-                onSubmit={updateDocument}
+                onSubmit={updateDocument} 
                 //onChange={handleChange}
                 language={selectedLanguage}
                 {...onSelect}  

packages/tdb-documents-ui-template/src/NewDocumentComponent.js

@@ -38,7 +38,7 @@ export const NewDocumentComponent = ({type,createDocument,jsonContent,frames,clo
                 <JsonFrameViewer jsonData={jsonContent} mode={CONST.CREATE_DOCUMENT} setExtracted={createDocument}/>
             }
             {view === CONST.FORM_VIEW && 
-            <FrameViewer frame={frames}
+            <FrameViewer frame={frames} 
                     type={type}
                     mode={CONST.CREATE_DOCUMENT}
                     language={selectedLanguage}

packages/tdb-documents-ui/src/components/CreateDocumentLink.js

@@ -15,13 +15,11 @@ import { documentInternalProperties } from "../helpers/documentHelpers"
 // display based on action  
 const DisplayLinkFrame = ({ reference, args, linkPropertyComment, formData, order_by, onSelect, propertyDocumentation, documentData, cardKey, setDocumentData, action, onChange, documentLinkPropertyName, extracted, required, mode, linked_to, linkId }) => {
 
-  let nextCreateLink =  false
-
   if(action === CONST.LINK_NEW_DOCUMENT) {
 
     let fields = []
 
-    function handleChange(data, fieldName, b_boxField) { 
+    function handleChange(data, fieldName, b_boxField, fieldLink) { 
       //console.log("documentData", documentData)
       let tempDocumentData = documentData
 
@@ -97,9 +95,9 @@ const DisplayLinkFrame = ({ reference, args, linkPropertyComment, formData, orde
         // if field name is undefined
         // at this point means that its the document link's data 
         // so we pass linked_to as param
-        // nextCreateLink stores the next link 
+        // fieldLink stores the next link 
         //tempDocumentData[fieldName ? fieldName : documentLinkPropertyName]=data
-        tempDocumentData[fieldName ? fieldName : nextCreateLink]=data
+        tempDocumentData[fieldName ? fieldName : fieldLink]=data
         setDocumentData(tempDocumentData)
         if(onChange) {
           if(CONST.GEOMETRY_ARRAY.includes(fieldName)) onChange(tempDocumentData, fieldName)
@@ -116,8 +114,6 @@ const DisplayLinkFrame = ({ reference, args, linkPropertyComment, formData, orde
       linked_to = definitions.properties[field][CONST.PLACEHOLDER]
       // if field is a document link then @placeholder will point to linked document at this point
       if(util.availableInReference(reference, linked_to))  {
-        // store the field name here to connect to correct changed data on create
-        nextCreateLink =  field  
         // another document link 
         fields.push(<CreateDocument name={field} 
           linked_to={linked_to}
@@ -131,9 +127,9 @@ const DisplayLinkFrame = ({ reference, args, linkPropertyComment, formData, orde
           depth={cardKey}
           reference={reference}
           extracted={definitions}
-          onChange={handleChange}
+          onChange={(data, fieldName, b_boxField) => handleChange(data, fieldName, b_boxField, field) }
           linkPropertyComment={linkPropertyComment}
-          required={required} />)
+          required={definitions.required.includes(field)} />)
       }
       else { 
         // internal properties

packages/tdb-documents-ui/src/components/EditDocumentLink.js

@@ -22,15 +22,14 @@ const DisplayFilledFrame = ({ args, documentData, propertyDocumentation, onTrave
   if(action === CONST.LINK_NEW_DOCUMENT) {
 
     let fields = []
-    let nextCreateLink =  false
 
-    function handleChange(data, fieldName) {
+    function handleChange(data, fieldName, field) {
       let tempDocumentData = documentData
       // if field name is undefined
       // at this point means that its the document link's data 
       // so we pass linked_to as param
       //tempDocumentData[fieldName ? fieldName : documentLinkPropertyName]=data
-      tempDocumentData[fieldName ? fieldName : nextCreateLink]=data
+      tempDocumentData[fieldName ? fieldName : field]=data
       setDocumentData(tempDocumentData)
       if(onChange) onChange(tempDocumentData) 
       setUpdate(Date.now())
@@ -45,7 +44,6 @@ const DisplayFilledFrame = ({ args, documentData, propertyDocumentation, onTrave
       linked_to = definitions.properties[field][CONST.PLACEHOLDER]
       if(util.availableInReference(reference, linked_to)) {
         if(!formData.hasOwnProperty(field)) {
-          nextCreateLink =  field  
           fields.push(<CreateDocument name={field} 
           linked_to={linked_to}
           mode={mode}
@@ -56,14 +54,13 @@ const DisplayFilledFrame = ({ args, documentData, propertyDocumentation, onTrave
           onSelect={onSelect}
           reference={reference}
           extracted={extracted}
-          onChange={handleChange}
+          onChange={(data, fieldName) => handleChange(data, fieldName, field)}
           //comment={comment}  // review
           required={required} />) 
         }
         else {
-          nextCreateLink =  field  
           fields.push(<EditDocument name={field} 
-            onChange={handleChange}
+            onChange={(data, fieldName) => handleChange(data, fieldName, field)}
             linked_to={linked_to}
             mode={mode}
             clickedUnlinked={clickedUnlinked}

packages/tdb-documents-ui/src/hook/useTDBDocuments.js

@@ -22,6 +22,9 @@ export const useTDBDocuments = (woqlClient) => {
     // bool|Object
     const [frames, setFrames]=useState(false)
 
+    // store the state of formData  entered by the user
+    const [formData, setFormData]= useState()
+
     //get all the Document Classes (no abstract or subdocument)
     // I can need to call this again
     // improve performance with check last commit
@@ -116,6 +119,7 @@ export const useTDBDocuments = (woqlClient) => {
             const res = await woqlClient.addDocument(jsonDocument)
             return res
         }catch(err){ 
+            setFormData(jsonDocument)
             setError(err.data || {message:err.message})
         }finally{
             setLoading(false)
@@ -166,12 +170,14 @@ export const useTDBDocuments = (woqlClient) => {
         }
         catch(err){
             //display conflict
+            setSelectedDocument(jsonDoc)
             setError(err.data || {message:err.message})
        }finally{setLoading(false)}
     }
 
     return {
             setError,
+            formData, 
             selectedDocument,
             getDocument,
             deleteDocument,