diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx
index e2d88091a..998391b3a 100644
--- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx
+++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx
@@ -1,14 +1,12 @@
import { ThemeProvider, CssBaseline, GlobalStyles } from '@mui/material';
+import QueryStatusView from './QueryStatusView';
import useMediaQuery from '@mui/material/useMediaQuery';
import QueryControl from './QueryControl';
import DataTable from './DataTable';
-import { useState, useEffect } from 'react';
+import { useState, useEffect, 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';
@@ -60,6 +58,14 @@ const App = () => {
const [blueTable, setBlueTable] = useState({columns: null, rows: null });
const [queryError, setQueryError] = useState(null);
const [queryState, setQueryState] = useState("Unsubscribed");
+ const queryStateDetails = useMemo(() => {
+ if (queryState == "Unsubscribed") {
+ return "Enter query above, then click the play button to subscribe";
+ }
+ if (queryState == "Subscribed") {
+ return null;
+ }
+ }, [queryState]);
const [sidebarIsOpen, setSidebarIsOpen] = useState(false);
const [cannedQuery, setCannedQuery] = useState(null);
@@ -163,16 +169,8 @@ const App = () => {
unsubscribe={unsubscribe} />
- {
- queryError != null
- ?
- : (hasData
- ?
- :
- No data received.
- Enter query, then click Play
- )
- }
+
+
diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryStatusView.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryStatusView.jsx
new file mode 100644
index 000000000..1ddb29a71
--- /dev/null
+++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryStatusView.jsx
@@ -0,0 +1,71 @@
+import { useState } from 'react';
+import PropTypes from 'prop-types';
+import { Box, Typography, Collapse } from '@mui/material';
+import Alert from '@mui/material/Alert';
+import AlertTitle from '@mui/material/AlertTitle';
+import { useTheme } from '@mui/material/styles';
+import { alpha } from '@mui/system';
+
+const QueryStatusView = ({ queryState, details, error }) => {
+ const theme = useTheme();
+ const [open, setOpen] = useState(false);
+
+ let header = queryState;
+ let headerContent = null;
+ let detailElements = [];
+ let severity = queryState == "Subscribed" ? "success" : "info";
+ let cursor = details == null ? "default" : "pointer";
+ if (error != null) {
+ severity = "error";
+ cursor = "pointer";
+ header = `Error Code: ${error.code}`;
+ headerContent = error.message;
+ detailElements.push({error.data.error_message});
+ detailElements.push(Stack Trace:);
+ detailElements.push(
+ {error.data.stack_trace}
+ );
+ } else if (details != null) {
+ detailElements.push({details});
+ }
+ return (
+
+ setOpen(!open)} sx={{
+ margin: theme.spacing(2, 0, 0, 0),
+ cursor: cursor,
+ }}>
+ {header}
+ {headerContent}
+
+ {detailElements.length == 0
+ ? null
+ :
+
+ {detailElements}
+
+ }
+
+ );
+};
+
+QueryStatusView.propTypes = {
+ queryState: PropTypes.string,
+ details: PropTypes.string,
+ error: PropTypes.shape({
+ code: PropTypes.number,
+ message: PropTypes.string,
+ data: PropTypes.object,
+ })
+};
+
+export default QueryStatusView;
diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/Theme.js b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/Theme.js
index 6894c6c45..42112d251 100644
--- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/Theme.js
+++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/Theme.js
@@ -59,9 +59,6 @@ const getDarkPalette = () => {
backgroundColor: '#ffffff00',
}
},
- warning: {
- main: '#c4823f'
- },
queryStopButton: {
Subscribed: {
color: '#ff4444a0',
@@ -72,6 +69,30 @@ const getDarkPalette = () => {
backgroundColor: '#ffffff00',
}
},
+ error: {
+ light: '#e57373',
+ main: '#f44336',
+ dark: '#d32f2f',
+ contrastText: '#fff',
+ },
+ warning: {
+ light: '#ffb74d',
+ main: '#ff9800',
+ dark: '#f57c00',
+ contrastText: '#000',
+ },
+ info: {
+ light: '#64b5f6',
+ main: '#2196f3',
+ dark: '#303030',
+ contrastText: '#fff',
+ },
+ success: {
+ light: '#81c784',
+ main: '#4caf50',
+ dark: '#388e3c',
+ contrastText: '#000',
+ },
};
};