Merge pull request #119 from terminusdb/starWars

Star wars

Author: KittyJose

packages/tdb-dashboard/src/App.css

@@ -1101,8 +1101,8 @@ pre.CodeMirror-line  > span > span.cm-string {
 }
 
 .group {
-  background: transparent;
-  border: 0px solid #DCC896;
+  background: transparent !important;
+  border: 1px solid #dee2e6 !important;
 }
 
 .rule_group{
@@ -1194,3 +1194,10 @@ pre.CodeMirror-line  > span > span.cm-string {
   height: 100px;
 }
 
+.payment_select{
+  background-color: transparent !important;
+  color: #adb5bd !important;
+  border-color: #adb5bd!important;
+    /* line-height: 1.5 !important; */
+  min-height: 49px!important;
+}

packages/tdb-dashboard/src/App.js

@@ -22,7 +22,7 @@ import {DocumentNew} from "./pages/DocumentNew"
 import {DocumentEdit} from "./pages/DocumentEdit"
 import {DocumentView} from "./pages/DocumentView"
 import {Home} from "./pages/Home"
-import {ChangeRequests} from "./pages/ChangeRequests"
+import {ChangeRequestsPage} from "./pages/ChangeRequestsPage"
 import {ChangeDiff} from "./pages/ChangeDiff"
 import {DocumentTemplate} from "./pages/DocumentTemplate"
 import {GraphIqlEditor} from "./pages/GraphIqlEditor"
@@ -109,7 +109,7 @@ function getRoutes(clientUser, isAdmin, woqlClient){
                 <Route path={PATH.GRAPHIQL}  element={<PrivateRoute component={GraphIqlEditor}/>} /> 
 
                 <Route path={PATH.CHANGE_REQUESTS} >
-                    <Route index  element={<PrivateRoute component={ChangeRequests}/>} />    
+                    <Route index  element={<PrivateRoute component={ChangeRequestsPage}/>} />    
                     <Route path=":id" element={<PrivateRoute component={ChangeDiff}/>} /> 
                 </Route>
                 <Route path={PATH.DOCUMENT_EXPLORER} element={<DocumentTemplate/>}>

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

@@ -9,7 +9,7 @@ const SQUASH_FORM = 'squashForm'
 const RESET_FORM = 'resetForm'
 const DELETE_FORM = 'deleteForm'
 
-export const BranchActions = ({branch, handleClose, setRefresh, showDefaultForm}) =>{
+export const BranchActions = ({branch, handleClose, setRefresh, showDefaultForm,updateTable}) =>{
     const [showForm, setShowForm] = useState(showDefaultForm || false)
     const [commit, setCommit] = useState(false)
     const [branchName,setBranchName] = useState(false)
@@ -24,7 +24,7 @@ export const BranchActions = ({branch, handleClose, setRefresh, showDefaultForm}
         handleOptimize,
         handleReset,
         handleSquash
-    } = BranchControl()
+    } = BranchControl(updateTable)
 
     const squashDescription = useRef(null);
 

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

@@ -5,7 +5,7 @@ import {BranchActions} from "./BranchActions"
 import {CommitLogs, CommitView} from "./CommitLogs"
 import {WOQLClientObj} from '../init-woql-client' 
 
-export const BranchInfoModal = ({showDefault, handleClose, handleSwitch, setSelectedCommit, selectedCommit,showDefaultForm}) => {
+export const BranchInfoModal = ({showDefault, handleClose, handleSwitch, setSelectedCommit, selectedCommit,showDefaultForm, updateTable}) => {
     const {woqlClient, branch, branchNeedReload} = WOQLClientObj()
     const [refresh, setRefresh] = useState(0)
 
@@ -25,7 +25,7 @@ export const BranchInfoModal = ({showDefault, handleClose, handleSwitch, setSele
             <Button variant="close" aria-label="Close" onClick={handleClose} />
         </Modal.Header>
         <Modal.Body className="p-5">
-            <BranchActions branchNeedReload={branchNeedReload} showDefaultForm={showDefaultForm} branch={branch} handleClose={handleClose} woqlClient={woqlClient} setRefresh={setRefresh}/>
+            <BranchActions updateTable={updateTable} branchNeedReload={branchNeedReload} showDefaultForm={showDefaultForm} branch={branch} handleClose={handleClose} woqlClient={woqlClient} setRefresh={setRefresh}/>
             <hr className="my-3 border-indigo dropdown-divider" role="separator"></hr>
             <CommitInfo/>
 

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

@@ -9,7 +9,6 @@ import {BiGitBranch} from "react-icons/bi"
 import Tab from 'react-bootstrap/Tab'
 import Tabs from 'react-bootstrap/Tabs'
 import Stack from 'react-bootstrap/Stack'
-import {ChangeRequest} from "../hooks/ChangeRequest"
 import {Loading} from "../components/Loading"
 import Alert from 'react-bootstrap/Alert'
 import {

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

@@ -2,12 +2,15 @@ import React, {useRef, useState} from "react"
 import {Alert, Modal, Button, Form} from "react-bootstrap" 
 import {ChangeRequest} from "../hooks/ChangeRequest"
 import {useNavigate} from "react-router-dom"
-
+import {WOQLClientObj} from '../init-woql-client'
 
 export const CreateChangeRequestModal = ({showModal, setShowModal , updateViewMode, type}) => { 
+    const { 
+        woqlClient
+    } = WOQLClientObj()
     const nameRef = useRef(null);
     const messageRef = useRef(null);
-    const {loading,errorMessage,setError,createChangeRequest} =  ChangeRequest()
+    const {loading,errorMessage,setError,createChangeRequest} =  ChangeRequest(woqlClient)
     const navigate = useNavigate()
 
     const closeModal = () => {

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

@@ -15,7 +15,6 @@ import ProgressBar from 'react-bootstrap/ProgressBar'
 import {BsPlus} from "react-icons/bs"
 import {BiMinusCircle} from "react-icons/bi"
 import {extractID} from "../components/utils"
-import {ChangeRequest} from "../hooks/ChangeRequest"
 import {Loading} from "./Loading"
 
 /**

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

@@ -49,7 +49,7 @@ export const DocumentsGraphqlTable = ({type,onRowClick,showGraphqlTab=true}) =>
 
     function onRowClickCall(row){
         if (onRowClick) {
-            const rowTmp = row && row.original ? {label:row.original.name, id:row.original._id}: {}
+            const rowTmp = row && row.original ? {label:row.original.name, id:row.original.fullID}: {}
             onRowClick(rowTmp)
         }
     }
@@ -60,6 +60,18 @@ export const DocumentsGraphqlTable = ({type,onRowClick,showGraphqlTab=true}) =>
 
     let extractedResults = documentResults ? extractDocuments(documentResults[type]) : []
 
+    function cleanIdValue(keyName, keyValue){
+        if(keyValue === "null") return ""
+        if(keyName!=="_id") return keyValue
+        try{
+            const regexp =/(?:\/+.*?\/)(.*$)/g
+            const array01 = [...keyValue.matchAll(regexp)];
+            return array01[0][1]
+        }catch(err){
+            return keyValue
+        }
+    }
+
     function extractDocuments(documentResultsArr) {
         if(!documentResultsArr) {
             //alert(JSON.stringify(documentResultsArr))
@@ -80,11 +92,15 @@ export const DocumentsGraphqlTable = ({type,onRowClick,showGraphqlTab=true}) =>
                     //key 
                     const objectKey = Object.keys(item[key])
                     objectKey.forEach(element => {
-                        newJson[`${key}---${element}`] = `${item[key][element]}`
+                        const columnName = element === "_id" ? `${key}---id` : `${key}---${element}`
+                        newJson[columnName] = cleanIdValue(element, item[key][element])
                     });
                 }
                 else {
-                    newJson[key] = `${item[key]}`
+                    if(key==="_id"){
+                        newJson["fullID"] = `${item[key]}`
+                    }
+                    newJson[key] = cleanIdValue(key, `${item[key]}`)
                 }
             }
             extractedResults.push(newJson)

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

@@ -8,6 +8,7 @@ import {getDocumentTools, getDeleteTool, getCopyIDTool} from "./DocumentActions"
 import {getColumnsFromResults, displayIDOfLinkedDocuments, isArray} from "./utils"
 import {Loading} from "./Loading"
 import { useParams,useNavigate } from "react-router-dom"
+import {UTILS} from '@terminusdb/terminusdb-client'
 
 export const DocumentWoqlTable = () => {
     const {
@@ -94,9 +95,8 @@ export const DocumentWoqlTable = () => {
 
     // on click document table row
     function onRowClick (row) {
-        const idFull = row.original["@id"]
-        const id = idFull.substring(idFull.indexOf("/")+1)
-        navigate(id)
+        const fullId = row["id"]
+        navigate(`${UTILS.encodeURISegment(fullId)}`)
     }
 
 

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

@@ -20,7 +20,6 @@ export const ManageProducts = ({setDataProductSettings , branches , updateTable}
         loading,
         reportAlert,
         handleSwitch,
-        handleDelete,
         handleBranchClick,
         setSelectedBranch
     } = BranchControl(updateTable)
@@ -79,7 +78,8 @@ export const ManageProducts = ({setDataProductSettings , branches , updateTable}
                 handleSwitch={handleSwitch} 
                 setSelectedCommit={setSelectedCommit}
                 showDefaultForm={showDefaultForm}
-                selectedCommit={selectedCommit}/>}
+                selectedCommit={selectedCommit}
+                updateTable={updateTable}/>}
 
             <div className="float-right text-right d-flex">
                 {/*<Button variant="light" className="mr-3" title={VIEW_HISTORY.title} onClick={(e) => setHistory(true)}>