Skip to content

Commit

Permalink
fix message (#270)
Browse files Browse the repository at this point in the history
Co-authored-by: Francesca-Bit <francesca@terminusdb.com>
  • Loading branch information
Francesca-Bit and Francesca-Bit committed Jul 5, 2023
1 parent 5caeb59 commit 46f182a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/tdb-dashboard/src/components/Messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ export const MessageBox = ({ setMessage, message }) => {
// displays textarea to write comments & button to save comments
export const MessageComponent = ({setKey}) => {
const { currentCRObject, setCurrentCRObject }= WOQLClientObj()
const { updateChangeRequestStatus, loading } = ChangeRequest()
const { addNewMessage, loading } = ChangeRequest()
const [comment, setComment]=useState("")
const { id } = useParams()

/** handle Message */
async function handleMessage(comment) {
let id=extractID(currentCRObject["@id"])
// this call return the changeRequestObj Updated
let res=await updateChangeRequestStatus(comment, currentCRObject.status, id)
let res=await addNewMessage(comment, id)
// we'll see if add need rebase check every time
res.needRebase = currentCRObject.needRebase
setCurrentCRObject(res)
Expand Down
17 changes: 17 additions & 0 deletions packages/tdb-dashboard/src/hooks/ChangeRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,22 @@ export function ChangeRequest(){
}
}

const addNewMessage = async(message, crID = false) =>{
try{
setLoading(true)
const payload = {message}
const currentCR = crID
const changeRequestDoc = await woqlClient.sendCustomRequest("POST", `${getUrl()}/${currentCR}/messages`,payload)
return changeRequestDoc
}catch(err){
const errMessage = formatErrorMessage(err)
setError(errMessage)
return false
}finally{
setLoading(false)
}
}

const updateChangeRequestStatus = async(message, status="Submitted", crID = false) =>{
try{
setLoading(true)
Expand Down Expand Up @@ -116,6 +132,7 @@ export function ChangeRequest(){
errorMessage,
changeRequestList,
createChangeRequest,
addNewMessage,
getChangeRequestList,
updateChangeRequestStatus,
getChangeRequestByID,
Expand Down

0 comments on commit 46f182a

Please sign in to comment.