From dc59b0468f5cf50ea1caa26023f0649173163b2c Mon Sep 17 00:00:00 2001 From: Ilango Date: Tue, 12 Mar 2024 13:19:16 +0530 Subject: [PATCH] Fix merge conflicts and build issues --- packages/server/src/index.ts | 2 +- .../cards/{StatsCard.js => StatsCard.jsx} | 0 .../ui-component/dialog/AllowedDomains.jsx | 8 +++---- .../src/ui-component/dialog/AnalyseFlow.jsx | 22 +++++++++---------- .../src/ui-component/dialog/ChatFeedback.jsx | 10 ++++----- .../dialog/ChatflowConfigurationDialog.jsx | 2 +- .../src/ui-component/dialog/SpeechToText.jsx | 22 +++++++++---------- .../ui-component/dialog/StarterPrompts.jsx | 8 +++---- .../extended/{Feedback.js => Feedback.jsx} | 0 pnpm-lock.yaml | 20 ++++++++++++++++- 10 files changed, 56 insertions(+), 38 deletions(-) rename packages/ui/src/ui-component/cards/{StatsCard.js => StatsCard.jsx} (100%) rename packages/ui/src/ui-component/extended/{Feedback.js => Feedback.jsx} (100%) diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index df9a252f6..c2b5f9adf 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -11,7 +11,7 @@ import logger from './utils/logger' import { expressRequestLogger } from './utils/logger' import { v4 as uuidv4 } from 'uuid' import OpenAI from 'openai' -import { DataSource, FindOptionsWhere, MoreThanOrEqual, LessThanOrEqual } from 'typeorm' +import { DataSource, FindOptionsWhere, MoreThanOrEqual, LessThanOrEqual, Between } from 'typeorm' import { IChatFlow, IncomingInput, diff --git a/packages/ui/src/ui-component/cards/StatsCard.js b/packages/ui/src/ui-component/cards/StatsCard.jsx similarity index 100% rename from packages/ui/src/ui-component/cards/StatsCard.js rename to packages/ui/src/ui-component/cards/StatsCard.jsx diff --git a/packages/ui/src/ui-component/dialog/AllowedDomains.jsx b/packages/ui/src/ui-component/dialog/AllowedDomains.jsx index cb0e9c8e2..e0d01dd36 100644 --- a/packages/ui/src/ui-component/dialog/AllowedDomains.jsx +++ b/packages/ui/src/ui-component/dialog/AllowedDomains.jsx @@ -1,20 +1,20 @@ import { useDispatch } from 'react-redux' import { useState, useEffect } from 'react' import PropTypes from 'prop-types' -import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from 'store/actions' +import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from '@/store/actions' // material-ui import { Button, IconButton, OutlinedInput, Box, List, InputAdornment } from '@mui/material' import { IconX, IconTrash, IconPlus } from '@tabler/icons' // Project import -import { StyledButton } from 'ui-component/button/StyledButton' +import { StyledButton } from '@/ui-component/button/StyledButton' // store -import useNotifier from 'utils/useNotifier' +import useNotifier from '@/utils/useNotifier' // API -import chatflowsApi from 'api/chatflows' +import chatflowsApi from '@/api/chatflows' const AllowedDomains = ({ dialogProps }) => { const dispatch = useDispatch() diff --git a/packages/ui/src/ui-component/dialog/AnalyseFlow.jsx b/packages/ui/src/ui-component/dialog/AnalyseFlow.jsx index 05f4b26d4..4d00a12f9 100644 --- a/packages/ui/src/ui-component/dialog/AnalyseFlow.jsx +++ b/packages/ui/src/ui-component/dialog/AnalyseFlow.jsx @@ -1,7 +1,7 @@ import { useDispatch } from 'react-redux' import { useState, useEffect } from 'react' import PropTypes from 'prop-types' -import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from 'store/actions' +import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from '@/store/actions' // material-ui import { @@ -19,20 +19,20 @@ import ExpandMoreIcon from '@mui/icons-material/ExpandMore' import { IconX } from '@tabler/icons' // Project import -import CredentialInputHandler from 'views/canvas/CredentialInputHandler' -import { TooltipWithParser } from 'ui-component/tooltip/TooltipWithParser' -import { SwitchInput } from 'ui-component/switch/Switch' -import { Input } from 'ui-component/input/Input' -import { StyledButton } from 'ui-component/button/StyledButton' -import langsmithPNG from 'assets/images/langchain.png' -import langfuseSVG from 'assets/images/langfuse.svg' -import lunarySVG from 'assets/images/lunary.svg' +import CredentialInputHandler from '@/views/canvas/CredentialInputHandler' +import { TooltipWithParser } from '@/ui-component/tooltip/TooltipWithParser' +import { SwitchInput } from '@/ui-component/switch/Switch' +import { Input } from '@/ui-component/input/Input' +import { StyledButton } from '@/ui-component/button/StyledButton' +import langsmithPNG from '@/assets/images/langchain.png' +import langfuseSVG from '@/assets/images/langfuse.svg' +import lunarySVG from '@/assets/images/lunary.svg' // store -import useNotifier from 'utils/useNotifier' +import useNotifier from '@/utils/useNotifier' // API -import chatflowsApi from 'api/chatflows' +import chatflowsApi from '@/api/chatflows' const analyticProviders = [ { diff --git a/packages/ui/src/ui-component/dialog/ChatFeedback.jsx b/packages/ui/src/ui-component/dialog/ChatFeedback.jsx index 2ea2db38f..3a15e8a1e 100644 --- a/packages/ui/src/ui-component/dialog/ChatFeedback.jsx +++ b/packages/ui/src/ui-component/dialog/ChatFeedback.jsx @@ -1,21 +1,21 @@ import { useDispatch } from 'react-redux' import { useState, useEffect } from 'react' import PropTypes from 'prop-types' -import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from 'store/actions' +import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from '@/store/actions' // material-ui import { Button, Box } from '@mui/material' import { IconX } from '@tabler/icons' // Project import -import { StyledButton } from 'ui-component/button/StyledButton' -import { SwitchInput } from 'ui-component/switch/Switch' +import { StyledButton } from '@/ui-component/button/StyledButton' +import { SwitchInput } from '@/ui-component/switch/Switch' // store -import useNotifier from 'utils/useNotifier' +import useNotifier from '@/utils/useNotifier' // API -import chatflowsApi from 'api/chatflows' +import chatflowsApi from '@/api/chatflows' const ChatFeedback = ({ dialogProps }) => { const dispatch = useDispatch() diff --git a/packages/ui/src/ui-component/dialog/ChatflowConfigurationDialog.jsx b/packages/ui/src/ui-component/dialog/ChatflowConfigurationDialog.jsx index 775a4281d..c87446290 100644 --- a/packages/ui/src/ui-component/dialog/ChatflowConfigurationDialog.jsx +++ b/packages/ui/src/ui-component/dialog/ChatflowConfigurationDialog.jsx @@ -4,7 +4,7 @@ import { useSelector } from 'react-redux' import { createPortal } from 'react-dom' import { Box, Dialog, DialogContent, DialogTitle, Tabs, Tab } from '@mui/material' import SpeechToText from './SpeechToText' -import Configuration from 'views/chatflows/Configuration' +import Configuration from '@/views/chatflows/Configuration' import AllowedDomains from './AllowedDomains' import ChatFeedback from './ChatFeedback' import AnalyseFlow from './AnalyseFlow' diff --git a/packages/ui/src/ui-component/dialog/SpeechToText.jsx b/packages/ui/src/ui-component/dialog/SpeechToText.jsx index eb5e5af64..b56c8f852 100644 --- a/packages/ui/src/ui-component/dialog/SpeechToText.jsx +++ b/packages/ui/src/ui-component/dialog/SpeechToText.jsx @@ -1,27 +1,27 @@ import { useDispatch } from 'react-redux' import { useState, useEffect } from 'react' import PropTypes from 'prop-types' -import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from 'store/actions' +import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from '@/store/actions' // material-ui import { Typography, Box, Button, FormControl, ListItem, ListItemAvatar, ListItemText, MenuItem, Select } from '@mui/material' import { IconX } from '@tabler/icons' // Project import -import CredentialInputHandler from 'views/canvas/CredentialInputHandler' -import { TooltipWithParser } from 'ui-component/tooltip/TooltipWithParser' -import { SwitchInput } from 'ui-component/switch/Switch' -import { Input } from 'ui-component/input/Input' -import { StyledButton } from 'ui-component/button/StyledButton' -import { Dropdown } from 'ui-component/dropdown/Dropdown' -import openAISVG from 'assets/images/openai.svg' -import assemblyAIPng from 'assets/images/assemblyai.png' +import CredentialInputHandler from '@/views/canvas/CredentialInputHandler' +import { TooltipWithParser } from '@/ui-component/tooltip/TooltipWithParser' +import { SwitchInput } from '@/ui-component/switch/Switch' +import { Input } from '@/ui-component/input/Input' +import { StyledButton } from '@/ui-component/button/StyledButton' +import { Dropdown } from '@/ui-component/dropdown/Dropdown' +import openAISVG from '@/assets/images/openai.svg' +import assemblyAIPng from '@/assets/images/assemblyai.png' // store -import useNotifier from 'utils/useNotifier' +import useNotifier from '@/utils/useNotifier' // API -import chatflowsApi from 'api/chatflows' +import chatflowsApi from '@/api/chatflows' const speechToTextProviders = { openAIWhisper: { diff --git a/packages/ui/src/ui-component/dialog/StarterPrompts.jsx b/packages/ui/src/ui-component/dialog/StarterPrompts.jsx index 1cf291f74..a12c51bbb 100644 --- a/packages/ui/src/ui-component/dialog/StarterPrompts.jsx +++ b/packages/ui/src/ui-component/dialog/StarterPrompts.jsx @@ -1,20 +1,20 @@ import { useDispatch } from 'react-redux' import { useState, useEffect } from 'react' import PropTypes from 'prop-types' -import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from 'store/actions' +import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from '@/store/actions' // material-ui import { Button, IconButton, OutlinedInput, Box, List, InputAdornment } from '@mui/material' import { IconX, IconTrash, IconPlus, IconBulb } from '@tabler/icons' // Project import -import { StyledButton } from 'ui-component/button/StyledButton' +import { StyledButton } from '@/ui-component/button/StyledButton' // store -import useNotifier from 'utils/useNotifier' +import useNotifier from '@/utils/useNotifier' // API -import chatflowsApi from 'api/chatflows' +import chatflowsApi from '@/api/chatflows' const StarterPrompts = ({ dialogProps }) => { const dispatch = useDispatch() diff --git a/packages/ui/src/ui-component/extended/Feedback.js b/packages/ui/src/ui-component/extended/Feedback.jsx similarity index 100% rename from packages/ui/src/ui-component/extended/Feedback.js rename to packages/ui/src/ui-component/extended/Feedback.jsx diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f93a3984..e50e472de 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4227,7 +4227,7 @@ packages: dependencies: lodash.camelcase: 4.3.0 long: 5.2.3 - protobufjs: 7.2.4 + protobufjs: 7.2.6 yargs: 17.7.2 dev: false @@ -23845,6 +23845,24 @@ packages: long: 5.2.3 dev: false + /protobufjs@7.2.6: + resolution: {integrity: sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==} + engines: {node: '>=12.0.0'} + dependencies: + '@protobufjs/aspromise': 1.1.2 + '@protobufjs/base64': 1.1.2 + '@protobufjs/codegen': 2.0.4 + '@protobufjs/eventemitter': 1.1.0 + '@protobufjs/fetch': 1.1.0 + '@protobufjs/float': 1.0.2 + '@protobufjs/inquire': 1.1.0 + '@protobufjs/path': 1.1.2 + '@protobufjs/pool': 1.1.0 + '@protobufjs/utf8': 1.1.0 + '@types/node': 20.11.26 + long: 5.2.3 + dev: false + /protoc-gen-ts@0.8.7: resolution: {integrity: sha512-jr4VJey2J9LVYCV7EVyVe53g1VMw28cCmYJhBe5e3YX5wiyiDwgxWxeDf9oTqAe4P1bN/YGAkW2jhlH8LohwiQ==} hasBin: true