dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-01 19:03:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Jan Prochazka
2020-10-24 21:36:17 +02:00
parent f9f2a501ab
commit 22a263a598
5 changed files with 0 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
packages/web/src/datagrid/DataGridCore.js
View File

@@ -4,7 +4,6 @@ import ReactDOM from 'react-dom';
import styled from 'styled-components'; import styled from 'styled-components';
import { HorizontalScrollBar, VerticalScrollBar } from './ScrollBars'; import { HorizontalScrollBar, VerticalScrollBar } from './ScrollBars';
import useDimensions from '../utility/useDimensions'; import useDimensions from '../utility/useDimensions';
import axios from '../utility/axios';
import DataFilterControl from './DataFilterControl'; import DataFilterControl from './DataFilterControl';
import stableStringify from 'json-stable-stringify'; import stableStringify from 'json-stable-stringify';
import { getFilterType, getFilterValueExpression } from '@dbgate/filterparser'; import { getFilterType, getFilterValueExpression } from '@dbgate/filterparser';
@@ -18,19 +17,6 @@ import {
filterCellsForRow, filterCellsForRow,
cellIsSelected, cellIsSelected,
} from './gridutil'; } from './gridutil';
import useModalState from '../modals/useModalState';
import ConfirmSqlModal from '../modals/ConfirmSqlModal';
import {
changeSetToSql,
createChangeSet,
revertChangeSetRowChanges,
getChangeSetInsertedRows,
changeSetInsertNewRow,
deleteChangeSetRows,
batchUpdateChangeSet,
setChangeSetValue,
} from '@dbgate/datalib';
import { scriptToSql } from '@dbgate/sqltree';
import { copyTextToClipboard } from '../utility/clipboard'; import { copyTextToClipboard } from '../utility/clipboard';
import DataGridToolbar from './DataGridToolbar'; import DataGridToolbar from './DataGridToolbar';
// import usePropsCompare from '../utility/usePropsCompare'; // import usePropsCompare from '../utility/usePropsCompare';
@@ -38,14 +24,8 @@ import ColumnHeaderControl from './ColumnHeaderControl';
import InlineButton from '../widgets/InlineButton'; import InlineButton from '../widgets/InlineButton';
import { showMenu } from '../modals/DropDownMenu'; import { showMenu } from '../modals/DropDownMenu';
import DataGridContextMenu from './DataGridContextMenu'; import DataGridContextMenu from './DataGridContextMenu';
import useSocket from '../utility/SocketProvider';
import LoadingInfo from '../widgets/LoadingInfo'; import LoadingInfo from '../widgets/LoadingInfo';
import ErrorInfo from '../widgets/ErrorInfo'; import ErrorInfo from '../widgets/ErrorInfo';
import useShowModal from '../modals/showModal';
import ErrorMessageModal from '../modals/ErrorMessageModal';
import ImportExportModal from '../modals/ImportExportModal';
import { openNewTab } from '../utility/common';
import { useSetOpenedTabs } from '../utility/globalState';
const GridContainer = styled.div` const GridContainer = styled.div`
position: absolute; position: absolute;
@@ -132,8 +112,6 @@ export default function DataGridCore(props) {
display, display,
conid, conid,
database, database,
// changeSetState,
// dispatchChangeSet,
tabVisible, tabVisible,
loadNextData, loadNextData,
errorMessage, errorMessage,
@@ -143,7 +121,6 @@ export default function DataGridCore(props) {
allRowCount, allRowCount,
openQuery, openQuery,
onSave, onSave,
insertedRowCount,
isLoading, isLoading,
grider, grider,
} = props; } = props;
@@ -170,11 +147,6 @@ export default function DataGridCore(props) {
const [autofillSelectedCells, setAutofillSelectedCells] = React.useState(emptyCellArray); const [autofillSelectedCells, setAutofillSelectedCells] = React.useState(emptyCellArray);
const [focusFilterInputs, setFocusFilterInputs] = React.useState({}); const [focusFilterInputs, setFocusFilterInputs] = React.useState({});
// const [inplaceEditorCell, setInplaceEditorCell] = React.useState(nullCell);
// const [inplaceEditorInitText, setInplaceEditorInitText] = React.useState('');
// const [inplaceEditorShouldSave, setInplaceEditorShouldSave] = React.useState(false);
// const [inplaceEditorChangedOnCreate, setInplaceEditorChangedOnCreate] = React.useState(false);
const autofillMarkerCell = React.useMemo( const autofillMarkerCell = React.useMemo(
() => () =>
selectedCells && selectedCells.length > 0 && _.uniq(selectedCells.map((x) => x[0])).length == 1 selectedCells && selectedCells.length > 0 && _.uniq(selectedCells.map((x) => x[0])).length == 1
@@ -183,28 +155,12 @@ export default function DataGridCore(props) {
[selectedCells] [selectedCells]
); );
const showModal = useShowModal();
// const data = useFetch({
// url: 'database-connections/query-data',
// method: 'post',
// params: {
// conid,
// database,
// },
// data: { sql },
// });
// const { rows, columns } = data || {};
const [firstVisibleRowScrollIndex, setFirstVisibleRowScrollIndex] = React.useState(0); const [firstVisibleRowScrollIndex, setFirstVisibleRowScrollIndex] = React.useState(0);
const [firstVisibleColumnScrollIndex, setFirstVisibleColumnScrollIndex] = React.useState(0); const [firstVisibleColumnScrollIndex, setFirstVisibleColumnScrollIndex] = React.useState(0);
const [headerRowRef, { height: rowHeight }] = useDimensions(); const [headerRowRef, { height: rowHeight }] = useDimensions();
const [tableBodyRef] = useDimensions(); const [tableBodyRef] = useDimensions();
const [containerRef, { height: containerHeight, width: containerWidth }] = useDimensions(); const [containerRef, { height: containerHeight, width: containerWidth }] = useDimensions();
// const [tableRef, { height: tableHeight, width: tableWidth }] = useDimensions();
// const changeSet = changeSetState && changeSetState.value;
// const setChangeSet = React.useCallback((value) => dispatchChangeSet({ type: 'set', value }), [dispatchChangeSet]);
const [inplaceEditorState, dispatchInsplaceEditor] = React.useReducer((state, action) => { const [inplaceEditorState, dispatchInsplaceEditor] = React.useReducer((state, action) => {
switch (action.type) { switch (action.type) {
@@ -273,20 +229,6 @@ export default function DataGridCore(props) {
} }
}, [selectedCells, props.refReloadToken, grider.getRowData(0)]); }, [selectedCells, props.refReloadToken, grider.getRowData(0)]);
// const handleCloseInplaceEditor = React.useCallback(
// mode => {
// const [row, col] = currentCell || [];
// setInplaceEditorCell(null);
// setInplaceEditorInitText(null);
// setInplaceEditorShouldSave(false);
// if (tableElement) tableElement.focus();
// // @ts-ignore
// if (mode == 'enter' && row) moveCurrentCell(row + 1, col);
// if (mode == 'save') setTimeout(handleSave, 1);
// },
// [tableElement, currentCell]
// );
// usePropsCompare({ columnSizes, firstVisibleColumnScrollIndex, gridScrollAreaWidth, columns }); // usePropsCompare({ columnSizes, firstVisibleColumnScrollIndex, gridScrollAreaWidth, columns });
const visibleRealColumns = React.useMemo( const visibleRealColumns = React.useMemo(
@@ -352,9 +294,6 @@ export default function DataGridCore(props) {
} }
if (allRowCount == null) return 'Loading row count...'; if (allRowCount == null) return 'Loading row count...';
return `Rows: ${allRowCount.toLocaleString()}`; return `Rows: ${allRowCount.toLocaleString()}`;
// if (this.isLoadingFirstPage) return "Loading first page...";
// if (this.isFirstPageError) return "Error loading first page";
// return `Rows: ${this.rowCount.toLocaleString()}`;
}, [selectedCells, allRowCount, grider, visibleRealColumns]); }, [selectedCells, allRowCount, grider, visibleRealColumns]);
if (!columns || columns.length == 0) if (!columns || columns.length == 0)
@@ -466,8 +405,6 @@ export default function DataGridCore(props) {
.replace(/\r/g, '') .replace(/\r/g, '')
.split('\n') .split('\n')
.map((row) => row.split('\t')); .map((row) => row.split('\t'));
// let chs = changeSet;
// let allRows = loadedAndInsertedRows;
if (selectedCells.length <= 1) { if (selectedCells.length <= 1) {
const startRow = isRegularCell(currentCell) ? currentCell[0] : grider.rowCount; const startRow = isRegularCell(currentCell) ? currentCell[0] : grider.rowCount;
const startCol = isRegularCell(currentCell) ? currentCell[1] : 0; const startCol = isRegularCell(currentCell) ? currentCell[1] : 0;
@@ -477,18 +414,8 @@ export default function DataGridCore(props) {
grider.insertRow(); grider.insertRow();
} }
let colIndex = startCol; let colIndex = startCol;
// const row = allRows[rowIndex];
for (const cell of rowData) { for (const cell of rowData) {
setCellValue([rowIndex, colIndex], cell == '(NULL)' ? null : cell); setCellValue([rowIndex, colIndex], cell == '(NULL)' ? null : cell);
// chs = setChangeSetValue(
// chs,
// display.getChangeSetField(
// row,
// realColumnUniqueNames[colIndex],
// rowIndex >= loadedRows.length ? rowIndex - loadedRows.length : null
// ),
// cell == '(NULL)' ? null : cell
// );
colIndex += 1; colIndex += 1;
} }
rowIndex += 1; rowIndex += 1;
@@ -505,11 +432,9 @@ export default function DataGridCore(props) {
const pasteRow = pasteRows[selectionRow % pasteRows.length]; const pasteRow = pasteRows[selectionRow % pasteRows.length];
const pasteCell = pasteRow[selectionCol % pasteRow.length]; const pasteCell = pasteRow[selectionCol % pasteRow.length];
setCellValue(cell, pasteCell); setCellValue(cell, pasteCell);
// chs = setCellValue(chs, cell, pasteCell);
} }
} }
grider.endUpdate(); grider.endUpdate();
// setChangeSet(chs);
} }
function setNull() { function setNull() {
@@ -596,26 +521,10 @@ export default function DataGridCore(props) {
} }
} }
// function getRowDefinitions(rowIndexes) {
// const res = [];
// // if (!loadedAndInsertedRows) return res;
// // for (const index of rowIndexes) {
// // if (loadedAndInsertedRows[index] && _.isNumber(index)) {
// // const insertedRowIndex = index >= loadedRows.length ? index - loadedRows.length : null;
// // res.push(display.getChangeSetRow(loadedAndInsertedRows[index], insertedRowIndex));
// // }
// // }
// return res;
// }
function getSelectedRowIndexes() { function getSelectedRowIndexes() {
return _.uniq((selectedCells || []).map((x) => x[0])); return _.uniq((selectedCells || []).map((x) => x[0]));
} }
// function getSelectedRowDefinitions() {
// return getRowDefinitions(getSelectedRowIndexes());
// }
function getSelectedRowData() { function getSelectedRowData() {
return _.compact(getSelectedRowIndexes().map((index) => grider.getRowData(index))); return _.compact(getSelectedRowIndexes().map((index) => grider.getRowData(index)));
} }
@@ -626,11 +535,6 @@ export default function DataGridCore(props) {
if (_.isNumber(index)) grider.revertRowChanges(index); if (_.isNumber(index)) grider.revertRowChanges(index);
} }
grider.endUpdate(); grider.endUpdate();
// const updatedChangeSet = getSelectedRowDefinitions().reduce(
// (chs, row) => revertChangeSetRowChanges(chs, row),
// changeSet
// );
// setChangeSet(updatedChangeSet);
} }
function filterSelectedValue() { function filterSelectedValue() {
@@ -648,19 +552,12 @@ export default function DataGridCore(props) {
display.setFilters(flts); display.setFilters(flts);
} }
// function revertAllChanges() {
// grider.revertAllChanges();
// // setChangeSet(createChangeSet());
// }
function deleteSelectedRows() { function deleteSelectedRows() {
grider.beginUpdate(); grider.beginUpdate();
for (const index of getSelectedRowIndexes()) { for (const index of getSelectedRowIndexes()) {
if (_.isNumber(index)) grider.deleteRow(index); if (_.isNumber(index)) grider.deleteRow(index);
} }
grider.endUpdate(); grider.endUpdate();
// const updatedChangeSet = getSelectedRowDefinitions().reduce((chs, row) => deleteChangeSetRows(chs, row), changeSet);
// setChangeSet(updatedChangeSet);
} }
function handleGridWheel(event) { function handleGridWheel(event) {
@@ -698,16 +595,11 @@ export default function DataGridCore(props) {
return; return;
} }
if (onSave) onSave(); if (onSave) onSave();
// const script = changeSetToSql(changeSetRef.current, display.dbinfo);
// const sql = scriptToSql(display.driver, script);
// setConfirmSql(sql);
// confirmSqlModalState.open();
} }
const insertNewRow = () => { const insertNewRow = () => {
if (display.baseTable) { if (display.baseTable) {
const rowIndex = grider.insertRow(); const rowIndex = grider.insertRow();
// setChangeSet(changeSetInsertNewRow(changeSet, display.baseTable));
const cell = [rowIndex, (currentCell && currentCell[1]) || 0]; const cell = [rowIndex, (currentCell && currentCell[1]) || 0];
// @ts-ignore // @ts-ignore
setCurrentCell(cell); setCurrentCell(cell);
@@ -1045,7 +937,6 @@ export default function DataGridCore(props) {
</TableHead> </TableHead>
<TableBody ref={tableBodyRef}> <TableBody ref={tableBodyRef}>
{_.range(firstVisibleRowScrollIndex, firstVisibleRowScrollIndex + visibleRowCountUpperBound) {_.range(firstVisibleRowScrollIndex, firstVisibleRowScrollIndex + visibleRowCountUpperBound)
// .slice(firstVisibleRowScrollIndex, firstVisibleRowScrollIndex + visibleRowCountUpperBound)
.map((rowIndex) => ( .map((rowIndex) => (
<DataGridRow <DataGridRow
key={rowIndex} key={rowIndex}
@@ -1057,16 +948,8 @@ export default function DataGridCore(props) {
dispatchInsplaceEditor={dispatchInsplaceEditor} dispatchInsplaceEditor={dispatchInsplaceEditor}
autofillSelectedCells={autofillSelectedCells} autofillSelectedCells={autofillSelectedCells}
selectedCells={filterCellsForRow(selectedCells, rowIndex)} selectedCells={filterCellsForRow(selectedCells, rowIndex)}
// insertedRowIndex={
// firstVisibleRowScrollIndex + index >= rows.length - (insertedRowCount || 0)
// ? firstVisibleRowScrollIndex + index - rows.length - (insertedRowCount || 0)
// : null
// }
autofillMarkerCell={filterCellForRow(autofillMarkerCell, rowIndex)} autofillMarkerCell={filterCellForRow(autofillMarkerCell, rowIndex)}
// changeSet={changeSet}
// setChangeSet={setChangeSet}
display={display} display={display}
// row={row}
focusedColumn={display.focusedColumn} focusedColumn={display.focusedColumn}
/> />
))} ))}
@@ -1096,9 +979,6 @@ export default function DataGridCore(props) {
reload={() => display.reload()} reload={() => display.reload()}
save={handleSave} save={handleSave}
grider={grider} grider={grider}
// changeSetState={changeSetState}
// dispatchChangeSet={dispatchChangeSet}
// revert={revertAllChanges}
/>, />,
props.toolbarPortalRef.current props.toolbarPortalRef.current
)} )}

13
packages/web/src/datagrid/DataGridRow.js
View File

@@ -170,11 +170,6 @@ function DataGridRow(props) {
visibleRealColumns, visibleRealColumns,
inplaceEditorState, inplaceEditorState,
dispatchInsplaceEditor, dispatchInsplaceEditor,
// row,
// display,
// changeSet,
// setChangeSet,
// insertedRowIndex,
autofillMarkerCell, autofillMarkerCell,
selectedCells, selectedCells,
autofillSelectedCells, autofillSelectedCells,
@@ -202,10 +197,6 @@ function DataGridRow(props) {
const rowData = grider.getRowData(rowIndex); const rowData = grider.getRowData(rowIndex);
const rowStatus = grider.getRowStatus(rowIndex); const rowStatus = grider.getRowStatus(rowIndex);
// const rowDefinition = display.getChangeSetRow(row, insertedRowIndex);
// const [matchedField, matchedChangeSetItem] = findExistingChangeSetItem(changeSet, rowDefinition);
// const rowUpdated = matchedChangeSetItem ? { ...row, ...matchedChangeSetItem.fields } : row;
const hintFieldsAllowed = visibleRealColumns const hintFieldsAllowed = visibleRealColumns
.filter((col) => { .filter((col) => {
if (!col.hintColumnName) return false; if (!col.hintColumnName) return false;
@@ -250,10 +241,6 @@ function DataGridRow(props) {
grider={grider} grider={grider}
rowIndex={rowIndex} rowIndex={rowIndex}
uniqueName={col.uniqueName} uniqueName={col.uniqueName}
// changeSet={changeSet}
// setChangeSet={setChangeSet}
// insertedRowIndex={insertedRowIndex}
// definition={display.getChangeSetField(row, col.uniqueName, insertedRowIndex)}
/> />
) : ( ) : (
<> <>

9
packages/web/src/datagrid/InplaceEditor.js
View File

@@ -5,7 +5,6 @@ import React from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import theme from '../theme'; import theme from '../theme';
import keycodes from '../utility/keycodes'; import keycodes from '../utility/keycodes';
import { setChangeSetValue } from '@dbgate/datalib';
const StyledInput = styled.input` const StyledInput = styled.input`
border: 0px solid; border: 0px solid;
@@ -16,16 +15,12 @@ const StyledInput = styled.input`
export default function InplaceEditor({ export default function InplaceEditor({
widthPx, widthPx,
// definition,
// changeSet,
// setChangeSet,
rowIndex, rowIndex,
uniqueName, uniqueName,
grider, grider,
cellValue, cellValue,
inplaceEditorState, inplaceEditorState,
dispatchInsplaceEditor, dispatchInsplaceEditor,
// isInsertedRow,
}) { }) {
const editorRef = React.useRef(); const editorRef = React.useRef();
const isChangedRef = React.useRef(!!inplaceEditorState.text); const isChangedRef = React.useRef(!!inplaceEditorState.text);
@@ -41,7 +36,6 @@ export default function InplaceEditor({
if (isChangedRef.current) { if (isChangedRef.current) {
const editor = editorRef.current; const editor = editorRef.current;
grider.setCellValue(rowIndex, uniqueName, editor.value); grider.setCellValue(rowIndex, uniqueName, editor.value);
// setChangeSet(setChangeSetValue(changeSet, definition, editor.value));
isChangedRef.current = false; isChangedRef.current = false;
} }
dispatchInsplaceEditor({ type: 'close' }); dispatchInsplaceEditor({ type: 'close' });
@@ -50,7 +44,6 @@ export default function InplaceEditor({
const editor = editorRef.current; const editor = editorRef.current;
if (isChangedRef.current) { if (isChangedRef.current) {
grider.setCellValue(rowIndex, uniqueName, editor.value); grider.setCellValue(rowIndex, uniqueName, editor.value);
// setChangeSet(setChangeSetValue(changeSet, definition, editor.value));
isChangedRef.current = false; isChangedRef.current = false;
} }
editor.blur(); editor.blur();
@@ -66,7 +59,6 @@ export default function InplaceEditor({
case keycodes.enter: case keycodes.enter:
if (isChangedRef.current) { if (isChangedRef.current) {
grider.setCellValue(rowIndex, uniqueName, editor.value); grider.setCellValue(rowIndex, uniqueName, editor.value);
// setChangeSet(setChangeSetValue(changeSet, definition, editor.value));
isChangedRef.current = false; isChangedRef.current = false;
} }
editor.blur(); editor.blur();
@@ -76,7 +68,6 @@ export default function InplaceEditor({
if (event.ctrlKey) { if (event.ctrlKey) {
if (isChangedRef.current) { if (isChangedRef.current) {
grider.setCellValue(rowIndex, uniqueName, editor.value); grider.setCellValue(rowIndex, uniqueName, editor.value);
// setChangeSet(setChangeSetValue(changeSet, definition, editor.value));
isChangedRef.current = false; isChangedRef.current = false;
} }
event.preventDefault(); event.preventDefault();

3
packages/web/src/datagrid/JslDataGridCore.js
View File

@@ -1,12 +1,9 @@
import React from 'react'; import React from 'react';
import axios from '../utility/axios'; import axios from '../utility/axios';
import { useSetOpenedTabs } from '../utility/globalState'; import { useSetOpenedTabs } from '../utility/globalState';
import DataGridCore from './DataGridCore';
import useSocket from '../utility/SocketProvider'; import useSocket from '../utility/SocketProvider';
import useShowModal from '../modals/showModal'; import useShowModal from '../modals/showModal';
import ImportExportModal from '../modals/ImportExportModal'; import ImportExportModal from '../modals/ImportExportModal';
import { getChangeSetInsertedRows } from '@dbgate/datalib';
import { openNewTab } from '../utility/common';
import LoadingDataGridCore from './LoadingDataGridCore'; import LoadingDataGridCore from './LoadingDataGridCore';
import RowsArrayGrider from './RowsArrayGrider'; import RowsArrayGrider from './RowsArrayGrider';

94
packages/web/src/datagrid/LoadingDataGridCore.js
View File

@@ -1,89 +1,9 @@
import React from 'react'; import React from 'react';
import axios from '../utility/axios';
import { useSetOpenedTabs } from '../utility/globalState';
import DataGridCore from './DataGridCore'; import DataGridCore from './DataGridCore';
import useSocket from '../utility/SocketProvider';
import useShowModal from '../modals/showModal';
import ImportExportModal from '../modals/ImportExportModal';
import { getChangeSetInsertedRows } from '@dbgate/datalib';
import { openNewTab } from '../utility/common';
// /** @param props {import('./types').LoadingDataGridProps} */
// async function loadDataPage(props, offset, limit) {
// const { display, conid, database, jslid } = props;
// if (jslid) {
// const response = await axios.request({
// url: 'jsldata/get-rows',
// method: 'get',
// params: {
// jslid,
// offset,
// limit,
// },
// });
// return response.data;
// }
// const sql = display.getPageQuery(offset, limit);
// const response = await axios.request({
// url: 'database-connections/query-data',
// method: 'post',
// params: {
// conid,
// database,
// },
// data: { sql },
// });
// if (response.data.errorMessage) return response.data;
// return response.data.rows;
// }
// function dataPageAvailable(props) {
// const { display, jslid } = props;
// if (jslid) return true;
// const sql = display.getPageQuery(0, 1);
// return !!sql;
// }
// /** @param props {import('./types').LoadingDataGridProps} */
// async function loadRowCount(props) {
// const { display, conid, database, jslid } = props;
// if (jslid) {
// const response = await axios.request({
// url: 'jsldata/get-stats',
// method: 'get',
// params: {
// jslid,
// },
// });
// return response.data.rowCount;
// }
// const sql = display.getCountQuery();
// const response = await axios.request({
// url: 'database-connections/query-data',
// method: 'post',
// params: {
// conid,
// database,
// },
// data: { sql },
// });
// return parseInt(response.data.rows[0].count);
// }
export default function LoadingDataGridCore(props) { export default function LoadingDataGridCore(props) {
const { const {
display, display,
changeSetState,
dispatchChangeSet,
tabVisible,
loadDataPage, loadDataPage,
dataPageAvailable, dataPageAvailable,
loadRowCount, loadRowCount,
@@ -105,19 +25,9 @@ export default function LoadingDataGridCore(props) {
loadNextDataToken: 0, loadNextDataToken: 0,
}); });
const { isLoading, loadedRows, isLoadedAll, loadedTime, allRowCount, errorMessage } = loadProps; const { isLoading, loadedRows, isLoadedAll, loadedTime, allRowCount, errorMessage } = loadProps;
const showModal = useShowModal();
const loadedTimeRef = React.useRef(0); const loadedTimeRef = React.useRef(0);
// const changeSet = changeSetState && changeSetState.value;
// const setChangeSet = React.useCallback((value) => dispatchChangeSet({ type: 'set', value }), [dispatchChangeSet]);
// const setOpenedTabs = useSetOpenedTabs();
// const socket = useSocket();
// const changeSetRef = React.useRef(changeSet);
// changeSetRef.current = changeSet;
const handleLoadRowCount = async () => { const handleLoadRowCount = async () => {
const rowCount = await loadRowCount(props); const rowCount = await loadRowCount(props);
setLoadProps((oldLoadProps) => ({ setLoadProps((oldLoadProps) => ({
@@ -196,9 +106,6 @@ export default function LoadingDataGridCore(props) {
})); }));
}, [loadNextDataToken]); }, [loadNextDataToken]);
// const insertedRows = getChangeSetInsertedRows(changeSet, display.baseTable);
// const rowCountNewIncluded = loadedRows.length + insertedRows.length;
const griderProps = { ...props, sourceRows: loadedRows }; const griderProps = { ...props, sourceRows: loadedRows };
const grider = React.useMemo(() => griderFactory(griderProps), griderFactoryDeps(griderProps)); const grider = React.useMemo(() => griderFactory(griderProps), griderFactoryDeps(griderProps));
@@ -222,7 +129,6 @@ export default function LoadingDataGridCore(props) {
allRowCount={allRowCount} allRowCount={allRowCount}
openQuery={openQuery} openQuery={openQuery}
isLoading={isLoading} isLoading={isLoading}
// rows={loadedRows}
grider={grider} grider={grider}
/> />
); );