progress

Author: KittyJose

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

@@ -180,98 +180,6 @@ function DiffViewDocument ({documentID,diffObj, CRObject,propertyModifiedCount,f
 </Accordion>
 }
 
-/**
- * 
- * @param {*} diffs diff list 
- * @param {*} trackingBranchDocumentList document list of tracking branch
- * @param {*} originBranchDocumentList document list of origin branch
- * @returns 
- */
-export const DiffView_OLD = ({diffs, CRObject, start, setStart }) => {  
-    const {woqlClient} = WOQLClientObj()
-
-    // I need to copy the woqlClient and set the original_branch 
-    // to get the right frame
-    const woqlClientCopy = woqlClient.copy()
-    woqlClientCopy.checkout(CRObject.original_branch)
-
-    const {frames,getDocumentFrames} = useTDBDocuments(woqlClientCopy)
-    // pagination constants
-    const [activePage, setActivePage]=useState(1)
-    const [current, setCurrent]=useState(0)
-
-    const [page, setPage] = useState(start)
-
-    let elements=[], paginationItems=[]
-
-    let divide = Math.ceil(diffs.length/DIFFS_PER_PAGE_LIMIT)
-
-    useEffect(() => {
-        getDocumentFrames()
-	},[])
-    // function to handle on click of page
-    function handlePagination(number) {
-        alert(number)
-        /*let position=DIFFS_PER_PAGE_LIMIT * (number-1)
-        
-        setCurrent(position)
-        setActivePage(number) */
-        
-    }
-
-    // populate pagination Item
-    /*for (let number = 1; number <= divide; number++) {
-        paginationItems.push(
-            <Pagination.Item key={number} active={number === activePage} onClick={(e) => handlePagination(number)}>
-                {number}
-            </Pagination.Item>
-        )
-    }*/
-    
-    if(!frames) return <Loading message={`Loading Frames ...`}/>
-    if(!diffs) return <Loading message={`Loading Diffs ...`}/>
-
-    
-    // looping through diff lists
-    for(let start=current; start<(current + DIFFS_PER_PAGE_LIMIT); start++) {
-       
-        if(start >= diffs.length) continue
-      
-        const propertyModifiedCount = getPropertyModifiedCount(diffs[start])
-        const diffObj = diffs[start]
-        const action = diffObj["@op"] || "Change"
-        const actionKey = `@${action.toLowerCase()}`
-        const eventKey= diffObj[actionKey] && diffObj[actionKey]["@id"] ? diffObj[actionKey]["@id"] : diffObj["@id"]
-        const docType = diffObj[actionKey] && diffObj[actionKey]["@type"] ? diffObj[actionKey]["@type"] : diffObj["@type"]
-        
-        // this are the diff panel for document
-        elements.push(
-            <React.Fragment key={`item__${start}`}>
-               <DiffViewDocument frames={frames} key={actionKey}
-                    action={action}
-                    docType={docType}
-                    propertyModifiedCount={propertyModifiedCount} 
-                    documentID={eventKey} 
-                    diffObj={diffObj} 
-                    CRObject={CRObject}/>
-            </React.Fragment>
-        )
-    }
-
-    return <React.Fragment>
-        {elements}
-        <Row className="w-100">
-            <Col/> 
-            <Col>
-                <Pagination className="justify-content-center ">
-                    <Pagination.Prev onClick={(e) => handlePagination(e)}/>
-                    <Pagination.Next onClick={(e) => handlePagination(e)}/>
-                </Pagination>
-            </Col>
-            <Col/>
-        </Row>
-    </React.Fragment>
-}
 
 /**
  * 
@@ -292,7 +200,7 @@ export const DiffView = ({diffs, CRObject, start, setStart }) => {
 
     let elements=[]
 
-
+ 
     useEffect(() => {
         getDocumentFrames()
 	},[])

packages/tdb-documents-ui/src/helpers/displayHelper.js

@@ -489,7 +489,7 @@ export function displayBBoxDocument (props, args, property, id) {
 
   return <TDBBBoxDocuments config={config}/>
 }
-
+ 
 
 // ARRAY 
 export function displayArrayWidgets (props, args, extracted, property, expand, id, hideFieldLabel, linked_to) {
@@ -508,6 +508,7 @@ export function displayArrayWidgets (props, args, extracted, property, expand, i
       required: true,
       mode: args.mode,
       args: args,
+      hideFieldLabel: hideFieldLabel,
       //fieldUIFrame: fieldUIFrame,
       onChange: (data, selectedField) => handleArrayOnChange(data, selectedField),
       //defaultClassName: defaultClassName,

packages/tdb-documents-ui/src/helpers/fieldDisplay.js

@@ -22,7 +22,7 @@ export const getDisplay = (props, args, property) => {
     let id = props.id, linked_to=props.linked_to
     let extracted=args.reference[linked_to]
     let expand=props.isArray ? true : props.expand
-    return display.displayArrayWidgets(props, args, extracted, property, expand, id, hideFieldLabel, linked_to)
+    return display.displayArrayWidgets(props, args, extracted, property, expand, id, true, linked_to)
   }
   else if(util.isSubDocumentType(field)){ 
     // SUBDOCUMENT TYPE

packages/tdb-documents-ui/src/helpers/typeHelper.js

@@ -14,6 +14,10 @@ export const typeHelper = (documentFrame, property, fullFrame, isArray) => {
       return CONST.BOOLEAN_TYPE
     return CONST.STRING_TYPE
   } 
+  else if(util.isOneOfDataType(documentFrame, property)) {
+    // ONE OF TYPE
+    return [ CONST.STRING_TYPE, CONST.OBJECT_TYPE ] 
+  }
   else if(util.isSubDocumentType(field)){
     // SUBDOCUMENT TYPE 
     //return [ "null", CONST.OBJECT_TYPE ]

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

@@ -37,8 +37,7 @@ export function makeMandatoryFrames (args, property) {
     // assign default value if sys unit
     layout["default"]=[]
   }
-
-
+ 
   let uiLayout = uiHelper(args, property)
 
   return { layout, uiLayout }