data stream web app client check pt

This commit is contained in:
John Colvin committed 2024-10-14 17:21:45 +00:00
1 parent 46b4313f2a
commit 368ffce5cf
15 files changed
+267 -264

No files matched your search

@@ -0,0 +1 @@
VITE_WEBSOCKET_URL=wss://localhost:8443/ws
@@ -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",
@@ -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"
@@ -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;
}
@@ -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 (
<ThemeProvider theme={theme}>
<CssBaseline />
<GlobalStyles styles={globalStyles} />
<div>
<h1 id='main-header'>BTS Cloud Streams</h1>
{/* <Container sx={{ display: 'flex', justifyContent: 'flex-start', alignItems: 'flex-start' }}> */}
<div className="app-container">
{/* <CannedQueries /> */}
{/* <SideBar navItems={[]} /> */}
<Sidebar onSelection={onCannedQueryClicked} />
<QueryControl
columns={blueTable.columns}
rows={blueTable.rows}
isRunning={isRunning}
queryInputText={queryInputText}
subscribe={subscribe}
unsubscribe={unsubscribe} />
<div className='root-div'>
<div style={{
display: 'flex',
flexDirection: 'column',
alignItems: 'flex-start',
flexWrap: 'nowrap',
width: sidebarWidth,
transition: 'width 0.3s ease',
}}>
<div style={{
width: '100%',
height: '100px',
}} />
<Sidebar onSelection={onCannedQueryClicked} onOpened={onOpened} onClosed={onClosed} />
</div>
<div style={{
display: 'flex',
flexDirection: 'column',
left: sidebarWidth,
width: '100%',
transition: 'width 0.3s ease',
}}>
<div style={{width: '100%', display: 'flex', flexDirection: 'row', alignItems: 'flex-start' }}>
<div style={{width: '20%' }} />
<h1 id={`main-header`}>BTS Cloud Streams</h1>
</div>
<div style={{width: '100%', display: 'flex', flexDirection: 'row', alignItems: 'flex-start' }}>
<QueryControl
columns={blueTable.columns}
rows={blueTable.rows}
isRunning={isRunning}
queryInputText={queryInputText}
queryError={queryError}
subscribe={subscribe}
unsubscribe={unsubscribe} />
</div>
</div>
</div>
</ThemeProvider>
@@ -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 (
<Container className='container-row' sx={{justifyContent: 'flex-start', width: '25%'}}>
<Button
aria-controls="canned-queries-menu"
aria-haspopup="true"
onClick={handleClick}>
Open Menu List
</Button>
<Menu id="canned-queries-menu" sx={{width: "100px"}} keepMounted anchorEl={anchorEl} onClose={handleClose} open={true}>
{cannedQueries.map(cq => <MenuItem key={cq.name} onClick={handleClose}><div>{cq.name}</div></MenuItem>)}
</Menu>
</Container>
);
};
export default CannedQueries;
@@ -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;
}
@@ -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 (
<DataGrid
className='data-grid-container'
autosizeOnMount={false}
columns={columns?.map(getGridColDef) ?? []}
rows={rows ?? []}
sx={{
tableLayout: "auto",
borderColor: 'primary.main',
backgroundColor: 'primary.dark',
color: 'text.primary',
@@ -49,4 +53,5 @@ DataTable.propTypes = {
})
).isRequired,
rows: PropTypes.arrayOf(PropTypes.array).isRequired,
apiRef: PropTypes.object,
};
@@ -1,18 +0,0 @@
// import { NextPage } from "next";
// import React from "react";
const HomePage = () => {
return (
<div className=" ">
<div className="container h-screen">
<div className="flex flex-col items-center gap-4">
<h1 className="text-4xl my-8">
Welcome to NextJS Collapsible Sidebar Tutorial
</h1>
</div>
</div>
</div>
);
};
export default HomePage;
@@ -1,26 +0,0 @@
import PropTypes from "prop-types";
import { Bars3Icon } from "@heroicons/react/24/outline";
import classNames from "classnames";
const NavBar = ({onMenuButtonClick}) => {
return (
<nav
className={classNames({
"bg-white text-zinc-500": true, // colors
"flex items-center": true, // layout
"w-screen md:w-full sticky z-10 px-4 shadow-sm h-[73px] top-0 ": true, //positioning & styling
})}
>
<div className="font-bold text-lg">Admin Panel</div>
<div className="flex-grow"></div>
<button className="md:hidden" onClick={onMenuButtonClick}>
<Bars3Icon className="h-6 w-6" />
</button>
</nav>
);
};
export default NavBar;
NavBar.propTypes = {
onMenuButtonClick: PropTypes.func
}
@@ -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 (
<div>
<Box sx={{ display: "flex", flexFlow: "column", alignItems: "stretch" }}>
<div style={{
width: '75%'
}}>
<Box sx={{ display: "flex", flexFlow: "column" }}>
<Paper elevation={3} sx={{ color: 'primary.main' }}>
<Box sx={{ p: 2 }}>
<TextField
@@ -68,6 +85,13 @@ const QueryControl = (props) => {
</Button>
</Tooltip>
</Grid>
<Grid item xs>
<Tooltip title="Resize">
<Button onClick={onResizeClick} sx={{ padding: '11px', color: 'text.dark' }}>
Resize Columns
</Button>
</Tooltip>
</Grid>
<Grid item>
<Tooltip title="Run (Ctrl+Enter)">
<Button onClick={onRunClick} sx={{
@@ -95,7 +119,8 @@ const QueryControl = (props) => {
</Paper>
</Box>
{
<DataTable columns={columns ?? []} rows={rows ?? []} />
queryError != null ? <JsonView style={{expandIcon: "+"}} data={queryError} shouldExpandNode={allExpanded} /> :
<ReactDataGrid columns={columns ?? []} rows={rows ?? []} />
}
</div>
);
@@ -106,6 +131,7 @@ QueryControl.propTypes = {
rows: PropTypes.array,
isRunning: PropTypes.bool,
queryInputText: PropTypes.string,
queryError: PropTypes.object,
subscribe: PropTypes.func,
unsubscribe: PropTypes.func,
};
@@ -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 (
<Box sx={{ display: "flex", flexFlow: "column", alignItems: "stretch" }}>
<Paper elevation={3} sx={{ color: 'primary.main' }}>
<Box sx={{ p: 2 }}>
<TextField
fullWidth
multiline
rows={10}
variant="outlined"
onKeyDown={onKeyDown}
inputRef={textInput}
placeholder="Enter Query..."
/>
</Box>
<Box sx={{ p: 2, borderTop: 1 }}>
<Grid container spacing={2} justifyContent="flex-start">
<Grid item xs>
<Tooltip title="Clear Query Text">
<Button onClick={onClearClick} sx={{ padding: '11px', color: 'text.dark' }}>
Clear
</Button>
</Tooltip>
</Grid>
<Grid item>
<Tooltip title="Run (Ctrl+Enter)">
<Button onClick={onRunClick} sx={{
color: `query_start_button.${isRunning ? 'active' : 'inactive'}.color`,
bgcolor: `query_start_button.${isRunning ? 'active' : 'inactive'}.background_color`,
padding: '11px'
}}>
<PlayArrowIcon />
</Button>
</Tooltip>
</Grid>
<Grid item>
<Tooltip title="Stop">
<Button onClick={onStopClick} sx={{
color: `query_stop_button.${isRunning ? 'inactive' : 'active'}.color`,
bgcolor: `query_stop_button.${isRunning ? 'inactive' : 'active'}.background_color`,
padding: '11px'
}}>
<StopIcon />
</Button>
</Tooltip>
</Grid>
</Grid>
</Box>
</Paper>
</Box>
);
};
QueryInputForm.propTypes = {
isRunning: PropTypes.bool.isRequired,
onStart: PropTypes.func.isRequired,
onStop: PropTypes.func.isRequired,
queryInputText: PropTypes.string,
};
export default QueryInputForm;
@@ -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 (
<DataGrid className={"data-grid"} rows={rows} columns={columns.map(getGridColDef)} />
)
}
ReactDataGrid.propTypes = {
columns: PropTypes.arrayOf(
PropTypes.shape({
name: PropTypes.string.isRequired,
type: PropTypes.string.isRequired,
})
).isRequired,
rows: PropTypes.arrayOf(PropTypes.array).isRequired,
};
@@ -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;
}
@@ -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 (
<div className={"sidebar"}>
<div className={"sidebar"}
style={{
display: 'flex',
flexDirection: 'row',
justifyContent: 'flexStart',
alignItems: 'flexStart',
}}
>
<div className={mainContentClass}>
{cannedQueries.map(cq =>
<Button key={cq.name} className={menuItemClass} onClick={(event) => onMenuItemClick(event, cq)}>
@@ -49,9 +65,7 @@ const Sidebar = ({onSelection}) => {
</Button>)}
</div>
<Tooltip title={toggleButtonTitle}>
<Button
onClick={toggleIsOpen}
>
<Button onClick={toggleIsOpen}>
<Icon className="w-5 h-5" />
</Button>
</Tooltip>
@@ -63,4 +77,6 @@ export default Sidebar;
Sidebar.propTypes = {
onSelection: PropTypes.func,
onOpened: PropTypes.func,
onClosed: PropTypes.func,
};