diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx index 0b369d2c3..688776f91 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx @@ -55,7 +55,7 @@ const App = () => { '--background-color': theme.palette.background.default, }, }; - const [blueTable, setBlueTable] = useState({columns: null, rows: null }); + const [blueTable, setBlueTable] = useState({ columns: null, rows: null }); const [queryError, setQueryError] = useState(null); const [queryState, setQueryState] = useState("Unsubscribed"); const queryStateDetails = useMemo(() => { @@ -72,7 +72,7 @@ const App = () => { const onCannedQueryClicked = (cannedQuery) => { console.info(`Executing canned query: ${JSON.stringify(cannedQuery)}`); const queryText = cannedQuery.query.join("\n"); - setCannedQuery({queryText: queryText, clickTime: Date.now()}); + setCannedQuery({ queryText: queryText, clickTime: Date.now() }); subscribe(queryText); }; @@ -102,7 +102,7 @@ const App = () => { } else { console.assert(msg.params.subscription_id == subscriptionId); console.info(`Received rows: ${msg.params.table.all}`); - setBlueTable({columns: msg.params.table.columns, rows: msg.params.table.all}); + setBlueTable({ columns: msg.params.table.columns, rows: msg.params.table.all }); } }; }, [getWebSocket, readyState]); @@ -128,7 +128,6 @@ const App = () => { }; const sidebarWidth = sidebarIsOpen ? '250px' : '65px'; - const hasData = blueTable.columns != null && blueTable.columns.length > 0; return ( @@ -142,10 +141,6 @@ const App = () => { width: sidebarWidth, transition: 'width 0.3s ease', }}> -
{ width: '100%', transition: 'width 0.3s ease', }}> -
-
+
+
{ subscribe={subscribe} unsubscribe={unsubscribe} />
-
+
diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx index ce7a0fe14..6cc6681bd 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx @@ -1,9 +1,11 @@ import PropTypes from 'prop-types'; +import { useTheme } from '@mui/material/styles'; import { DataGrid } from '@mui/x-data-grid'; import './DataGrid.css' import { useMemo, useState } from 'react'; export default function DataTable({ columns, rows }) { + const theme = useTheme(); const [columnWidths, setColumnWidths] = useState({}); const handleColumnResize = (params) => { @@ -32,6 +34,7 @@ export default function DataTable({ columns, rows }) { onColumnResize={handleColumnResize} rows={rows ?? []} sx={{ + margin: theme.spacing(2, 0, 0, 0), borderColor: 'primary.main', backgroundColor: 'primary.dark', color: 'text.primary', diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryStatusView.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryStatusView.jsx index 1ddb29a71..53d3c89b6 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryStatusView.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryStatusView.jsx @@ -29,10 +29,11 @@ const QueryStatusView = ({ queryState, details, error }) => { detailElements.push({details}); } return ( - + setOpen(!open)} sx={{ + onClick={() => setOpen(!open)} + sx={{ margin: theme.spacing(2, 0, 0, 0), cursor: cursor, }}> @@ -47,7 +48,7 @@ const QueryStatusView = ({ queryState, details, error }) => { backgroundColor: alpha(theme.palette[severity].light, 0.75), color: theme.palette[severity].contrastText, padding: theme.spacing(2), - marginTop: theme.spacing(1), + marginTop: theme.spacing(0), borderRadius: theme.shape.borderRadius, }} > diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.jsx index 1e53fa8d2..7ae77e1c7 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.jsx @@ -1,5 +1,6 @@ import { useState, useEffect } from 'react'; import Button from '@mui/material/Button'; +import { useTheme } from '@mui/material/styles'; import PropTypes from 'prop-types'; import Tooltip from '@mui/material/Tooltip'; import ChevronLeftRounded from "@mui/icons-material/ChevronLeftRounded" @@ -8,6 +9,7 @@ import FileCopyIcon from '@mui/icons-material/FileCopy'; import './SideBar.css'; const Sidebar = ({ onSelection, onOpened, onClosed }) => { + const theme = useTheme(); const [isOpen, setIsOpen] = useState(false); const [cannedQueries, setCannedQueries] = useState([]); const Icon = isOpen ? ChevronLeftRounded : ChevronRightRounded; @@ -59,12 +61,14 @@ const Sidebar = ({ onSelection, onOpened, onClosed }) => { const toggleButtonTitle = `${isOpen ? 'Hide' : 'Show'} Common Queries`; return ( -