diff --git a/web/src/components/RealtimeTable/RealtimeTable.jsx b/web/src/components/RealtimeTable/RealtimeTable.jsx index b67bcc2..884aa77 100644 --- a/web/src/components/RealtimeTable/RealtimeTable.jsx +++ b/web/src/components/RealtimeTable/RealtimeTable.jsx @@ -22,9 +22,10 @@ import { } from './constants/tableConfig'; import { useRealtime } from './contexts/RealtimeContext'; import { toast } from 'react-toastify'; +import { CircularProgress } from '@mui/material'; const RealtimeTable = ({ formType, formId, sheetName, direction }) => { - const { data, setData } = useRealtimeData(formId, sheetName, direction); + const { data, setData, isLoading: isTableLoading } = useRealtimeData(formId, sheetName, direction); const [globalFilter, setGlobalFilter] = useState(''); const [showColumnFilters, setShowColumnFilters] = useState(false); const [selectedColumn, setSelectedColumn] = useState(); @@ -149,7 +150,8 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => { columnVisibility, globalFilter, showColumnFilters, - rowSelection + rowSelection, + isLoading: isTableLoading, }, initialState: { expanded: true @@ -196,6 +198,7 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => { containerRef, tableMeta, rowSelection, + isTableLoading, ], ); @@ -234,10 +237,6 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => { setRowSelection({}); }, [rowSelection, table]) - if (!data) { - return