merge changes

KittyJose · KittyJose · commit 1a62a4c3a538 · 2023-02-14T11:20:09.000Z
diff --git a/packages/tdb-dashboard/src/components/CreateChangeRequestModal.js b/packages/tdb-dashboard/src/components/CreateChangeRequestModal.js
@@ -2,15 +2,11 @@ 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(woqlClient)
+    const {loading,errorMessage,setError,createChangeRequest} =  ChangeRequest()
     const navigate = useNavigate()
 
     const closeModal = () => {
diff --git a/packages/tdb-dashboard/src/components/DocumentComponents.js b/packages/tdb-dashboard/src/components/DocumentComponents.js
@@ -22,6 +22,7 @@ import OverlayTrigger from "react-bootstrap/OverlayTrigger"
 import Row from "react-bootstrap/Row"
 import {DocumentsGraphqlTable} from "./DocumentsGraphqlTable"
 import {WOQLClientObj} from '../init-woql-client'
+import {CreateChangeRequestModal} from "../components/CreateChangeRequestModal"
 
 // button to view frames
 const ViewFramesButton = () => {
@@ -178,8 +179,6 @@ const ViewHeader = ({type, id, setView, setShowCRModal, setClickedDelete}) => {
         else setClickedDelete(Date.now())
     }
 
-
-
     return <Stack direction="horizontal" gap={3} className="w-100">
         <div className="col-md-6"> 
             <strong className="text-success">
diff --git a/packages/tdb-dashboard/src/components/DocumentsWoqlTable.js b/packages/tdb-dashboard/src/components/DocumentsWoqlTable.js
@@ -95,8 +95,10 @@ export const DocumentWoqlTable = () => {
 
     // on click document table row
     function onRowClick (row) {
-        const fullId = row["id"]
-        navigate(`${UTILS.encodeURISegment(fullId)}`)
+        let fullId = row.original['@id']
+    
+        let fullIdEncode = btoa(fullId)
+        navigate(fullIdEncode)
     }
 
 
diff --git a/packages/tdb-dashboard/src/components/ReviewComponent.js b/packages/tdb-dashboard/src/components/ReviewComponent.js
@@ -27,7 +27,7 @@ const ToggleActions = ({ message }) => {
             if(res){
                 setCurrentCRObject(false)
                 exitChangeRequestBranch()
-                navigate(`/${organization}/${dataProduct}`)
+                navigate(`/${organization}/${dataProduct}/change_requests?status=${status}`)
             }
         }
         if(action) doAction()
diff --git a/packages/tdb-dashboard/src/components/SubmitChangeRequestModal.js b/packages/tdb-dashboard/src/components/SubmitChangeRequestModal.js
@@ -1,12 +1,10 @@
 import React, {useRef, useState} from "react"
 import {Alert, Modal, Button, Form} from "react-bootstrap" 
 import {ChangeRequest} from "../hooks/ChangeRequest"
-import {WOQLClientObj} from '../init-woql-client'
 
 export const SubmitChangeRequestModal = ({showModal, setShowModal , updateParent, updateChangeRequestID}) => { 
     const messageRef = useRef(null);
-    const {woqlClient} = WOQLClientObj()
-    const {loading,errorMessage,setError,updateChangeRequestStatus} =  ChangeRequest(woqlClient)
+    const {loading,errorMessage,setError,updateChangeRequestStatus} =  ChangeRequest()
     
     const closeModal = () => setShowModal(false)
 
diff --git a/packages/tdb-dashboard/src/components/utils.js b/packages/tdb-dashboard/src/components/utils.js
@@ -329,3 +329,13 @@ export function getCRConflictError (errorData) {
 	</div>
 }
 
+export function decodeUrl(id){
+    let idDecode
+    try{
+         idDecode= atob(id)
+    }catch(err){
+        return undefined
+    }
+    return idDecode
+}
+
diff --git a/packages/tdb-dashboard/src/hooks/BranchControl.js b/packages/tdb-dashboard/src/hooks/BranchControl.js
@@ -9,14 +9,14 @@ import { ChangeRequest } from "./ChangeRequest"
 // we have the branches list only in document explorer and in time travel
 export function BranchControl (updateTable)  {
     const {woqlClient,
-           ref,
+            ref,
            setHead,
            branch,
           // branches,
             // branchNeedReload,
            setConsoleTime} = WOQLClientObj()
     
-    const {getChangeRequestList} = ChangeRequest(woqlClient)
+    const {getChangeRequestList} = ChangeRequest()
     if(!woqlClient) return ""
     const dataProduct = woqlClient.db()
       
diff --git a/packages/tdb-dashboard/src/hooks/ChangeRequest.js b/packages/tdb-dashboard/src/hooks/ChangeRequest.js
@@ -2,10 +2,11 @@ import React, {useState} from "react";
 //import { ClientObj } from "../cms-init-client"
 //import {errorMessageFormatter} from "../utils/errorMessage"
 
-// import {WOQLClientObj} from '../init-woql-client'
+import {WOQLClientObj} from '../init-woql-client'
 import { formatErrorMessage } from './hookUtils'
- 
-export function ChangeRequest(woqlClient){  
+
+export function ChangeRequest(){  
+    const {woqlClient} = WOQLClientObj()
     const [loading, setLoading] = useState(false)
     const [errorMessage, setError] = useState(false)
     const [changeRequestList, setChangeRequestList]  = useState([])
diff --git a/packages/tdb-dashboard/src/hooks/DocumentHook.js b/packages/tdb-dashboard/src/hooks/DocumentHook.js
@@ -6,8 +6,8 @@ import { WOQLClientObj } from "../init-woql-client";
 
 // to be review this
 export function CheckStatusObj() {
-    const {woqlClient:client, currentChangeRequest} = WOQLClientObj()
-    const {getChangeRequestByID} = ChangeRequest(client)
+    const {currentChangeRequest} = WOQLClientObj()
+    const {getChangeRequestByID} = ChangeRequest()
     
     async function checkStatus (){   
         const CRObject = await getChangeRequestByID(currentChangeRequest)
diff --git a/packages/tdb-dashboard/src/hooks/hookUtils.js b/packages/tdb-dashboard/src/hooks/hookUtils.js
@@ -38,16 +38,18 @@ export function getBaseUrlFeedback(){
 
 export function formatErrorMessage (err){
 	let message = err.message
-	if(err.data && err.data["api:message"]){ 
-		if( err.data["api:message"] === "Incorrect authentication information"){
-			return "Incorrect authentication information, wrong username or password"
-		}            
-		message = err.data["api:message"]
-	}else if (message.indexOf("Network Error")>-1){
+	if (message.indexOf("Network Error")>-1){
 		message = "Network Error"
-	}
-	else if (err.data && err.data["api:status"] && err.data["api:status"]==="api:conflict") {
-		message = getCRConflictError(err.data["api:witnesses"])
+	}else if(err.data && err.data["api:message"]){ 
+		if( err.data["api:message"] === "Incorrect authentication information"){
+			message =  "Incorrect authentication information, wrong username or password"
+		}else if (err.data["api:status"]==="api:conflict"){
+			message = getCRConflictError(err.data["api:witnesses"])
+		}else if (err.data["api:message"]=== "Schema check failure"){
+			message = `${err.data["api:message"]} ${JSON.stringify(err.data["system:witnesses"], null, 2)}`
+		}else{
+			message = err.data["api:message"]
+		}
 	}
 	return message
 }
diff --git a/packages/tdb-dashboard/src/pages/ChangeDiff.js b/packages/tdb-dashboard/src/pages/ChangeDiff.js
@@ -16,16 +16,16 @@ import { Alerts } from "../components/Alerts"
 
 const CRAction = ({}) => {
     const {
-        woqlClient,
         currentCRObject,
         setCurrentCRObject
     } = WOQLClientObj() 
 
     const {
         rebaseChangeRequestBranch,
         loading,
-        error
-    } = ChangeRequest(woqlClient)
+        errorMessage,
+        setError
+    } = ChangeRequest()
 
     const rebaseHandler = async ()=>{ 
         const changeRequestDoc = await rebaseChangeRequestBranch(extractID(currentCRObject["@id"]))
@@ -91,8 +91,8 @@ export const ChangeDiff = () => {
         getChangeRequestByID,
         rebaseChangeRequestBranch,
         loading,
-        error
-    } = ChangeRequest(client)
+        errorMessage
+    } = ChangeRequest()
     
     
 
diff --git a/packages/tdb-dashboard/src/pages/ChangeRequestsPage.js b/packages/tdb-dashboard/src/pages/ChangeRequestsPage.js
@@ -1,6 +1,6 @@
 import React, {useEffect, useState} from "react";
 import {Container , Card, Button, ListGroup,Badge} from "react-bootstrap"
-import {useNavigate, useParams} from "react-router-dom";
+import {useNavigate, useParams, useSearchParams} from "react-router-dom";
 import {WOQLClientObj} from '../init-woql-client'
 import {ChangeRequest} from "../hooks/ChangeRequest"
 import {BiGitPullRequest} from "react-icons/bi"
@@ -32,11 +32,12 @@ const GetChangeRequestSummary = ({changeRequestList}) => {
 
 export const ChangeRequestsPage = () => {
 	const {organization,dataProduct} = useParams()
+	let [searchParams, setSearchParams] = useSearchParams();
 	const navigate = useNavigate()
 
 	const [updateChangeRequestID,setShowUpdateChangeRequestID] = useState(false)
 
-	// const [tmpChangeRequest,setTmpChangeRequest] = useState(false)
+	const startStatus = searchParams.get("status") || OPEN
 
     const {
 		woqlClient,
@@ -49,15 +50,18 @@ export const ChangeRequestsPage = () => {
 		loading,
 		getChangeRequestList,
 		changeRequestList
-    } =  ChangeRequest(woqlClient) 
+    } =  ChangeRequest() 
+
+	const [filter, setFilter]=useState(startStatus)
 
 	const updateParent = () =>{
 		exitChangeRequestBranch()
 		getChangeRequestList()
+		setFilter(SUBMITTED)
     }
 
-	const [refresh, setRefersh]=useState(Date.now())
-	const [filter, setFilter]=useState(OPEN)
+	// const [refresh, setRefersh]=useState(Date.now())
+	
   
     useEffect(() => { 
         if(woqlClient) getChangeRequestList()
diff --git a/packages/tdb-dashboard/src/pages/DocumentEdit.js b/packages/tdb-dashboard/src/pages/DocumentEdit.js
@@ -13,6 +13,7 @@ import {Loading} from "../components/Loading"
 import {DocumentControlObj} from "../hooks/DocumentControlContext"
 import {CreateChangeRequestModal} from "../components/CreateChangeRequestModal"
 import {UTILS} from "@terminusdb/terminusdb-client"
+import {decodeUrl} from "../components/utils"
 
 const checkIfPrefix =(id)=>{
     if(id.indexOf(":")>-1){
@@ -65,7 +66,7 @@ const DisplayDocumentBody = ({setLoading, setErrorMsg}) => {
     } = DocumentControlObj()
 
     const {type, id} = useParams()
-    let documentID=atob(id)
+    let documentID=decodeUrl(id)
     
     // constants for extracted data 
     const [extracted, setExtracted]=useState(false)
@@ -116,7 +117,7 @@ export const DocumentEdit = () => {
     } = WOQLClientObj()
 
     const {type, id} = useParams()
-    let documentID=atob(id)
+    let documentID=decodeUrl(id)
     // constants to display document body in Form or JSON View
     const [view, setView]=useState(CONST.FORM_VIEW) 
     const [loading, setLoading]=useState(false)
diff --git a/packages/tdb-dashboard/src/pages/DocumentView.js b/packages/tdb-dashboard/src/pages/DocumentView.js
@@ -13,6 +13,7 @@ import {DocumentControlObj} from "../hooks/DocumentControlContext"
 import {TarverseDocumentLinks} from "../components/TarverseDocumentLinks"
 import {CreateChangeRequestModal} from "../components/CreateChangeRequestModal"
 import Modal from 'react-bootstrap/Modal';
+import {decodeUrl} from "../components/utils"
 
 const DisplayDocumentBody = ({setLoading, setErrorMsg, setClicked, setModalShow}) => {
     const { 
@@ -29,7 +30,7 @@ const DisplayDocumentBody = ({setLoading, setErrorMsg, setClicked, setModalShow}
     const [data, setData]=useState(false)
 
     // hook to view a document 
-    let documentID= atob(id)
+    let documentID=decodeUrl(id)
     const viewResult = GetDocumentHook(woqlClient, documentID, setData, setLoading, setErrorMsg) || null
 
     function handleTraverse (documentID) {
@@ -78,22 +79,16 @@ export const DocumentView = () => {
     const [clicked, setClicked]=useState(false)
     const [modalShow, setModalShow] = React.useState(false);
     const [showCRModal, setShowCRModal] = useState(false)
-    
-    /*useEffect(() => {
-        if(clickedDelete && branch === "main"){
-            //setShowModal(true)
-        }
-	},[clickedDelete])*/
+   
 
     const handleClose = () => setClickedDelete(false);
 
-    let documentID=atob(id)
+    let documentID=decodeUrl(id)
     const deleteResult=DeleteDocumentHook(woqlClient, documentID, type, deleteDocument, setLoading, setErrorMsg) 
 
     const updateViewMode =(newBranchName, changeRequestId)=>{
         setChangeRequestBranch(newBranchName, changeRequestId)
         setClickedDelete(Date.now())
-       // setCurrentMode(currentMode)
     }
 
     function handleDelete () {
diff --git a/packages/tdb-dashboard/src/pages/DocumentsGraphqlList.js b/packages/tdb-dashboard/src/pages/DocumentsGraphqlList.js
@@ -27,7 +27,7 @@ export const DocumentsGraphqlList = () => {
         startFilters ={"name":{"regex":searchParams.get('filters')}}
     }      
     const onRowClick = (row) =>{
-        let fullId = row["id"]    
+        let fullId = row['id']
         let fullIdEncode = btoa(fullId)
         navigate(fullIdEncode)
     }
diff --git a/packages/tdb-dashboard/src/pages/Layout.js b/packages/tdb-dashboard/src/pages/Layout.js
@@ -31,7 +31,7 @@ export const Layout = (props) => {
     
     const updateParent = () =>{
         exitChangeRequestBranch()
-        navigate(`/${organization}/${dataProduct}/change_requests`)
+        navigate(`/${organization}/${dataProduct}/change_requests?status=Submitted`)
     }
 
     const closeChangeRequest = () =>{

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ const ToggleActions = ({ message }) => {`
`27`	`27`	`if(res){`
`28`	`28`	`setCurrentCRObject(false)`
`29`	`29`	`exitChangeRequestBranch()`
`30`		- navigate(`/${organization}/${dataProduct}`)
	`30`	+ navigate(`/${organization}/${dataProduct}/change_requests?status=${status}`)
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`if(action) doAction()`