diff --git a/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx index a1710cc32..6ed82e469 100644 --- a/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx +++ b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx @@ -1,4 +1,4 @@ -import { useDebounceFn, useMemoizedFn } from '@/hooks'; +import { useMemoizedFn } from '@/hooks'; import { EditableTitle } from '@/components/ui/typography/EditableTitle'; import React from 'react'; import { useUpdateDashboard } from '@/api/buster_rest/dashboards'; @@ -50,7 +50,7 @@ export const DashboardEditTitles: React.FC<{ className={'py-0! pl-0!'} readOnly={readOnly} onChange={onChangeDashboardDescription} - defaultValue={description} + value={description} autoResize={descriptionAutoResize} placeholder="Add description..." /> diff --git a/web/src/controllers/ReasoningController/ReasoningController.tsx b/web/src/controllers/ReasoningController/ReasoningController.tsx index b6a324802..007558db6 100644 --- a/web/src/controllers/ReasoningController/ReasoningController.tsx +++ b/web/src/controllers/ReasoningController/ReasoningController.tsx @@ -9,6 +9,8 @@ import { ScrollArea } from '@/components/ui/scroll-area'; import { useAutoScroll } from '@/hooks/useAutoScroll'; import isEmpty from 'lodash/isEmpty'; import { ReasoningScrollToBottom } from './ReasoningScrollToBottom'; +import { useQuery } from '@tanstack/react-query'; +import { queryKeys } from '@/api/query_keys'; interface ReasoningControllerProps { chatId: string; @@ -23,6 +25,11 @@ export const ReasoningController: React.FC = ({ chatId const { data: isCompletedStream } = useGetChatMessage(messageId, { select: ({ isCompletedStream }) => isCompletedStream }); + const blackBoxMessage = useQuery({ + ...queryKeys.chatsBlackBoxMessages(messageId), + notifyOnChangeProps: ['data'] + }).data; + const viewportRef = useRef(null); const { isAutoScrollEnabled, scrollToBottom, enableAutoScroll } = useAutoScroll(viewportRef, { @@ -49,11 +56,11 @@ export const ReasoningController: React.FC = ({ chatId isCompletedStream={isCompletedStream ?? true} chatId={chatId} messageId={messageId} - isLastMessage={messageIndex === reasoningMessageIds.length - 1} + isLastMessage={messageIndex === reasoningMessageIds.length - 1 && !blackBoxMessage} /> ))} - + diff --git a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningBlackBoxMessage.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningBlackBoxMessage.tsx index d78243fd1..5233d6bd0 100644 --- a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningBlackBoxMessage.tsx +++ b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningBlackBoxMessage.tsx @@ -5,25 +5,22 @@ import React from 'react'; import { queryKeys } from '@/api/query_keys'; import { BarContainer } from './BarContainer'; -export const BlackBoxMessage: React.FC<{ messageId: string }> = React.memo(({ messageId }) => { - const blackBoxMessage = useQuery({ - ...queryKeys.chatsBlackBoxMessages(messageId), - notifyOnChangeProps: ['data'] - }).data; +export const BlackBoxMessage: React.FC<{ blackBoxMessage: string | undefined | null }> = React.memo( + ({ blackBoxMessage }) => { + if (blackBoxMessage) { + return ( + + ); + } - if (blackBoxMessage) { - return ( - - ); + return null; } - - return null; -}); +); BlackBoxMessage.displayName = 'BlackBoxMessage';