fix: thread chat cache

l3vels · Mar 18, 2024 · c3bc959 · c3bc959
1 parent b5cf8d8
commit c3bc959
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 18 deletions.
diff --git a/apps/ui/src/hooks/useApollo.ts b/apps/ui/src/hooks/useApollo.ts
@@ -141,6 +141,7 @@ const useApollo = () => {
       return new ApolloClient({
         link: apolloLink,
         cache: new InMemoryCache(),
+        connectToDevTools: true,
 
         defaultOptions: {
           watchQuery: {

diff --git a/apps/ui/src/modals/AIChatModal/components/ChatV2.tsx b/apps/ui/src/modals/AIChatModal/components/ChatV2.tsx
@@ -84,7 +84,7 @@ const ChatV2 = ({ chatSessionId }: { chatSessionId?: string }) => {
 
   const agentId = urlParams.get('agent')
   const teamId = urlParams.get('team')
-  const chatId = urlParams.get('chat') || chatSessionId
+  const chatId = urlParams.get('chat') || urlParams.get('session') || chatSessionId
 
   const { thinking, setThinking, socket } = useChatState()
 

diff --git a/apps/ui/src/modals/AIChatModal/hooks/useChatSocket.ts b/apps/ui/src/modals/AIChatModal/hooks/useChatSocket.ts
@@ -22,7 +22,7 @@ const useChatSocket = ({ userId, createdChatId }: ChatSocketProps) => {
 
   const agentId = urlParams.get('agent')
   const teamId = urlParams.get('team')
-  const chatId = urlParams.get('chat') || createdChatId || ''
+  const chatId = urlParams.get('chat') || urlParams.get('session') || createdChatId || ''
 
   const groupId = getSessionId({
     user,
@@ -46,6 +46,7 @@ const useChatSocket = ({ userId, createdChatId }: ChatSocketProps) => {
 
     const response = await fetch(url)
     const data = await response.json()
+
     return data.url
   }, [user?.id])
 
@@ -68,6 +69,7 @@ const useChatSocket = ({ userId, createdChatId }: ChatSocketProps) => {
         onUserTypingEvent(e)
       }
       if (data.type === 'CHAT_MESSAGE_ADDED') {
+        console.log('socket', data)
         upsertChatMessageInCache(data.chat_message, {
           agentId: data.agent_id,
           teamId: data.team_id,

diff --git a/apps/ui/src/modals/AIChatModal/hooks/useUpdateChatCache.ts b/apps/ui/src/modals/AIChatModal/hooks/useUpdateChatCache.ts
@@ -42,6 +42,7 @@ const useUpdateChatCache = () => {
         isNil,
       )
     }
+
     apolloClient.cache.updateQuery(
       { query: CHAT_MESSAGES_GQL, variables: queryVariables },
       data => {

diff --git a/apps/ui/src/pages/Agents/AgentTables/AgentSessionsTable.tsx b/apps/ui/src/pages/Agents/AgentTables/AgentSessionsTable.tsx
@@ -71,7 +71,7 @@ const AgentSessionsTable = ({ agentId }: { agentId: string }) => {
         />
         {sessionId && (
           <ChatContextProvider>
-            <ChatV2 chatSessionId={sessionId} />
+            <ChatV2 />
           </ChatContextProvider>
         )}
       </StyledChatWrapper>

diff --git a/apps/ui/src/services/chat/useChatMessagesService.ts b/apps/ui/src/services/chat/useChatMessagesService.ts
@@ -12,21 +12,27 @@ type UseChatMessagesService = {
   chatId?: Nullable<string>
 }
 
-export const useChatMessagesService = ({
-  agentId,
-  teamId,
-  chatId,
-}: UseChatMessagesService) => {
-  const { data, error, loading, refetch } = useQuery(CHAT_MESSAGES_GQL, {
-    // Omit undefined variables to exclude in query params
-    variables: omitBy(
+export const useChatMessagesService = ({ agentId, teamId, chatId }: UseChatMessagesService) => {
+  let queryVariables = omitBy(
+    {
+      agent_id: agentId,
+      team_id: teamId,
+      chat_id: chatId,
+    },
+    isNil,
+  )
+  if (chatId) {
+    queryVariables = omitBy(
       {
-        agent_id: agentId,
-        team_id: teamId,
         chat_id: chatId,
       },
       isNil,
-    ),
+    )
+  }
+
+  const { data, error, loading, refetch } = useQuery(CHAT_MESSAGES_GQL, {
+    // Omit undefined variables to exclude in query params
+    variables: queryVariables,
   })
 
   return {
@@ -37,10 +43,7 @@ export const useChatMessagesService = ({
   }
 }
 
-export const useChatMessagesHistoryService = ({
-  agentId,
-  teamId,
-}: UseChatMessagesService) => {
+export const useChatMessagesHistoryService = ({ agentId, teamId }: UseChatMessagesService) => {
   const { data, error, loading, refetch } = useQuery(CHAT_MESSAGES_HISTORY_GQL, {
     // Omit undefined variables to exclude in query params
     variables: omitBy(
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ const useUpdateChatCache = () => { @@
             isNil,
           )
         }
         apolloClient.cache.updateQuery(
           { query: CHAT_MESSAGES_GQL, variables: queryVariables },
           data => {
@@ Expand Down @@