From 8807783aa6a6bf0604410504463f98df35924ebb Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Wed, 24 Jul 2024 18:28:23 +0800 Subject: [PATCH] feat: switch topic tab on change assistant --- src/renderer/src/pages/home/components/Assistants.tsx | 2 ++ src/renderer/src/pages/home/components/RightSidebar.tsx | 3 ++- src/renderer/src/services/event.ts | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/pages/home/components/Assistants.tsx b/src/renderer/src/pages/home/components/Assistants.tsx index 4a1317cb..b41176f2 100644 --- a/src/renderer/src/pages/home/components/Assistants.tsx +++ b/src/renderer/src/pages/home/components/Assistants.tsx @@ -3,6 +3,7 @@ import { DragDropContext, Draggable, Droppable, DropResult } from '@hello-pangea import AssistantSettingPopup from '@renderer/components/Popups/AssistantSettingPopup' import { useAssistant, useAssistants } from '@renderer/hooks/useAssistant' import { getDefaultTopic } from '@renderer/services/assistant' +import { EVENT_NAMES, EventEmitter } from '@renderer/services/event' import { useAppSelector } from '@renderer/store' import { Assistant } from '@renderer/types' import { droppableReorder, uuid } from '@renderer/utils' @@ -77,6 +78,7 @@ const Assistants: FC = ({ activeAssistant, setActiveAssistant, onCreateAs window.message.warning({ content: t('message.switch.disabled'), key: 'switch-assistant' }) return } + EventEmitter.emit(EVENT_NAMES.SWITCH_TOPIC_SIDEBAR) setActiveAssistant(assistant) } diff --git a/src/renderer/src/pages/home/components/RightSidebar.tsx b/src/renderer/src/pages/home/components/RightSidebar.tsx index 6bdd2eed..3f94e9e7 100644 --- a/src/renderer/src/pages/home/components/RightSidebar.tsx +++ b/src/renderer/src/pages/home/components/RightSidebar.tsx @@ -41,7 +41,8 @@ const RightSidebar: FC = (props) => { } showRightSidebar() setTab('settings') - }) + }), + EventEmitter.on(EVENT_NAMES.SWITCH_TOPIC_SIDEBAR, () => setTab('topic')) ] return () => unsubscribes.forEach((unsub) => unsub()) }, [hideRightSidebar, isSettingsTab, isTopicTab, rightSidebarShown, showRightSidebar]) diff --git a/src/renderer/src/services/event.ts b/src/renderer/src/services/event.ts index 01298211..c061e3f7 100644 --- a/src/renderer/src/services/event.ts +++ b/src/renderer/src/services/event.ts @@ -13,5 +13,6 @@ export const EVENT_NAMES = { CHAT_COMPLETION_PAUSED: 'CHAT_COMPLETION_PAUSED', ESTIMATED_TOKEN_COUNT: 'ESTIMATED_TOKEN_COUNT', SHOW_CHAT_SETTINGS: 'SHOW_CHAT_SETTINGS', - SHOW_TOPIC_SIDEBAR: 'SHOW_TOPIC_SIDEBAR' + SHOW_TOPIC_SIDEBAR: 'SHOW_TOPIC_SIDEBAR', + SWITCH_TOPIC_SIDEBAR: 'SWITCH_TOPIC_SIDEBAR' }