Skip to content

Commit af8cc47

Browse files
Merge branch 'main' into interface/fix-typo-in-branch-actions
2 parents 0190a9f + ba2112b commit af8cc47

File tree

313 files changed

+39417
-29616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

313 files changed

+39417
-29616
lines changed

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ packages/*/auth_config
77
packages/tdb-dashboard/.env
88
packages/tdb-dashboard/cypress/integration/1-getting-started
99
packages/tdb-dashboard/cypress/integration/2-advanced-examples
10+
packages/tdb-documents-ui_old
11+
packages/tdb-documents-ui/src/oneOfTypeFrames copy
12+
packages/tdb-documents-ui/src/oneOfTypeFrames copy2
13+
packages/tdb-documents-ui/src/oneOfTypeFrames copy3
14+
15+
packages/tdb-documents-ui/mockTest
16+
packages/tdb-documents-ui/playground/.env
17+
packages/tdb-documents-ui/test/.env
18+
packages/tdb-documents-ui/diff/.env
19+
packages/tdb-documents-ui/src/pending.md
1020

1121
*.DS_Store
1222
node_modules/

package-lock.json

Lines changed: 15125 additions & 16013 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,13 @@
77
"./packages/tdb-access-control-component",
88
"./packages/tdb-documents-ui",
99
"./packages/tdb-dashboard"
10-
]
10+
],
11+
"dependencies": {
12+
"bootswatch": "^5.2.3",
13+
"esbuild-jest": "^0.5.0",
14+
"jsonlint-mod": "^1.7.6"
15+
},
16+
"devDependencies": {
17+
"@testing-library/react": "^13.4.0"
18+
}
1119
}

packages/tdb-access-control-component/package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@terminusdb/terminusdb-access-control-component",
3-
"version": "5.0.3",
3+
"version": "6.0.3",
44
"description": "Table for terminusdb",
55
"main": "src/index",
66
"module": "es6/index",
@@ -37,20 +37,21 @@
3737
"test",
3838
"lint"
3939
],
40-
"repository": {},
41-
"author": "terminusdb group",
4240
"peerDependencies": {
43-
"react": "^16.0.0",
44-
"react-dom": "^16.0.0"
41+
"react": "^18.2.0",
42+
"react-dom": "^18.2.0"
4543
},
44+
"repository": {},
45+
"author": "terminusdb group",
4646
"dependencies": {
47-
"@terminusdb/terminusdb-client": "^10.0.23",
48-
"@terminusdb/terminusdb-react-table": "^0.0.5",
47+
"@terminusdb/terminusdb-client": "^10.0.25",
48+
"babel-jest": "^29.3.1",
4949
"classnames": "^2.2.5",
5050
"date-fns": "^2.28.0",
51-
"react-bootstrap": "^2.1.2",
51+
"react-bootstrap": "^2.7.0",
5252
"react-icons": "^4.3.1",
53-
"react-table": "^7.0.0-rc.15"
53+
"react-table": "^7.0.0-rc.15",
54+
"ts-jest": "^29.0.5"
5455
},
5556
"devDependencies": {
5657
"@babel/cli": "^7.6.4",
@@ -74,8 +75,6 @@
7475
"eslint-plugin-jsx-a11y": "^6.1.0",
7576
"eslint-plugin-react": "^7.16.0",
7677
"pre-commit": "^1.1.3",
77-
"react": "^16.10.2",
78-
"react-dom": "^16.10.2",
7978
"react-hot-loader": "^1.3.0",
8079
"react-router-dom": "^5.1.2",
8180
"rimraf": "^2.7.1",

packages/tdb-access-control-component/src/hooks/AccessControlHook.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const AccessControlHook=(accessControlDashboard,options)=> {
2323
let message = err.message || ''
2424
if(err.data && err.data["api:message"]){
2525
message = err.data["api:message"]
26-
}else if (message.indexOf("but an object with that id already exists")){
26+
}else if (message.indexOf("but an object with that id already exists")!== -1){
2727
message = "The Team name already exists, Please choose another name"
2828
}
2929
return message

packages/tdb-dashboard/cypress.config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
module.exports = {
2-
env:{},
2+
env:{"MAILSLURP_API_KEY": "134d181528f7c1d7d730894948b5ea9faa117c4b8a580e1cbd805a93ce27a9e7",
3+
"COLLABORATOR_USER":"[email protected]",
4+
"COLLABORATOR_PASS":"[email protected]",
5+
"OWNER_PASS": "GEHEHUWBZBSBVD&#*JSHHDHBSHBNJ",
6+
"NEW_PASS" : "6789UWBZBSBVD&#*JSHHDHBSHBNJ"},
37
defaultCommandTimeout: 120000,
48
responseTimeout: 120000,
59
requestTimeout: 120000,
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module.exports = {
2+
env:{},
3+
defaultCommandTimeout: 120000,
4+
responseTimeout: 120000,
5+
requestTimeout: 120000,
6+
chromeWebSecurity: false,
7+
e2e: {
8+
// We've imported your old cypress plugins here.
9+
// You may want to clean this up later by importing these.
10+
setupNodeEvents(on, config) {
11+
return require('./cypress/plugins/index.js')(on, config)
12+
},
13+
baseUrl: 'https://dashboard-dev.terminusdb.com/',
14+
15+
16+
},
17+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ it('check that you can create a new Team', ()=>{
107107
cy.get('input#team_id').type(teamName).trigger('change');
108108
cy.get('#create_new_team_button').click()
109109
cy.wait(5000)
110-
cy.get('#team_list_nenu_button').should("contain",teamName)
110+
cy.get('#team_list_menu_button').should("contain",teamName)
111111

112112
})
113113

packages/tdb-dashboard/package.json

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@terminusdb-live/tdb-dashboard",
3-
"version": "5.0.3",
3+
"version": "6.0.3",
44
"description": "react",
55
"homepage": "./",
66
"main": "src/index",
@@ -29,7 +29,8 @@
2929
"test": "exit 0",
3030
"lint": "eslint src",
3131
"autofix": "eslint src --fix",
32-
"cypress": "npx cypress open"
32+
"cypress": "npx cypress open",
33+
"cypress-local": "npx cypress open --config cypress.config_local.js"
3334
},
3435
"pre-commit": [],
3536
"pre-push": [
@@ -38,36 +39,54 @@
3839
],
3940
"repository": {},
4041
"author": "terminusdb group",
41-
"peerDependencies": {
42-
"react": "^16.10.3",
43-
"react-dom": "^16.10.3"
44-
},
4542
"dependencies": {
43+
"@apollo/client": "^3.7.1",
4644
"@auth0/auth0-spa-js": "^1.19.3",
47-
"@terminusdb/terminusdb-client": "^10.0.23",
45+
"@emotion/styled": "^11.10.5",
46+
"@graphiql/toolkit": "^0.8.0",
47+
"@material-ui/core": "^4.12.4",
48+
"@material-ui/icons": "^4.11.3",
49+
"@material-ui/lab": "^4.0.0-alpha.61",
50+
"@material-ui/pickers": "^3.3.10",
51+
"@mui/material": "^5.11.1",
52+
"@stripe/react-stripe-js": "^1.16.4",
53+
"@stripe/stripe-js": "^1.46.0",
54+
"@terminusdb/terminusdb-client": "^10.0.25",
4855
"axios": "^0.21.1",
56+
"babel-jest": "^29.3.1",
4957
"classnames": "^2.2.5",
5058
"codemirror": "^5.64.0",
59+
"codemirror-graphql": "^2.0.2",
60+
"console-browserify": "^1.2.0",
5161
"date-fns": "^2.27.0",
5262
"dotenv": "^9.0.2",
5363
"dotenv-webpack": "^7.0.2",
5464
"file-loader": "^6.2.0",
65+
"graphiql": "^2.2.0",
66+
"graphql": "^15.8.0",
67+
"graphql-formatter": "^1.0.3",
68+
"graphql-react": "^20.0.0",
69+
"graphql-ws": "^5.11.2",
5570
"history": "^5.3.0",
71+
"jshint": "^2.13.6",
72+
"jsoneditor": "^9.9.2",
73+
"material-ui-confirm": "^3.0.7",
5674
"moment": "^2.29.1",
5775
"papaparse": "^5.3.0",
5876
"postcss-loader": "^5.3.0",
5977
"prop-types": "^15.6.0",
6078
"re-resizable": "^6.9.9",
61-
"react": "^16.10.3",
79+
"react": "^18.2.0",
6280
"react-accessible-accordion": "^3.3.4",
6381
"react-anchor-link-smooth-scroll": "^1.0.12",
64-
"react-bootstrap": "^1.5.2",
82+
"react-awesome-query-builder": "^5.4.0",
83+
"react-bootstrap": "^2.7.0",
6584
"react-codemirror2": "^7.2.1",
6685
"react-collapsed": "^3.6.0",
6786
"react-collapsible-component": "^1.3.4",
6887
"react-color": "^2.19.3",
6988
"react-dates": "^21.8.0",
70-
"react-dom": "^16.10.3",
89+
"react-dom": "^18.2.0",
7190
"react-icons": "^4.2.0",
7291
"react-json-editor-ajrm": "^2.5.13",
7392
"react-json-view": "^1.21.3",
@@ -79,9 +98,11 @@
7998
"react-sizeme": "^3.0.1",
8099
"react-split-pane": "^0.1.92",
81100
"react-use-dimensions": "^1.2.1",
101+
"react-uuid": "^2.0.0",
82102
"react-vertical-timeline-component": "^3.3.3",
83103
"recharts": "^2.1.8",
84104
"sass-loader": "^11.1.1",
105+
"ts-jest": "^29.0.5",
85106
"uuid": "^8.3.2",
86107
"yup": "^0.32.11"
87108
},

0 commit comments

Comments
 (0)