Merge pull request #222 from terminusdb/newDoc

Francesca-Bit · web-flow · commit 96508de79a23 · 2023-05-03T14:48:46.000+01:00
make subdocuments expanded for geo coordinates in VIEW mode
diff --git a/packages/tdb-dashboard/src/App.css b/packages/tdb-dashboard/src/App.css
@@ -1487,3 +1487,18 @@ button.graphiql-tab-add>svg
   padding: 10px;
   color: white !important;
 }
+
+.pre--error {
+  padding: 10px;
+  box-sizing:border-box;
+  -moz-box-sizing:border-box;
+  webkit-box-sizing:border-box;
+  display:block; 
+  white-space: pre-wrap;  
+  white-space: -moz-pre-wrap; 
+  white-space: -pre-wrap; 
+  white-space: -o-pre-wrap; 
+  word-wrap: break-word; 
+  width:100%; 
+  overflow-x:auto;
+ }
diff --git a/packages/tdb-dashboard/src/components/Alerts.js b/packages/tdb-dashboard/src/components/Alerts.js
@@ -48,7 +48,7 @@ export const Alerts = ({message, type, onCancel, time}) => {
             <div>
                 <AiOutlineWarning className="me-1" />
                 <strong>Warning: </strong>
-                <div className="text-wrap">{message}</div>
+                <pre className="pre--error">{message}</pre>
             </div>
             <Button variant="close" size="xs" onClick={() => onClose("warning")} />
             </div>
@@ -66,7 +66,7 @@ export const Alerts = ({message, type, onCancel, time}) => {
                 <div className="w-100">
                     <FaExclamationTriangle className="me-1 mb-1" />
                     <strong>ERROR: </strong>
-                    <div className="text-wrap">{message}</div>
+                    <pre className="pre--error">{message}</pre>
                 </div> 
                 <AlertCloseButton className={"alert_btn_close alert_danger_text"} onClick={() => onClose("danger")}/>
             </div>
@@ -83,7 +83,7 @@ export const Alerts = ({message, type, onCancel, time}) => {
             <div>
                 <AiOutlineCheckCircle className="me-1" />
                 <strong>Success: </strong> 
-                <div className="text-wrap">{message}</div>
+                <pre className="pre--error">{message}</pre>
                 {time && ` ${queryTimeDisplay(updateTime)}`}
             </div>
             <Button variant="close" size="xs" onClick={() => onClose("success")} />
@@ -93,15 +93,14 @@ export const Alerts = ({message, type, onCancel, time}) => {
     if(type == TERMINUS_MESSAGE)
         return  <Alert
             variant="light"
-            className="text-break"
             show={shouldShowAlert("light")}
             onClose={() => onClose("light")}>
 
         <div className="d-flex justify-content-between">
         <div>
             <BsInfoCircle className="me-1" />
             <strong>Info: </strong> 
-            <div className="text-wrap">{message}</div>
+            <pre className="pre--error">{message}</pre>
         </div>
         <Button variant="close" size="xs" onClick={() => onClose("light")} />
         </div>
diff --git a/packages/tdb-dashboard/src/components/ErrorDisplay.js b/packages/tdb-dashboard/src/components/ErrorDisplay.js
@@ -43,12 +43,13 @@ export const DisplayErrorPerProperty = ({ propertyName, errorType, message }) =>
                       expandComponent={<MdKeyboardArrowRight/>} 
                       hideComponent={<MdKeyboardArrowDown/>}/>
                   {errorType}
-                  <pre className="alert_danger_border ml-1 p-1 rounded">{propertyName}</pre>
+                
+                  <pre className="alert_danger_border ml-1 p-1 rounded text-break">{propertyName}</pre>
               </div>
           </div>
       </Accordion.Item>
       <Accordion.Collapse eventKey={propertyName} className={"bg-transparent"}>
-          <div style={{ whiteSpace: "pre-wrap" }}>{message}</div>
+            <pre className="pre--error">{message}</pre>
       </Accordion.Collapse>
     </Accordion>
 }
@@ -59,13 +60,14 @@ export const ErrorDisplay = ({ errorData, message, css }) => {
     return <Accordion className="bg-transparent border-0 w-100">
         <Card className="bg-transparent border-0">
             <Card.Header className="bg-transparent">
-                <span className="text-uppercase">{message} </span>
+                <span>{message} </span>
                 <ToggleErrorDisplay eventKey="0" expandComponent={"More Info" } hideComponent={"Hide"} css={css}/>
             </Card.Header>
             <Accordion.Collapse eventKey="0">
                 <Card.Body>
+                
                     {/*<pre>{JSON.stringify(errorData, null, 2)}</pre>*/}
-                    {errorData}               
+                   <pre className="pre--error">{errorData}</pre>              
                 </Card.Body>
             </Accordion.Collapse>
         </Card>
diff --git a/packages/tdb-dashboard/src/components/ErrorMessageReport.js b/packages/tdb-dashboard/src/components/ErrorMessageReport.js
@@ -49,7 +49,7 @@ export const FormatErrorMessages = ({error, setError}) => {
         let errorElements = []
         if(error["api:error"]) {
             if(Array.isArray(error["api:error"]["api:witnesses"])) {
-                error["api:error"]["api:witnesses"].map(err => {
+                error["api:error"]["api:witnesses"].map((err,index) => {
 
                     if(err.hasOwnProperty("constraint_name")) {
                         // CONSTRAINT ERRORS
@@ -58,14 +58,14 @@ export const FormatErrorMessages = ({error, setError}) => {
                         let message = err.message
 
                         errorElements.push(
-                            <DisplayErrorPerProperty propertyName={propertyName} message={message} errorType={errorType}/>
+                            <DisplayErrorPerProperty key={`error__${index}`} propertyName={propertyName} message={message} errorType={errorType}/>
                         )
                     }
                     else {
                         if(err.hasOwnProperty("@type")) {
                             checkType(err)
                             errorElements.push(
-                                <pre>{JSON.stringify(err, null, 2)}</pre>
+                                JSON.stringify(err, null, 2)
                             )
                         }
                         else {
@@ -75,7 +75,7 @@ export const FormatErrorMessages = ({error, setError}) => {
                                 let errorType = err[propertyName].hasOwnProperty("@type") ? `${err[propertyName]["@type"]} on ` : `Error occured on`
                                 let message = JSON.stringify(err[propertyName], null, 2)
                                 errorElements.push(
-                                    <DisplayErrorPerProperty propertyName={propertyName} message={message} errorType={errorType}/>
+                                    <DisplayErrorPerProperty key={`error__${index}`} propertyName={propertyName} message={message} errorType={errorType}/>
                                 )
                             }
                         }
@@ -86,7 +86,7 @@ export const FormatErrorMessages = ({error, setError}) => {
                 if(errorObj.hasOwnProperty("@type")) {
                     checkType(errorObj)
                     errorElements.push(
-                        <pre>{JSON.stringify(errorObj, null, 2)}</pre>
+                        JSON.stringify(errorObj, null, 2)
                     )
                 }
             }
diff --git a/packages/tdb-dashboard/src/components/JSONModelBuilder.js b/packages/tdb-dashboard/src/components/JSONModelBuilder.js
@@ -13,7 +13,6 @@ import {Alert} from "react-bootstrap"
 import {MODEL_BUILDER_EDITOR_OPTIONS} from "./constants"
 import { BiUndo } from "react-icons/bi"
 import {FaRegEdit} from 'react-icons/fa'
-//import {Alerts} from "./Alerts"
 import {TERMINUS_DANGER,DOCUMENT_PREFIX} from "./constants"
 import {GRAPH_TAB} from "../pages/constants"
 import {GraphContextObj} from "@terminusdb-live/tdb-react-components"
diff --git a/packages/tdb-dashboard/src/pages/GraphIqlEditor.js b/packages/tdb-dashboard/src/pages/GraphIqlEditor.js
@@ -26,7 +26,7 @@ export function GraphIqlEditor({}) {
     <Layout mainClassName={layoutClass} showLeftSideBar={false}>
         <GraphiQL 
           editorTheme="shadowfox"
-          defaultQuery={'query{}'}
+          defaultQuery={'query()'}
           fetcher={fetcher}
         
         />
diff --git a/packages/tdb-documents-ui-template/src/components/DocumentsGraphqlTable.js b/packages/tdb-documents-ui-template/src/components/DocumentsGraphqlTable.js
@@ -116,7 +116,7 @@ export const DocumentsGraphqlTable = ({gqlQuery,apolloClient,tableConfig, type,
    
     return <div> 
             {error && <Alert onClose={() => setError(false)}  dismissible className="text-break" variant="danger">
-                 GraphQL query error <div className="text-wrap">{errorMessage}</div> </Alert>}  
+                 GraphQL query error <pre className="pre--error">{errorMessage}</pre> </Alert>}  
             {advSearchFields &&
                  <Accordion className="mb-4">
                     <Accordion.Item eventKey="0">
diff --git a/packages/tdb-documents-ui-template/src/hook/useTDBGraphqlQuery.js b/packages/tdb-documents-ui-template/src/hook/useTDBGraphqlQuery.js
@@ -67,9 +67,10 @@ export function useTDBGraphqlQuery (apolloClient, graphqlQuery, documentType, op
     const callFetchMore = async (currentlimit,currentpage,currentOrderBy,currentFilter) =>{
         setLoading(true)
         setError(false)
+        let result
         try{
-        const result = await apolloClient.query({query:graphqlQuery,
-            variables:{"offset":currentpage , "limit":currentlimit+1, 
+        result = await apolloClient.query({query:graphqlQuery,
+            variables:{"offset":currentpage , "limit":currentlimit+1,
             "orderBy":currentOrderBy || {}, "filter":currentFilter || {}}})
         
         if(result.errors) {
@@ -91,7 +92,13 @@ export function useTDBGraphqlQuery (apolloClient, graphqlQuery, documentType, op
                 setExtractedData(extractedData)
         }
         }catch(err){
-            console.log("ERRORRRRR",err)
+          //console.log("ERRORCALL",err.graphQLErrors,err.networkError.result.errors)
+          const errorMessage = err.networkError && err.networkError.result ? err.networkError.result.errors : ""
+          setRowCount(0)
+          setData([])
+          setExtractedData([])
+          setError(errorMessage)
+          
         }finally{
             setLoading(false)
         }
diff --git a/packages/tdb-documents-ui/src/widgets/subDocumentWidget.js b/packages/tdb-documents-ui/src/widgets/subDocumentWidget.js
@@ -105,9 +105,17 @@ export const SubDocumentProperties = ({ subDocumentPropertyName, props, order_by
     {update && getSubDocumentFields(subDocumentData)}
   </Card.Body>
 } 
+
+// function returns expanded for subdocuments
+// if a location is deascribed & geometry_location return true always 
+// we do this as a temporary fix so that maps in geo locations are loaded correctly
+function getExpanded(expanded, linked_to, frame) {
+  if(frame.hasOwnProperty(linked_to) && frame[linked_to].hasOwnProperty("geometry_location")) return true
+  return expanded 
+}
   
 export const TDBSubDocument = ({ extracted, expanded, order_by, comment, props, index, hideFieldLabel, linked_to, propertyDocumentation, id, reference, subDocumentData, setSubDocumentData, args }) => {
-  const [open, setOpen] = useState(expanded);
+  const [open, setOpen] = useState(args.mode === CONST.VIEW ? getExpanded(expanded, linked_to, args.fullFrame) : expanded);
   //const [open, setOpen] = useState(true);
   let uiFrame = args.uiFrame, mode = args.mode 
  
diff --git a/packages/tdb-react-table/src/AdvancedSearch.js b/packages/tdb-react-table/src/AdvancedSearch.js
@@ -1,14 +1,7 @@
 import React, {useState} from 'react';
 import { BasicConfig,Query, Builder, Utils as QbUtils } from '@react-awesome-query-builder/ui';
-//import {BootstrapConfig} from '@react-awesome-query-builder/bootstrap'
 import '@react-awesome-query-builder/ui/css/styles.css';
-//import "bootstrap/dist/css/bootstrap.css";
-//import '@react-awesome-query-builder/bootstrap/css/styles.css';
-//import '@react-awesome-query-builder/ui/css/styles.css';
-//import {Query, Builder, BasicConfig, Utils as QbUtils} from 'react-awesome-query-builder';
 import {Button} from 'react-bootstrap'
-//import './style.css';
-
 
 // Choose your skin (ant/material/vanilla):
 const InitialConfig = BasicConfig //BootstrapConfig // AntdConfig; // or MaterialConfig or MuiConfig or BootstrapConfig or BasicConfig
@@ -131,12 +124,13 @@ export const AdvancedSearch = (props) =>{
     const checkValueFormat = (fieldOptions, value, operator )=>{
         if(!fieldOptions) return {[operator]:value}
         let tmpValue = value 
-        switch(fieldOptions.typevalue){
-            case "Datetime" :
+        const typeValue = typeof fieldOptions.typevalue === "string" ? fieldOptions.typevalue.toUpperCase() : fieldOptions.typevalue
+        switch(typeValue){
+            case "DATETIME" :
               tmpValue = `${value.replace(' ','T')}Z`
               break
-            case "Int":
-            case "BigInt":
+            case "INT":
+            case "BIGINT":
               tmpValue = `${value}`
               break;
         }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export const FormatErrorMessages = ({error, setError}) => {`
`49`	`49`	`let errorElements = []`
`50`	`50`	`if(error["api:error"]) {`
`51`	`51`	`if(Array.isArray(error["api:error"]["api:witnesses"])) {`
`52`		`- error["api:error"]["api:witnesses"].map(err => {`
	`52`	`+ error["api:error"]["api:witnesses"].map((err,index) => {`
`53`	`53`
`54`	`54`	`if(err.hasOwnProperty("constraint_name")) {`
`55`	`55`	`// CONSTRAINT ERRORS`
`@@ -58,14 +58,14 @@ export const FormatErrorMessages = ({error, setError}) => {`
`58`	`58`	`let message = err.message`
`59`	`59`
`60`	`60`	`errorElements.push(`
`61`		`- <DisplayErrorPerProperty propertyName={propertyName} message={message} errorType={errorType}/>`
	`61`	+ <DisplayErrorPerProperty key={`error__${index}`} propertyName={propertyName} message={message} errorType={errorType}/>
`62`	`62`	`)`
`63`	`63`	`}`
`64`	`64`	`else {`
`65`	`65`	`if(err.hasOwnProperty("@type")) {`
`66`	`66`	`checkType(err)`
`67`	`67`	`errorElements.push(`
`68`		`- <pre>{JSON.stringify(err, null, 2)}</pre>`
	`68`	`+ JSON.stringify(err, null, 2)`
`69`	`69`	`)`
`70`	`70`	`}`
`71`	`71`	`else {`
`@@ -75,7 +75,7 @@ export const FormatErrorMessages = ({error, setError}) => {`
`75`	`75`	let errorType = err[propertyName].hasOwnProperty("@type") ? `${err[propertyName]["@type"]} on ` : `Error occured on`
`76`	`76`	`let message = JSON.stringify(err[propertyName], null, 2)`
`77`	`77`	`errorElements.push(`
`78`		`- <DisplayErrorPerProperty propertyName={propertyName} message={message} errorType={errorType}/>`
	`78`	+ <DisplayErrorPerProperty key={`error__${index}`} propertyName={propertyName} message={message} errorType={errorType}/>
`79`	`79`	`)`
`80`	`80`	`}`
`81`	`81`	`}`
`@@ -86,7 +86,7 @@ export const FormatErrorMessages = ({error, setError}) => {`
`86`	`86`	`if(errorObj.hasOwnProperty("@type")) {`
`87`	`87`	`checkType(errorObj)`
`88`	`88`	`errorElements.push(`
`89`		`- <pre>{JSON.stringify(errorObj, null, 2)}</pre>`
	`89`	`+ JSON.stringify(errorObj, null, 2)`
`90`	`90`	`)`
`91`	`91`	`}`
`92`	`92`	`}`