Refactor collaboration APIs to include versionId in relevant functions and clean up commented code
This commit is contained in:
@@ -77,7 +77,6 @@ const Messages: React.FC<MessageProps> = ({ val, i, setMessages, mode, setIsEdit
|
|||||||
// position: editThreadTitle.data.position,
|
// position: editThreadTitle.data.position,
|
||||||
// rotation: [0, 0, 0],
|
// rotation: [0, 0, 0],
|
||||||
// comments: [],
|
// comments: [],
|
||||||
// versionId: selectedVersion?.versionId || ""
|
|
||||||
// }
|
// }
|
||||||
// updateComment((val as CommentSchema).threadId, editedThread)
|
// updateComment((val as CommentSchema).threadId, editedThread)
|
||||||
// }
|
// }
|
||||||
@@ -105,7 +104,6 @@ const Messages: React.FC<MessageProps> = ({ val, i, setMessages, mode, setIsEdit
|
|||||||
// createdAt: getRelativeTime(editComments.data?.createdAt),
|
// createdAt: getRelativeTime(editComments.data?.createdAt),
|
||||||
// lastUpdatedAt: "2 hrs ago",
|
// lastUpdatedAt: "2 hrs ago",
|
||||||
// comment: value,
|
// comment: value,
|
||||||
// versionId: selectedVersion?.versionId || ""
|
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// updateReply((val as CommentSchema).threadId, (val as Reply)?.replyId, commentData);
|
// updateReply((val as CommentSchema).threadId, (val as Reply)?.replyId, commentData);
|
||||||
@@ -160,11 +158,11 @@ const Messages: React.FC<MessageProps> = ({ val, i, setMessages, mode, setIsEdit
|
|||||||
versionId: selectedVersion?.versionId || ""
|
versionId: selectedVersion?.versionId || ""
|
||||||
}
|
}
|
||||||
setMessages(prev => {
|
setMessages(prev => {
|
||||||
console.log("Previous messages:", prev.map((val) => val)); // 👈 logs the current state
|
// 👈 logs the current state
|
||||||
return prev.filter(message => message.replyId !== (val as Reply).replyId);
|
return prev.filter(message => message.replyId !== (val as Reply).replyId);
|
||||||
});
|
});
|
||||||
removeReply(selectedComment?.threadId, (val as Reply).replyId); // Remove listener after response
|
removeReply(selectedComment?.threadId, (val as Reply).replyId); // Remove listener after response
|
||||||
console.log('(val as Reply).replyId: ', (val as Reply).replyId);
|
|
||||||
|
|
||||||
threadSocket.emit("v1-Comment:delete", deleteComment);
|
threadSocket.emit("v1-Comment:delete", deleteComment);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -154,7 +154,6 @@ const ThreadChat: React.FC = () => {
|
|||||||
// createdAt: "2 hrs ago",
|
// createdAt: "2 hrs ago",
|
||||||
// lastUpdatedAt: "2 hrs ago",
|
// lastUpdatedAt: "2 hrs ago",
|
||||||
// comment: value,
|
// comment: value,
|
||||||
// versionId: selectedVersion?.versionId || ""
|
|
||||||
// }
|
// }
|
||||||
// setMessages((prevMessages) => [
|
// setMessages((prevMessages) => [
|
||||||
// ...prevMessages,
|
// ...prevMessages,
|
||||||
@@ -201,7 +200,6 @@ const ThreadChat: React.FC = () => {
|
|||||||
threadId: selectedComment?.threadId,
|
threadId: selectedComment?.threadId,
|
||||||
versionId: selectedVersion?.versionId || ""
|
versionId: selectedVersion?.versionId || ""
|
||||||
}
|
}
|
||||||
|
|
||||||
setSelectedComment(null)
|
setSelectedComment(null)
|
||||||
removeComment(selectedComment?.threadId)
|
removeComment(selectedComment?.threadId)
|
||||||
threadSocket.emit("v1:thread:delete", deleteThread);
|
threadSocket.emit("v1:thread:delete", deleteThread);
|
||||||
|
|||||||
@@ -75,8 +75,6 @@ const ThreadSocketResponsesDev = ({ setMessages, modeRef, messages }: ThreadSock
|
|||||||
setMessages((prev) =>
|
setMessages((prev) =>
|
||||||
prev.map((message) => {
|
prev.map((message) => {
|
||||||
// 👈 log each message
|
// 👈 log each message
|
||||||
|
|
||||||
|
|
||||||
return message.replyId === data.data?._id
|
return message.replyId === data.data?._id
|
||||||
? { ...message, comment: data.data?.comment }
|
? { ...message, comment: data.data?.comment }
|
||||||
: message;
|
: message;
|
||||||
@@ -92,14 +90,6 @@ const ThreadSocketResponsesDev = ({ setMessages, modeRef, messages }: ThreadSock
|
|||||||
// --- Delete Comment Handler ---
|
// --- Delete Comment Handler ---
|
||||||
|
|
||||||
const handleDeleteComment = (data: any) => {
|
const handleDeleteComment = (data: any) => {
|
||||||
|
|
||||||
// setMessages(prev => {
|
|
||||||
// // 👈 logs the current state
|
|
||||||
// return prev.filter(message => message.replyId !== data.data._id);
|
|
||||||
// });
|
|
||||||
|
|
||||||
// removeReply(selectedComment?.threadId, data.data._id);
|
|
||||||
//
|
|
||||||
};
|
};
|
||||||
threadSocket.on('v1-Comment:response:delete', handleDeleteComment);
|
threadSocket.on('v1-Comment:response:delete', handleDeleteComment);
|
||||||
|
|
||||||
@@ -131,9 +121,7 @@ const ThreadSocketResponsesDev = ({ setMessages, modeRef, messages }: ThreadSock
|
|||||||
|
|
||||||
// };
|
// };
|
||||||
// threadSocket.on("v1-thread:response:delete", handleDeleteThread);
|
// threadSocket.on("v1-thread:response:delete", handleDeleteThread);
|
||||||
console.log(
|
|
||||||
"del"
|
|
||||||
);
|
|
||||||
const handleDeleteThread = (data: any) => {
|
const handleDeleteThread = (data: any) => {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,14 +4,16 @@ export const addCommentsApi = async (
|
|||||||
projectId: any,
|
projectId: any,
|
||||||
comment: string,
|
comment: string,
|
||||||
threadId?: string,
|
threadId?: string,
|
||||||
commentId?: string
|
commentId?: string,
|
||||||
|
versionId?: string
|
||||||
) => {
|
) => {
|
||||||
console.log(
|
console.log(
|
||||||
" projectId, comments, threadId: ",
|
" projectId, comments, threadId: ",
|
||||||
projectId,
|
projectId,
|
||||||
comment,
|
comment,
|
||||||
threadId,
|
threadId,
|
||||||
commentId
|
commentId,
|
||||||
|
versionId
|
||||||
);
|
);
|
||||||
try {
|
try {
|
||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
@@ -27,7 +29,7 @@ export const addCommentsApi = async (
|
|||||||
body: JSON.stringify({ projectId, comment, threadId, commentId }),
|
body: JSON.stringify({ projectId, comment, threadId, commentId }),
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
console.log('response: ', response);
|
console.log("response: ", response);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
console.error("Failed to add project");
|
console.error("Failed to add project");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ export const createThreadApi = async (
|
|||||||
state: string,
|
state: string,
|
||||||
position: any,
|
position: any,
|
||||||
rotation: any,
|
rotation: any,
|
||||||
threadTitle: any
|
threadTitle: any,
|
||||||
|
versionId?: string
|
||||||
) => {
|
) => {
|
||||||
try {
|
try {
|
||||||
const response = await fetch(`${url_Backend_dwinzo}/api/v1/upsetThread`, {
|
const response = await fetch(`${url_Backend_dwinzo}/api/v1/upsetThread`, {
|
||||||
@@ -16,13 +17,20 @@ export const createThreadApi = async (
|
|||||||
token: localStorage.getItem("token") || "",
|
token: localStorage.getItem("token") || "",
|
||||||
refresh_token: localStorage.getItem("refreshToken") || "",
|
refresh_token: localStorage.getItem("refreshToken") || "",
|
||||||
},
|
},
|
||||||
body: JSON.stringify({ projectId, state, position, rotation, threadTitle }),
|
body: JSON.stringify({
|
||||||
|
projectId,
|
||||||
|
state,
|
||||||
|
position,
|
||||||
|
rotation,
|
||||||
|
threadTitle,
|
||||||
|
versionId,
|
||||||
|
}),
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
console.error("Failed to add project");
|
console.error("Failed to add project");
|
||||||
}
|
}
|
||||||
const result = await response.json();
|
const result = await response.json();
|
||||||
console.log('result: ', result);
|
console.log("result: ", result);
|
||||||
return result;
|
return result;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error) {
|
if (error instanceof Error) {
|
||||||
|
|||||||
@@ -4,12 +4,14 @@ let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_UR
|
|||||||
export const deleteCommentApi = async (
|
export const deleteCommentApi = async (
|
||||||
projectId: string,
|
projectId: string,
|
||||||
threadId: string,
|
threadId: string,
|
||||||
commentId: string
|
commentId: string,
|
||||||
|
versionId?: string
|
||||||
) => {
|
) => {
|
||||||
const body: any = {
|
const body: any = {
|
||||||
projectId,
|
projectId,
|
||||||
threadId,
|
threadId,
|
||||||
commentId,
|
commentId,
|
||||||
|
versionId,
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -4,12 +4,14 @@ let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_UR
|
|||||||
export const editThreadTitleApi = async (
|
export const editThreadTitleApi = async (
|
||||||
projectId: string,
|
projectId: string,
|
||||||
threadId: string,
|
threadId: string,
|
||||||
threadTitle: string
|
threadTitle: string,
|
||||||
|
versionId?: string
|
||||||
) => {
|
) => {
|
||||||
const body: any = {
|
const body: any = {
|
||||||
projectId,
|
projectId,
|
||||||
threadId,
|
threadId,
|
||||||
threadTitle,
|
threadTitle,
|
||||||
|
versionId,
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
|
let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
|
||||||
|
|
||||||
export const getAllThreads = async (projectId: string, versionId: string) => {
|
export const getAllThreads = async (projectId: string, versionId: string) => {
|
||||||
console.log("projectId: ", projectId, versionId);
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
`${url_Backend_dwinzo}/api/v1/Threads/${projectId}/${versionId}`,
|
`${url_Backend_dwinzo}/api/v1/Threads/${projectId}/${versionId}`,
|
||||||
|
|||||||
Reference in New Issue
Block a user