From 06fd35d4208eec1781d57ecbb02f06a2c25218aa Mon Sep 17 00:00:00 2001 From: balibabu Date: Wed, 17 Jul 2024 17:08:24 +0800 Subject: [PATCH] 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) --- .../hooks/{logicHooks.ts => logic-hooks.ts} | 2 +- web/src/layouts/components/header/index.tsx | 2 +- .../components/right-toolbar/index.tsx | 2 +- .../knowledge-upload-file/index.tsx | 2 +- .../components/knowledge-file/index.tsx | 467 +++++------ .../chat/chat-configuration-modal/index.tsx | 5 +- web/src/pages/chat/hooks.ts | 12 +- web/src/pages/chat/index.tsx | 762 +++++++++--------- web/src/pages/chat/shared-hooks.ts | 2 +- web/src/pages/file-manager/hooks.ts | 2 +- web/src/pages/flow/chat/hooks.ts | 2 +- web/src/pages/flow/hooks.ts | 2 +- web/src/pages/flow/list/create-flow-modal.tsx | 2 +- .../user-setting/setting-profile/index.tsx | 2 +- 14 files changed, 639 insertions(+), 627 deletions(-) rename web/src/hooks/{logicHooks.ts => logic-hooks.ts} (99%) diff --git a/web/src/hooks/logicHooks.ts b/web/src/hooks/logic-hooks.ts similarity index 99% rename from web/src/hooks/logicHooks.ts rename to web/src/hooks/logic-hooks.ts index b3402552b..74c651002 100644 --- a/web/src/hooks/logicHooks.ts +++ b/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 diff --git a/web/src/layouts/components/header/index.tsx b/web/src/layouts/components/header/index.tsx index ea515e245..57262eac4 100644 --- a/web/src/layouts/components/header/index.tsx +++ b/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'; diff --git a/web/src/layouts/components/right-toolbar/index.tsx b/web/src/layouts/components/right-toolbar/index.tsx index 5970727e2..70845b4fb 100644 --- a/web/src/layouts/components/right-toolbar/index.tsx +++ b/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'; diff --git a/web/src/pages/add-knowledge/components/knowledge-dataset/knowledge-upload-file/index.tsx b/web/src/pages/add-knowledge/components/knowledge-dataset/knowledge-upload-file/index.tsx index b7025e1cf..47114aac3 100644 --- a/web/src/pages/add-knowledge/components/knowledge-dataset/knowledge-upload-file/index.tsx +++ b/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'; diff --git a/web/src/pages/add-knowledge/components/knowledge-file/index.tsx b/web/src/pages/add-knowledge/components/knowledge-file/index.tsx index f0b2e0e35..dd5664d84 100644 --- a/web/src/pages/add-knowledge/components/knowledge-file/index.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-file/index.tsx @@ -1,233 +1,234 @@ -import ChunkMethodModal from '@/components/chunk-method-modal'; -import SvgIcon from '@/components/svg-icon'; -import { - useSelectDocumentList, - useSetDocumentStatus, -} from '@/hooks/documentHooks'; -import { useSetSelectedRecord } from '@/hooks/logicHooks'; -import { useSelectParserList } from '@/hooks/userSettingHook'; -import { IKnowledgeFile } from '@/interfaces/database/knowledge'; -import { getExtension } from '@/utils/documentUtils'; -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, - useCreateEmptyDocument, - useFetchDocumentListOnMount, - useGetPagination, - useGetRowSelection, - useHandleUploadDocument, useHandleWebCrawl, - useNavigateToOtherPage, - useRenameDocument, -} from './hooks'; -import ParsingActionCell from './parsing-action-cell'; -import ParsingStatusCell from './parsing-status-cell'; -import RenameModal from './rename-modal'; - -import FileUploadModal from '@/components/file-upload-modal'; -import { formatDate } from '@/utils/date'; -import styles from './index.less'; - -const { Text } = Typography; - -const KnowledgeFile = () => { - const data = useSelectDocumentList(); - const { fetchDocumentList } = useFetchDocumentListOnMount(); - const parserList = useSelectParserList(); - const { pagination } = useGetPagination(fetchDocumentList); - const onChangeStatus = useSetDocumentStatus(); - const { toChunk } = useNavigateToOtherPage(); - const { currentRecord, setRecord } = useSetSelectedRecord(); - const { - renameLoading, - onRenameOk, - renameVisible, - hideRenameModal, - showRenameModal, - } = useRenameDocument(currentRecord.id); - const { - createLoading, - onCreateOk, - createVisible, - hideCreateModal, - showCreateModal, - } = useCreateEmptyDocument(); - const { - changeParserLoading, - onChangeParserOk, - changeParserVisible, - hideChangeParserModal, - showChangeParserModal, - } = useChangeDocumentParser(currentRecord.id); - const { - documentUploadVisible, - hideDocumentUploadModal, - showDocumentUploadModal, - onDocumentUploadOk, - documentUploadLoading, - } = useHandleUploadDocument(); - const { - webCrawlUploadVisible, - hideWebCrawlUploadModal, - showWebCrawlUploadModal, - onWebCrawlUploadOk, - webCrawlUploadLoading, - } = useHandleWebCrawl(); - const { t } = useTranslation('translation', { - keyPrefix: 'knowledgeDetails', - }); - - const rowSelection = useGetRowSelection(); - - const columns: ColumnsType = [ - { - title: t('name'), - dataIndex: 'name', - key: 'name', - fixed: 'left', - render: (text: any, { id, thumbnail, name }) => ( -
toChunk(id)}> - - {thumbnail ? ( - - ) : ( - - )} - - {text} - - -
- ), - }, - { - title: t('chunkNumber'), - dataIndex: 'chunk_num', - key: 'chunk_num', - }, - { - title: t('uploadDate'), - dataIndex: 'create_time', - key: 'create_time', - render(value) { - return formatDate(value); - }, - }, - { - title: t('chunkMethod'), - dataIndex: 'parser_id', - key: 'parser_id', - render: (text) => { - return parserList.find((x) => x.value === text)?.label; - }, - }, - { - title: t('enabled'), - key: 'status', - dataIndex: 'status', - render: (_, { status, id }) => ( - <> - { - onChangeStatus(e, id); - }} - /> - - ), - }, - { - title: t('parsingStatus'), - dataIndex: 'run', - key: 'run', - render: (text, record) => { - return ; - }, - }, - { - title: t('action'), - key: 'action', - render: (_, record) => ( - - ), - }, - ]; - - const finalColumns = columns.map((x) => ({ - ...x, - className: `${styles.column}`, - })); - - return ( -
-

{t('dataset')}

-

{t('datasetDescription')}

- - - - - - - - - - ); -}; - -export default KnowledgeFile; +import ChunkMethodModal from '@/components/chunk-method-modal'; +import SvgIcon from '@/components/svg-icon'; +import { + useSelectDocumentList, + useSetDocumentStatus, +} from '@/hooks/documentHooks'; +import { useSetSelectedRecord } from '@/hooks/logic-hooks'; +import { useSelectParserList } from '@/hooks/userSettingHook'; +import { IKnowledgeFile } from '@/interfaces/database/knowledge'; +import { getExtension } from '@/utils/documentUtils'; +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 DocumentToolbar from './document-toolbar'; +import { + useChangeDocumentParser, + useCreateEmptyDocument, + useFetchDocumentListOnMount, + useGetPagination, + useGetRowSelection, + 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'; +import styles from './index.less'; + +const { Text } = Typography; + +const KnowledgeFile = () => { + const data = useSelectDocumentList(); + const { fetchDocumentList } = useFetchDocumentListOnMount(); + const parserList = useSelectParserList(); + const { pagination } = useGetPagination(fetchDocumentList); + const onChangeStatus = useSetDocumentStatus(); + const { toChunk } = useNavigateToOtherPage(); + const { currentRecord, setRecord } = useSetSelectedRecord(); + const { + renameLoading, + onRenameOk, + renameVisible, + hideRenameModal, + showRenameModal, + } = useRenameDocument(currentRecord.id); + const { + createLoading, + onCreateOk, + createVisible, + hideCreateModal, + showCreateModal, + } = useCreateEmptyDocument(); + const { + changeParserLoading, + onChangeParserOk, + changeParserVisible, + hideChangeParserModal, + showChangeParserModal, + } = useChangeDocumentParser(currentRecord.id); + const { + documentUploadVisible, + hideDocumentUploadModal, + showDocumentUploadModal, + onDocumentUploadOk, + documentUploadLoading, + } = useHandleUploadDocument(); + const { + webCrawlUploadVisible, + hideWebCrawlUploadModal, + showWebCrawlUploadModal, + onWebCrawlUploadOk, + webCrawlUploadLoading, + } = useHandleWebCrawl(); + const { t } = useTranslation('translation', { + keyPrefix: 'knowledgeDetails', + }); + + const rowSelection = useGetRowSelection(); + + const columns: ColumnsType = [ + { + title: t('name'), + dataIndex: 'name', + key: 'name', + fixed: 'left', + render: (text: any, { id, thumbnail, name }) => ( +
toChunk(id)}> + + {thumbnail ? ( + + ) : ( + + )} + + {text} + + +
+ ), + }, + { + title: t('chunkNumber'), + dataIndex: 'chunk_num', + key: 'chunk_num', + }, + { + title: t('uploadDate'), + dataIndex: 'create_time', + key: 'create_time', + render(value) { + return formatDate(value); + }, + }, + { + title: t('chunkMethod'), + dataIndex: 'parser_id', + key: 'parser_id', + render: (text) => { + return parserList.find((x) => x.value === text)?.label; + }, + }, + { + title: t('enabled'), + key: 'status', + dataIndex: 'status', + render: (_, { status, id }) => ( + <> + { + onChangeStatus(e, id); + }} + /> + + ), + }, + { + title: t('parsingStatus'), + dataIndex: 'run', + key: 'run', + render: (text, record) => { + return ; + }, + }, + { + title: t('action'), + key: 'action', + render: (_, record) => ( + + ), + }, + ]; + + const finalColumns = columns.map((x) => ({ + ...x, + className: `${styles.column}`, + })); + + return ( +
+

{t('dataset')}

+

{t('datasetDescription')}

+ + +
+ + + + + + + ); +}; + +export default KnowledgeFile; diff --git a/web/src/pages/chat/chat-configuration-modal/index.tsx b/web/src/pages/chat/chat-configuration-modal/index.tsx index 580113a46..309f3fcee 100644 --- a/web/src/pages/chat/chat-configuration-modal/index.tsx +++ b/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'; diff --git a/web/src/pages/chat/hooks.ts b/web/src/pages/chat/hooks.ts index 1ccb5f2ef..15f758eaf 100644 --- a/web/src/pages/chat/hooks.ts +++ b/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; diff --git a/web/src/pages/chat/index.tsx b/web/src/pages/chat/index.tsx index 51ee878be..d947bbdfe 100644 --- a/web/src/pages/chat/index.tsx +++ b/web/src/pages/chat/index.tsx @@ -1,381 +1,381 @@ -import { ReactComponent as ChatAppCube } from '@/assets/svg/chat-app-cube.svg'; -import RenameModal from '@/components/rename-modal'; -import { - CloudOutlined, - DeleteOutlined, - EditOutlined, - PlusOutlined, -} from '@ant-design/icons'; -import { - Avatar, - Button, - Card, - Divider, - Dropdown, - Flex, - MenuProps, - Space, - Spin, - Tag, - Typography, -} from 'antd'; -import { MenuItemProps } from 'antd/lib/menu/MenuItem'; -import classNames from 'classnames'; -import { useCallback } from 'react'; -import ChatConfigurationModal from './chat-configuration-modal'; -import ChatContainer from './chat-container'; -import { - useClickConversationCard, - useClickDialogCard, - useDeleteConversation, - useDeleteDialog, - useEditDialog, - useFetchConversationListOnMount, - useFetchDialogOnMount, - useGetChatSearchParams, - useHandleItemHover, - useRenameConversation, - useSelectConversationListLoading, - useSelectDerivedConversationList, - useSelectDialogListLoading, - useSelectFirstDialogOnMount, -} from './hooks'; - -import { useSetModalState, useTranslate } from '@/hooks/commonHooks'; -import { useSetSelectedRecord } from '@/hooks/logicHooks'; -import { IDialog } from '@/interfaces/database/chat'; -import ChatOverviewModal from './chat-overview-modal'; -import styles from './index.less'; - -const { Text } = Typography; - -const Chat = () => { - const dialogList = useSelectFirstDialogOnMount(); - const { onRemoveDialog } = useDeleteDialog(); - const { onRemoveConversation } = useDeleteConversation(); - const { handleClickDialog } = useClickDialogCard(); - const { handleClickConversation } = useClickConversationCard(); - const { dialogId, conversationId } = useGetChatSearchParams(); - const { list: conversationList, addTemporaryConversation } = - useSelectDerivedConversationList(); - const { activated, handleItemEnter, handleItemLeave } = useHandleItemHover(); - const { - activated: conversationActivated, - handleItemEnter: handleConversationItemEnter, - handleItemLeave: handleConversationItemLeave, - } = useHandleItemHover(); - const { - conversationRenameLoading, - initialConversationName, - onConversationRenameOk, - conversationRenameVisible, - hideConversationRenameModal, - showConversationRenameModal, - } = useRenameConversation(); - const { - dialogSettingLoading, - initialDialog, - onDialogEditOk, - dialogEditVisible, - clearDialog, - hideDialogEditModal, - showDialogEditModal, - } = useEditDialog(); - const dialogLoading = useSelectDialogListLoading(); - const conversationLoading = useSelectConversationListLoading(); - const { t } = useTranslate('chat'); - const { - visible: overviewVisible, - hideModal: hideOverviewModal, - showModal: showOverviewModal, - } = useSetModalState(); - const { currentRecord, setRecord } = useSetSelectedRecord(); - - useFetchDialogOnMount(dialogId, true); - - const handleAppCardEnter = (id: string) => () => { - handleItemEnter(id); - }; - - const handleConversationCardEnter = (id: string) => () => { - handleConversationItemEnter(id); - }; - - const handleShowChatConfigurationModal = - (dialogId?: string): any => - (info: any) => { - info?.domEvent?.preventDefault(); - info?.domEvent?.stopPropagation(); - showDialogEditModal(dialogId); - }; - - const handleRemoveDialog = - (dialogId: string): MenuItemProps['onClick'] => - ({ domEvent }) => { - domEvent.preventDefault(); - domEvent.stopPropagation(); - onRemoveDialog([dialogId]); - }; - - const handleShowOverviewModal = - (dialog: IDialog): any => - (info: any) => { - info?.domEvent?.preventDefault(); - info?.domEvent?.stopPropagation(); - setRecord(dialog); - showOverviewModal(); - }; - - const handleRemoveConversation = - (conversationId: string): MenuItemProps['onClick'] => - ({ domEvent }) => { - domEvent.preventDefault(); - domEvent.stopPropagation(); - onRemoveConversation([conversationId]); - }; - - const handleShowConversationRenameModal = - (conversationId: string): MenuItemProps['onClick'] => - ({ domEvent }) => { - domEvent.preventDefault(); - domEvent.stopPropagation(); - showConversationRenameModal(conversationId); - }; - - const handleDialogCardClick = (dialogId: string) => () => { - handleClickDialog(dialogId); - }; - - const handleConversationCardClick = (dialogId: string) => () => { - handleClickConversation(dialogId); - }; - - const handleCreateTemporaryConversation = useCallback(() => { - addTemporaryConversation(); - }, [addTemporaryConversation]); - - const items: MenuProps['items'] = [ - { - key: '1', - onClick: handleCreateTemporaryConversation, - label: ( - - - {t('newChat')} - - ), - }, - ]; - - const buildAppItems = (dialog: IDialog) => { - const dialogId = dialog.id; - - const appItems: MenuProps['items'] = [ - { - key: '1', - onClick: handleShowChatConfigurationModal(dialogId), - label: ( - - - {t('edit', { keyPrefix: 'common' })} - - ), - }, - { type: 'divider' }, - { - key: '2', - onClick: handleRemoveDialog(dialogId), - label: ( - - - {t('delete', { keyPrefix: 'common' })} - - ), - }, - { type: 'divider' }, - { - key: '3', - onClick: handleShowOverviewModal(dialog), - label: ( - - - {t('overview')} - - ), - }, - ]; - - return appItems; - }; - - const buildConversationItems = (conversationId: string) => { - const appItems: MenuProps['items'] = [ - { - key: '1', - onClick: handleShowConversationRenameModal(conversationId), - label: ( - - - {t('rename', { keyPrefix: 'common' })} - - ), - }, - { type: 'divider' }, - { - key: '2', - onClick: handleRemoveConversation(conversationId), - label: ( - - - {t('delete', { keyPrefix: 'common' })} - - ), - }, - ]; - - return appItems; - }; - - useFetchConversationListOnMount(); - - return ( - - - - - - - - {dialogList.map((x) => ( - - - - -
- - - {x.name} - - -
{x.description}
-
- - {activated === x.id && ( -
- - - -
- )} - - - ))} - - - - - - - - - - {t('chat')} - {conversationList.length} - - - {/* */} - - - - - - - {conversationList.map((x) => ( - - -
- - {x.name} - -
- {conversationActivated === x.id && x.id !== '' && ( -
- - - -
- )} - - - ))} - - - - - - - - - - - ); -}; - -export default Chat; +import { ReactComponent as ChatAppCube } from '@/assets/svg/chat-app-cube.svg'; +import RenameModal from '@/components/rename-modal'; +import { + CloudOutlined, + DeleteOutlined, + EditOutlined, + PlusOutlined, +} from '@ant-design/icons'; +import { + Avatar, + Button, + Card, + Divider, + Dropdown, + Flex, + MenuProps, + Space, + Spin, + Tag, + Typography, +} from 'antd'; +import { MenuItemProps } from 'antd/lib/menu/MenuItem'; +import classNames from 'classnames'; +import { useCallback } from 'react'; +import ChatConfigurationModal from './chat-configuration-modal'; +import ChatContainer from './chat-container'; +import { + useClickConversationCard, + useClickDialogCard, + useDeleteConversation, + useDeleteDialog, + useEditDialog, + useFetchConversationListOnMount, + useFetchDialogOnMount, + useGetChatSearchParams, + useHandleItemHover, + useRenameConversation, + useSelectConversationListLoading, + useSelectDerivedConversationList, + useSelectDialogListLoading, + useSelectFirstDialogOnMount, +} from './hooks'; + +import { useSetModalState, useTranslate } from '@/hooks/commonHooks'; +import { useSetSelectedRecord } from '@/hooks/logic-hooks'; +import { IDialog } from '@/interfaces/database/chat'; +import ChatOverviewModal from './chat-overview-modal'; +import styles from './index.less'; + +const { Text } = Typography; + +const Chat = () => { + const dialogList = useSelectFirstDialogOnMount(); + const { onRemoveDialog } = useDeleteDialog(); + const { onRemoveConversation } = useDeleteConversation(); + const { handleClickDialog } = useClickDialogCard(); + const { handleClickConversation } = useClickConversationCard(); + const { dialogId, conversationId } = useGetChatSearchParams(); + const { list: conversationList, addTemporaryConversation } = + useSelectDerivedConversationList(); + const { activated, handleItemEnter, handleItemLeave } = useHandleItemHover(); + const { + activated: conversationActivated, + handleItemEnter: handleConversationItemEnter, + handleItemLeave: handleConversationItemLeave, + } = useHandleItemHover(); + const { + conversationRenameLoading, + initialConversationName, + onConversationRenameOk, + conversationRenameVisible, + hideConversationRenameModal, + showConversationRenameModal, + } = useRenameConversation(); + const { + dialogSettingLoading, + initialDialog, + onDialogEditOk, + dialogEditVisible, + clearDialog, + hideDialogEditModal, + showDialogEditModal, + } = useEditDialog(); + const dialogLoading = useSelectDialogListLoading(); + const conversationLoading = useSelectConversationListLoading(); + const { t } = useTranslate('chat'); + const { + visible: overviewVisible, + hideModal: hideOverviewModal, + showModal: showOverviewModal, + } = useSetModalState(); + const { currentRecord, setRecord } = useSetSelectedRecord(); + + useFetchDialogOnMount(dialogId, true); + + const handleAppCardEnter = (id: string) => () => { + handleItemEnter(id); + }; + + const handleConversationCardEnter = (id: string) => () => { + handleConversationItemEnter(id); + }; + + const handleShowChatConfigurationModal = + (dialogId?: string): any => + (info: any) => { + info?.domEvent?.preventDefault(); + info?.domEvent?.stopPropagation(); + showDialogEditModal(dialogId); + }; + + const handleRemoveDialog = + (dialogId: string): MenuItemProps['onClick'] => + ({ domEvent }) => { + domEvent.preventDefault(); + domEvent.stopPropagation(); + onRemoveDialog([dialogId]); + }; + + const handleShowOverviewModal = + (dialog: IDialog): any => + (info: any) => { + info?.domEvent?.preventDefault(); + info?.domEvent?.stopPropagation(); + setRecord(dialog); + showOverviewModal(); + }; + + const handleRemoveConversation = + (conversationId: string): MenuItemProps['onClick'] => + ({ domEvent }) => { + domEvent.preventDefault(); + domEvent.stopPropagation(); + onRemoveConversation([conversationId]); + }; + + const handleShowConversationRenameModal = + (conversationId: string): MenuItemProps['onClick'] => + ({ domEvent }) => { + domEvent.preventDefault(); + domEvent.stopPropagation(); + showConversationRenameModal(conversationId); + }; + + const handleDialogCardClick = (dialogId: string) => () => { + handleClickDialog(dialogId); + }; + + const handleConversationCardClick = (dialogId: string) => () => { + handleClickConversation(dialogId); + }; + + const handleCreateTemporaryConversation = useCallback(() => { + addTemporaryConversation(); + }, [addTemporaryConversation]); + + const items: MenuProps['items'] = [ + { + key: '1', + onClick: handleCreateTemporaryConversation, + label: ( + + + {t('newChat')} + + ), + }, + ]; + + const buildAppItems = (dialog: IDialog) => { + const dialogId = dialog.id; + + const appItems: MenuProps['items'] = [ + { + key: '1', + onClick: handleShowChatConfigurationModal(dialogId), + label: ( + + + {t('edit', { keyPrefix: 'common' })} + + ), + }, + { type: 'divider' }, + { + key: '2', + onClick: handleRemoveDialog(dialogId), + label: ( + + + {t('delete', { keyPrefix: 'common' })} + + ), + }, + { type: 'divider' }, + { + key: '3', + onClick: handleShowOverviewModal(dialog), + label: ( + + + {t('overview')} + + ), + }, + ]; + + return appItems; + }; + + const buildConversationItems = (conversationId: string) => { + const appItems: MenuProps['items'] = [ + { + key: '1', + onClick: handleShowConversationRenameModal(conversationId), + label: ( + + + {t('rename', { keyPrefix: 'common' })} + + ), + }, + { type: 'divider' }, + { + key: '2', + onClick: handleRemoveConversation(conversationId), + label: ( + + + {t('delete', { keyPrefix: 'common' })} + + ), + }, + ]; + + return appItems; + }; + + useFetchConversationListOnMount(); + + return ( + + + + + + + + {dialogList.map((x) => ( + + + + +
+ + + {x.name} + + +
{x.description}
+
+ + {activated === x.id && ( +
+ + + +
+ )} + + + ))} + + + + + + + + + + {t('chat')} + {conversationList.length} + + + {/* */} + + + + + + + {conversationList.map((x) => ( + + +
+ + {x.name} + +
+ {conversationActivated === x.id && x.id !== '' && ( +
+ + + +
+ )} + + + ))} + + + + + + + + + + + ); +}; + +export default Chat; diff --git a/web/src/pages/chat/shared-hooks.ts b/web/src/pages/chat/shared-hooks.ts index 2260ea616..3f3391099 100644 --- a/web/src/pages/chat/shared-hooks.ts +++ b/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'; diff --git a/web/src/pages/file-manager/hooks.ts b/web/src/pages/file-manager/hooks.ts index a3bce65ac..2ce0a4b23 100644 --- a/web/src/pages/file-manager/hooks.ts +++ b/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'; diff --git a/web/src/pages/flow/chat/hooks.ts b/web/src/pages/flow/chat/hooks.ts index b7d19262a..947fd2261 100644 --- a/web/src/pages/flow/chat/hooks.ts +++ b/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'; diff --git a/web/src/pages/flow/hooks.ts b/web/src/pages/flow/hooks.ts index 64ae00651..11d1ffbfc 100644 --- a/web/src/pages/flow/hooks.ts +++ b/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'; diff --git a/web/src/pages/flow/list/create-flow-modal.tsx b/web/src/pages/flow/list/create-flow-modal.tsx index 621528710..5a9311e85 100644 --- a/web/src/pages/flow/list/create-flow-modal.tsx +++ b/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'; diff --git a/web/src/pages/user-setting/setting-profile/index.tsx b/web/src/pages/user-setting/setting-profile/index.tsx index e2422a984..1a2141097 100644 --- a/web/src/pages/user-setting/setting-profile/index.tsx +++ b/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';