Merge branch 'main' into add_payment

Francesca-Bit · web-flow · commit 9c8d853ff114 · 2023-02-02T11:32:40.000Z
diff --git a/packages/tdb-access-control-component/package.json b/packages/tdb-access-control-component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@terminusdb/terminusdb-access-control-component",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Table for terminusdb",
   "main": "src/index",
   "module": "es6/index",
diff --git a/packages/tdb-dashboard/package.json b/packages/tdb-dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@terminusdb-live/tdb-dashboard",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "react",
   "homepage": "./",
   "main": "src/index",
diff --git a/packages/tdb-dashboard/src/App.js b/packages/tdb-dashboard/src/App.js
@@ -39,7 +39,10 @@ export function App (props){
 
     if (clientUser.firstLogin === true) {
         clientUser.firstLogin = false
-        navigate(`/${PLANS}`)
+
+       // navigate(`/${PLANS}`)
+        window.location.replace(`/${PLANS}`) 
+
     }
 
     // this happen after confirm you password linking in the email url
diff --git a/packages/tdb-dashboard/src/clientUtils.js b/packages/tdb-dashboard/src/clientUtils.js
@@ -14,7 +14,8 @@ export function createClientUser(useAuth0,params){
         clientUser.firstLogin = user && user['http://terminusdb.com/schema/system#afterSignUp'] ? true : false 
         // the agentName is the userID
         clientUser.user = clientUser.agentName
-        clientUser.serverType = "TerminusX"
+        //clientUser.serverType = "TerminusX"
+        clientUser.serverType = "TerminusCMS"
     }catch(err){
         const lastuser = localStorage.getItem("Terminusdb-USER") //|| params.user
         clientUser = {email: lastuser } 
diff --git a/packages/tdb-dashboard/src/components/MainNavBar.js b/packages/tdb-dashboard/src/components/MainNavBar.js
@@ -30,7 +30,7 @@ export const MainNavBar = ({setShowTimeTravel}) => {
                     {dataProduct}
                 </h4>
                 <TimeTravelWidget setShowTimeTravel={setShowTimeTravel}/>
-            </React.Fragment>  
+            </React.Fragment>   
             }
             {accessControlDashboard && accessControlDashboard.createDB() && 
                 <NewDataProduct css={"btn-sm mr-1 pt-2 pr-4 pl-4 "}/>
diff --git a/packages/tdb-dashboard/src/components/ServerError.js b/packages/tdb-dashboard/src/components/ServerError.js
@@ -6,7 +6,7 @@ import { ChangeUser } from "./ChangeUser"
 
 export const ServerError = (props) => {
     const {clientUser } = WOQLClientObj()
-    const serverType = clientUser ? clientUser.serverType : "TerminusX"
+    const serverType = clientUser ? clientUser.serverType : "TerminusCMS"
 
     const gotoMainPage= ()=>{
         const base = process.env.BASE_URL ? `/${process.env.BASE_URL}` : "/"
@@ -27,7 +27,7 @@ export const ServerError = (props) => {
                     Go to Teams
                 </Button>}
                 {clientUser.connection_type !=="LOCAL" &&
-                    <a href="https://discuss.terminusdb.com/" targert="_blank">
+                    <a href="https://www.reddit.com/r/TerminusDB/" targert="_blank">
                         {`Please contact the ${serverType} Team`}
                     </a>
                 }      
diff --git a/packages/tdb-dashboard/src/components/constants.js b/packages/tdb-dashboard/src/components/constants.js
@@ -11,7 +11,7 @@ import {GrGraphQl} from "react-icons/gr"
 import {BiGitPullRequest} from "react-icons/bi"
 
 //User Messages
-export const SERVER_LOADING_MESSAGE = "Setting up TerminusX Cloud ... "
+export const SERVER_LOADING_MESSAGE = "Setting up TerminusCMS ... "
 export const SCHEMA_LOADING_MESSAGE = "The schema being loaded... "
 
 
diff --git a/packages/tdb-dashboard/src/pages/PlansPage.js b/packages/tdb-dashboard/src/pages/PlansPage.js
@@ -88,9 +88,11 @@ export const PlansPage = (props) => {
 									<Card.Text className="text-light text-left h6">
 										{arr.text}
 									</Card.Text>
+
 									<Stack direction="vertical">
 									{getLabels(arr)}
 									</Stack>
+
 								</Card.Body>
 								<Card.Footer  style={{background:arr.color}}>
 								</Card.Footer >
diff --git a/packages/tdb-dashboard/src/payment/FormPayment.js b/packages/tdb-dashboard/src/payment/FormPayment.js
@@ -204,6 +204,12 @@ const renderSuccess = () => {
                         className="border-light-01" type="email" name="email" id="email" placeholder="Email" 
                         defaultValue={props.defaultEmail} />          
                     </FormGroup>             
+
+                     <FormGroup className="mb-4">
+                      <Form.Label for="name">Company Name</Form.Label>
+                      <FormControl ref={companyName}  className="border-light-01" type="text" name="name" id="name" placeholder="Company Name" required={true} />
+                    </FormGroup>
+
                     <Row>
                         <Col >
                       <FormGroup className="mb-4">
@@ -222,10 +228,7 @@ const renderSuccess = () => {
                      <FormGroup className="mb-4">
                       <Form.Label for="address">Street Address</Form.Label>
                       <FormControl ref={address}  className="border-light-01" type="text" name="name" id="name" placeholder="Street Address" required={true} />
-                    </FormGroup> 
-                    <FormGroup className="mb-4">
-                      <Form.Label for="name">Company Name</Form.Label>
-                      <FormControl ref={companyName}  className="border-light-01" type="text" name="name" id="name" placeholder="Company Name" required={true} />
+
                     </FormGroup> 
                     <Row>
                     <Col >
diff --git a/packages/tdb-documents-ui/package.json b/packages/tdb-documents-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@terminusdb/terminusdb-documents-ui",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "SDK to build UI from terminusdb documents",
   "main": "src/index.js",
   "module": "es6/index",
diff --git a/packages/tdb-documents-ui/src/documentTypeFrames/documentTypeFrames.js b/packages/tdb-documents-ui/src/documentTypeFrames/documentTypeFrames.js
@@ -80,15 +80,20 @@ function getCreateAnyOfFrames (frame, item, exractedProperties) {
 	return anyOfFrame
 }
 
-function checkIfCycleExists(property, linked_to_frames) {
+function checkIfCycleExists(property, linked_to_frames, linked_to, docType) {
 	if(linked_to_frames.hasOwnProperty(property)) return true
+	if(linked_to && docType) {
+		// doc Type is the type of document to be displayed in <FrameViewer/>
+		// checks if linked to is same as the parent document class
+		if(linked_to === docType) return true
+	}
 	return false 
 }
 
 /** make documentation frames basaed on mode */
 export const makeDocumentTypeFrames = (args) => {
   
-    let {fullFrame, frame, item, uiFrame, documentation, mode, formData, onTraverse, onSelect}=args 
+    let {fullFrame, frame, item, uiFrame, documentation, mode, formData, onTraverse, onSelect, docType}=args 
 
     let anyOf = []
     let linked_to = frame[item]
@@ -97,7 +102,7 @@ export const makeDocumentTypeFrames = (args) => {
     let linked_to_frames=fullFrame[linked_to]  
 	let unfoldable=util.isUnfoldable(fullFrame[linked_to])
 
-	let ifCycleExists=checkIfCycleExists(item, linked_to_frames)
+	let ifCycleExists=checkIfCycleExists(item, linked_to_frames, linked_to, docType)
 
 	/** if a property is pointing to its own parent document class
 	 * then display only Link an Existing Document 
@@ -118,11 +123,13 @@ export const makeDocumentTypeFrames = (args) => {
 	}
 	
 	/** extract frames to pass to any of when user chooses to Create a new Document */
+	let linkedDocType=linked_to
+	// pass the linked doc type instead to check if there are cycles
     let exractedProperties = getProperties(
         fullFrame, 
         linked_to, 
         linked_to_frames, 
-        uiFrame, mode, formData, onTraverse, onSelect, documentation) 
+        uiFrame, mode, formData, onTraverse, onSelect, documentation, linkedDocType) 
     
     // adding type of linked data  
     exractedProperties["properties"]["@type"] = {
diff --git a/packages/tdb-documents-ui/src/documentationTemplates.js b/packages/tdb-documents-ui/src/documentationTemplates.js
@@ -6,7 +6,15 @@ import OverlayTrigger from 'react-bootstrap/OverlayTrigger'
 import Tooltip from 'react-bootstrap/Tooltip'
 import {FiHelpCircle} from "react-icons/fi"
 
-/**
+/** displays documentation for enum with @comment*/
+export function getEnumLabelDescription(item, documentation) {
+    if(!documentation) return <div className="control-label">{item}</div>
+    if(!documentation.hasOwnProperty(CONST.COMMENT)) return <div className="control-label">{item}</div>
+    return <DisplayPropertyNameAndComment comment={documentation[CONST.COMMENT]} label={item}/>
+    //return <small className="fst-italic text-muted">{documentation[CONST.COMMENT]}</small>
+}
+
+/** 
  * 
  * @param {*} documentation - documentation object which contains labels and comments
  * @param {*} item - item 
@@ -19,6 +27,7 @@ import {FiHelpCircle} from "react-icons/fi"
 		"@values": values
 	}
 	if(!documentation) return enumDocumentation
+	//if(typeof documentation === CONST.OBJECT_TYPE) return getEnumLabelDescription(item, documentation)
 	if(!Array.isArray(documentation)) return enumDocumentation
 	let valueArray=[]
 	documentation.map(doc => { 
@@ -51,9 +60,9 @@ import {FiHelpCircle} from "react-icons/fi"
  * @param {*} comment - documentation comment which will be displayed as a description tool tip in the UI 
  * @returns 
  */
-function DisplayPropertyNameAndComment ({label, comment}){
+export function DisplayPropertyNameAndComment ({label, comment}){
 	return <React.Fragment>
-		<span id="tdb__property__name__label" className="h6">{label}</span>
+		{label && <span id="tdb__property__name__label" className="h6">{label}</span>}
 		{comment && <OverlayTrigger
 			key={comment}
 			placement={'right'}
diff --git a/packages/tdb-documents-ui/src/enumTypeFrames/enumTypeFrames.js b/packages/tdb-documents-ui/src/enumTypeFrames/enumTypeFrames.js
@@ -3,6 +3,7 @@ import {getLabelFromEnumDocumentation} from "../documentationTemplates"
 import * as util from "../utils"
 import * as CONST from "../constants"
 import React from "react"
+import {DisplayPropertyNameAndComment} from "../documentationTemplates"
 
 export function makeEnumTypeFrames (fullFrame, frame, item, uiFrame, mode, formData, documentation) {
     let enumClassName=frame[item]["@id"]
@@ -16,15 +17,16 @@ export function makeEnumTypeFrames (fullFrame, frame, item, uiFrame, mode, formD
     return {enum: enumDocumentation["@values"]}  
 }
 
+
 export function getUILayout (fullFrame, frame, item, uiFrame, mode, formData, documentation) {
-    
+     
     let label=item
     //let enumDocumentation=getLabelFromEnumDocumentation(item, documentation, frame[item]["@values"]) 
     //if(enumDocumentation.hasOwnProperty("@label")) label=enumDocumentation["@label"]
     
     let uiLayout = {
         "ui:placeholder": `Select ${label} ...`,
-        //"ui:description": getUI(),
+        //"ui:description": getDescription(documentation),
         classNames: "tdb__input mb-3 mt-3"
     } 
 
diff --git a/packages/tdb-documents-ui/src/helpers/labelHelper.js b/packages/tdb-documents-ui/src/helpers/labelHelper.js
@@ -2,7 +2,7 @@ import React from "react"
 import * as util from "../utils"
 import * as CONST from "../constants"
 import {getDataType} from "../dataTypeFrames/helpers"
-import {getLabelFromEnumDocumentation} from "../documentationTemplates"
+import {getEnumLabelDescription} from "../documentationTemplates"
 import {getPropertyLabelFromDocumentation} from "../documentationTemplates"
 import Row from "react-bootstrap/Row"
 
@@ -35,7 +35,7 @@ const EnumLabelComponent =({frame, label, documentation, isKey}) => {
 
     let values=frame[label]["@values"]
     return <div className="d-flex hd enum__label">
-        {getLabelFromEnumDocumentation (label, documentation, values)}
+        {getEnumLabelDescription(label, documentation)}
         {util.displayIfKeyField(isKey, label)}
     </div>
 } 
@@ -55,6 +55,10 @@ export function generateLabel (frame, item, documentation, fullFrame) {
 
     let isKey=util.checkIfKey(item, frame["@key"]) 
 
+    if(util.isEnumType(frame[item])) {
+        return <EnumLabelComponent frame={frame} label={item} documentation={documentation} isKey={isKey}/>
+    }
+    
     if(util.isSubDocumentType(frame[item])) {
         return <SubDocumentLabelComponent label={item} documentation={documentation} isKey={isKey}/>
     }
diff --git a/packages/tdb-documents-ui/src/helpers/propertyHelper.js b/packages/tdb-documents-ui/src/helpers/propertyHelper.js
@@ -18,7 +18,7 @@ function getSubDocumentFormData (formData, subDocumentName) {
     return formData[subDocumentName]
 }
  
-function constructSubDocumentFrame (fullFrame, subDocumentName, documentClassName,frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, setChainedData) {
+function constructSubDocumentFrame (fullFrame, subDocumentName, documentClassName,frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, docType) {
     
     //documentClassNamme
     let constructedFrame= fullFrame.hasOwnProperty(documentClassName) ? fullFrame[documentClassName] : {}
@@ -36,7 +36,7 @@ function constructSubDocumentFrame (fullFrame, subDocumentName, documentClassNam
         onTraverse,
         onSelect,
         documentation,
-        setChainedData
+        docType
     )
     // Add @type attribute here only for CREATE & EDIT mode to help in saving to terminusDB
     if(mode !== CONST.VIEW) {
@@ -61,26 +61,27 @@ function constructSubDocumentFrame (fullFrame, subDocumentName, documentClassNam
     }
     return subDocumentFrames
 }
- 
+  
 
-export function generateInternalFrames(fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, setChainedData) {
+export function generateInternalFrames(fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, docType) {
     /** return null if frame doesnt have property in it */
     if(!frame.hasOwnProperty(item)) return null
 
     if(util.isOneOfSubDocumentType(fullFrame, frame[item])) {
-        let {anyOf, anyOfUiSchema}=makeOneOfTypeFrames({fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation})
+        let {anyOf, anyOfUiSchema}=makeOneOfTypeFrames({fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, docType})
         //let oneOfFrame= makeOneOfTypeFrames({fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation})
         return {anyOf, anyOfUiSchema}
     }
     if(util.isSubDocumentType(frame[item])) { // Subdocument type
         let documentClassName=util.getLinkedDocumentClassName (frame, item)
+        //let cycleExists=checkDocumentClassCycles(documentClassName, fullFrame)
         let subDocumentFormData=formData//formData.hasOwnProperty(item) ? formData[item] : {}
-        let subDocumentFrame = constructSubDocumentFrame(fullFrame, item, documentClassName, frame, uiFrame, mode, subDocumentFormData, onTraverse, onSelect, documentation, setChainedData) 
+        let subDocumentFrame = constructSubDocumentFrame(fullFrame, item, documentClassName, frame, uiFrame, mode, subDocumentFormData, onTraverse, onSelect, documentation, docType) 
 
         return subDocumentFrame
     }
     else if (util.isChoiceSubDocumentType(frame[item])) {
-        let choiceSubDocumentFrame= makeChoiceSubDocumentTypeFrames({fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation})
+        let choiceSubDocumentFrame= makeChoiceSubDocumentTypeFrames({fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, docType})
         return choiceSubDocumentFrame
     }
     else if (util.isEnumType(frame[item])) { 
@@ -110,7 +111,7 @@ export function generateInternalFrames(fullFrame, item, frame, uiFrame, mode, fo
         return feautureViewFrames
     }*/
     else if(util.isDocumentType(frame[item], fullFrame)) {
-        let documetFrames=makeDocumentTypeFrames({fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation})
+        let documetFrames=makeDocumentTypeFrames({fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, docType})
         return documetFrames
     }
     else if (util.isRdfLangString(frame[item])) {
diff --git a/packages/tdb-documents-ui/src/mandatoryFrames.js b/packages/tdb-documents-ui/src/mandatoryFrames.js
@@ -18,10 +18,10 @@ import * as CONST from "./constants"
  * @param {*} documentation - formData - filled data to be displayed in form 
  * @returns a data field 
  */
-export function makeMandatoryFrames (fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, setChainedData) {
+export function makeMandatoryFrames (fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, docType) {
 
     /** generate properties of sub frames */
-    let extractedFrames = propertyHelper.generateInternalFrames(fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, setChainedData)
+    let extractedFrames = propertyHelper.generateInternalFrames(fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, docType)
     //console.log("extractedFrames", extractedFrames)
     
     /** gather layout of property  */ 
@@ -77,7 +77,7 @@ export function makeMandatoryFrames (fullFrame, item, frame, uiFrame, mode, form
     }
 
     /** gather ui layout of property to change look and feel */
-    let uiLayout = generateUI(fullFrame, frame, item, uiFrame, mode, formData, onTraverse, onSelect, documentation, extractedFrames, setChainedData)
+    let uiLayout = generateUI(fullFrame, frame, item, uiFrame, mode, formData, onTraverse, onSelect, documentation, extractedFrames, docType)
 
     //console.log("layout", layout)
     //console.log("uiLayout", uiLayout)
diff --git a/packages/tdb-documents-ui/src/oneOfTypeFrames/helpers.js b/packages/tdb-documents-ui/src/oneOfTypeFrames/helpers.js
@@ -61,14 +61,14 @@ function extractPropertyFrames (extractedProperties) {
  
 // retrieves layout of object data types one ofs
 function getDocumentLayout(choiceDocument, choiceDocumentFrames, oneOfLinkedClassName, args) {
-    let {fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, setChainedData} = args
+    let {fullFrame, item, frame, uiFrame, mode, formData, onTraverse, onSelect, documentation, docType} = args
 
     let choiceSubDocument=choiceDocumentFrames.hasOwnProperty("@class") ? choiceDocumentFrames["@class"] : choiceDocumentFrames
     let choiceSubDocumentFrame = fullFrame[choiceSubDocument]
  
     // get documentation from frame
     let extractedDocumentation= choiceSubDocumentFrame.hasOwnProperty(CONST.DOCUMENTATION) ? choiceSubDocumentFrame[CONST.DOCUMENTATION] : []
-    let exractedProperties = getProperties(fullFrame, item, choiceSubDocumentFrame, uiFrame, mode, formData, onTraverse, onSelect, extractedDocumentation, setChainedData) 
+    let exractedProperties = getProperties(fullFrame, item, choiceSubDocumentFrame, uiFrame, mode, formData, onTraverse, onSelect, extractedDocumentation, docType) 
 
     console.log("exractedProperties sub", exractedProperties)
     exractedProperties.properties["@type"]={
diff --git a/packages/tdb-documents-ui/src/oneOfTypeFrames/oneOfTypeFrames.js b/packages/tdb-documents-ui/src/oneOfTypeFrames/oneOfTypeFrames.js
@@ -1,5 +1,4 @@
 import * as CONST from "../constants"
-import {getProperties} from "../FrameHelpers"
 import * as util from "../utils"
 import * as helper from "./helpers"
 
diff --git a/packages/tdb-documents-ui/src/utils.js b/packages/tdb-documents-ui/src/utils.js
diff --git a/packages/tdb-react-components/package.json b/packages/tdb-react-components/package.json
diff --git a/packages/tdb-react-table/package.json b/packages/tdb-react-table/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@terminusdb/terminusdb-access-control-component",`
`3`		`- "version": "6.0.0",`
	`3`	`+ "version": "6.0.1",`
`4`	`4`	`"description": "Table for terminusdb",`
`5`	`5`	`"main": "src/index",`
`6`	`6`	`"module": "es6/index",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@terminusdb-live/tdb-dashboard",`
`3`		`- "version": "6.0.0",`
	`3`	`+ "version": "6.0.1",`
`4`	`4`	`"description": "react",`
`5`	`5`	`"homepage": "./",`
`6`	`6`	`"main": "src/index",`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export const MainNavBar = ({setShowTimeTravel}) => {`
`30`	`30`	`{dataProduct}`
`31`	`31`	`</h4>`
`32`	`32`	`<TimeTravelWidget setShowTimeTravel={setShowTimeTravel}/>`
`33`		`- </React.Fragment>`
	`33`	`+ </React.Fragment>`
`34`	`34`	`}`
`35`	`35`	`{accessControlDashboard && accessControlDashboard.createDB() &&`
`36`	`36`	`<NewDataProduct css={"btn-sm mr-1 pt-2 pr-4 pl-4 "}/>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@terminusdb/terminusdb-documents-ui",`
`3`		`- "version": "6.0.0",`
	`3`	`+ "version": "6.0.1",`
`4`	`4`	`"description": "SDK to build UI from terminusdb documents",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"module": "es6/index",`