diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx index 4201d77dc..8802fa75c 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx @@ -1,10 +1,14 @@ import { ThemeProvider, CssBaseline, GlobalStyles } from '@mui/material'; import useMediaQuery from '@mui/material/useMediaQuery'; import QueryControl from './QueryControl'; +import ReactDataGrid from './ReactDataGrid'; import { useState, useMemo } from 'react'; import useWebSocket, { ReadyState } from 'react-use-websocket'; import Sidebar from './SideBar'; import getTheme from './Theme'; +import ErrorView from './ErrorView'; +import Alert from '@mui/material/Alert'; +import AlertTitle from '@mui/material/AlertTitle'; import '@fontsource/noto-sans'; import './App.css'; @@ -111,6 +115,7 @@ const App = () => { }; const sidebarWidth = sidebarIsOpen ? '250px' : '65px'; + const hasData = blueTable.columns != null && blueTable.columns.length > 0; return ( @@ -141,15 +146,26 @@ const App = () => {

BTS Cloud Streams

-
- +
+
+ +
+
+ { + queryError != null + ? + : (hasData + ? + : + No data received. +

Enter query, then click Play

+
) + } +
diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/ErrorView.css b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/ErrorView.css new file mode 100644 index 000000000..c2e33384c --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/ErrorView.css @@ -0,0 +1,4 @@ +p.error-text { + font-weight: bold; + color: var(--error-color); +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/ErrorView.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/ErrorView.jsx new file mode 100644 index 000000000..2c12a43e8 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/ErrorView.jsx @@ -0,0 +1,42 @@ +import React from 'react'; +import { Box, Typography, Collapse } from '@mui/material'; +import { useTheme } from '@mui/material/styles'; +import Alert from '@mui/material/Alert'; +import AlertTitle from '@mui/material/AlertTitle'; + +const ErrorView = ({ error }) => { + const theme = useTheme(); + const [open, setOpen] = React.useState(false); + + if (!error) { + return null; + } + + return ( + + setOpen(!open)} sx={{ cursor: 'pointer' }}> + Error Code: {error.code} + {error.message} + + + + {error.data.error_message} + Stack Trace: + + {error.data.stack_trace} + + + + + ); +}; + +export default ErrorView; diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryControl.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryControl.jsx index fa1d4784e..16a3ae828 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryControl.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryControl.jsx @@ -2,7 +2,6 @@ import PropTypes from 'prop-types'; import DataTable from './DataTable'; import { useRef, useEffect } from 'react'; import { useGridApiRef } from '@mui/x-data-grid'; -import ReactDataGrid from './ReactDataGrid'; import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; import Grid from '@mui/material/Grid'; @@ -11,10 +10,9 @@ import PlayArrowIcon from '@mui/icons-material/PlayArrow'; import StopIcon from '@mui/icons-material/Stop'; import TextField from '@mui/material/TextField'; import Tooltip from '@mui/material/Tooltip'; -import { JsonView, allExpanded, darkStyles, defaultStyles } from 'react-json-view-lite'; const QueryControl = (props) => { - const { columns, rows, isRunning, queryInputText, queryError, subscribe, unsubscribe } = props; + const { isRunning, queryInputText, subscribe, unsubscribe } = props; // const theme = useTheme(); let textInput = useRef(); useEffect(() => { @@ -45,71 +43,55 @@ const QueryControl = (props) => { } }; - const prettyError = { - code: 0, - message: "", - }; - if (queryError != null) { - prettyError.code = queryError.code; - // prettyError.message = quer - } return ( -
- - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - { - queryError != null ? : - - } -
+ + + + + + + + + + + + + + ); }; @@ -118,7 +100,6 @@ QueryControl.propTypes = { rows: PropTypes.array, isRunning: PropTypes.bool, queryInputText: PropTypes.string, - queryError: PropTypes.object, subscribe: PropTypes.func, unsubscribe: PropTypes.func, };