From d20580cebb0c1d0aea2004adbd2f65064ebec124 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 25 Jul 2024 21:51:51 +0000 Subject: [PATCH] refactor: Bring back Material DataGrid Fix the column resize bugs that made it previously unusable --- .../Bts.DataStreamWebApp.Client/src/App.jsx | 4 +-- .../src/DataTable.jsx | 28 ++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx index ecfaf705d..b66887e10 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx @@ -1,7 +1,7 @@ import { ThemeProvider, CssBaseline, GlobalStyles } from '@mui/material'; import useMediaQuery from '@mui/material/useMediaQuery'; import QueryControl from './QueryControl'; -import ReactDataGrid from './ReactDataGrid'; +import DataTable from './DataTable'; import { useState, useEffect } from 'react'; import useWebSocket, { ReadyState } from 'react-use-websocket'; import Sidebar from './SideBar'; @@ -165,7 +165,7 @@ const App = () => { queryError != null ? : (hasData - ? + ? : No data received.

Enter query, then click Play

diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx index d7af78fa9..ce7a0fe14 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/DataTable.jsx @@ -1,23 +1,37 @@ import PropTypes from 'prop-types'; import { DataGrid } from '@mui/x-data-grid'; import './DataGrid.css' +import { useMemo, useState } from 'react'; -function getGridColDef(col) { - return { - field: col.name, - headerName: col.name, +export default function DataTable({ columns, rows }) { + const [columnWidths, setColumnWidths] = useState({}); + + const handleColumnResize = (params) => { + const newWidth = params.width; + setColumnWidths((prevWidths) => ({ + ...prevWidths, + [params.colDef.field]: params.width, + })); }; -} -export default function DataTable({ columns, rows, apiRef }) { + const getGridColDef = useMemo(() => { + return col => { + return { + field: col.name, + headerName: col.name, + width: columnWidths[col.name], + }; + } + }, [columnWidths]); + return (