Merge branch 'main' into dashboard-review

Author: Francesca-Bit

package-lock.json

@@ -5,7 +5,7 @@
     "./packages/react-worker",
     "./packages/tdb-react-layout",
     "./packages/tdb-access-control-component",
-    "./packages/tdb-dashboard",
-    "../terminusdb-documents-ui/src/index.js"
+    "./packages/tdb-documents-ui",
+    "./packages/tdb-dashboard"
   ]
 }

package.json

@@ -151,6 +151,7 @@ export const AccessControlDashboard = (clientAccessControl)=>{
         return checkDBManagmentAccess(COMMIT_WRITE_ACCESS)
     }
 
+    // to be review maybe not put here but only in the hook 
     const getRolesList = () =>{
         return __rolesList
     }

packages/tdb-access-control-component/src/accessControlDashboard.js

@@ -8,11 +8,11 @@ import { RoleListModal } from "./RoleList"
 //create user if do not exists and add to team
 export const ManageUserCapabilityModal = ({showModal, setShowModal, team, parentRole, currentRoleToUpdate, accessControlDashboard,options,updateTable}) => {
     if(!accessControlDashboard) return ""
-    const {successMessage,createUserRole,updateUserRole,rolesList,
+    const {successMessage,createUserRole,updateUserRole,
           loading,
           errorMessage} =  AccessControlHook(accessControlDashboard,options)
 
-    const roles = rolesList
+    const roles = accessControlDashboard.getRolesList()
 
     const changeUserRole = (userRoles) =>{
         //alert(role)

packages/tdb-access-control-component/src/roles/ManageUserCapabilityModal.js

@@ -1,7 +1,7 @@
 import React, {useState, useEffect} from "react"
 import {WOQLClientObj} from '../init-woql-client'
 import {MenuItem, SubMenu} from 'react-pro-sidebar'
-import 'react-pro-sidebar/dist/css/styles.css'
+import 'react-pro-sidebar/dist/css/styles.css' 
 import {QueryPaneObj} from "../hooks/queryPaneContext"
 //import {DatabaseInfoControl} from "../hooks/DatabaseInfoControl" 
 import {getPropertiesOfClass, getPropertyRelation, getDocumentClasses} from '../queries/GeneralQueries'
@@ -52,6 +52,7 @@ export const DataProductDocuments = () => {
 
 
     async function handleClassClick (id) {
+        
         try{
             let db=woqlClient.db()
             const result = await woqlClient.getSchemaFrame(id, db)
@@ -71,6 +72,7 @@ export const DataProductDocuments = () => {
 
     useEffect(() => { // get count of document classes
         if(!documentClasses) return 
+        console.log(" i enter here ")
         let q=getCountOfDocumentClass(documentClasses)
         setQuery(q)
     }, [documentClasses])
@@ -187,10 +189,7 @@ export const DocumentExplorerDocuments = () => {
                     title={`View documents of type ${item["@id"]}`}
                     onClick={(e) => handleClassClick(item["@id"])}
                     disabled={disabled}>
-                    
-                        
                         <span className="text-gray">{item["@id"]}</span>
-                        
                 </Button>
                 {actionControl.write && <Button 
                     className="btn-create-document pro-item-content btn-sm" 

packages/tdb-dashboard/src/components/DataProductDocuments.js

@@ -130,6 +130,7 @@ export const DocumentFrames = () => {
     //console.log("documentObject", documentObject.message)
 
     //console.log("refreshedDocumentObject in doc frame", documentObjectWithFrames)
+    
     if(loading) return <Loading message={`Fetching frames ...`} type={PROGRESS_BAR_COMPONENT}/>
 
     return <main className="content mr-3 ml-5 w-100">

packages/tdb-dashboard/src/components/DocumentFrames.js

@@ -78,7 +78,7 @@ export const DocumentInfo = () => {
     }
 
     function onTraverse(clicked) {
-        console.log("clicked", clicked)
+       
         var previous = []
         if(Array.isArray(documentObject.previous)) {
             previous = documentObject.previous

packages/tdb-dashboard/src/components/DocumentInfo.js

@@ -20,7 +20,6 @@ import {DocumentControlObj} from '../hooks/DocumentControlContext'
 
 export const DocumentSummary = () => {
 
-
     const {dataProduct,organization} = useParams()
 
     const getUrl = (pageName)=> {

packages/tdb-dashboard/src/components/DocumentSummary.js

@@ -82,7 +82,13 @@ export const DocumentView = () => {
         if(documentClasses){
             setBarLoading(false)
         }
-    }, [documentClasses])
+    }, [documentClasses]) 
+
+    /*useEffect(() => {
+        if(!perDocumentCount) return 
+        if(!documentClasses) return 
+        setBarLoading(false)
+    }, [documentObjectWithFrames.update])*/
 
     useEffect(() => {
         setBarLoading(true)
@@ -110,6 +116,7 @@ export const DocumentView = () => {
 
     function extractDocuments(documentResults) {
         var extractedResults=[]
+        
         documentResults.map(item=> {
             var newJson={}
             for(var key in item){
@@ -124,15 +131,18 @@ export const DocumentView = () => {
                         newJson[key]=newArray
                     }
                 }
-                else if(item[key]["@id"]){ // object
-                    newJson[key]=item[key]["@id"]
+                else if(typeof item[key] === "object"){
+                    if(item[key].hasOwnProperty("@id")){ // object - we do not display sys json data as part of table
+                        newJson[key]=item[key]["@id"]
+                    }
                 }
                 else {
                     newJson[key]=item[key]
                 }
             }
             extractedResults.push(newJson)
         })
+        //console.log("extractedResults", extractedResults)
         return extractedResults
     }
 
@@ -188,7 +198,6 @@ export const DocumentView = () => {
         })
     }
 
-
     if(barloading){
         var message
         if(!documentObjectWithFrames.action) message = `Fetching documents of ${dataProduct}`
@@ -197,8 +206,6 @@ export const DocumentView = () => {
         return <Loading message={message}/>
     }
 
-    //console.log("documentResults", documentResults)
-
     if(!actionControl.read && !actionControl.write) {
         // info reader access control
         return <React.Fragment>
@@ -286,6 +293,7 @@ export const DocumentView = () => {
                 documentObjectWithFrames.update &&
                 <DocumentFrames/>}
 
+
         </Row>
     </React.Fragment>
 

packages/tdb-dashboard/src/components/DocumentView.js

@@ -110,7 +110,8 @@ export const UserMenu = ({organization}) => {
                 </Dropdown.Item>
             </Dropdown.Menu>
         </Dropdown>
-        {displayUserRoles()}
+        {displayUserRoles(TEAM_USER_ROLES)}
+        {displayUserRoles(DB_USER_ROLES)}
     </React.Fragment>
 }