review change request

Author: Francesca-Bit

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

@@ -58,9 +58,6 @@ export const ChangeDiffComponent = () => {
         currentCRObject
     } = WOQLClientObj() 
 
-    /*const {
-        getChangeRequestByID,
-    } = ChangeRequest()*/
 
     const {id} = useParams()
 
@@ -69,16 +66,7 @@ export const ChangeDiffComponent = () => {
     const [loading, setLoading]=useState(true)
     const [errorMsg, setErrorMsg]=useState(false)
 
-   /* useEffect(() => {
-        async function getCRID() {
-            await getChangeRequestByID(id,true)
-        }
-        if(id, client) getCRID()
-    }, [id, client])*/
-
-    //let changeRequestID=localStorage.getItem("TERMINUSCMS_CHANGE_REQUEST_ID")
     const result = GetDiffList(client, id, setLoading, setErrorMsg)      
-    //const result = GetDiffList(client, currentCRObject["@id"])   
 
     useEffect(() => {
         if(key === DIFFS) setAction(false)

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

@@ -31,7 +31,9 @@ export const DeleteDatabaseModal = ({showModal,setShowModal, dataProductDetails}
 
         setLoading(true)
         let dbInfo = dataProductDetails
-        woqlClient.deleteDatabase(dataProductDetails.name, woqlClient.organization(), true)
+        const clientCopy = woqlClient.copy()
+        clientCopy.connectionConfig.api_extension = 'api/'
+        clientCopy.deleteDatabase(dataProductDetails.name, woqlClient.organization(), true)
         .then((res) => {        
             setShowModal(false)
             setDisabled(true)

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

@@ -38,13 +38,13 @@ const Actions = ({checked, message, setKey, setMessage}) => {
 
     const {
         currentCRObject,
+        setCurrentCRObject,
         exitChangeRequestBranch
     }= WOQLClientObj()
 
     const {
         updateChangeRequestStatus,
         getChangeRequestList,
-        getChangeRequestByID,
 		loading
     } = ChangeRequest()
 
@@ -54,17 +54,20 @@ const Actions = ({checked, message, setKey, setMessage}) => {
     /** handle Message */
     async function handleMessage() {
         let id=extractID(currentCRObject["@id"])
+        // this call return the changeRequestObj Updated
         let res=await updateChangeRequestStatus(message, currentCRObject.status, id)
-        let cr=await getChangeRequestByID(id) 
+        // we'll see if add need rebase check every time
+        res.needRebase = currentCRObject.needRebase
+        setCurrentCRObject(res)
         if(setKey) setKey(CONST.MESSAGES)
         if(setMessage) setMessage("")
     }
 
     /** handle Merge */
     async function handleMerge () { 
         let res=await updateChangeRequestStatus(message, CONST.MERGED, id)
-        let cr=await getChangeRequestList()
 		if(res){
+            setCurrentCRObject(false)
 			exitChangeRequestBranch()
 			navigate(`/${organization}/${dataProduct}`)
 		}
@@ -73,8 +76,8 @@ const Actions = ({checked, message, setKey, setMessage}) => {
     /** handle Reject */
     async function handleReject () {
         let res=await updateChangeRequestStatus(message, CONST.REJECTED, id)
-        let cr=await getChangeRequestList()
         if(res){
+            setCurrentCRObject(false)
 			exitChangeRequestBranch()
 			navigate(`/${organization}/${dataProduct}`)
 		}

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

@@ -42,8 +42,8 @@ export function ChangeRequest(){
             setLoading(true)
             const payload = {message,status}
             const currentCR = crID || currentChangeRequest
-            await woqlClient.sendCustomRequest("PUT", `${getUrl()}/${currentCR}`,payload)
-            return true
+            const changeRequestDoc = await woqlClient.sendCustomRequest("PUT", `${getUrl()}/${currentCR}`,payload)
+            return changeRequestDoc
         }catch(err){ 
             const errMessage = formatErrorMessage(err)
             setError(errMessage)
@@ -92,13 +92,6 @@ export function ChangeRequest(){
             const queryParams = check_head ? `?check_head=true` : ""
             const result = await woqlClient.sendCustomRequest("GET", `${getUrl()}/${id}${queryParams}`)
             return result
-            /* if(setCurrentCRObject) {
-                result.map(res=>{
-                    if(res["@id"] === `ChangeRequest/${id}`){
-                        setCurrentCRObject(res) 
-                    }
-                })
-            }*/
         }catch(err){
             const errMessage = formatErrorMessage(err)
             setError(errMessage)