Merge branch 'beta' into develop

tipisai · Apr 10, 2024 · 3168dec · 3168dec
2 parents 1a15c3b + fe349e0
commit 3168dec
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 13 deletions.
diff --git a/apps/agent/src/page/WorkSpace/AI/components/SyncMessageCard/index.tsx b/apps/agent/src/page/WorkSpace/AI/components/SyncMessageCard/index.tsx
@@ -86,7 +86,8 @@ export const SyncMessageCard: FC<SyncMessageCardProps> = ({
         onClick={() => setShowMessage(!showMessage)}
       >
         <div css={infoContainerStyle}>
-          {runRequestType || messageStatus === MESSAGE_STATUS.ANALYZE_STOP ? (
+          {runRequestType ||
+          messageStatus !== MESSAGE_STATUS.ANALYZE_PENDING ? (
             <>
               <div css={textAndIconContainerStyle}>
                 <div css={iconStyle(messageStatus)}>{InfoIcon}</div>

diff --git a/apps/agent/src/page/WorkSpace/AI/context/AgentWSContext/index.tsx b/apps/agent/src/page/WorkSpace/AI/context/AgentWSContext/index.tsx
@@ -53,6 +53,7 @@ import {
 import store from "@/redux/store"
 import {
   cancelPendingMessage,
+  delayHandleTask,
   formatSendMessagePayload,
   getNeedCacheUIMessage,
   groupReceivedMessagesForUI,
@@ -494,12 +495,14 @@ export const AgentWSProvider: FC<IAgentWSProviderProps> = (props) => {
     if (!teamID) {
       return
     }
-    startSendMessage(
-      {} as ChatSendRequestPayload,
-      TextSignal.STOP_RUN,
-      SEND_MESSAGE_WS_TYPE.STOP_ALL,
-    )
-    setIsReceiving(false)
+    await delayHandleTask(() => {
+      startSendMessage(
+        {} as ChatSendRequestPayload,
+        TextSignal.STOP_RUN,
+        SEND_MESSAGE_WS_TYPE.STOP_ALL,
+      )
+      setIsReceiving(false)
+    })
     cleanMessage()
     setChatMessages([])
     chatMessagesRef.current = []

diff --git a/apps/agent/src/page/WorkSpace/Chat/context/index.tsx b/apps/agent/src/page/WorkSpace/Chat/context/index.tsx
@@ -48,6 +48,7 @@ import { useLazyGetAIAgentAnonymousAddressQuery } from "@/redux/services/agentAP
 import store from "@/redux/store"
 import {
   cancelPendingMessage,
+  delayHandleTask,
   formatSendMessagePayload,
   getNeedCacheUIMessage,
   groupReceivedMessagesForUI,
@@ -394,12 +395,14 @@ export const ChatWSProvider: FC<IChatWSProviderProps> = (props) => {
     if (!teamID || !chatID) {
       return
     }
-    startSendMessage(
-      {} as ChatSendRequestPayload,
-      TextSignal.STOP_RUN,
-      SEND_MESSAGE_WS_TYPE.STOP_ALL,
-    )
-    setIsReceiving(false)
+    await delayHandleTask(() => {
+      startSendMessage(
+        {} as ChatSendRequestPayload,
+        TextSignal.STOP_RUN,
+        SEND_MESSAGE_WS_TYPE.STOP_ALL,
+      )
+      setIsReceiving(false)
+    })
     cleanMessage()
     setChatMessages([])
     chatMessagesRef.current = []

diff --git a/apps/agent/src/utils/agent/constants.ts b/apps/agent/src/utils/agent/constants.ts
@@ -0,0 +1 @@
+export const DELAY_TASK_TIME = 500
diff --git a/apps/agent/src/utils/agent/wsUtils.ts b/apps/agent/src/utils/agent/wsUtils.ts
@@ -8,6 +8,7 @@ import {
   MESSAGE_SYNC_TYPE,
 } from "@/components/PreviewChat/interface"
 import { AgentInitial } from "@/page/WorkSpace/AI/AIAgent/interface"
+import { DELAY_TASK_TIME } from "./constants"
 import { isGroupMessage, isNormalMessage } from "./typeHelper"
 
 export const formatSendMessagePayload = (payload: ChatSendRequestPayload) => {
@@ -211,3 +212,12 @@ export const getNeedCacheUIMessage = (
     | ChatMessage
   )[]
 }
+
+export const delayHandleTask = (task: () => void) => {
+  return new Promise((resolve) => {
+    task()
+    setTimeout(() => {
+      resolve(true)
+    }, DELAY_TASK_TIME)
+  })
+}