Skip to content

Commit 5875a89

Browse files
authored
Merge pull request #1912 from fedspendingtransparency/FDG-10767
FDG-10767 UTF DDP page when selecting 100 Rows per page is either missing a scroll bar or it is displaying only one row of data even though it has 119568 rows
2 parents 5c41897 + 689a281 commit 5875a89

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/components/data-table/data-table-footer/data-table-footer.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ const DataTableFooter: FunctionComponent<IDataTableFooter> = ({
5858

5959
// For serverside paginated data (unfiltered datasets > 20000 rows), use paging props
6060
const tablePagingProps = manualPagination
61-
? pagingProps
61+
? {
62+
...pagingProps,
63+
handlePerPageChange: handlePerPageChange,
64+
}
6265
: {
6366
itemsPerPage: pagingProps?.itemsPerPage,
6467
handlePerPageChange: x => {

src/components/dataset-data/table-section-container/table-section-container.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,9 @@ const TableSectionContainer = ({
407407
userFilterUnmatchedForDateRange={userFilterUnmatchedForDateRange}
408408
apiFilterDefault={apiFilterDefault && !selectedTable?.apiFilter?.displayDefaultData}
409409
onToggleLegend={legendToggler}
410-
emptyData={!isLoading && !serverSidePagination && (!apiData || !apiData.data || !apiData.data.length) && !apiError}
410+
emptyData={
411+
!isLoading && !serverSidePagination && !userFilterSelection && (!apiData || !apiData.data || !apiData.data.length) && !apiError
412+
}
411413
unchartable={noChartMessage !== undefined}
412414
currentTab={selectedTab}
413415
datasetName={config?.name}

src/components/dtg-table/dtg-table.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ export default function DtgTable({
296296
setCurrentPage(1);
297297
updateTable(true);
298298
}
299-
}, [tableSorting, dateRange, selectedTable]);
299+
}, [tableSorting, dateRange, selectedTable, tableMeta]);
300300

301301
useMemo(() => {
302302
if (selectedTable?.rowCount > REACT_TABLE_MAX_NON_PAGINATED_SIZE) {
@@ -375,6 +375,7 @@ export default function DtgTable({
375375
// user filter tables <= 20000 rows
376376
setReactTableData(dePaginated);
377377
setManualPagination(false);
378+
setMaxRows(dePaginated.data.length);
378379
setIsLoading(false);
379380
}
380381
}, [rawData, dePaginated]);

0 commit comments

Comments
 (0)