Merge branch 'main' into add-change-request-optional

Author: Francesca-Bit

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

@@ -60,6 +60,7 @@ export const MessageComponent = ({setKey}) => {
         let id=extractID(currentCRObject["@id"])
         // this call return the changeRequestObj Updated
         let res=await addNewMessage(comment,id)
+
         // we'll see if add need rebase check every time
         res.needRebase = currentCRObject.needRebase
         setCurrentCRObject(res)

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

@@ -133,6 +133,7 @@ export function ChangeRequest(){
         errorMessage,
         changeRequestList,
         createChangeRequest,
+        addNewMessage,
         getChangeRequestList,
         updateChangeRequestStatus,
         getChangeRequestByID,

packages/tdb-documents-ui-template/src/components/ViewDocumentHistory.js

@@ -173,7 +173,7 @@ const DisplayHistory = ({ history, setDiffCommitObject, diffObject, frames, type
             placement={"left"}
             overlay={
               <Tooltip id={`tooltip-${"left"}`}>
-                {historyItem.message}
+                <label className="text-light">{historyItem.message}</label>
               </Tooltip>
             }
           >

packages/tdb-documents-ui-template/src/hook/hookUtility.js

@@ -23,7 +23,7 @@ export function extractDocuments(documentResultsArr) {
             // if it is an array this is set type, I can have more than 1 result for row
             //?? I can pust the count
             if (Array.isArray(item[key])) {
-                newJson[key] = `${(item[key].length)}`
+                newJson[key] = `Item Count ${(item[key].length)}`
             }
             else if (item[key] && typeof item[key] === "object") {
                 //key 

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

@@ -15,6 +15,7 @@ const SelectedLanguage = ({ language }) => {
 }
 
 
+
 export const Viewer = ({ display, message, mode, type, onSubmit, readOnly, data, setData, documentation, language }) => {
 
 	return <div className="tdb__frame__viewer ">

packages/tdb-documents-ui/src/components/DescriptionComponent.js

@@ -4,11 +4,11 @@ import { AiOutlineLink } from "react-icons/ai"
 
 // description field for document links 
 // shows to which document a property is linked
-export function getLinkedDescription (linked) {
+export function getLinkedDescription (linked, type) {
   return  <Stack direction="horizontal" gap={2} className="fw-bold">
     <AiOutlineLink className="text-warning h6 mt-1"/>
     <small className="fst-italic text-muted">
-      {`Linked to document: `}
+      {`Linked to ${type ? type : "document"}: `}
       <span className="text-warning fw-bold">{linked}</span>
     </small>
   </Stack>

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

@@ -67,7 +67,7 @@ export function DisplayPropertyNameAndComment ({ comment }){
 			placement={'right'}
 			overlay={
 			<Tooltip id={`tooltip-right`}>
-				<small className="text-gray">{comment}</small>
+				<small className="text-light">{comment}</small>
 			</Tooltip>
 			}
 		> 

packages/tdb-documents-ui/src/widgets/inputWidgets.js

@@ -60,6 +60,7 @@ export const TDBInput = ({ id, name, value, required, isKey, hideFieldLabel, mod
       onChange={ (event) => onChange(event.target.value, name) } />}
     {/** only allow numbers */} 
     {NUMBER_ARRAY.includes(placeholder) &&  <input type="number"
+      step="any"
       id={id}   
       name={id}
       pattern="[0-9]*"

packages/tdb-documents-ui/src/widgets/subDocumentWidget.js

@@ -10,6 +10,7 @@ import { DisplayDocumentation } from "../templates"
 import { AiOutlineUp, AiOutlineRight } from "react-icons/ai"
 import { displayInternalProperties } from "../helpers/documentHelpers"
 import { HiddenSubDocumentWidgets } from "./hiddenWidgets"
+import { getLinkedDescription } from "../components/DescriptionComponent"
 
 const CollapseMessage = ({ message, name, icon }) => {
   return <>
@@ -115,7 +116,7 @@ function getExpanded(expanded, linked_to, frame) {
 }
 
 export const TDBSubDocument = ({ extracted, expanded, order_by, comment, props, index, hideFieldLabel, linked_to, propertyDocumentation, id, label, reference, subDocumentData, setSubDocumentData, args }) => {
-  const [open, setOpen] = useState(args.mode === CONST.VIEW ? getExpanded(expanded, linked_to, args.fullFrame) : expanded);
+  const [open, setOpen] = useState(args.mode === CONST.VIEW ? getExpanded(expanded, linked_to, args.fullFrame) : true);
   //const [open, setOpen] = useState(true);
   let uiFrame = args.uiFrame, mode = args.mode 
 
@@ -145,7 +146,7 @@ export const TDBSubDocument = ({ extracted, expanded, order_by, comment, props,
       className="tdb__label__width" 
       hideFieldLabel={hideFieldLabel}/> 
     <Card bg="secondary" className={`tdb__subdocument__input ${util.getBorder(uiFrame, props.name, index)} w-100`} key={id}>
-      <Button variant={"secondary"}
+      {mode === CONST.VIEW && <><Button variant={"secondary"}
         className={`text-start p-4`}
         data-testid={`root_subdocument_${props.name}_button`}
         name={`root_subdocument_${props.name}_button`}
@@ -154,8 +155,8 @@ export const TDBSubDocument = ({ extracted, expanded, order_by, comment, props,
         aria-expanded={open} 
       >
         {/*<TDBLabel name={props.name} required={props.required} comment={comment}/>*/}
-        {!open && <CollapseMessage message={`Click here to expand SubDocument`} name={props.name} icon={<AiOutlineRight className="text-muted"/>}/>}
-        {open && <CollapseMessage message={`Click here to collapse SubDocument`} name={props.name} icon={<AiOutlineUp className="text-muted"/>}/>}
+        {!open && <CollapseMessage message={`Click here to expand SubDocument`} name={linked_to} icon={<AiOutlineRight className="text-muted"/>}/>}
+        {open && <CollapseMessage message={`Click here to collapse SubDocument`} name={linked_to} icon={<AiOutlineUp className="text-muted"/>}/>}
       </Button>
       <Collapse in={open}>
         <div id={`root_subdocument_${props.name}`}>
@@ -176,7 +177,30 @@ export const TDBSubDocument = ({ extracted, expanded, order_by, comment, props,
             linked_to={linked_to}
             args={args}/>}
         </div>
-      </Collapse>
+      </Collapse></>}
+      {mode !== CONST.VIEW && <>
+        <Card.Header>
+          {getLinkedDescription (linked_to, `SubDocument`)}
+        </Card.Header>
+        <div id={`root_subdocument_${props.name}`}>
+          {subDocumentData && linked_to === subDocumentData[CONST.TYPE] && <SubDocumentProperties properties={extracted.properties} 
+            //required={extracted.required}
+            required={props.required}
+            //formData={props.formData}
+            id={id}
+            index={index}
+            reference={reference}
+            order_by={order_by}
+            props={props}
+            subDocumentPropertyName={props.name}
+            propertyDocumentation={propertyDocumentation}
+            onChange={props.onChange}
+            subDocumentData={subDocumentData} 
+            setSubDocumentData={setSubDocumentData}
+            linked_to={linked_to}
+            args={args}/>}
+        </div>
+      </>}
     </Card>
   </Stack>
 }

packages/tdb-react-components/src/treeGraphComponent/MainGraphObject.js

@@ -687,8 +687,10 @@ export const MainGraphObject = (mainGraphDataProvider,dbName)=>{
 		}
 		else {
 			// initialize metadata & render as for propertyObj
-			_currentNode.schema["@metadata"]["render_as"] = {
-				[currentpropertyID]: "markdown"
+			_currentNode.schema["@metadata"] = {
+				"render_as": {
+					[currentpropertyID]: "markdown" 
+				}
 			}
 		}
 	}