diff --git a/app/react/components/datatables/Datatable.tsx b/app/react/components/datatables/Datatable.tsx index 3b4728978..3fc883f2a 100644 --- a/app/react/components/datatables/Datatable.tsx +++ b/app/react/components/datatables/Datatable.tsx @@ -110,7 +110,7 @@ export function Datatable< initialState: { pagination: { pageSize: settings.pageSize, - pageIndex: page, + pageIndex: page || 0, }, sorting: settings.sortBy ? [settings.sortBy] : [], globalFilter: settings.search, @@ -163,6 +163,7 @@ export function Datatable< renderTableActions={() => renderTableActions(selectedItems)} renderTableSettings={() => renderTableSettings(tableInstance)} /> + tableInstance={tableInstance} renderRow={(row) => renderRow(row, highlightedItemId)}