Merge branch 'main' into feature/Prompt-Chaining

packages/ui/src/views/canvas/CanvasHeader.js

@@ -8,11 +8,12 @@ import { useTheme } from '@mui/material/styles'
 import { Avatar, Box, ButtonBase, Typography, Stack, TextField } from '@mui/material'
 
 // icons
-import { IconSettings, IconChevronLeft, IconDeviceFloppy, IconPencil, IconCheck, IconX } from '@tabler/icons'
+import { IconSettings, IconChevronLeft, IconDeviceFloppy, IconPencil, IconCheck, IconX, IconWorldWww } from '@tabler/icons'
 
 // project imports
 import Settings from 'views/settings'
 import SaveChatflowDialog from 'ui-component/dialog/SaveChatflowDialog'
+import APICodeDialog from 'ui-component/dialog/APICodeDialog'
 
 // API
 import chatflowsApi from 'api/chatflows'
@@ -35,6 +36,8 @@ const CanvasHeader = ({ chatflow, handleSaveFlow, handleDeleteFlow, handleLoadFl
     const [flowName, setFlowName] = useState('')
     const [isSettingsOpen, setSettingsOpen] = useState(false)
     const [flowDialogOpen, setFlowDialogOpen] = useState(false)
+    const [apiDialogOpen, setAPIDialogOpen] = useState(false)
+    const [apiDialogProps, setAPIDialogProps] = useState({})
 
     const updateChatflowApi = useApi(chatflowsApi.updateChatflow)
     const canvas = useSelector((state) => state.canvas)
@@ -76,6 +79,14 @@ const CanvasHeader = ({ chatflow, handleSaveFlow, handleDeleteFlow, handleLoadFl
         }
     }
 
+    const onAPIDialogClick = () => {
+        setAPIDialogProps({
+            title: 'Use this chatflow with API',
+            chatflowid: chatflow.id
+        })
+        setAPIDialogOpen(true)
+    }
+
     const onSaveChatflowClick = () => {
         if (chatflow.id) handleSaveFlow(chatflow.name)
         else setFlowDialogOpen(true)
@@ -219,6 +230,26 @@ const CanvasHeader = ({ chatflow, handleSaveFlow, handleDeleteFlow, handleLoadFl
                 )}
             </Box>
             <Box>
+                <ButtonBase title='API Endpoint' sx={{ borderRadius: '50%', mr: 2 }}>
+                    <Avatar
+                        variant='rounded'
+                        sx={{
+                            ...theme.typography.commonAvatar,
+                            ...theme.typography.mediumAvatar,
+                            transition: 'all .2s ease-in-out',
+                            background: theme.palette.canvasHeader.deployLight,
+                            color: theme.palette.canvasHeader.deployDark,
+                            '&:hover': {
+                                background: theme.palette.canvasHeader.deployDark,
+                                color: theme.palette.canvasHeader.deployLight
+                            }
+                        }}
+                        color='inherit'
+                        onClick={onAPIDialogClick}
+                    >
+                        <IconWorldWww stroke={1.5} size='1.3rem' />
+                    </Avatar>
+                </ButtonBase>
                 <ButtonBase title='Save Chatflow' sx={{ borderRadius: '50%', mr: 2 }}>
                     <Avatar
                         variant='rounded'
@@ -277,6 +308,7 @@ const CanvasHeader = ({ chatflow, handleSaveFlow, handleDeleteFlow, handleLoadFl
                 onCancel={() => setFlowDialogOpen(false)}
                 onConfirm={onConfirmSaveName}
             />
+            <APICodeDialog show={apiDialogOpen} dialogProps={apiDialogProps} onCancel={() => setAPIDialogOpen(false)} />
         </>
     )
 }

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

@@ -34,6 +34,8 @@ import useApi from 'hooks/useApi'
 import useConfirm from 'hooks/useConfirm'
 import useNotifier from 'utils/useNotifier'
 
+import { maxScroll } from 'store/constant'
+
 export const ChatMessage = ({ chatflowid }) => {
     const theme = useTheme()
     const customization = useSelector((state) => state.customization)
@@ -116,7 +118,7 @@ export const ChatMessage = ({ chatflowid }) => {
 
     const scrollToBottom = () => {
         if (ps.current) {
-            ps.current.scrollTo({ top: Number.MAX_SAFE_INTEGER, behavior: 'smooth' })
+            ps.current.scrollTo({ top: maxScroll, behavior: 'smooth' })
         }
     }