diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/.env.development b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/.env.development new file mode 100644 index 000000000..ae9c2a02a --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/.env.development @@ -0,0 +1 @@ +VITE_WEBSOCKET_URL=wss://localhost:8443/ws diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json index 2917e7a7d..d04d51411 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json @@ -19,8 +19,10 @@ "bulma": "^1.0.1", "classnames": "^2.5.1", "react": "^18.3.1", + "react-data-grid": "^7.0.0-beta.44", "react-data-table-component": "^7.6.2", "react-dom": "^18.3.1", + "react-json-view-lite": "^1.4.0", "react-pro-sidebar": "^1.1.0", "react-use-websocket": "^4.8.1", "rpc-websockets": "^7.11.2" @@ -6026,6 +6028,18 @@ "node": ">=0.10.0" } }, + "node_modules/react-data-grid": { + "version": "7.0.0-beta.44", + "resolved": "https://registry.npmjs.org/react-data-grid/-/react-data-grid-7.0.0-beta.44.tgz", + "integrity": "sha512-VTql8VPBJEf7E+zkrqYW+jaQT1/m47dxigWzPq59QESJ8LhU59kHyzIx06BUpjdZKdK/tzbWaw2yyJpKoNnt5g==", + "dependencies": { + "clsx": "^2.0.0" + }, + "peerDependencies": { + "react": "^18.0", + "react-dom": "^18.0" + } + }, "node_modules/react-data-table-component": { "version": "7.6.2", "resolved": "https://registry.npmjs.org/react-data-table-component/-/react-data-table-component-7.6.2.tgz", @@ -6060,6 +6074,17 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "node_modules/react-json-view-lite": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/react-json-view-lite/-/react-json-view-lite-1.4.0.tgz", + "integrity": "sha512-wh6F6uJyYAmQ4fK0e8dSQMEWuvTs2Wr3el3sLD9bambX1+pSWUVXIz1RFaoy3TI1mZ0FqdpKq9YgbgTTgyrmXA==", + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "react": "^16.13.1 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/react-mui-sidebar": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/react-mui-sidebar/-/react-mui-sidebar-1.3.5.tgz", diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json index 31a4e084b..3fa9ac038 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json @@ -21,8 +21,10 @@ "bulma": "^1.0.1", "classnames": "^2.5.1", "react": "^18.3.1", + "react-data-grid": "^7.0.0-beta.44", "react-data-table-component": "^7.6.2", "react-dom": "^18.3.1", + "react-json-view-lite": "^1.4.0", "react-pro-sidebar": "^1.1.0", "react-use-websocket": "^4.8.1", "rpc-websockets": "^7.11.2" diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.css b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.css index 0398891df..d899b9848 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.css +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.css @@ -2,6 +2,21 @@ @use "@material/icon-button"; @use "@material/data-table/data-table"; +.root-div { + display: flex; + flex-direction: row; + align-items: flex-start; +} + +.main-content-div { + display: flex; + flex-direction: row; +} + +.title-div { + width: 100%; +} + .container { display: flex; } diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx index 5461f795a..7ffa25116 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx @@ -1,20 +1,16 @@ import { ThemeProvider, CssBaseline, GlobalStyles } from '@mui/material'; import useMediaQuery from '@mui/material/useMediaQuery'; -// import MenuList from '@mui/material/MenuList'; -// import MenuItem from '@mui/material/MenuItem'; -// import Button from '@mui/material/Button'; -import CannedQueries from './CannedQueries'; -import Container from '@mui/material/Container'; import QueryControl from './QueryControl'; -import SideBar from './SideBar'; -import { useState, useEffect, useRef } from 'react'; +import { useState, useMemo } from 'react'; +import useWebSocket, { ReadyState } from 'react-use-websocket'; +import Sidebar from './SideBar'; import getTheme from './Theme'; + import '@fontsource/noto-sans'; import './App.css'; import './SideBar.css'; -// import AnimatedSideBar from './AnimatedSideBar'; -import Sidebar from './SideBar'; +const webSocketUrl = import.meta.env.VITE_WEBSOCKET_URL; var rpcReqIdCounter = 1; function subscribeReq(query) { @@ -52,31 +48,38 @@ const App = () => { '--background-color': theme.palette.background.default, }, }; - const connection = useRef(null); const [blueTable, setBlueTable] = useState({columns: null, rows: null }); const [queryInputText, setQueryInputText] = useState(null); + const [queryError, setQueryError] = useState(null); const [isRunning, setIsRunning] = useState(false); + const [sidebarIsOpen, setSidebarIsOpen] = useState(false); const onCannedQueryClicked = (cannedQuery) => { console.info(`Executing canned query: ${JSON.stringify(cannedQuery)}`); setQueryInputText(cannedQuery.query.join("\n")); }; - useEffect(() => { - const websocketUrl = "wss://localhost:8443/ws"; - const ws = new WebSocket(websocketUrl); - console.info(`Connecting to WebSocket: ${websocketUrl}`); - ws.onopen = () => console.info(`WebSocket open. ${ws.url}`); - ws.onclose = () => console.info(`WebSocket closed. ${ws.url}`); - connection.current = ws; - return () => ws.close(); - }, []); - - useEffect(() => { - console.info(`Binding WebSocket.onmessage callback`); - connection.current.onmessage = e => { + const { sendJsonMessage, getWebSocket, readyState } = useWebSocket( + webSocketUrl, + { + onOpen: () => console.info(`WebSocket open.`), + onClose: () => console.info(`WebSocket closed.`), + shouldReconnect: () => true, + }); + useMemo(() => { + console.info(`WebSocket readyState: ${readyState}`) + if (readyState != ReadyState.OPEN) { + return; + } + const ws = getWebSocket(); + ws.onmessage = e => { console.info(`Received message: ${e.data}`); const msg = JSON.parse(e.data); + if (msg.error != null) { + setQueryError(msg.error); + return; + } + setQueryError(null); if (msg.id != null) { setIsRunning(msg.result.status == "Subscribed"); } else { @@ -84,41 +87,69 @@ const App = () => { setBlueTable({columns: msg.params.columns, rows: msg.params.all}); } }; - }, []); - // useEffect(() => { - // setBlueTable(newTable); - // }, [blueTable]); + }, [getWebSocket, readyState]); const subscribe = (query) => { - const req = JSON.stringify(subscribeReq(query)); - console.info(`Subscribing: ${req}`); - connection.current.send(req); + const req = subscribeReq(query); + console.info(`Subscribing: ${JSON.stringify(subscribeReq(query))}`); + sendJsonMessage(req); }; const unsubscribe = () => { - const req = JSON.stringify(unsubscribeReq()); - console.info(`Unsubscribing: ${req}`); - connection.current.send(req); + const req = unsubscribeReq(); + console.info(`Unsubscribing: ${JSON.stringify(req)}`); + sendJsonMessage(req); }; + const onOpened = () => { + setSidebarIsOpen(true); + }; + + const onClosed = () => { + setSidebarIsOpen(false); + }; + + const sidebarWidth = sidebarIsOpen ? '250px' : '65px'; return ( -
-

BTS Cloud Streams

- {/* */} -
- {/* */} - {/* */} - - +
+
+
+ +
+
+
+
+

BTS Cloud Streams

+
+
+ +
diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/CannedQueries.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/CannedQueries.jsx deleted file mode 100644 index b1ad42d67..000000000 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/CannedQueries.jsx +++ /dev/null @@ -1,46 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import Container from '@mui/material/Container'; -import Button from '@mui/material/Button'; -import Menu from '@mui/material/Menu'; -import MenuItem from '@mui/material/MenuItem'; -import '@fontsource/noto-sans'; -import './App.css'; - -const CannedQueries = () => { - const [cannedQueries, setCannedQueries] = useState([]); - const [anchorEl, setAnchorEl] = React.useState(null); - const handleClose = () => { - setAnchorEl(null); - }; - const handleClick = (event) => { - setAnchorEl(event.currentTarget); - }; - useEffect(() => { - const fetchCannedQueries = async () => { - try { - const response = await fetch('api/cannedqueries'); - const data = await response.json(); - setCannedQueries(data); - } catch (error) { - console.error('Error fetching WebSocket config:', error); - } - } - fetchCannedQueries(); - }, []); - // const cannedQueries = fetch('/api/CannedQueries') - return ( - - - - {cannedQueries.map(cq =>
{cq.name}
)} -
-
- ); -}; - -export default CannedQueries; diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataGrid.css b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataGrid.css new file mode 100644 index 000000000..8f84e7f94 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataGrid.css @@ -0,0 +1,43 @@ +@use "@material/checkbox"; +@use "@material/icon-button"; +@use "@material/data-table/data-table"; + +.data-grid-container { + overflow: auto; + white-space: nowrap; +} + + +.data-grid { + height: 100%; + max-height: 600px; +} + +.rdg-row { + border: 0px; + border-top: 0px; + border-bottom: 0px; + background-color: var(--primary-dark-color); + color: var(--primary-color); +} + + +.rdg-row { + border: 0px; + border-top: 0px; + border-bottom: 0px; + background-color: var(--primary-dark-color); + color: var(--primary-color); +} + +.rdg-cell { + border-bottom: 0px; +} + +.rdg-cell.even { + border-bottom: 5px; +} + +.rdg-cell.odd { + border-bottom: 5px; +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx index 184eefb50..d7af78fa9 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx @@ -1,5 +1,6 @@ import PropTypes from 'prop-types'; import { DataGrid } from '@mui/x-data-grid'; +import './DataGrid.css' function getGridColDef(col) { return { @@ -8,12 +9,15 @@ function getGridColDef(col) { }; } -export default function DataTable({ columns, rows }) { +export default function DataTable({ columns, rows, apiRef }) { return ( { - return ( -
-
-
-

- Welcome to NextJS Collapsible Sidebar Tutorial -

-
-
-
- ); -}; - -export default HomePage; diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/NavBar.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/NavBar.jsx deleted file mode 100644 index 05428a17e..000000000 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/NavBar.jsx +++ /dev/null @@ -1,26 +0,0 @@ -import PropTypes from "prop-types"; -import { Bars3Icon } from "@heroicons/react/24/outline"; -import classNames from "classnames"; -const NavBar = ({onMenuButtonClick}) => { - return ( - - ); -}; - -export default NavBar; - -NavBar.propTypes = { - onMenuButtonClick: PropTypes.func -} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryControl.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryControl.jsx index 6126c1190..8f5416a00 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryControl.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryControl.jsx @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import DataTable from './DataTable'; -// import QueryInputForm from './QueryInputForm'; -import { useTheme } from '@mui/material/styles'; 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,9 +11,10 @@ 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, subscribe, unsubscribe } = props; + const { columns, rows, isRunning, queryInputText, queryError, subscribe, unsubscribe } = props; // const theme = useTheme(); let textInput = useRef(); useEffect(() => { @@ -24,6 +25,7 @@ const QueryControl = (props) => { textInput.current.value = queryInputText; }, [queryInputText, subscribe]); console.info(`Initializing query input form with text: ${queryInputText}`) + const gridApiRef = useGridApiRef(); const onClearClick = () => { textInput.current.value = ''; }; @@ -35,6 +37,11 @@ const QueryControl = (props) => { const onStopClick = () => { unsubscribe(); }; + + const onResizeClick = () => { + gridApiRef.current.autosizeColumns(true); + gridApiRef.current.resize(); + }; const onKeyDown = (e) => { // Detect keyboard shortcuts. @@ -44,9 +51,19 @@ const QueryControl = (props) => { } }; + const prettyError = { + code: 0, + message: "", + }; + if (queryError != null) { + prettyError.code = queryError.code; + // prettyError.message = quer + } return ( -
- +
+ { + + + + +
); @@ -106,6 +131,7 @@ QueryControl.propTypes = { rows: PropTypes.array, isRunning: PropTypes.bool, queryInputText: PropTypes.string, + queryError: PropTypes.object, subscribe: PropTypes.func, unsubscribe: PropTypes.func, }; diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryInputForm.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryInputForm.jsx deleted file mode 100644 index b0f98a992..000000000 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/QueryInputForm.jsx +++ /dev/null @@ -1,95 +0,0 @@ -import { useRef } from 'react'; -import Box from '@mui/material/Box'; -import Button from '@mui/material/Button'; -import Grid from '@mui/material/Grid'; -import Paper from '@mui/material/Paper'; -import PlayArrowIcon from '@mui/icons-material/PlayArrow'; -import PropTypes from 'prop-types'; -import StopIcon from '@mui/icons-material/Stop'; -import TextField from '@mui/material/TextField'; -import Tooltip from '@mui/material/Tooltip'; - -const QueryInputForm = ({ isRunning, onStart, onStop, queryInputText }) => { - let textInput = useRef({ current: { value: queryInputText } }); - console.info(`Initializing query input form with text: ${queryInputText}`) - - const onClearClick = () => { - textInput.current.value = ''; - }; - - const onRunClick = () => { - onStart(textInput.current.value); - }; - - const onStopClick = () => { - onStop(); - }; - - const onKeyDown = (e) => { - // Detect keyboard shortcuts. - // Ctrl+Enter : Run - if (e.ctrlKey && e.key === 'Enter') { - onRunClick(); - } - }; - - return ( - - - - - - - - - - - - - - - - - - - - - - - - - - - ); -}; - -QueryInputForm.propTypes = { - isRunning: PropTypes.bool.isRequired, - onStart: PropTypes.func.isRequired, - onStop: PropTypes.func.isRequired, - queryInputText: PropTypes.string, -}; - -export default QueryInputForm; diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/ReactDataGrid.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/ReactDataGrid.jsx new file mode 100644 index 000000000..8cd2d84a0 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/ReactDataGrid.jsx @@ -0,0 +1,27 @@ +import 'react-data-grid/lib/styles.css'; +import PropTypes from 'prop-types'; +import DataGrid from 'react-data-grid'; +import './DataGrid.css'; + +function getGridColDef(col) { + return { + key: col.name, + name: col.name, + }; +} + +export default function ReactDataGrid({columns, rows}) { + return ( + + ) +} + +ReactDataGrid.propTypes = { + columns: PropTypes.arrayOf( + PropTypes.shape({ + name: PropTypes.string.isRequired, + type: PropTypes.string.isRequired, + }) + ).isRequired, + rows: PropTypes.arrayOf(PropTypes.array).isRequired, +}; diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.css b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.css index c8d9601df..51828d803 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.css +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.css @@ -2,7 +2,6 @@ .app-container { display: flex; width: 100%; - height: 100vh; overflow: hidden; flex-direction: row; justify-content: flex-start; @@ -11,7 +10,6 @@ .sidebar { display: flex; - height: 100vh; flex-direction: row; justify-content: flex-start; align-items: flex-start; @@ -22,11 +20,11 @@ } .sidebar.open { - width: 250px; + width: 100%; } .sidebar.closed { - width: 0; + width: 0%; } .sidebar-toggle-button { @@ -41,26 +39,23 @@ padding: 0px; background-color: transparent; transition: background-color 100ms linear 0s, color 100ms linear 0s, opacity 300ms cubic-bezier(0.2, 0, 0, 1) 0s, transform 300ms cubic-bezier(0.2, 0, 0, 1) 0s; - width: 24px; + width: 20%; } .sidebar-toggle-button:hover { transition: background-color 100ms linear 0s, color 100ms linear 0s, opacity 300ms cubic-bezier(0.2, 0, 0, 1) 0s, transform 300ms cubic-bezier(0.2, 0, 0, 1) 0s; } -.main-content { - flex-grow: 1; +.main-content.open { + width: 165px; transition: width 0.3s ease; background-color: transparent; } -.main-content.open { - width: 250px; - background-color: transparent; -} - .main-content.closed { - width: 25px; + width: 0%; + /* min-width: 25px; */ + transition: width 0.3s ease; background-color: transparent; } @@ -71,24 +66,26 @@ .sidebar-menu-item.open { width: 100%; - justify-content: flex-start; + /* justify-content: flex-start; */ transition: width 0.3s ease; } .sidebar-menu-item.closed { - width: 100%; - justify-content: flex-start; + width: 0%; + min-width: 0px; + /* justify-content: flex-start; */ transition: width 0.3s ease; } .sidebar-menu-item-content.open { - justify-content: flex-start; + width: 100%; + /* justify-content: flex-start; */ transition: width 0.3s ease; } .sidebar-menu-item-content.closed { width: 0px; - justify-content: flex-start; + /* justify-content: flex-start; */ transition: width 0.3s ease; } diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.jsx index 46822da81..120ff202e 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/SideBar.jsx @@ -1,19 +1,28 @@ import { useState, useEffect } from 'react'; import Button from '@mui/material/Button'; import PropTypes from 'prop-types'; -import { useTheme } from '@mui/material/styles'; import Tooltip from '@mui/material/Tooltip'; import ChevronLeftRounded from "@mui/icons-material/ChevronLeftRounded" import ChevronRightRounded from '@mui/icons-material/ChevronRightRounded'; import './SideBar.css'; -const Sidebar = ({onSelection}) => { +const Sidebar = ({ onSelection, onOpened, onClosed }) => { const [isOpen, setIsOpen] = useState(false); const [cannedQueries, setCannedQueries] = useState([]); const Icon = isOpen ? ChevronLeftRounded : ChevronRightRounded; const toggleIsOpen = () => { - setIsOpen(!isOpen); + if (isOpen) { + setIsOpen(false); + if (onClosed != null) { + onClosed(); + } + } else { + setIsOpen(true); + if (onOpened != null) { + onOpened(); + } + } }; const onMenuItemClick = (event, cannedQuery) => { console.info(`menu item clicked: ${cannedQuery.name}`); @@ -39,7 +48,14 @@ const Sidebar = ({onSelection}) => { const toggleButtonTitle = `${isOpen ? 'Hide' : 'Show'} Common Queries`; return ( -
+
{cannedQueries.map(cq => )}
- @@ -63,4 +77,6 @@ export default Sidebar; Sidebar.propTypes = { onSelection: PropTypes.func, + onOpened: PropTypes.func, + onClosed: PropTypes.func, };