Skip to content

Commit daaea73

Browse files
committed
inherritence
1 parent 7c28dcd commit daaea73

File tree

15 files changed

+146
-162
lines changed

15 files changed

+146
-162
lines changed

packages/tdb-dashboard/cypress/e2e/dashboard/local_dashboard.cy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ describe('visit dashboard local', () => {
55

66

77
beforeAll(function () {
8-
// visit at the start
8+
// visit at the start
99
cy.visit(dashboard)
1010
})
1111

packages/tdb-dashboard/src/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {OrganizationHome } from "./pages/OrganizationHome"
2121
import {DocumentNew} from "./pages/DocumentNew"
2222
import {DocumentEdit} from "./pages/DocumentEdit"
2323
import {DocumentView} from "./pages/DocumentView"
24-
import {Home} from "./pages/Home"
24+
import {Home} from "./pages/Home"
2525
import {ChangeRequestsPage} from "./pages/ChangeRequestsPage"
2626
import {ChangeDiff} from "./pages/ChangeDiff"
2727
import {DocumentTemplate} from "./pages/DocumentTemplate"
@@ -120,7 +120,7 @@ function getRoutes(clientUser, isAdmin, useChangeRequest){
120120
<Route path="*" element={<div><PageNotFound/></div >} />
121121
</React.Fragment>
122122
}
123-
return <React.Fragment>
123+
return <React.Fragment>
124124
{/*<Route path="/verify" element={<VerifyEmail/>}/>*/}
125125
<Route path="/verify" element={<VerifyEmail/>}/>
126126
<Route path = {PATH.INVITE_PAGE} element = {<PrivateRoute component={InvitePage}/>} />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export function ChangeRequest(){
1212
const [errorMessage, setError] = useState(false)
1313
const [changeRequestList, setChangeRequestList] = useState([])
1414
const [manageConflict, setManageConflict]=useState(false)
15-
15+
1616
//I'm using the client to get my custom url
1717
function getUrl(){
1818
return getChangesUrl(woqlClient)
@@ -71,7 +71,7 @@ export function ChangeRequest(){
7171

7272
const getChangeRequestList = async(branchName, message) =>{
7373
try{
74-
setLoading(true)
74+
setLoading(true)
7575
const result = await woqlClient.sendCustomRequest("GET", getUrl())
7676
setChangeRequestList(result)
7777
return result

packages/tdb-dashboard/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from "react"
1+
import React from "react"
22
import {BrowserRouter,useNavigate} from "react-router-dom"
33
import { App } from "./App"
44
import {WOQLClientProvider} from './init-woql-client'

packages/tdb-dashboard/src/init-woql-client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {createClientUser} from "./clientUtils"
88
import { formatErrorMessage } from './hooks/hookUtils'
99
import { createApolloClient } from './routing/ApolloClientConfig'
1010
import {getChangesUrl} from "./hooks/hookUtils"
11-
import {cleanGraphiqlCache} from "./pages/utils"
11+
import {cleanGraphiqlCache} from "./pages/utils"
1212

1313
export const WOQLContext = React.createContext()
1414
export const WOQLClientObj = () => useContext(WOQLContext)

packages/tdb-dashboard/src/pages/ChangeRequestsPage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ export const ChangeRequestsPage = () => {
5050

5151
const {
5252
loading,
53-
getChangeRequestList,
53+
getChangeRequestList,
5454
changeRequestList
55-
} = ChangeRequest()
55+
} = ChangeRequest()
5656

5757
const [filter, setFilter]=useState(startStatus)
5858

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, {useState} from 'react'
22
import {sortAlphabetically} from "./utils"
33
import {getTotalNumberOfDocuments} from "./queryTemplates"
44

5-
export const useTDBDocuments = (woqlClient) => {
5+
export const useTDBDocuments = (woqlClient) => {
66
const [error, setError] = useState(false)
77
const [loading, setLoading] = useState(false)
88

packages/tdb-documents-ui/diff/src/Output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {OLD_VALUE, CHANGED_VALUE} from "./constants"
55
import {getSelectedTypeData} from "./functions"
66
import {oldData, changedData} from "./diff.constants"
77
import '../../src/css/terminusdb__darkly.css'
8-
import { STAR_WAR_FRAMES, PEOPLE_OLD_VALUE, PEOPLE_NEW_VALUE } from "./starwars.constants"
8+
//import { STAR_WAR_FRAMES, PEOPLE_OLD_VALUE, PEOPLE_NEW_VALUE } from "./starwars.constants"
99

1010
export const Output = () => {
1111
const {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'bootstrap/dist/css/bootstrap.min.css';
2-
import './css/terminusdb__styles.css';
2+
import './css/terminusdb__styles.css';
33

44
export { FrameViewer } from './FrameViewer'
55
export { DiffViewer } from './diffs/diffViewer'

packages/tdb-react-components/src/constants/details-labels.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export const BOOLEAN_TYPE_DATAPROVIDER = {label: 'Boolean Type', id:'range',
105105
export const JSON_TYPE_DATAPROVIDER = {label: 'JSON Type', id:'range',
106106
options:[{label:'JSON', value:'sys:JSON'}]}
107107

108-
108+
export const UNIT_TYPE_DATAPROVIDER = "sys:Unit"
109109

110110
/*
111111
*/
@@ -139,6 +139,7 @@ export const CLASS_PROPERTIES_LIST=[{label:'Enum Property', id:'ChoiceProperty',
139139
{label:'Boolean Property', id:'BooleanProperty',defaultRange:'xsd:boolean'},
140140
{label:'JSON Property', id:'JSONProperty',defaultRange:'sys:JSON'},
141141
{label:'Link Property', id:'LinkProperty',defaultRange:''},
142+
{label:'Unit Property', id:'UnitProperty',defaultRange:''},
142143
{label:'OneOf Property', id:'OneOfProperty',defaultRange:''}]
143144

144145

@@ -286,6 +287,7 @@ export const ELEMENT_HELP = {
286287
'number_subtype': `Choose from a decimal, integer or other, more refined numeric types ${FIELD_TYPE}`,
287288
'geo_subtype': `A geographic point (coordinate), a path (coordinate line) or a shape (coordinate polygon) ${FIELD_TYPE}`,
288289
'time_subtype': `A date, a date and time, or a range of date times ${FIELD_TYPE}`,
290+
'unit_property': `A unit measurement if present or not`,
289291
'oneOf_type': `The value of @oneOf field is a set, so can be any number of documents all of which have mutually disjointed properties, can be linked.`
290292
}
291293

0 commit comments

Comments
 (0)