update package.json

Author: Francesca-Bit

packages/tdb-dashboard/package-lock.json

@@ -43,8 +43,8 @@
   },
   "dependencies": {
     "@auth0/auth0-spa-js": "^1.19.3",
-    "@terminusdb/terminusdb-access-control-component": "^0.0.8",
-    "@terminusdb/terminusdb-client": "^10.0.13",
+    "@terminusdb/terminusdb-access-control-component": "^0.0.9",
+    "@terminusdb/terminusdb-client": "^10.0.14",
     "@terminusdb/terminusdb-documents-ui": "^1.0.7",
     "axios": "^0.21.1",
     "classnames": "^2.2.5",

packages/tdb-dashboard/package.json

@@ -21,4 +21,14 @@ export function getBaseUrl(){
         remote_url += process.env.FEEDBACK_URL.endsWith('/') ? process.env.FEEDBACK_URL : process.env.FEEDBACK_URL+'/'
     }
     return `${remote_url}api`
+}
+
+export function formatErrorMessage (err){
+	let message = err.message
+	if(err.data && err.data["api:message"]){                  
+		message = err.data["api:message"]
+	}else if (message.indexOf("Network Error")>-1){
+		message = "Network Error"
+	}
+	return message
 }

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

@@ -7,7 +7,7 @@ import {executeQueryHook} from "./hooks/executeQueryHook"
 import {AccessControlDashboard} from "@terminusdb/terminusdb-access-control-component"
 import {useLocation} from "react-router-dom"
 import {createClientUser,formatSchema} from "./clientUtils"
-
+import { formatErrorMessage } from './hooks/hookUtils'
 export const WOQLContext = React.createContext()
 export const WOQLClientObj = () => useContext(WOQLContext)
 
@@ -128,13 +128,7 @@ export const WOQLClientProvider = ({children, params}) => {
                  setAccessControl(clientAccessControl)
                  setWoqlClient(dbClient)
             } catch (err) {
-                let message = err.message
-                if(err.data && err.data["api:message"]){                  
-                    message = err.data["api:message"]
-                    console.log("ERROR_DATA",message)
-                }else if (message.indexOf("Network Error")>-1){
-                    message = "Network Error"
-                }
+                const message = formatErrorMessage(err)
                 setError(message)
             }finally {
                 setLoadingServer(false)
@@ -307,32 +301,37 @@ export const WOQLClientProvider = ({children, params}) => {
 
    // review
     async function changeOrganization (orgName,setDataP, hubClient,accessControlDash){      
-        hubClient = hubClient || woqlClient 
-        accessControlDash = accessControlDash || accessControlDashboard
-        //this set the organization name and reset the databases list to empty
-        hubClient.organization(orgName)
-        // this failed if the organization does not exists
-        await accessControlDash.callGetUserTeamRole(clientUser.user,orgName)
-
-        //I use this for now to not call getDatabases
-        if(hubClient.userOrganizations().length>0){  
-            const hh= hubClient.userOrganizations();                 
-            const dbs =  hubClient.userOrganizations().find(element => element['name'] === orgName ) 
-            //console.log("DATABASES", dbs)
-            const dbList = dbs && dbs.databases ? dbs.databases : []
-            hubClient.databases(dbList)
-        }
-        //this is for change the base url api for the proxy
-        if(opts.connection_type!== "LOCAL"){
-            hubClient.connectionConfig.api_extension = `${orgName}/api/`
-            //load the list of system roles
-            accessControlDash.callGetRolesList()
+        try{
+            hubClient = hubClient || woqlClient 
+            accessControlDash = accessControlDash || accessControlDashboard
+            //this set the organization name and reset the databases list to empty
+            hubClient.organization(orgName)
+            // this failed if the organization does not exists
+            await accessControlDash.callGetUserTeamRole(clientUser.user,orgName)
+
+            //I use this for now to not call getDatabases
+            if(hubClient.userOrganizations().length>0){  
+                const hh= hubClient.userOrganizations();                 
+                const dbs =  hubClient.userOrganizations().find(element => element['name'] === orgName ) 
+                //console.log("DATABASES", dbs)
+                const dbList = dbs && dbs.databases ? dbs.databases : []
+                hubClient.databases(dbList)
+            }
+            //this is for change the base url api for the proxy
+            if(opts.connection_type!== "LOCAL"){
+                hubClient.connectionConfig.api_extension = `${orgName}/api/`
+                //load the list of system roles
+                accessControlDash.callGetRolesList()
+            }
+            
+            localStorage.setItem("Org", orgName)
+            const dataP = setDataP || false
+            //reset database and commit head
+            setDataProduct(dataP,hubClient,accessControlDash)
+        }catch(err){
+            const message = formatErrorMessage(err)
+            setError(message)
         }
-        
-        localStorage.setItem("Org", orgName)
-        const dataP = setDataP || false
-        //reset database and commit head
-        setDataProduct(dataP,hubClient,accessControlDash)
    } 
 
     //get the list of databases