Merge branch 'main' into feature/AgentFlowV2

# Conflicts:
#	dist/components/Bot.d.ts.map
#	dist/web.js
#	dist/web.umd.js
#	src/components/Bot.tsx

Author: HenryHengZJ

dist/components/Bot.d.ts.map

@@ -20,6 +20,7 @@ type TextInputProps = {
     autoFocus?: boolean;
     sendMessageSound?: boolean;
     sendSoundLocation?: string;
+    fullFileUploadAllowedTypes?: string;
     enableInputHistory?: boolean;
     maxHistorySize?: number;
 };

dist/components/inputs/textInput/components/TextInput.d.ts

@@ -514,6 +514,7 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
   // drag & drop
   const [isDragActive, setIsDragActive] = createSignal(false);
   const [uploadedFiles, setUploadedFiles] = createSignal<{ file: File; type: string }[]>([]);
+  const [fullFileUploadAllowedTypes, setFullFileUploadAllowedTypes] = createSignal('*');
 
   createMemo(() => {
     const customerId = (props.chatflowConfig?.vars as any)?.customerId;
@@ -772,14 +773,18 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
     }
 
     if (data.followUpPrompts) {
+      let followUpPrompts = data.followUpPrompts;
+      if (typeof followUpPrompts === 'string') {
+        followUpPrompts = JSON.parse(followUpPrompts);
+      }
       setMessages((prevMessages) => {
         const allMessages = [...cloneDeep(prevMessages)];
         if (allMessages[allMessages.length - 1].type === 'userMessage') return allMessages;
-        allMessages[allMessages.length - 1].followUpPrompts = data.followUpPrompts;
+        allMessages[allMessages.length - 1].followUpPrompts = followUpPrompts;
         addChatMessage(allMessages);
         return allMessages;
       });
-      setFollowUpPrompts(JSON.parse(data.followUpPrompts));
+      setFollowUpPrompts(followUpPrompts);
     }
   };
 
@@ -1396,6 +1401,9 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
       }
       if (chatbotConfig.fullFileUpload) {
         setFullFileUpload(chatbotConfig.fullFileUpload.status);
+        if (chatbotConfig.fullFileUpload?.allowedUploadFileTypes) {
+          setFullFileUploadAllowedTypes(chatbotConfig.fullFileUpload?.allowedUploadFileTypes);
+        }
       }
     }
 
@@ -1986,6 +1994,7 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
                   onSubmit={handleSubmit}
                   uploadsConfig={uploadsConfig()}
                   isFullFileUpload={fullFileUpload()}
+                  fullFileUploadAllowedTypes={fullFileUploadAllowedTypes()}
                   setPreviews={setPreviews}
                   onMicrophoneClicked={onMicrophoneClicked}
                   handleFileChange={handleFileChange}

dist/components/inputs/textInput/components/TextInput.d.ts.map

@@ -335,7 +335,7 @@ export const BotBubble = (props: Props) => {
           <Avatar initialAvatarSrc={props.avatarSrc} />
         </Show>
         <div class="flex flex-col justify-start">
-          {props.message.agentFlowExecutedData &&
+          {props.showAgentMessages && props.message.agentFlowExecutedData &&
             Array.isArray(props.message.agentFlowExecutedData) &&
             props.message.agentFlowExecutedData.length > 0 && (
               <div>

dist/web.js

@@ -28,6 +28,7 @@ type TextInputProps = {
   autoFocus?: boolean;
   sendMessageSound?: boolean;
   sendSoundLocation?: string;
+  fullFileUploadAllowedTypes?: string;
   enableInputHistory?: boolean;
   maxHistorySize?: number;
 };
@@ -128,7 +129,7 @@ export const TextInput = (props: TextInputProps) => {
   };
 
   const getFileType = () => {
-    if (props.isFullFileUpload) return '*';
+    if (props.isFullFileUpload) return props.fullFileUploadAllowedTypes === '' ? '*' : props.fullFileUploadAllowedTypes;
     if (props.uploadsConfig?.fileUploadSizeAndTypes?.length) {
       const allowedFileTypes = props.uploadsConfig?.fileUploadSizeAndTypes.map((allowed) => allowed.fileTypes).join(',');
       if (allowedFileTypes.includes('*')) return '*';