fix: add back last message

Signed-off-by: James <[email protected]>

Author: James

web/helpers/EventHandler.tsx

@@ -1,14 +1,27 @@
 import { addNewMessageAtom, updateMessageAtom } from './atoms/ChatMessage.atom'
 import { toChatMessage } from '@models/ChatMessage'
-import { events, EventName, NewMessageResponse } from '@janhq/core'
+import { events, EventName, NewMessageResponse, DataService } from '@janhq/core'
 import { useSetAtom } from 'jotai'
 import { ReactNode, useEffect } from 'react'
 import useGetBots from '@hooks/useGetBots'
 import useGetUserConversations from '@hooks/useGetUserConversations'
+import { updateConversationAtom } from './atoms/Conversation.atom'
+import { executeSerial } from '../../electron/core/plugin-manager/execution/extension-manager'
+import { debounce } from 'lodash'
+
+let currentConversation: Conversation | undefined = undefined
+
+const debouncedUpdateConversation = debounce(
+  async (updatedConv: Conversation) => {
+    await executeSerial(DataService.UpdateConversation, updatedConv)
+  },
+  1000
+)
 
 export default function EventHandler({ children }: { children: ReactNode }) {
   const addNewMessage = useSetAtom(addNewMessageAtom)
   const updateMessage = useSetAtom(updateMessageAtom)
+  const updateConversation = useSetAtom(updateConversationAtom)
   const { getBotById } = useGetBots()
   const { getConversationById } = useGetUserConversations()
 
@@ -34,12 +47,32 @@ export default function EventHandler({ children }: { children: ReactNode }) {
       messageResponse.conversationId &&
       messageResponse._id &&
       messageResponse.message
-    )
+    ) {
       updateMessage(
         messageResponse._id,
         messageResponse.conversationId,
         messageResponse.message
       )
+    }
+
+    if (messageResponse.conversationId) {
+      if (
+        !currentConversation ||
+        currentConversation._id !== messageResponse.conversationId
+      ) {
+        currentConversation = await getConversationById(
+          messageResponse.conversationId
+        )
+      }
+
+      const updatedConv: Conversation = {
+        ...currentConversation,
+        lastMessage: messageResponse.message,
+      }
+
+      updateConversation(updatedConv)
+      debouncedUpdateConversation(updatedConv)
+    }
   }
 
   useEffect(() => {

web/hooks/useSendChatMessage.ts

@@ -77,10 +77,20 @@ export default function useSendChatMessage() {
     events.emit(EventName.OnNewMessageRequest, newMessage)
 
     if (!currentConvo?.summary && currentConvo) {
-      const updatedConv = {
+      const updatedConv: Conversation = {
         ...currentConvo,
+        lastMessage: prompt,
         summary: `Prompt: ${prompt}`,
       }
+
+      updateConversation(updatedConv)
+      await executeSerial(DataService.UpdateConversation, updatedConv)
+    } else {
+      const updatedConv: Conversation = {
+        ...currentConvo,
+        lastMessage: prompt,
+      }
+
       updateConversation(updatedConv)
       await executeSerial(DataService.UpdateConversation, updatedConv)
     }

web/package.json

@@ -28,10 +28,10 @@
     "eslint-config-next": "13.4.10",
     "framer-motion": "^10.16.4",
     "highlight.js": "^11.9.0",
-    "react-intersection-observer": "^9.5.2",
     "jotai": "^2.4.0",
     "jotai-optics": "^0.3.1",
     "jwt-decode": "^3.1.2",
+    "lodash": "^4.17.21",
     "lucide-react": "^0.288.0",
     "marked": "^9.1.2",
     "marked-highlight": "^2.0.6",
@@ -42,6 +42,7 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-hook-form": "^7.45.4",
+    "react-intersection-observer": "^9.5.2",
     "sass": "^1.69.4",
     "tailwind-merge": "^1.14.0",
     "tailwindcss": "3.3.3",
@@ -50,6 +51,7 @@
   },
   "devDependencies": {
     "@tailwindcss/forms": "^0.5.4",
+    "@types/lodash": "^4.14.200",
     "@types/node": "20.6.5",
     "@types/uuid": "^9.0.6",
     "encoding": "^0.1.13",