RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #318 from RecentRunner/fix-customer-ws-subscription

Browse Source 
fix customer ws subscription
This commit was merged in pull request #318.
This commit is contained in:
Harkamal
2026-04-15 21:19:58 -06:00
committed by GitHub
parent 00459a06b2 4674a2eaaf
commit 895ba8e5fd
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/app/ai-chat/page.js
View File

@@ -114,7 +114,10 @@ function AiChatPage() {
lastMessageIdRef.current = msg.id;
} catch { /* silent */ }
});
client.subscribe(`/topic/chat/conversations`, (frame) => {
const convTopic = user?.role === "CUSTOMER"
? `/user/queue/chat/conversations`
: `/topic/chat/conversations`;
client.subscribe(convTopic, (frame) => {
try {
const conv = JSON.parse(frame.body);
if (conv.id === convId) setConversation(conv);
@@ -124,7 +127,7 @@ function AiChatPage() {
};
stompRef.current = client;
client.activate();
}, [token]);
}, [token, user?.role]);
useEffect(() => {
if (!token || authLoading) return;

7
web/app/chat/page.js
View File

@@ -128,7 +128,10 @@ function ChatPage() {
lastMessageIdRef.current = msg.id;
} catch { /* silent */ }
});
client.subscribe(`/topic/chat/conversations`, (frame) => {
const convTopic = user?.role === "CUSTOMER"
? `/user/queue/chat/conversations`
: `/topic/chat/conversations`;
client.subscribe(convTopic, (frame) => {
try {
const conv = JSON.parse(frame.body);
if (conv.id === convId) setConversation(conv);
@@ -138,7 +141,7 @@ function ChatPage() {
};
stompRef.current = client;
client.activate();
}, [token]);
}, [token, user?.role]);
useEffect(() => {
if (!token || authLoading) return;