From f199550ec464216ec010503bb22352400f651e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cnora?= Date: Wed, 23 Oct 2024 14:07:40 -0400 Subject: [PATCH] chore: 3 --- .../component-examples/AIChatLogExamples.ts | 4 +- .../components/assistant/AssistantCanvas.tsx | 5 +- .../components/assistant/AssistantMessage.tsx | 5 +- .../components/assistant/LoadingMessage.tsx | 55 ++++--------------- 4 files changed, 14 insertions(+), 55 deletions(-) diff --git a/packages/paste-website/src/component-examples/AIChatLogExamples.ts b/packages/paste-website/src/component-examples/AIChatLogExamples.ts index a1622bae7b..ff9e831a7e 100644 --- a/packages/paste-website/src/component-examples/AIChatLogExamples.ts +++ b/packages/paste-website/src/component-examples/AIChatLogExamples.ts @@ -101,7 +101,7 @@ const MessageWithLoadingAndStop = () => { return ( - + Good Bot @@ -120,7 +120,7 @@ const MessageWithLoading = () => { return ( - + Good Bot diff --git a/packages/paste-website/src/components/assistant/AssistantCanvas.tsx b/packages/paste-website/src/components/assistant/AssistantCanvas.tsx index 920a33c81a..b60348fa5e 100644 --- a/packages/paste-website/src/components/assistant/AssistantCanvas.tsx +++ b/packages/paste-website/src/components/assistant/AssistantCanvas.tsx @@ -18,7 +18,6 @@ type AssistantCanvasProps = { export const AssistantCanvas: React.FC = ({ selectedThreadID }) => { const [mounted, setMounted] = React.useState(false); - const [logWidth, setLogWidth] = React.useState(0); const messages = useAssistantMessagesStore(useShallow((state) => state.messages)); const setMessages = useAssistantMessagesStore(useShallow((state) => state.setMessages)); const activeRun = useAssistantRunStore(useShallow((state) => state.activeRun)); @@ -49,8 +48,6 @@ export const AssistantCanvas: React.FC = ({ selectedThread React.useEffect(() => { setMounted(true); - // whats the width of the log? You'll need it to render the skeleton loader - setLogWidth(loggerRef.current?.offsetWidth ?? 0); }, []); // scroll to bottom of chat log when new messages are added @@ -106,7 +103,7 @@ export const AssistantCanvas: React.FC = ({ selectedThread } return ; })} - {(isCreatingAResponse || activeRun != null) && } + {(isCreatingAResponse || activeRun != null) && } diff --git a/packages/paste-website/src/components/assistant/AssistantMessage.tsx b/packages/paste-website/src/components/assistant/AssistantMessage.tsx index 75736bc7d9..5b22f59a9e 100644 --- a/packages/paste-website/src/components/assistant/AssistantMessage.tsx +++ b/packages/paste-website/src/components/assistant/AssistantMessage.tsx @@ -8,10 +8,7 @@ import { AssistantMarkdown } from "./AssistantMarkdown"; export const AssistantMessage: React.FC<{ threadMessage: ThreadMessage }> = ({ threadMessage }) => { return ( - + PasteBot diff --git a/packages/paste-website/src/components/assistant/LoadingMessage.tsx b/packages/paste-website/src/components/assistant/LoadingMessage.tsx index 2c92a38a75..d6d63a394f 100644 --- a/packages/paste-website/src/components/assistant/LoadingMessage.tsx +++ b/packages/paste-website/src/components/assistant/LoadingMessage.tsx @@ -1,55 +1,20 @@ -/* eslint-disable camelcase */ -import { Box } from "@twilio-paste/box"; -import { ChatBubble, ChatMessage, ChatMessageMeta, ChatMessageMetaItem } from "@twilio-paste/chat-log"; -import { SkeletonLoader } from "@twilio-paste/skeleton-loader"; -import { useUID } from "@twilio-paste/uid-library"; +import { AIChatMessage, AIChatMessageAuthor, AIChatMessageBody, AIChatMessageLoading } from "@twilio-paste/ai-chat-log"; import * as React from "react"; -import { Logo } from "../../assets/Logo"; -import { useAssistantRunStore } from "../../stores/assistantRunStore"; import { formatTimestamp } from "../../utils/formatTimestamp"; -const getRandomNumber = (max: number): number => { - return Math.floor(Math.random() * max); -}; - -const STATUS_MAP = { - queued: "Queued...", - in_progress: "Researching...", - requires_action: "Researching...", - cancelling: "Concelling...", - cancelled: "Cancelled.", - failed: "Failed.", - completed: "Finished.", - expired: "Expired.", -}; - -export const LoadingMessage: React.FC<{ maxWidth: number }> = ({ maxWidth }) => { - const activeRun = useAssistantRunStore((state) => state.activeRun); - +export const LoadingMessage: React.FC = () => { const newDateTime = new Date(); const timestamp = Math.floor(newDateTime.getTime() / 1000); - const randomWidths = React.useMemo(() => { - return Array.from({ length: 3 }, () => getRandomNumber(maxWidth)); - }, [maxWidth]); - return ( - - - - {randomWidths.map((width) => ( - - ))} - - - - - - PasteBot ・ {activeRun?.status ? STATUS_MAP[activeRun?.status] : "Thinking..."} - - - + + + PasteBot + + + + + ); }; -/* eslint-enable camelcase */