From a562a510255b3aeaa05455e8036041baab15f4ae Mon Sep 17 00:00:00 2001 From: Poovizhi99 Date: Tue, 24 Jun 2025 12:21:12 +0530 Subject: [PATCH] Refactor collaboration APIs to include versionId in relevant functions and clean up commented code --- app/src/components/ui/collaboration/Messages.tsx | 6 ++---- app/src/components/ui/collaboration/ThreadChat.tsx | 2 -- .../socket/threadSocketResponses.dev.tsx | 14 +------------- .../factoryBuilder/comments/addCommentsApi.ts | 8 +++++--- .../factoryBuilder/comments/createThreadApi.ts | 14 +++++++++++--- .../factoryBuilder/comments/deleteCommentApi.ts | 4 +++- .../factoryBuilder/comments/editThreadTitleApi.ts | 4 +++- .../factoryBuilder/comments/getAllThreads.ts | 2 +- 8 files changed, 26 insertions(+), 28 deletions(-) diff --git a/app/src/components/ui/collaboration/Messages.tsx b/app/src/components/ui/collaboration/Messages.tsx index a182ad8..b3f37e1 100644 --- a/app/src/components/ui/collaboration/Messages.tsx +++ b/app/src/components/ui/collaboration/Messages.tsx @@ -77,7 +77,6 @@ const Messages: React.FC = ({ val, i, setMessages, mode, setIsEdit // position: editThreadTitle.data.position, // rotation: [0, 0, 0], // comments: [], - // versionId: selectedVersion?.versionId || "" // } // updateComment((val as CommentSchema).threadId, editedThread) // } @@ -105,7 +104,6 @@ const Messages: React.FC = ({ val, i, setMessages, mode, setIsEdit // createdAt: getRelativeTime(editComments.data?.createdAt), // lastUpdatedAt: "2 hrs ago", // comment: value, - // versionId: selectedVersion?.versionId || "" // } // updateReply((val as CommentSchema).threadId, (val as Reply)?.replyId, commentData); @@ -160,11 +158,11 @@ const Messages: React.FC = ({ val, i, setMessages, mode, setIsEdit versionId: selectedVersion?.versionId || "" } 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); }); 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); } diff --git a/app/src/components/ui/collaboration/ThreadChat.tsx b/app/src/components/ui/collaboration/ThreadChat.tsx index 3660dbe..8e4b24b 100644 --- a/app/src/components/ui/collaboration/ThreadChat.tsx +++ b/app/src/components/ui/collaboration/ThreadChat.tsx @@ -154,7 +154,6 @@ const ThreadChat: React.FC = () => { // createdAt: "2 hrs ago", // lastUpdatedAt: "2 hrs ago", // comment: value, - // versionId: selectedVersion?.versionId || "" // } // setMessages((prevMessages) => [ // ...prevMessages, @@ -201,7 +200,6 @@ const ThreadChat: React.FC = () => { threadId: selectedComment?.threadId, versionId: selectedVersion?.versionId || "" } - setSelectedComment(null) removeComment(selectedComment?.threadId) threadSocket.emit("v1:thread:delete", deleteThread); diff --git a/app/src/modules/collaboration/socket/threadSocketResponses.dev.tsx b/app/src/modules/collaboration/socket/threadSocketResponses.dev.tsx index edccff8..3b6eb10 100644 --- a/app/src/modules/collaboration/socket/threadSocketResponses.dev.tsx +++ b/app/src/modules/collaboration/socket/threadSocketResponses.dev.tsx @@ -75,8 +75,6 @@ const ThreadSocketResponsesDev = ({ setMessages, modeRef, messages }: ThreadSock setMessages((prev) => prev.map((message) => { // 👈 log each message - - return message.replyId === data.data?._id ? { ...message, comment: data.data?.comment } : message; @@ -92,14 +90,6 @@ const ThreadSocketResponsesDev = ({ setMessages, modeRef, messages }: ThreadSock // --- Delete Comment Handler --- 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); @@ -131,9 +121,7 @@ const ThreadSocketResponsesDev = ({ setMessages, modeRef, messages }: ThreadSock // }; // threadSocket.on("v1-thread:response:delete", handleDeleteThread); - console.log( - "del" - ); + const handleDeleteThread = (data: any) => { }; diff --git a/app/src/services/factoryBuilder/comments/addCommentsApi.ts b/app/src/services/factoryBuilder/comments/addCommentsApi.ts index 7e9469a..3bfda04 100644 --- a/app/src/services/factoryBuilder/comments/addCommentsApi.ts +++ b/app/src/services/factoryBuilder/comments/addCommentsApi.ts @@ -4,14 +4,16 @@ export const addCommentsApi = async ( projectId: any, comment: string, threadId?: string, - commentId?: string + commentId?: string, + versionId?: string ) => { console.log( " projectId, comments, threadId: ", projectId, comment, threadId, - commentId + commentId, + versionId ); try { const response = await fetch( @@ -27,7 +29,7 @@ export const addCommentsApi = async ( body: JSON.stringify({ projectId, comment, threadId, commentId }), } ); - console.log('response: ', response); + console.log("response: ", response); if (!response.ok) { console.error("Failed to add project"); } diff --git a/app/src/services/factoryBuilder/comments/createThreadApi.ts b/app/src/services/factoryBuilder/comments/createThreadApi.ts index d9bf553..cefc5fb 100644 --- a/app/src/services/factoryBuilder/comments/createThreadApi.ts +++ b/app/src/services/factoryBuilder/comments/createThreadApi.ts @@ -5,7 +5,8 @@ export const createThreadApi = async ( state: string, position: any, rotation: any, - threadTitle: any + threadTitle: any, + versionId?: string ) => { try { const response = await fetch(`${url_Backend_dwinzo}/api/v1/upsetThread`, { @@ -16,13 +17,20 @@ export const createThreadApi = async ( token: localStorage.getItem("token") || "", 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) { console.error("Failed to add project"); } const result = await response.json(); - console.log('result: ', result); + console.log("result: ", result); return result; } catch (error) { if (error instanceof Error) { diff --git a/app/src/services/factoryBuilder/comments/deleteCommentApi.ts b/app/src/services/factoryBuilder/comments/deleteCommentApi.ts index 4147197..fba74c0 100644 --- a/app/src/services/factoryBuilder/comments/deleteCommentApi.ts +++ b/app/src/services/factoryBuilder/comments/deleteCommentApi.ts @@ -4,12 +4,14 @@ let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_UR export const deleteCommentApi = async ( projectId: string, threadId: string, - commentId: string + commentId: string, + versionId?: string ) => { const body: any = { projectId, threadId, commentId, + versionId, }; try { diff --git a/app/src/services/factoryBuilder/comments/editThreadTitleApi.ts b/app/src/services/factoryBuilder/comments/editThreadTitleApi.ts index 1b07186..10440a7 100644 --- a/app/src/services/factoryBuilder/comments/editThreadTitleApi.ts +++ b/app/src/services/factoryBuilder/comments/editThreadTitleApi.ts @@ -4,12 +4,14 @@ let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_UR export const editThreadTitleApi = async ( projectId: string, threadId: string, - threadTitle: string + threadTitle: string, + versionId?: string ) => { const body: any = { projectId, threadId, threadTitle, + versionId, }; try { diff --git a/app/src/services/factoryBuilder/comments/getAllThreads.ts b/app/src/services/factoryBuilder/comments/getAllThreads.ts index e956342..0854c95 100644 --- a/app/src/services/factoryBuilder/comments/getAllThreads.ts +++ b/app/src/services/factoryBuilder/comments/getAllThreads.ts @@ -1,7 +1,7 @@ let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`; export const getAllThreads = async (projectId: string, versionId: string) => { - console.log("projectId: ", projectId, versionId); + try { const response = await fetch( `${url_Backend_dwinzo}/api/v1/Threads/${projectId}/${versionId}`,