[Security Solution] Fix skip intro for elastic assistant

elastic · Jul 12, 2023 · c1ab91d · c1ab91d
1 parent 665b887
commit c1ab91d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.tsx
@@ -126,10 +126,7 @@ const AssistantComponent: React.FC<Props> = ({
     return doesConversationHaveMessages
       ? {
           ...conversation,
-          messages: [
-            ...conversation.messages,
-            ...BASE_CONVERSATIONS[WELCOME_CONVERSATION_TITLE].messages,
-          ],
+          messages: [...conversation.messages],
         }
       : {
           ...conversation,

diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/streaming_text/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/streaming_text/index.tsx
@@ -12,7 +12,7 @@ export interface StreamingTextProps {
   children?: (text: string, isStreamingComplete: boolean) => React.ReactNode;
   chunkSize?: number;
   delay?: number;
-  onStreamingComplete?: () => void;
+  onStreamingComplete: () => void;
 }
 
 export const StreamingText: React.FC<StreamingTextProps> = React.memo<StreamingTextProps>(
@@ -22,7 +22,7 @@ export const StreamingText: React.FC<StreamingTextProps> = React.memo<StreamingT
 
     useEffect(() => {
       if (delay === 0) {
-        onStreamingComplete?.();
+        onStreamingComplete();
       }
       // Only run on initial render so onStreamingComplete is only called once if delay is 0
       // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -37,7 +37,7 @@ export const StreamingText: React.FC<StreamingTextProps> = React.memo<StreamingT
       setIsStreamingComplete(false);
       const interval = setInterval(() => {
         if (currentPos >= text.length) {
-          onStreamingComplete?.();
+          onStreamingComplete();
           setIsStreamingComplete(true);
           clearInterval(interval);
           return;

diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/index.tsx
@@ -103,11 +103,13 @@ export const useConnectorSetup = ({
 
   // Once streaming of previous message is complete, proceed to next message
   const onHandleMessageStreamingComplete = useCallback(() => {
-    const timeoutId = setTimeout(() => {
+    setTimeout(() => {
       bottomRef.current?.scrollIntoView({ block: 'end' });
+      if (currentMessageIndex >= MESSAGE_INDEX_BEFORE_CONNECTOR) {
+        return;
+      }
       return setCurrentMessageIndex(currentMessageIndex + 1);
     }, conversation.messages[currentMessageIndex]?.presentation?.delay ?? 0);
-    return () => clearTimeout(timeoutId);
   }, [conversation.messages, currentMessageIndex]);
 
   // Show button to add connector after last message has finished streaming
@@ -121,7 +123,8 @@ export const useConnectorSetup = ({
   // Show button to add connector after last message has finished streaming
   const handleSkipSetup = useCallback(() => {
     setCurrentMessageIndex(MESSAGE_INDEX_BEFORE_CONNECTOR);
-  }, [setCurrentMessageIndex]);
+    onHandleLastMessageStreamingComplete();
+  }, [onHandleLastMessageStreamingComplete]);
 
   // Create EuiCommentProps[] from conversation messages
   const commentBody = useCallback(
@@ -135,7 +138,10 @@ export const useConnectorSetup = ({
       }
       const isLastMessage = index === length - 1;
       const enableStreaming =
-        (message?.presentation?.stream ?? false) && currentMessageIndex !== length - 1;
+        (message?.presentation?.stream ?? false) &&
+        currentMessageIndex !== length - 1 &&
+        index < MESSAGE_INDEX_BEFORE_CONNECTOR;
+
       return (
         <StreamingText
           text={message.content}
@@ -144,7 +150,7 @@ export const useConnectorSetup = ({
             isLastMessage ? onHandleLastMessageStreamingComplete : onHandleMessageStreamingComplete
           }
         >
-          {(streamedText, isStreamingComplete) => (
+          {(streamedText) => (
             <EuiText>
               <EuiMarkdownFormat className={`message-${index}`}>{streamedText}</EuiMarkdownFormat>
               <span ref={bottomRef} />