Merge pull request #52 from terminusdb/dashboard-review

fix timetravel

Author: Francesca-Bit

packages/tdb-dashboard/src/components/JSONModelBuilder.js

@@ -30,8 +30,6 @@ export const JSONModelBuilder = ({tab,saveGraph,accessControlEditMode}) => {
     let ref = ""
 
     const onBlurHandler = (value) =>{
-        console.log("onBlurHandler",value)
-        console.log(Array.isArray(value),"onBlurHandlerIsArray")
         setValue(value)
     }
 

packages/tdb-dashboard/src/components/MainNavBar.js

@@ -7,14 +7,14 @@ import {WOQLClientObj} from '../init-woql-client'
 import {DATA_PRODUCTS} from "../routing/constants"
 import history from "../routing/history"
 import { UserMenu } from "./UserMenu";
-import {useNavigate,useParams} from "react-router-dom"
+import {useNavigate,useParams,useLocation} from "react-router-dom"
 
 export const MainNavBar = ({setShowTimeTravel}) => {
     const {woqlClient,changeOrganization,accessControlDashboard,clientUser} = WOQLClientObj()
     if(!clientUser || !woqlClient) return ""
     //we don't need setRoute
     const { organization, dataProduct } = useParams();
-    const currentPage = history.location.pathname
+    const currentPage = useLocation().pathname
 
     let navigate = useNavigate();
     function changeOrganizationHandler(orgName) {
@@ -24,7 +24,7 @@ export const MainNavBar = ({setShowTimeTravel}) => {
 
     return <Navbar className="navbar-dark bg-dark p-0 sticky-top main-navbar-shadow">           
         <div className="d-flex flex-grow-1 justify-content-end align-items-center">                    
-            {dataProduct && currentPage!==DATA_PRODUCTS &&
+            {dataProduct && currentPage!==`/${organization}/${dataProduct}` &&
             <React.Fragment>  
                 <h4 className="text-success ml-4 flex-grow-1 fw-bold mt-1" >
                     {dataProduct}

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

@@ -67,8 +67,6 @@ export const DocumentPage = (props) => {
             setError(null)
             const json = JSON.parse(createDoc.current.value)
             const dbNameValue = dbName.current.value || undefined//"test_profile"
-            //createDoc.current;
-            console.log("JSON______",json)
             const params={'graph_type':'schema'}
             if(replaceData.current.checked === true){
                 params['full_replace'] =true;

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

@@ -1,4 +1,4 @@
-import React, {useState} from 'react'
+import React, {useState,useEffect} from 'react'
 import {Container} from "react-bootstrap"
 import {MainNavBar} from '../components/MainNavBar'
 import SplitPane from 'react-split-pane'
@@ -9,10 +9,10 @@ import history from "../routing/history"
 import {DATA_PRODUCTS} from "../routing/constants"
 import { Outlet,useParams } from 'react-router-dom'
 import {LeftSideBar} from '../components/LeftSideBar'
+import {WOQLClientObj} from '../init-woql-client'
 
 export const Layout = (props) => {
     const { organization, dataProduct } = useParams();
-
     const [showTimeTravel, setShowTimeTravel] = useState(false)
     const [showFeedbackForm, setShowFeedbackForm] = useState(false)
 
@@ -24,12 +24,11 @@ export const Layout = (props) => {
                     <div style={{position: "relative"}}>
                         {showFeedbackForm && <Feedback setShowFeedbackForm={setShowFeedbackForm}/>}
                     </div>
-                </div>
-                
+                </div>              
                 <div className="main-content h-100">                      
                     <MainNavBar setShowTimeTravel={setShowTimeTravel}/>
                     <div className="container-fluid " >
-                        { dataProduct  && <TimeTravelContainer dataProduct={dataProduct} show={showTimeTravel} setShowTimeTravel={setShowTimeTravel}/>}                          
+                        { dataProduct  && <TimeTravelContainer show={showTimeTravel} setShowTimeTravel={setShowTimeTravel}/>}                          
                         {props.children}
                     </div>
                 </div>