Skip to content

Commit 8289b31

Browse files
Francesca-BitFrancesca-Bit
committed
fix query-builder, scroll in schema builder, error display, change the document hook name
1 parent a331bac commit 8289b31

File tree

25 files changed

+137
-171
lines changed

25 files changed

+137
-171
lines changed

‎packages/tdb-dashboard/src/components/AboutDataProduct.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {CopyButton} from "./utils"
1212
import { ManageDatabase } from "../hooks/ManageDatabase"
1313
import { useParams } from "react-router-dom"
1414
import { Loading } from "./Loading"
15-
import {DocumentsUIHook} from "@terminusdb/terminusdb-documents-ui"
15+
import {useTDBDocuments} from "@terminusdb/terminusdb-documents-ui"
1616

1717
import { UTILS } from "@terminusdb/terminusdb-client"
1818

@@ -21,7 +21,7 @@ export const AboutDataProduct = ({dataProductDetails, setShowDeleteModal, setSho
2121
const [showHealth, setShowHealth]=useState(false)
2222
const [branchCount, setBranchCount]= useState(0)
2323
const {woqlClient, accessControlDashboard} = WOQLClientObj()
24-
const {documentClasses,getUpdatedDocumentClasses} = DocumentsUIHook(woqlClient)
24+
const {documentClasses,getDocumentClasses} = useTDBDocuments(woqlClient)
2525

2626

2727
const {cloneDatabase, loading:loadingClone, error:errorClone , setError:setCloneError} = ManageDatabase()
@@ -44,7 +44,7 @@ export const AboutDataProduct = ({dataProductDetails, setShowDeleteModal, setSho
4444
}, [healthColor])
4545

4646
useEffect(() => {
47-
getUpdatedDocumentClasses()
47+
getDocumentClasses()
4848
if(cloneDBName && cloneDBName.current){
4949
cloneDBName.current.value = dataProduct
5050
}

‎packages/tdb-dashboard/src/components/Alerts.js‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import React from "react"
33
import { Alert, Button } from 'react-bootstrap';
44
import {TERMINUS_WARNING, TERMINUS_SUCCESS, TERMINUS_DANGER, TERMINUS_MESSAGE} from "./constants"
55
import {AiOutlineCheckCircle, AiOutlineWarning} from "react-icons/ai"
6-
import {BiErrorCircle} from "react-icons/bi"
76
import {BsInfoCircle} from "react-icons/bs"
87
import {queryTimeDisplay} from "./utils"
98
import { FaTimes, FaExclamationTriangle } from "react-icons/fa"
@@ -48,7 +47,8 @@ export const Alerts = ({message, type, onCancel, time}) => {
4847
<div className="d-flex justify-content-between">
4948
<div>
5049
<AiOutlineWarning className="me-1" />
51-
<strong>Warning: </strong> {message}
50+
<strong>Warning: </strong>
51+
<div className="text-wrap">{message}</div>
5252
</div>
5353
<Button variant="close" size="xs" onClick={() => onClose("warning")} />
5454
</div>
@@ -65,7 +65,8 @@ export const Alerts = ({message, type, onCancel, time}) => {
6565
<div className="d-flex justify-content-between">
6666
<div className="w-100">
6767
<FaExclamationTriangle className="me-1 mb-1" />
68-
<strong>Oops! Something went wrong.</strong> {message}
68+
<strong>Oops! Something went wrong.</strong>
69+
<div className="text-wrap">{message}</div>
6970
</div>
7071
<AlertCloseButton className={"alert_btn_close alert_danger_text"} onClick={() => onClose("danger")}/>
7172
</div>
@@ -81,7 +82,8 @@ export const Alerts = ({message, type, onCancel, time}) => {
8182
<div className="d-flex justify-content-between">
8283
<div>
8384
<AiOutlineCheckCircle className="me-1" />
84-
<strong>Success: </strong> {message}
85+
<strong>Success: </strong>
86+
<div className="text-wrap">{message}</div>
8587
{time && ` ${queryTimeDisplay(updateTime)}`}
8688
</div>
8789
<Button variant="close" size="xs" onClick={() => onClose("success")} />
@@ -98,7 +100,8 @@ export const Alerts = ({message, type, onCancel, time}) => {
98100
<div className="d-flex justify-content-between">
99101
<div>
100102
<BsInfoCircle className="me-1" />
101-
<strong>Info: </strong> {message}
103+
<strong>Info: </strong>
104+
<div className="text-wrap">{message}</div>
102105
</div>
103106
<Button variant="close" size="xs" onClick={() => onClose("light")} />
104107
</div>

‎packages/tdb-dashboard/src/components/DataProductDocuments.js‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {getPropertyRelation} from '../queries/GeneralQueries'
77
import {Button, Badge, ButtonGroup} from "react-bootstrap"
88
import {BiPlus} from "react-icons/bi"
99
import {SearchBox} from "./SearchBox"
10-
import {DocumentsUIHook} from "@terminusdb/terminusdb-documents-ui"
10+
import {useTDBDocuments} from "@terminusdb/terminusdb-documents-ui"
1111
import {Loading} from "./Loading"
1212
import {NEW_DOC} from "../routing/constants"
1313
import {useParams, useNavigate} from "react-router-dom"
@@ -25,21 +25,22 @@ export const DataProductDocuments = () => {
2525

2626
//maybe I have to update the count when enter here well see
2727
const {addQueryPane} = QueryPaneObj()
28-
const {getDocNumber,perDocumentCount:dataProvider, documentClasses,frames,getUpdatedFrames} =
29-
DocumentsUIHook(woqlClient)
28+
const {getDocumentNumbers,perDocumentCount:dataProvider, documentClasses,frames,getDocumentFrames} =
29+
useTDBDocuments(woqlClient)
3030

3131
// search docs constant
3232
const [searchDocument, setSearchDocument]=useState(false)
3333
const [selectedClass, setSelectedClass] = useState(false)
3434

3535
// I call ones
3636
useEffect(() => {
37-
getDocNumber()
38-
getUpdatedFrames()
37+
getDocumentNumbers()
38+
getDocumentFrames()
3939
},[dataProduct])
4040

41-
function handlePropertyClick (property) {
42-
let q = getPropertyRelation(property, dataProduct, woqlClient)
41+
function handlePropertyClick (property,docName) {
42+
43+
let q = getPropertyRelation(property, docName, woqlClient)
4344
//queryObj.editorObj.text = q
4445
addQueryPane(q)
4546
}
@@ -72,9 +73,9 @@ export const DataProductDocuments = () => {
7273
<div className="ml-3">
7374
{Object.keys(frames[item["@id"]]).map(props => {
7475
if(props === "@type") props = "rdf:type"
75-
if(props !== "@key"){
76+
if(props.indexOf("@") === -1){
7677
return <Button key={props} className="btn btn-sm m-1 text-light"
77-
onClick={(e) => handlePropertyClick(props)}
78+
onClick={(e) => handlePropertyClick(props,item["@id"])}
7879
variant="outline-secondary">{props}</Button>
7980
}
8081
})}
@@ -104,8 +105,8 @@ export const DocumentExplorerDocuments= () => {
104105
const {
105106
documentClasses,
106107
loading,
107-
getUpdatedDocumentClasses
108-
} = DocumentsUIHook(woqlClient)
108+
getDocumentClasses
109+
} = useTDBDocuments(woqlClient)
109110

110111
// search docs constant
111112
const [searchDocument, setSearchDocument]=useState(false)
@@ -114,7 +115,7 @@ export const DocumentExplorerDocuments= () => {
114115

115116
useEffect(() => {
116117
if(!accessControlDashboard || ( !accessControlDashboard.instanceRead() && !accessControlDashboard.instanceWrite())) setDisabled(true)
117-
getUpdatedDocumentClasses()
118+
getDocumentClasses()
118119
}, [dataProduct])
119120

120121

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Alert from 'react-bootstrap/Alert'
1313
import {BsPlus} from "react-icons/bs"
1414
import {BiMinusCircle} from "react-icons/bi"
1515
import {Loading} from "./Loading"
16-
import {DocumentsUIHook} from "@terminusdb/terminusdb-documents-ui"
16+
import {useTDBDocuments} from "@terminusdb/terminusdb-documents-ui"
1717
import {WOQLClientObj} from '../init-woql-client'
1818
/**
1919
*
@@ -192,7 +192,7 @@ export const DiffView = ({diffs, CRObject}) => {
192192
const woqlClientCopy = woqlClient.copy()
193193
woqlClientCopy.checkout(CRObject.original_branch)
194194

195-
const {frames,getUpdatedFrames} = DocumentsUIHook(woqlClientCopy)
195+
const {frames,getDocumentFrames} = useTDBDocuments(woqlClientCopy)
196196
// pagination constants
197197
const [activePage, setActivePage]=useState(1)
198198
const [current, setCurrent]=useState(0)
@@ -202,7 +202,7 @@ export const DiffView = ({diffs, CRObject}) => {
202202
let divide = diffs.length/DIFFS_PER_PAGE_LIMIT
203203

204204
useEffect(() => {
205-
getUpdatedFrames()
205+
getDocumentFrames()
206206
},[])
207207
// function to handle on click of page
208208
function handlePagination(number) {

‎packages/tdb-dashboard/src/components/DocumentSearchComponent.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, {useEffect} from "react"
22
import {DocumentsGraphqlTable} from "@terminusdb/terminusdb-documents-ui-template"
33
import {gql} from "@apollo/client"
4-
import {DocumentsUIHook} from "@terminusdb/terminusdb-documents-ui"
4+
import {useTDBDocuments} from "@terminusdb/terminusdb-documents-ui"
55
import {WOQLClientObj} from '../init-woql-client'
66
/**
77
*
@@ -12,13 +12,13 @@ import {WOQLClientObj} from '../init-woql-client'
1212
export const DocumentSearchComponent = ({setSelected, doctype}) => {
1313
const {apolloClient,woqlClient} = WOQLClientObj()
1414
if(!apolloClient) return <div/>
15-
const {documentTablesConfig,getGraphqlTableConfig} = DocumentsUIHook(woqlClient)
15+
const {documentTablesConfig,getGraphqlTablesConfig} = useTDBDocuments(woqlClient)
1616

17-
getGraphqlTableConfig
17+
1818

1919
useEffect(() => {
2020
if(doctype){
21-
getGraphqlTableConfig()
21+
getGraphqlTablesConfig()
2222
}
2323
},[doctype]);
2424
const querystr = documentTablesConfig && documentTablesConfig.objQuery ? documentTablesConfig.objQuery[doctype].query : null

‎packages/tdb-dashboard/src/components/ErrorMessageReport.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ export const FormatErrorMessages = ({error, setError}) => {
8181
}
8282
}
8383
})
84+
}else{
85+
const errorObj = error["api:error"]
86+
if(errorObj.hasOwnProperty("@type")) {
87+
checkType(errorObj)
88+
errorElements.push(
89+
<pre>{JSON.stringify(errorObj, null, 2)}</pre>
90+
)
91+
}
8492
}
8593
}
8694
return <ErrorDisplay errorData={errorElements} message={message} css={CONST.ERROR_MORE_INFO_CLASSNAME}/>

‎packages/tdb-dashboard/src/components/Results.js‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {GRAPH_VIEW, TABLE_VIEW, JSON_VIEW, EDITOR_WRITE_OPTIONS} from "./constan
66
import {TDBCollapse} from './layout/TDBCollapse'
77
import {TDBReactResizable} from './layout/TDBReactResizable'
88
import {ControlledQueryHook} from '@terminusdb-live/tdb-react-components'
9-
import {WOQLClientObj} from '../init-woql-client'
9+
//import {WOQLClientObj} from '../init-woql-client'
1010
import {UnControlled as CodeMirror} from 'react-codemirror2'
1111
import 'codemirror/lib/codemirror.css'
1212
import 'codemirror/theme/ayu-dark.css'
@@ -27,13 +27,8 @@ export const Results = ({freewidth, queryObj, woql, changeLimits,setOrder,loadin
2727
const bindings = (result && result.bindings) ? result.bindings : []
2828
//const [graphConfig, setGraphConf]=useState(queryResult.graph || graphViewConfig(bindings))
2929

30-
const {
31-
setSelectedDocument,
32-
selectedDocument
33-
} = WOQLClientObj()
3430

35-
36-
function onRowClick (row) {
31+
/*function onRowClick (row) {
3732
if(row.original["Subject"]) {
3833
setSelectedDocument({
3934
action: VIEW_DOCUMENT,
@@ -49,9 +44,9 @@ export const Results = ({freewidth, queryObj, woql, changeLimits,setOrder,loadin
4944
})
5045
// history.push(DOCUMENT_EXPLORER)
5146
}
52-
}
47+
}*/
5348

54-
const [tableConfig, setTableConfig]=useState(tableViewConfig(onRowClick))
49+
const [tableConfig, setTableConfig]=useState(tableViewConfig(null))
5550
const [currentView, setCurrentView]=useState(queryResult.currentView)
5651
const [isExpanded, setPanelExpanded] = useState(queryObj.resultPanelIsOpen)
5752

‎packages/tdb-dashboard/src/functions/ViewConfig.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export const tableViewConfig= (onRowClick) => {
55
const tabConfig= TerminusClient.View.table();
66
tabConfig.pager("remote")
77
tabConfig.pagesize(10)
8-
tabConfig.row().click(onRowClick)
8+
if(onRowClick)tabConfig.row().click(onRowClick)
99
return tabConfig
1010
}
1111

‎packages/tdb-dashboard/src/hooks/DocumentHook.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ export function DocumentHook(){
5050
}finally{setLoading(false)}
5151
}
5252

53-
async function getDiffList(changeRequestID) {
53+
async function getDiffList(changeRequestID,start=0,count=5) {
5454
try{
5555
const client = woqlClient.copy()
5656
client.connectionConfig.api_extension = 'api/'
5757
const baseUrl = client.connectionConfig.dbBase("changes")
58-
const result = await client.sendCustomRequest("GET", `${baseUrl}/${changeRequestID}/diff`)
58+
const result = await client.sendCustomRequest("GET", `${baseUrl}/${changeRequestID}/diff?count=${count}&start=${start}`)
5959
setResult(result)
6060
}
6161
catch(err){

‎packages/tdb-dashboard/src/pages/DocumentEdit.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {Loading} from "../components/Loading"
77
import {CreateChangeRequestModal} from "../components/CreateChangeRequestModal"
88
import {decodeUrl} from "../components/utils"
99
import {DocumentSearchComponent} from "../components/DocumentSearchComponent"
10-
import {DocumentsUIHook} from "@terminusdb/terminusdb-documents-ui"
10+
import {useTDBDocuments} from "@terminusdb/terminusdb-documents-ui"
1111

1212
export const DocumentEdit = () => {
1313
const {setChangeRequestBranch, branch,woqlClient,currentChangeRequest} = WOQLClientObj()
@@ -20,11 +20,11 @@ export const DocumentEdit = () => {
2020
updateDocument,
2121
getDocument,
2222
selectedDocument,
23-
getUpdatedFrames,
23+
getDocumentFrames,
2424
frames,
2525
error,
2626
setError
27-
} = DocumentsUIHook(woqlClient)
27+
} = useTDBDocuments(woqlClient)
2828

2929
let documentID=decodeUrl(docid)
3030

@@ -40,7 +40,7 @@ export const DocumentEdit = () => {
4040
if(!currentChangeRequest){
4141
setShowModal(true)
4242
}
43-
getUpdatedFrames()
43+
getDocumentFrames()
4444
getDocument(documentID)
4545
},[branch])
4646

0 commit comments

Comments
 (0)