Merge pull request #49 from terminusdb/dashboard-review

reviewgraph

Author: Francesca-Bit

package-lock.json

@@ -30,9 +30,9 @@ module.exports = {
   resolve: {
     alias: {
       "@terminusdb/terminusdb-access-control-component": path.join(__dirname, '..', 'src/index.js'),
-      "@terminusdb/terminusdb-client": path.resolve('../terminusdb-client/index.js'),
-      "@terminusdb/terminusdb-react-table": path.resolve('../terminusdb-react-table/src/index.js'),
-      react: path.resolve('./node_modules/react')
+      "@terminusdb/terminusdb-client": path.resolve('../../../terminusdb-client/index.js'),
+      "@terminusdb/terminusdb-react-table": path.resolve('../../../terminusdb-react-table/src/index.js'),
+      react: path.resolve('../../node_modules/react')
     },
     extensions: ['.js', '.jsx', '.json', '.css'],
   },

packages/tdb-access-control-component/demo/webpack.config.js

@@ -64,9 +64,16 @@ export const DocumentFrames = () => {
     }, [documentObject.frames])
 
 
+    const checkIfPrefix =(id)=>{
+        if(id.indexOf(":")>-1){
+            return id
+        }
+        return "@schema:"+id
+    }
+
     const onSelect = async (inp, type) => {
         let WOQL =  TerminusClient.WOQL
-        var docType=`@schema:${type}`
+        var docType=checkIfPrefix(type)
         let q = WOQL.isa("v:Documents", docType)
         const results = await q.execute(woqlClient)
         .then((response) => {

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

@@ -46,7 +46,7 @@ export const UserMenu = ({organization}) => {
                     <Button size="sm" className="bg-transparent border-0">
                     {clientUser.email}
                     </Button>
-                    <Dropdown.Toggle split className="bg-transparent border-0" vairant="info" id="profile_menu_arrow">
+                    <Dropdown.Toggle split className="bg-transparent border-0" id="profile_menu_arrow">
                     </Dropdown.Toggle>
                     <Dropdown.Menu >
                        {clientUser.user === "admin" && <Dropdown.Item>
@@ -76,7 +76,7 @@ export const UserMenu = ({organization}) => {
                         className="nav__main__profile__img"
                         width="50"/>
                 </Button>
-                <Dropdown.Toggle split className="bg-transparent border-0" vairant="info" id="profile_menu_arrow">
+                <Dropdown.Toggle split className="bg-transparent border-0"  id="profile_menu_arrow">
                 </Dropdown.Toggle>
                 <Dropdown.Menu >
                 {organization && <Dropdown.Item>

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

@@ -83,7 +83,7 @@ export const DocumentControlProvider = ({children}) => {
         }
     }, [documentObject.update])
 
-    // on click of submit on create or edit
+
     useEffect(() => {
         if(!documentObject.submit) return
         if(!Object.keys(documentObject.frames)) return

packages/tdb-dashboard/src/hooks/DocumentControlContext.js

@@ -20,7 +20,7 @@ export const getDocumentClasses = (dataProduct) => {
 
 export const getDocsTypeQuery=(type)=>{
     let WOQL =  TerminusClient.WOQL
-    var docType=`@schema:${type}`
+    var docType=checkIfPrefix(type)
     let q = WOQL.isa("v:Documents", docType)
     return q
 }
@@ -220,12 +220,18 @@ export const getDocumentsOfType = (doctype) => {
     ).sub(doctype, "v:Type ID")
 }*/
 
+const checkIfPrefix =(id)=>{
+    if(id.indexOf(":")>-1){
+        return id
+    }
+    return "@schema:"+id
+}
 // get count of document class instance
 export const getCountOfDocumentClass = (documentClasses) => {
     let WOQL =  TerminusClient.WOQL
     let CountArray=[]
     documentClasses.map(item => { // set type of document
-        let scmType="@schema:"+item["@id"]
+        let scmType=checkIfPrefix(item["@id"])
         let variable="v:"+item["@id"]
         CountArray.push(WOQL.count (variable, WOQL.triple("v:Doc", "rdf:type", scmType)))
     })
@@ -239,15 +245,12 @@ export const getTotalNumberOfDocuments = (documentClasses) => {
     let CountArray=[]
     let variableList = []
     documentClasses.map(item => { // set type of document
-        let scmType="@schema:"+item["@id"]
+        let scmType= checkIfPrefix(item["@id"])
         let variable="v:"+item["@id"]
         variableList.push(variable)
         CountArray.push(WOQL.count (variable, WOQL.triple("v:Doc", "rdf:type", scmType)))
     })
 
     let q = WOQL.and(...CountArray, WOQL.sum(variableList, "v:Count"))
     return q
-}
-
-
-//triple("v:Doc", "rdf:type", "@schema:Organization").triple("v:Doc", "v:Properties", "v:Value")
+}

packages/tdb-dashboard/src/queries/GeneralQueries.js

@@ -4,21 +4,62 @@ export const JSON_TYPE="object"
 export const NUMBER_TYPE="number"
 export const BOOLEAN_TYPE="boolean"
 export const DATE_TYPE="string"
+export const RDF_DATA_TYPE_PREFIX = "rdf:"
 export const XSD_DATA_TYPE_PREFIX = "xsd:"
 export const XDD_DATA_TYPE_PREFIX = "xdd:"
 export const SYS_UNIT_TYPE_PREFIX = "sys:"
-export const XSD_STRING="xsd:string";;
+export const XSD_STRING="xsd:string"
 export const XSD_ANY_URI="xsd:anyURI"
+export const XSD_NMTOKEN="xsd:NMTOKEN" // XML NMTOKENs
+export const XSD_NAME="xsd:Name" // XML Names
+export const XSD_NCNAME="xsd:NCName" // XML NCNames
 export const XDD_URL="xdd:url"
-export const XSD_FLOAT="xsd:float"
+export const XSD_NORMALIZED_STRING="xsd:normalizedString"
+export const XSD_LANGUAGE="xsd:language"
+export const RDF_LANGSTRING ="rdf:langString"
+
+//Encoded binary data
+export const XSD_HEXBINARY="xsd:hexBinary" //Hex-encoded binary data
+export const XSD_BASE64BINARY="xsd:base64Binary" //Base64-encoded binary data
+
+// Limited-range integer numbers
+export const XSD_BYTE =  "xsd:byte" //  -128…+127 (8 bit) 
+export const XSD_SHORT = "xsd:short" //    -32768…+32767 (16 bit) 
+export const XSD_INT =  "xsd:int" //   -2147483648…+2147483647 (32 bit) |
+export const XSD_LONG = "xsd:long" //    -9223372036854775808…+9223372036854775807 (64 bit) |
+export const XSD_UNSINGNEDBYTE =  "xsd:unsignedByte"//    0…255 (8 bit) |
+export const XSD_UNSIGNEDSHORT = "xsd:unsignedShort" //|    0…65535 (16 bit) |
+export const XSD_UNSIGNEDINT = "xsd:unsignedInt" //|    0…4294967295 (32 bit) |
+export const XSD_UNSIGNEDLONG = "xsd:unsignedLong"// |    0…18446744073709551615 (64 bit) |
+export const XSD_POSITIVE_INTEGER="xsd:positiveInteger" // |    Integer numbers >0 |
+export const XSD_NONNEGATIVEINTEGER = "xsd:nonNegativeInteger" // |    Integer numbers ≥0 |
+export const XSD_NEGATIVEINTEGER = "xsd:negativeInteger" // |    Integer numbers <0 |
+export const XSD_NONPOSITIVEINTEGER = "xsd:nonPositiveInteger" //Integer numbers ≤0
+
+
 export const XSD_DECIMAL="xsd:decimal"
-export const XSD_POSITIVE_INTEGER="xsd:positiveInteger"
+export const XSD_DOUBLE = "xsd:double"
+export const XSD_FLOAT= "xsd:float "
+
 export const XSD_INTEGER="xsd:integer"
 export const XSD_DATE_TIME="xsd:dateTime"
+export const XSD_DATE_TIMESTAMP="xsd:dateTimeStamp"
 export const XSD_G_YEAR= "xsd:gYear"
+export const XSD_TIME= "xsd:time"
+export const XSD_G_YEAR_MONTH= "xsd:gYearMonth"
+export const XSD_G_YEAR_MONTH_DURACTION= "xsd:yearMonthDuration"
+export const XSD_G_DAY_TIME_DURACTION= "xsd:dayTimeDuration"
+
+export const XSD_G_MONTH= "xsd:gMonth"
+export const XSD_G_MONTH_DAY= "xsd:gMonthDay"
+export const XSD_G_DAY= "xsd:gDay"
+export const XSD_TIME_DURATION= "xsd:duration"
 export const XSD_DATE= "xsd:date"
 export const XSD_BOOLEAN="xsd:boolean"
-export const XSD_LANGUAGE="xsd:language"
+
+
+
+//rdf:langString
 
 export const SYS_JSON_TYPE="sys:JSON"
 

packages/tdb-documents-ui/src/constants.js

@@ -1,26 +1,7 @@
 import React from "react"
 import {Form} from "react-bootstrap"
 import Stack from 'react-bootstrap/Stack'
-import {
-    XSD_STRING,
-    XSD_DECIMAL,
-    XSD_DATE_TIME,
-    XSD_BOOLEAN,
-    XSD_INTEGER,
-    XSD_ANY_URI,
-    STRING_TYPE,
-    SYS_JSON_TYPE,
-    NUMBER_TYPE,
-    BOOLEAN_TYPE, 
-    DATE_TYPE,
-    JSON_TYPE,
-    XSD_G_YEAR,
-    XSD_DATE,
-    XDD_URL, 
-    XSD_FLOAT,
-    XSD_LANGUAGE,
-    XSD_POSITIVE_INTEGER
-} from "../constants"
+import * as DATATYPE from "../constants"
 
 
 // function to provide a ui widget to date
@@ -66,21 +47,47 @@ export function getURIUIWidget(title) {
     return uiLayout
 }
 
+const matchType ={
+    [DATATYPE.XSD_STRING] : DATATYPE.STRING_TYPE,
+    [DATATYPE.XSD_ANY_URI] : DATATYPE.STRING_TYPE,
+    [DATATYPE.XSD_LANGUAGE] : DATATYPE.STRING_TYPE,
+    [DATATYPE.RDF_LANGSTRING] :DATATYPE.STRING_TYPE,
+    [DATATYPE.XDD_URL] : DATATYPE.STRING_TYPE,
+    [DATATYPE.XSD_NAME] : DATATYPE.STRING_TYPE,
+    [DATATYPE.XSD_NCNAME] : DATATYPE.STRING_TYPE,
+    [DATATYPE.XSD_NMTOKEN] : DATATYPE.STRING_TYPE,
+    [DATATYPE.XSD_NORMALIZED_STRING] :DATATYPE.STRING_TYPE,
+
+    [DATATYPE.SYS_JSON_TYPE] : DATATYPE.JSON_TYPE,
+
+    [DATATYPE.XSD_BYTE] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_SHORT] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_INT] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_LONG] : DATATYPE.NUMBER_TYPE,
+
+    [DATATYPE.XSD_DOUBLE] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_FLOAT] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_POSITIVE_INTEGER] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_NONPOSITIVEINTEGER] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_NONNEGATIVEINTEGER] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_NEGATIVEINTEGER] : DATATYPE.NUMBER_TYPE,
+
+    [DATATYPE.XSD_DECIMAL] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_INTEGER] : DATATYPE.NUMBER_TYPE,
+
+    [DATATYPE.XSD_UNSINGNEDBYTE] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_UNSIGNEDSHORT] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_UNSIGNEDINT] : DATATYPE.NUMBER_TYPE,
+    [DATATYPE.XSD_UNSIGNEDLONG] : DATATYPE.NUMBER_TYPE,
+
+    [DATATYPE.XSD_BOOLEAN] : DATATYPE.BOOLEAN_TYPE,
+    [DATATYPE.XSD_DATE_TIME] : DATATYPE.DATE_TYPE,
+    [DATATYPE.XSD_G_YEAR] : DATATYPE.DATE_TYPE,
+    [DATATYPE.XSD_DATE] : DATATYPE.STRING_TYPE
+} 
 
 //get data type xsd: or xdd:
 // you can rewrite with an object
 export function getDataType(type) { 
-    if(type === XSD_STRING) return STRING_TYPE 
-    else if(type === XSD_FLOAT) return NUMBER_TYPE
-    else if(type === XSD_ANY_URI) return STRING_TYPE
-    else if(type === XSD_LANGUAGE) return STRING_TYPE
-    else if(type === XDD_URL) return STRING_TYPE
-    else if(type === SYS_JSON_TYPE) return JSON_TYPE
-    else if(type === XSD_POSITIVE_INTEGER) return NUMBER_TYPE
-    else if(type === XSD_DECIMAL) return NUMBER_TYPE
-    else if(type === XSD_INTEGER) return NUMBER_TYPE
-    else if(type === XSD_BOOLEAN) return BOOLEAN_TYPE
-    else if(type === XSD_DATE_TIME) return DATE_TYPE 
-    else if(type === XSD_G_YEAR) return DATE_TYPE 
-    else if(type === XSD_DATE) return STRING_TYPE
+    return matchType[type]
 }

packages/tdb-documents-ui/src/dataTypeFrames/widget.js

@@ -3,7 +3,8 @@ import React from "react"
 import {Button, Form} from "react-bootstrap"
 import {
 	XSD_DATA_TYPE_PREFIX, 
-	XDD_DATA_TYPE_PREFIX, 
+	XDD_DATA_TYPE_PREFIX,
+	RDF_DATA_TYPE_PREFIX, 
 	POINT_TYPE, 
 	UI_FRAME_SELECT_STYLE, 
 	UI_FRAME_SUBDOCUMENT_STYLE, 
@@ -37,10 +38,12 @@ import OverlayTrigger from 'react-bootstrap/OverlayTrigger'
 import Tooltip from 'react-bootstrap/Tooltip'
 
 // returns true for properties which are of data types xsd and xdd
+const dataTypePrefix = {[XSD_DATA_TYPE_PREFIX]:true,
+						[XDD_DATA_TYPE_PREFIX]:true,
+						[RDF_DATA_TYPE_PREFIX]:true}
 export const isDataType = (property) => {
 	if(typeof property === "object") return false
-	if(property.substring(0, 4) === XSD_DATA_TYPE_PREFIX) return true
-	if(property.substring(0, 4) === XDD_DATA_TYPE_PREFIX) return true
+	return dataTypePrefix[ property.substring(0, 4)] || false
 }
 
 export const isSysDataType = (property) => {

packages/tdb-documents-ui/src/utils.js

@@ -3,7 +3,7 @@ import React, {useState,useEffect} from 'react';
 import {WOQLGraph} from '@terminusdb/terminusdb-react-components';
 import TerminusClient from '@terminusdb/terminusdb-client'
 import person from './person-graph.json';
-import bike from './bike-journey.json';
+import bike from './bike-data.json';
 import seshat from './seshat-data.json';
 /*
 *
@@ -17,7 +17,7 @@ export const GraphApp= (props) =>{
   let resultData={};
 
 
-	const server=process.env.API_URL;
+  const server=process.env.API_URL;
   const key=process.env.API_KEY
   const db=process.env.API_DB
 
@@ -42,7 +42,10 @@ export const GraphApp= (props) =>{
       */
       //
 
-      //woqlGraphConfig.edges(["v:Start", "v:Duration"], ["v:Duration", "v:End"]).text("v:Duration")
+      woqlGraphConfig.edges(["v:Start", "v:Duration"], ["v:Duration", "v:End"]).text("v:Duration")
+     /* woqlGraphConfig.edge("v:Property Domain", "v:Property Range").size(2).text("v:Property Name").arrow({width: 50, height: 20})
+      .icon({label: true, color: [109,98,100], size: 0.8})*/
+ 
       woqlGraphConfig.node("Start").text("Start_Label").icon({label: true, color:[0,0,0]}).color([35, 132, 113]).size(30)
 
       woqlGraphConfig.node("End").text("End_Label").icon({label: true, color:[0,0,0]}).color([243, 183, 115]).size(30)
@@ -64,6 +67,10 @@ export const GraphApp= (props) =>{
 
   }else{
       resultData=person;
+      woqlGraphConfig.edge("Mother", "Person").size(2).text("Person").arrow({width: 50, height: 20})
+      .icon({label: true, color: [109,98,100], size: 0.8})
+
+
       woqlGraphConfig.node("Mother").text("Mother_Name").color([60, 219, 11])//.size(10)
 
       woqlGraphConfig.node("Mother","Mother_Name").in("motherOfMaria01").color([255, 0, 255])//.size(10)