fix: new message appears in wrong chat window. #1289 (#1571)

### What problem does this PR solve?
fix: new message appears in wrong chat window. #1289

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)

web/src/hooks/logic-hooks.ts

@@ -214,7 +214,7 @@ export const useSendMessageWithSse = (
     [url],
   );
 
-  return { send, answer, done };
+  return { send, answer, done, setDone };
 };
 
 //#region chat hooks

web/src/layouts/components/header/index.tsx

@@ -8,7 +8,7 @@ import { useCallback, useMemo } from 'react';
 import { useLocation } from 'umi';
 import Toolbar from '../right-toolbar';
 
-import { useFetchAppConf } from '@/hooks/logicHooks';
+import { useFetchAppConf } from '@/hooks/logic-hooks';
 import { MessageOutlined } from '@ant-design/icons';
 import styles from './index.less';
 

web/src/layouts/components/right-toolbar/index.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 import User from '../user';
 
 import { LanguageList } from '@/constants/common';
-import { useChangeLanguage } from '@/hooks/logicHooks';
+import { useChangeLanguage } from '@/hooks/logic-hooks';
 import { useSelector } from 'umi';
 import styled from './index.less';
 

web/src/pages/add-knowledge/components/knowledge-dataset/knowledge-upload-file/index.tsx

@@ -15,7 +15,7 @@ import {
 import {
   useChangeDocumentParser,
   useSetSelectedRecord,
-} from '@/hooks/logicHooks';
+} from '@/hooks/logic-hooks';
 import { useFetchTenantInfo } from '@/hooks/userSettingHook';
 import { IKnowledgeFile } from '@/interfaces/database/knowledge';
 import { getExtension, isFileUploadDone } from '@/utils/documentUtils';

web/src/pages/add-knowledge/components/knowledge-file/index.tsx

@@ -4,7 +4,7 @@ import {
   useSelectDocumentList,
   useSetDocumentStatus,
 } from '@/hooks/documentHooks';
-import { useSetSelectedRecord } from '@/hooks/logicHooks';
+import { useSetSelectedRecord } from '@/hooks/logic-hooks';
 import { useSelectParserList } from '@/hooks/userSettingHook';
 import { IKnowledgeFile } from '@/interfaces/database/knowledge';
 import { getExtension } from '@/utils/documentUtils';
@@ -12,7 +12,6 @@ import { Divider, Flex, Switch, Table, Typography } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { useTranslation } from 'react-i18next';
 import CreateFileModal from './create-file-modal';
-import WebCrawlModal from './web-crawl-modal';
 import DocumentToolbar from './document-toolbar';
 import {
   useChangeDocumentParser,
@@ -20,13 +19,15 @@ import {
   useFetchDocumentListOnMount,
   useGetPagination,
   useGetRowSelection,
-  useHandleUploadDocument, useHandleWebCrawl,
+  useHandleUploadDocument,
+  useHandleWebCrawl,
   useNavigateToOtherPage,
   useRenameDocument,
 } from './hooks';
 import ParsingActionCell from './parsing-action-cell';
 import ParsingStatusCell from './parsing-status-cell';
 import RenameModal from './rename-modal';
+import WebCrawlModal from './web-crawl-modal';
 
 import FileUploadModal from '@/components/file-upload-modal';
 import { formatDate } from '@/utils/date';

web/src/pages/chat/chat-configuration-modal/index.tsx

@@ -15,7 +15,10 @@ import ModelSetting from './model-setting';
 import PromptEngine from './prompt-engine';
 
 import { useTranslate } from '@/hooks/commonHooks';
-import { useFetchLlmModelOnVisible, useFetchModelId } from '@/hooks/logicHooks';
+import {
+  useFetchLlmModelOnVisible,
+  useFetchModelId,
+} from '@/hooks/logic-hooks';
 import { getBase64FromUploadFileList } from '@/utils/fileUtil';
 import { removeUselessFieldsFromValues } from '@/utils/form';
 import styles from './index.less';

web/src/pages/chat/hooks.ts

@@ -23,7 +23,7 @@ import {
   useShowDeleteConfirm,
   useTranslate,
 } from '@/hooks/commonHooks';
-import { useSendMessageWithSse } from '@/hooks/logicHooks';
+import { useSendMessageWithSse } from '@/hooks/logic-hooks';
 import { useOneNamespaceEffectsLoading } from '@/hooks/storeHooks';
 import {
   IAnswer,
@@ -552,7 +552,7 @@ export const useSendMessage = (
   const { handleInputChange, value, setValue } = useHandleMessageInputChange();
 
   const { handleClickConversation } = useClickConversationCard();
-  const { send, answer, done } = useSendMessageWithSse();
+  const { send, answer, done, setDone } = useSendMessageWithSse();
 
   const sendMessage = useCallback(
     async (message: string, id?: string) => {
@@ -609,11 +609,19 @@ export const useSendMessage = (
   );
 
   useEffect(() => {
+    //  #1289
     if (answer.answer && answer?.conversationId === conversationId) {
       addNewestAnswer(answer);
     }
   }, [answer, addNewestAnswer, conversationId]);
 
+  useEffect(() => {
+    // #1289 switch to another conversion window when the last conversion answer doesn't finish.
+    if (conversationId) {
+      setDone(true);
+    }
+  }, [setDone, conversationId]);
+
   const handlePressEnter = useCallback(() => {
     if (trim(value) === '') return;
 

web/src/pages/chat/index.tsx

@@ -42,7 +42,7 @@ import {
 } from './hooks';
 
 import { useSetModalState, useTranslate } from '@/hooks/commonHooks';
-import { useSetSelectedRecord } from '@/hooks/logicHooks';
+import { useSetSelectedRecord } from '@/hooks/logic-hooks';
 import { IDialog } from '@/interfaces/database/chat';
 import ChatOverviewModal from './chat-overview-modal';
 import styles from './index.less';

web/src/pages/chat/shared-hooks.ts

@@ -3,7 +3,7 @@ import {
   useCreateSharedConversation,
   useFetchSharedConversation,
 } from '@/hooks/chatHooks';
-import { useSendMessageWithSse } from '@/hooks/logicHooks';
+import { useSendMessageWithSse } from '@/hooks/logic-hooks';
 import { useOneNamespaceEffectsLoading } from '@/hooks/storeHooks';
 import { IAnswer } from '@/interfaces/database/chat';
 import api from '@/utils/api';

web/src/pages/file-manager/hooks.ts

@@ -10,7 +10,7 @@ import {
   useSelectParentFolderList,
   useUploadFile,
 } from '@/hooks/fileManagerHooks';
-import { useGetPagination, useSetPagination } from '@/hooks/logicHooks';
+import { useGetPagination, useSetPagination } from '@/hooks/logic-hooks';
 import { useOneNamespaceEffectsLoading } from '@/hooks/storeHooks';
 import { IFile } from '@/interfaces/database/file-manager';
 import { PaginationProps } from 'antd';

web/src/pages/flow/chat/hooks.ts

@@ -4,7 +4,7 @@ import {
   useHandleMessageInputChange,
   useScrollToBottom,
   useSendMessageWithSse,
-} from '@/hooks/logicHooks';
+} from '@/hooks/logic-hooks';
 import { IAnswer } from '@/interfaces/database/chat';
 import { IMessage } from '@/pages/chat/interface';
 import api from '@/utils/api';

web/src/pages/flow/hooks.ts

@@ -18,7 +18,7 @@ import {
   ModelVariableType,
   settledModelVariableMap,
 } from '@/constants/knowledge';
-import { useFetchModelId, useSendMessageWithSse } from '@/hooks/logicHooks';
+import { useFetchModelId, useSendMessageWithSse } from '@/hooks/logic-hooks';
 import { Variable } from '@/interfaces/database/chat';
 import api from '@/utils/api';
 import { useDebounceEffect } from 'ahooks';

web/src/pages/flow/list/create-flow-modal.tsx

@@ -1,7 +1,7 @@
 import { IModalManagerChildrenProps } from '@/components/modal-manager';
 import { useTranslate } from '@/hooks/commonHooks';
 import { useFetchFlowTemplates } from '@/hooks/flow-hooks';
-import { useSelectItem } from '@/hooks/logicHooks';
+import { useSelectItem } from '@/hooks/logic-hooks';
 import { Card, Flex, Form, Input, Modal, Space, Typography } from 'antd';
 import classNames from 'classnames';
 import { useEffect } from 'react';

web/src/pages/user-setting/setting-profile/index.tsx

@@ -32,7 +32,7 @@ import {
 
 import { LanguageList } from '@/constants/common';
 import { useTranslate } from '@/hooks/commonHooks';
-import { useChangeLanguage } from '@/hooks/logicHooks';
+import { useChangeLanguage } from '@/hooks/logic-hooks';
 import parentStyles from '../index.less';
 import styles from './index.less';