Merge branch 'newDoc' of https://github.com/terminusdb/terminusdb-dashboard into newDoc

Author: Francesca-Bit

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

@@ -182,7 +182,7 @@ export const useTDBDocuments = (woqlClient) => {
             return true
         }catch(err){
             //display conflict
-            setSelectedDocument(jsonDoc)
+            setSelectedDocument(jsonDocument)
             setError(err.data || {message:err.message})
        }finally{setLoading(false)}
     }

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

@@ -151,14 +151,13 @@ const assignDepth = (data, depth = 0 , propertyLink) => {
     depth += 1
     return assignDepth(data[propertyLink], depth, propertyLink)
   }
-  return depth
+  return depth 
 };
 
 function getAction (formData, unfoldable) {
   if(!formData) return false
-  if(unfoldable && 
-    typeof formData === CONST.OBJECT_TYPE) return CONST.LINK_NEW_DOCUMENT
-  return CONST.LINK_EXISTING_DOCUMENT
+  if(typeof formData === CONST.STRING_TYPE) return CONST.LINK_EXISTING_DOCUMENT
+  return CONST.LINK_NEW_DOCUMENT
 }
 
 const EditHelper = ({ linked_to, cardKey, setDeleteLink, clickedUnlinked }) => {

packages/tdb-documents-ui/src/widgets/oneOfDocumentsWidget.js

@@ -168,7 +168,7 @@ function getSelected(oneOfDocumentData, oneOf) {
   }
   return false
 }
-
+ 
 export const TDBOneOfDocuments = ({ args, props, property, id, setOneOfDocumentData, oneOfDocumentData }) => { 
 
   let { documentFrame, mode } = args