Merge branch 'main' into feature/Credential

# Conflicts:
#	packages/components/src/utils.ts
#	packages/server/src/ChildProcess.ts

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "flowise-ui",
-    "version": "1.2.13",
+    "version": "1.2.14",
     "license": "SEE LICENSE IN LICENSE.md",
     "homepage": "https://flowiseai.com",
     "author": {

packages/ui/src/views/chatmessage/ChatExpandDialog.js

@@ -43,7 +43,7 @@ const ChatExpandDialog = ({ show, dialogProps, onClear, onCancel }) => {
                     )}
                 </div>
             </DialogTitle>
-            <DialogContent>
+            <DialogContent sx={{ display: 'flex', justifyContent: 'flex-end', flexDirection: 'column' }}>
                 <ChatMessage isDialog={true} open={dialogProps.open} chatflowid={dialogProps.chatflowid} />
             </DialogContent>
         </Dialog>

packages/ui/src/views/chatmessage/ChatMessage.css

@@ -127,7 +127,8 @@
 
 .cloud-dialog {
     width: 100%;
-    height: calc(100vh - 230px);
+    height: 100vh;
+    overflow-y: scroll;
     border-radius: 0.5rem;
     display: flex;
     justify-content: center;

packages/ui/src/views/chatmessage/ChatMessage.js

@@ -368,6 +368,7 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => {
                             value={userInput}
                             onChange={onChange}
                             multiline={true}
+                            maxRows={isDialog ? 7 : 2}
                             endAdornment={
                                 <InputAdornment position='end' sx={{ padding: '15px' }}>
                                     <IconButton type='submit' disabled={loading || !chatflowid} edge='end'>