From 2c379b299a8d09dcc2dbcdaf637683e93328c427 Mon Sep 17 00:00:00 2001 From: Greg L Date: Thu, 23 Nov 2023 18:38:02 -0500 Subject: [PATCH] - Bring files up to date with latest merge --- packages/ui/src/views/canvas/index.jsx | 26 +++++++-------- .../ui/src/views/chatflows/APICodeDialog.jsx | 32 +++++++++---------- .../ui/src/views/chatmessage/ChatMessage.jsx | 22 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/packages/ui/src/views/canvas/index.jsx b/packages/ui/src/views/canvas/index.jsx index 29602a4f..5fc23a0d 100644 --- a/packages/ui/src/views/canvas/index.jsx +++ b/packages/ui/src/views/canvas/index.jsx @@ -4,14 +4,14 @@ import 'reactflow/dist/style.css' import { useDispatch, useSelector } from 'react-redux' import { useNavigate, useLocation } from 'react-router-dom' -import { usePrompt } from '../../utils/usePrompt' +import { usePrompt } from '@/utils/usePrompt' import { REMOVE_DIRTY, SET_DIRTY, SET_CHATFLOW, enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction -} from 'store/actions' +} from '@/store/actions' import { omit, cloneDeep } from 'lodash' // material-ui @@ -23,28 +23,28 @@ import CanvasNode from './CanvasNode' import ButtonEdge from './ButtonEdge' import CanvasHeader from './CanvasHeader' import AddNodes from './AddNodes' -import ConfirmDialog from 'ui-component/dialog/ConfirmDialog' -import { ChatPopUp } from 'views/chatmessage/ChatPopUp' -import { VectorStorePopUp } from 'views/vectorstore/VectorStorePopUp' -import { flowContext } from 'store/context/ReactFlowContext' +import ConfirmDialog from '@/ui-component/dialog/ConfirmDialog' +import { ChatPopUp } from '@/views/chatmessage/ChatPopUp' +import { VectorStorePopUp } from '@/views/vectorstore/VectorStorePopUp' +import { flowContext } from '@/store/context/ReactFlowContext' // API -import nodesApi from 'api/nodes' -import chatflowsApi from 'api/chatflows' +import nodesApi from '@/api/nodes' +import chatflowsApi from '@/api/chatflows' // Hooks -import useApi from 'hooks/useApi' -import useConfirm from 'hooks/useConfirm' +import useApi from '@/hooks/useApi' +import useConfirm from '@/hooks/useConfirm' // icons import { IconX } from '@tabler/icons' // utils -import { getUniqueNodeId, initNode, getEdgeLabelName, rearrangeToolsOrdering, getUpsertDetails } from 'utils/genericHelper' -import useNotifier from 'utils/useNotifier' +import { getUniqueNodeId, initNode, getEdgeLabelName, rearrangeToolsOrdering, getUpsertDetails } from '@/utils/genericHelper' +import useNotifier from '@/utils/useNotifier' // const -import { FLOWISE_CREDENTIAL_ID } from 'store/constant' +import { FLOWISE_CREDENTIAL_ID } from '@/store/constant' const nodeTypes = { customNode: CanvasNode } const edgeTypes = { buttonedge: ButtonEdge } diff --git a/packages/ui/src/views/chatflows/APICodeDialog.jsx b/packages/ui/src/views/chatflows/APICodeDialog.jsx index 34c2281f..e3a32d0d 100644 --- a/packages/ui/src/views/chatflows/APICodeDialog.jsx +++ b/packages/ui/src/views/chatflows/APICodeDialog.jsx @@ -20,36 +20,36 @@ import { CopyBlock, atomOneDark } from 'react-code-blocks' import ExpandMoreIcon from '@mui/icons-material/ExpandMore' // Project import -import { Dropdown } from 'ui-component/dropdown/Dropdown' +import { Dropdown } from '@/ui-component/dropdown/Dropdown' import ShareChatbot from './ShareChatbot' import EmbedChat from './EmbedChat' import Configuration from './Configuration' // Const -import { baseURL } from 'store/constant' -import { SET_CHATFLOW } from 'store/actions' +import { baseURL } from '@/store/constant' +import { SET_CHATFLOW } from '@/store/actions' // Images -import pythonSVG from 'assets/images/python.svg' -import javascriptSVG from 'assets/images/javascript.svg' -import cURLSVG from 'assets/images/cURL.svg' -import EmbedSVG from 'assets/images/embed.svg' -import ShareChatbotSVG from 'assets/images/sharing.png' -import settingsSVG from 'assets/images/settings.svg' +import pythonSVG from '@/assets/images/python.svg' +import javascriptSVG from '@/assets/images/javascript.svg' +import cURLSVG from '@/assets/images/cURL.svg' +import EmbedSVG from '@/assets/images/embed.svg' +import ShareChatbotSVG from '@/assets/images/sharing.png' +import settingsSVG from '@/assets/images/settings.svg' import { IconBulb } from '@tabler/icons' // API -import apiKeyApi from 'api/apikey' -import chatflowsApi from 'api/chatflows' -import configApi from 'api/config' +import apiKeyApi from '@/api/apikey' +import chatflowsApi from '@/api/chatflows' +import configApi from '@/api/config' // Hooks -import useApi from 'hooks/useApi' -import { CheckboxInput } from 'ui-component/checkbox/Checkbox' -import { TableViewOnly } from 'ui-component/table/Table' +import useApi from '@/hooks/useApi' +import { CheckboxInput } from '@/ui-component/checkbox/Checkbox' +import { TableViewOnly } from '@/ui-component/table/Table' // Helpers -import { unshiftFiles, getConfigExamplesForJS, getConfigExamplesForPython, getConfigExamplesForCurl } from 'utils/genericHelper' +import { unshiftFiles, getConfigExamplesForJS, getConfigExamplesForPython, getConfigExamplesForCurl } from '@/utils/genericHelper' function TabPanel(props) { const { children, value, index, ...other } = props diff --git a/packages/ui/src/views/chatmessage/ChatMessage.jsx b/packages/ui/src/views/chatmessage/ChatMessage.jsx index c610f944..af0b7b3b 100644 --- a/packages/ui/src/views/chatmessage/ChatMessage.jsx +++ b/packages/ui/src/views/chatmessage/ChatMessage.jsx @@ -14,25 +14,25 @@ import { useTheme } from '@mui/material/styles' import { IconSend, IconDownload } from '@tabler/icons' // project import -import { CodeBlock } from 'ui-component/markdown/CodeBlock' -import { MemoizedReactMarkdown } from 'ui-component/markdown/MemoizedReactMarkdown' -import SourceDocDialog from 'ui-component/dialog/SourceDocDialog' +import { CodeBlock } from '@/ui-component/markdown/CodeBlock' +import { MemoizedReactMarkdown } from '@/ui-component/markdown/MemoizedReactMarkdown' +import SourceDocDialog from '@/ui-component/dialog/SourceDocDialog' import './ChatMessage.css' // api -import chatmessageApi from 'api/chatmessage' -import chatflowsApi from 'api/chatflows' -import predictionApi from 'api/prediction' +import chatmessageApi from '@/api/chatmessage' +import chatflowsApi from '@/api/chatflows' +import predictionApi from '@/api/prediction' // Hooks -import useApi from 'hooks/useApi' +import useApi from '@/hooks/useApi' // Const -import { baseURL, maxScroll } from 'store/constant' +import { baseURL, maxScroll } from '@/store/constant' -import robotPNG from 'assets/images/robot.png' -import userPNG from 'assets/images/account.png' -import { isValidURL, removeDuplicateURL, setLocalStorageChatflow } from 'utils/genericHelper' +import robotPNG from '@/assets/images/robot.png' +import userPNG from '@/assets/images/account.png' +import { isValidURL, removeDuplicateURL, setLocalStorageChatflow } from '@/utils/genericHelper' export const ChatMessage = ({ open, chatflowid, isDialog }) => { const theme = useTheme()