Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 47 additions & 34 deletions client/src/store/NodeListProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import useGroupSelect from "@/hooks/useGroupSelect";
import useHistoryState from "@/hooks/useHistoryState";
import { Node, NodeData, SelectedNode } from "@/types/Node";
import Konva from "konva";
import { createContext, ReactNode, useContext, useState } from "react";
import { createContext, ReactNode, useContext, useEffect, useState } from "react";
import { deleteNodes } from "@/konva_mindmap/events/deleteNode";
import { setLatestMindMap } from "@/utils/localstorage";
import useMindMapTitle from "@/hooks/useMindMapTitle";
Expand Down Expand Up @@ -53,39 +53,52 @@ export default function NodeListProvider({ children }: { children: ReactNode })
const socket = useConnectionStore((state) => state.socket);
const handleSocketEvent = useConnectionStore((state) => state.handleSocketEvent);

socket?.on("joinRoom", (initialData) => {
setLoading(true);
setTimeout(() => {
setData({ ...initialData.nodeData });
overrideHistory(JSON.stringify(initialData));
initializeTitle(initialData);
initializeContent(initialData);
setLoading(false);
}, 0);
});

socket?.on("updateNode", (updatedNodeData) => {
overrideNodeData(updatedNodeData);
});

socket?.on("updateTitle", (updatedTitle) => {
updateTitle(updatedTitle.title);
});

socket?.on("updateContent", (updatedContent) => {
updateContent(updatedContent.content);
});

socket?.on("disconnect", () => {
setData({});
overrideHistory(JSON.stringify({}));
setLatestMindMap(mindMapId);
});

socket?.on("aiResponse", (response) => {
const initializedNodes = initializeNodePosition(response.nodeData);
handleSocketEvent({ actionType: "updateNode", payload: initializedNodes });
});
useEffect(() => {
socket?.on("joinRoom", (initialData) => {
setLoading(true);
setTimeout(() => {
setData({ ...initialData.nodeData });
overrideHistory(JSON.stringify(initialData));
initializeTitle(initialData);
initializeContent(initialData);
setLoading(false);
}, 0);
});

socket?.on("updateNode", (updatedNodeData) => {
console.log("updatedNodeData", updatedNodeData);
overrideNodeData(updatedNodeData);
});

socket?.on("updateTitle", (updatedTitle) => {
updateTitle(updatedTitle.title);
});

socket?.on("updateContent", (updatedContent) => {
updateContent(updatedContent.content);
});

socket?.on("disconnect", () => {
setData({});
overrideHistory(JSON.stringify({}));
setLatestMindMap(mindMapId);
});

socket?.on("aiResponse", (response) => {
const initializedNodes = initializeNodePosition(response);
handleSocketEvent({
actionType: "updateNode",
payload: initializedNodes,
callback: (response) => {
overrideNodeData(response);
},
});
});

return () => {
socket?.offAny();
};
}, [socket]);

function updateNode(id: number, updatedNode: Partial<Node>) {
setData((prevData) => ({
Expand Down
6 changes: 3 additions & 3 deletions client/src/store/createSocketSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ export const createSocketSlice: StateCreator<ConnectionStore, [], [], SocketSlic
const socket = get().socket;
if (socket) socket.disconnect();
const response = await createMindmap();
const newMindMapId = response.data;
get().connectSocket(newMindMapId, get().token);
return newMindMapId;
const connectionId = response.data.connectionId;
get().connectSocket(connectionId, get().token);
return connectionId;
} catch (error) {
console.error(error);
}
Expand Down