From 7b99e7d8108f77ba79cb9b4e04cf2da3b2f0bfe3 Mon Sep 17 00:00:00 2001 From: Francesca-Bit Date: Thu, 13 Oct 2022 10:19:10 +0100 Subject: [PATCH] change client version --- package-lock.json | 119 +++++++++++++++++- .../src/hooks/AccessControlHook.js | 13 +- packages/tdb-dashboard/package.json | 1 + 3 files changed, 119 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62eb87a7..7699285b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4188,9 +4188,9 @@ "link": true }, "node_modules/@terminusdb/terminusdb-client": { - "version": "10.0.20", - "resolved": "https://registry.npmjs.org/@terminusdb/terminusdb-client/-/terminusdb-client-10.0.20.tgz", - "integrity": "sha512-Stfy0dzyS7xxnupHJW1mro3cXZKBSXcd9e9SriDetdqZicO7TXAYgUG6j2gEPp2bCXz+CztUAvn5zzLsMC5oaw==", + "version": "10.0.21", + "resolved": "https://registry.npmjs.org/@terminusdb/terminusdb-client/-/terminusdb-client-10.0.21.tgz", + "integrity": "sha512-rrzoms+oqzUr4tiCoBlHySyKwMEqL66S+JMwCjRF/rwWEH/6yYvASJo1kFrbqeSrf1hQORcG3Z4e0nMGF5l/VA==", "dependencies": { "axios": "^0.25.0", "follow-redirects": "^1.14.8", @@ -8154,6 +8154,18 @@ "fast-bind": "^1.0.0" } }, + "node_modules/cypress-mailslurp": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/cypress-mailslurp/-/cypress-mailslurp-1.5.0.tgz", + "integrity": "sha512-gK222pivxpTDpX0fXe09VPQOesaVhuldD/O9vr+gI6GIngYTeoBNiSi8wbEf/t1fofpt22aN2IayFDv2W+/99w==", + "dev": true, + "dependencies": { + "mailslurp-client": "^15.13.3" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/d3": { "version": "5.16.0", "license": "BSD-3-Clause", @@ -8966,6 +8978,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", + "dev": true + }, "node_modules/es6-shim": { "version": "0.35.6", "license": "MIT" @@ -14087,6 +14105,17 @@ "sourcemap-codec": "^1.4.8" } }, + "node_modules/mailslurp-client": { + "version": "15.14.1", + "resolved": "https://registry.npmjs.org/mailslurp-client/-/mailslurp-client-15.14.1.tgz", + "integrity": "sha512-LsIy9TL7fVYQYiJiwHn4PjGGMNfiwGb+GSLRRXdNuv7wlqaCbt8BJGLVA8YV7VWm8yFuvikOQxAwYwNMDV4hjg==", + "dev": true, + "dependencies": { + "cross-fetch": "^3.1.5", + "es6-promise": "^4.2.8", + "url": "^0.11.0" + } + }, "node_modules/make-dir": { "version": "2.1.0", "dev": true, @@ -16388,6 +16417,16 @@ "teleport": ">=0.2.0" } }, + "node_modules/querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", + "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "dev": true, + "engines": { + "node": ">=0.4.x" + } + }, "node_modules/querystringify": { "version": "2.2.0", "license": "MIT" @@ -19737,6 +19776,16 @@ "punycode": "^2.1.0" } }, + "node_modules/url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", + "dev": true, + "dependencies": { + "punycode": "1.3.2", + "querystring": "0.2.0" + } + }, "node_modules/url-parse": { "version": "1.5.10", "license": "MIT", @@ -19745,6 +19794,12 @@ "requires-port": "^1.0.0" } }, + "node_modules/url/node_modules/punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==", + "dev": true + }, "node_modules/use-composed-ref": { "version": "1.3.0", "license": "MIT", @@ -21140,6 +21195,7 @@ "babel-loader": "^8.2.5", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.7.1", + "cypress-mailslurp": "^1.5.0", "dotenv-webpack": "^8.0.1", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.5.0", @@ -24203,6 +24259,7 @@ "codemirror": "^5.64.0", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.7.1", + "cypress-mailslurp": "^1.5.0", "date-fns": "^2.27.0", "dotenv": "^9.0.2", "dotenv-webpack": "^8.0.1", @@ -24665,9 +24722,9 @@ } }, "@terminusdb/terminusdb-client": { - "version": "10.0.20", - "resolved": "https://registry.npmjs.org/@terminusdb/terminusdb-client/-/terminusdb-client-10.0.20.tgz", - "integrity": "sha512-Stfy0dzyS7xxnupHJW1mro3cXZKBSXcd9e9SriDetdqZicO7TXAYgUG6j2gEPp2bCXz+CztUAvn5zzLsMC5oaw==", + "version": "10.0.21", + "resolved": "https://registry.npmjs.org/@terminusdb/terminusdb-client/-/terminusdb-client-10.0.21.tgz", + "integrity": "sha512-rrzoms+oqzUr4tiCoBlHySyKwMEqL66S+JMwCjRF/rwWEH/6yYvASJo1kFrbqeSrf1hQORcG3Z4e0nMGF5l/VA==", "requires": { "axios": "^0.25.0", "follow-redirects": "^1.14.8", @@ -27508,6 +27565,15 @@ "fast-bind": "^1.0.0" } }, + "cypress-mailslurp": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/cypress-mailslurp/-/cypress-mailslurp-1.5.0.tgz", + "integrity": "sha512-gK222pivxpTDpX0fXe09VPQOesaVhuldD/O9vr+gI6GIngYTeoBNiSi8wbEf/t1fofpt22aN2IayFDv2W+/99w==", + "dev": true, + "requires": { + "mailslurp-client": "^15.13.3" + } + }, "d3": { "version": "5.16.0", "requires": { @@ -28066,6 +28132,12 @@ "is-symbol": "^1.0.2" } }, + "es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", + "dev": true + }, "es6-shim": { "version": "0.35.6" }, @@ -31210,6 +31282,17 @@ "sourcemap-codec": "^1.4.8" } }, + "mailslurp-client": { + "version": "15.14.1", + "resolved": "https://registry.npmjs.org/mailslurp-client/-/mailslurp-client-15.14.1.tgz", + "integrity": "sha512-LsIy9TL7fVYQYiJiwHn4PjGGMNfiwGb+GSLRRXdNuv7wlqaCbt8BJGLVA8YV7VWm8yFuvikOQxAwYwNMDV4hjg==", + "dev": true, + "requires": { + "cross-fetch": "^3.1.5", + "es6-promise": "^4.2.8", + "url": "^0.11.0" + } + }, "make-dir": { "version": "2.1.0", "dev": true, @@ -32455,6 +32538,12 @@ "q": { "version": "1.5.1" }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", + "dev": true + }, "querystringify": { "version": "2.2.0" }, @@ -34578,6 +34667,24 @@ "punycode": "^2.1.0" } }, + "url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", + "dev": true, + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + }, + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==", + "dev": true + } + } + }, "url-parse": { "version": "1.5.10", "requires": { diff --git a/packages/tdb-access-control-component/src/hooks/AccessControlHook.js b/packages/tdb-access-control-component/src/hooks/AccessControlHook.js index ce61d11d..6c391fee 100644 --- a/packages/tdb-access-control-component/src/hooks/AccessControlHook.js +++ b/packages/tdb-access-control-component/src/hooks/AccessControlHook.js @@ -20,9 +20,11 @@ export const AccessControlHook=(accessControlDashboard,options)=> { const [resultTable,setResultTable]=useState([]) const formatMessage = (err)=>{ - let message = err.message + let message = err.message || '' if(err.data && err.data["api:message"]){ message = err.data["api:message"] + }else if (message.indexOf("but an object with that id already exists")){ + message = "The Team name already exists, Please choose another name" } return message } @@ -258,13 +260,8 @@ export const AccessControlHook=(accessControlDashboard,options)=> { async function createOrganizationRemote(teamName){ resetStatus() const currentBaseUrl =clientAccessControl.baseURL - try{ - /* - * I need to override the baseUrl for the remoteCall - */ - clientAccessControl.baseURL = currentBaseUrl+"/private" - await clientAccessControl.createOrganization(teamName) - + try{ + await clientAccessControl.createOrganizationRemote(teamName) return true }catch(err){ setError(formatMessage(err)) diff --git a/packages/tdb-dashboard/package.json b/packages/tdb-dashboard/package.json index ef7c2e40..67af6696 100644 --- a/packages/tdb-dashboard/package.json +++ b/packages/tdb-dashboard/package.json @@ -93,6 +93,7 @@ "babel-loader": "^8.2.5", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.7.1", + "cypress-mailslurp": "^1.5.0", "dotenv-webpack": "^8.0.1", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.5.0",