changes to support profiledb

Author: KittyJose

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}/>
     }

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])) {

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)