Fix AI chat infinite loading shimmer on empty workspace (#17521)
## Summary Fixes an issue where the AI chat would show loading shimmers indefinitely when opened on a workspace with no conversation history. **Root cause:** The `isLoading` state in `useAgentChat` included `!currentAIChatThread`. On workspaces with no chat threads, `currentAIChatThread` remained `null`, causing `isLoading` to be permanently `true`. **Changes:** - Remove `!currentAIChatThread` from `isLoading` calculation in `useAgentChat` - this state should only reflect streaming/file selection status - Auto-create a chat thread in `useAgentChatData` when the threads query returns empty, ensuring a valid thread exists for the `useChat` hook to initialize properly - Add primary font color to empty state title for better visibility ## Test plan 1. Create a new workspace or use a workspace with no AI chat history 2. Open the AI chat 3. Verify the empty state shows (not infinite loading shimmer) 4. Send a message and verify it works correctly Made with [Cursor](https://cursor.com) --------- Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -24,6 +24,7 @@ const StyledSparkleIcon = styled.div`
|
||||
|
||||
const StyledTitle = styled.div`
|
||||
font-size: ${({ theme }) => theme.font.size.lg};
|
||||
color: ${({ theme }) => theme.font.color.primary};
|
||||
font-weight: 600;
|
||||
`;
|
||||
|
||||
|
||||
@@ -72,9 +72,11 @@ const MarkdownRenderer = lazy(async () => {
|
||||
default: ({
|
||||
children,
|
||||
TableScrollContainer,
|
||||
StyledParagraph,
|
||||
}: {
|
||||
children: string;
|
||||
TableScrollContainer: React.ComponentType<{ children: React.ReactNode }>;
|
||||
StyledParagraph: React.ComponentType<{ children: React.ReactNode }>;
|
||||
}) => (
|
||||
<Markdown
|
||||
remarkPlugins={[remarkGfm]}
|
||||
@@ -84,7 +86,11 @@ const MarkdownRenderer = lazy(async () => {
|
||||
<table>{children}</table>
|
||||
</TableScrollContainer>
|
||||
),
|
||||
p: ({ children }) => <p>{processChildrenForRecordLinks(children)}</p>,
|
||||
p: ({ children }) => (
|
||||
<StyledParagraph>
|
||||
{processChildrenForRecordLinks(children)}
|
||||
</StyledParagraph>
|
||||
),
|
||||
li: ({ children }) => (
|
||||
<li>{processChildrenForRecordLinks(children)}</li>
|
||||
),
|
||||
@@ -116,6 +122,19 @@ const StyledTableScrollContainer = styled.div`
|
||||
}
|
||||
`;
|
||||
|
||||
// Using div instead of p to allow RecordLink (which contains div elements) as children
|
||||
const StyledParagraph = styled.div`
|
||||
margin-block: 1em;
|
||||
|
||||
&:first-child {
|
||||
margin-block-start: 0;
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
margin-block-end: 0;
|
||||
}
|
||||
`;
|
||||
|
||||
const StyledSkeletonContainer = styled.div`
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -161,7 +180,10 @@ const LoadingSkeleton = () => {
|
||||
export const LazyMarkdownRenderer = ({ text }: { text: string }) => {
|
||||
return (
|
||||
<Suspense fallback={<LoadingSkeleton />}>
|
||||
<MarkdownRenderer TableScrollContainer={StyledTableScrollContainer}>
|
||||
<MarkdownRenderer
|
||||
TableScrollContainer={StyledTableScrollContainer}
|
||||
StyledParagraph={StyledParagraph}
|
||||
>
|
||||
{text}
|
||||
</MarkdownRenderer>
|
||||
</Suspense>
|
||||
|
||||
@@ -147,11 +147,10 @@ export const useAgentChat = (uiMessages: ExtendedUIMessage[]) => {
|
||||
|
||||
const isStreaming = status === 'streaming';
|
||||
|
||||
const isLoading =
|
||||
!currentAIChatThread || isStreaming || agentChatSelectedFiles.length > 0;
|
||||
const isLoading = isStreaming || agentChatSelectedFiles.length > 0;
|
||||
|
||||
const handleSendMessage = async () => {
|
||||
if (agentChatInput.trim() === '' || isLoading === true) {
|
||||
if (agentChatInput.trim() === '' || isLoading || !currentAIChatThread) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import {
|
||||
type AgentChatUsageState,
|
||||
} from '@/ai/states/agentChatUsageState';
|
||||
import { currentAIChatThreadState } from '@/ai/states/currentAIChatThreadState';
|
||||
import { isCreatingChatThreadState } from '@/ai/states/isCreatingChatThreadState';
|
||||
import { mapDBMessagesToUIMessages } from '@/ai/utils/mapDBMessagesToUIMessages';
|
||||
import {
|
||||
type SetterOrUpdater,
|
||||
@@ -13,6 +14,7 @@ import {
|
||||
import { isDefined } from 'twenty-shared/utils';
|
||||
import {
|
||||
type AgentChatThread,
|
||||
useCreateChatThreadMutation,
|
||||
useGetChatMessagesQuery,
|
||||
useGetChatThreadsQuery,
|
||||
} from '~/generated-metadata/graphql';
|
||||
@@ -43,9 +45,23 @@ export const useAgentChatData = () => {
|
||||
currentAIChatThreadState,
|
||||
);
|
||||
const setAgentChatUsage = useSetRecoilState(agentChatUsageState);
|
||||
const [isCreatingChatThread, setIsCreatingChatThread] = useRecoilState(
|
||||
isCreatingChatThreadState,
|
||||
);
|
||||
|
||||
const { scrollToBottom } = useAgentChatScrollToBottom();
|
||||
|
||||
const [createChatThread] = useCreateChatThreadMutation({
|
||||
onCompleted: (data) => {
|
||||
setIsCreatingChatThread(false);
|
||||
setCurrentAIChatThread(data.createChatThread.id);
|
||||
setAgentChatUsage(null);
|
||||
},
|
||||
onError: () => {
|
||||
setIsCreatingChatThread(false);
|
||||
},
|
||||
});
|
||||
|
||||
const { loading: threadsLoading } = useGetChatThreadsQuery({
|
||||
skip: isDefined(currentAIChatThread),
|
||||
onCompleted: (data) => {
|
||||
@@ -54,6 +70,9 @@ export const useAgentChatData = () => {
|
||||
|
||||
setCurrentAIChatThread(firstThread.id);
|
||||
setUsageFromThread(firstThread, setAgentChatUsage);
|
||||
} else if (!isCreatingChatThread) {
|
||||
setIsCreatingChatThread(true);
|
||||
createChatThread();
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
import { atom } from 'recoil';
|
||||
|
||||
export const isCreatingChatThreadState = atom<boolean>({
|
||||
key: 'ai/isCreatingChatThreadState',
|
||||
default: false,
|
||||
});
|
||||
Reference in New Issue
Block a user