Merge pull request #4147 from beyondessential/master

Master -> dev
beyondessential · Sep 6, 2022 · b5e8a84 · b5e8a84
2 parents 1cc4cfa + bfe1ad5
commit b5e8a84
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 141 deletions.
diff --git a/packages/database/src/migrations/20220901042432-AddFacilitiesPenfaa-modifies-data.js b/packages/database/src/migrations/20220901042432-AddFacilitiesPenfaa-modifies-data.js
diff --git a/packages/ui-components/src/components/Table/Table.js b/packages/ui-components/src/components/Table/Table.js
@@ -7,7 +7,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import MuiTable from '@material-ui/core/Table';
-import { TablePaginator } from './TablePaginator';
+import { TablePaginator, DEFAULT_ROWS_PER_PAGE_OPTIONS } from './TablePaginator';
 import { TableHeader } from './TableHeader';
 import { TableBody } from './TableBody';
 import { TableMessageProvider } from './TableMessageProvider';
@@ -128,7 +128,7 @@ Table.defaultProps = {
   order: 'asc',
   page: null,
   rowsPerPage: 10,
-  rowsPerPageOptions: null,
+  rowsPerPageOptions: DEFAULT_ROWS_PER_PAGE_OPTIONS,
   rowIdKey: 'id',
   className: null,
 };
diff --git a/packages/ui-components/src/components/Table/TablePaginator.js b/packages/ui-components/src/components/Table/TablePaginator.js
@@ -10,7 +10,7 @@ import styled from 'styled-components';
 import PropTypes from 'prop-types';
 import { tableColumnShape } from './tableColumnShape';
 
-const ROWS_PER_PAGE_OPTIONS = [10, 25, 50];
+export const DEFAULT_ROWS_PER_PAGE_OPTIONS = [10, 25, 50];
 
 const TableFooter = styled(MuiTableFooter)`
   .MuiTableCell-footer.MuiTablePagination-root {
@@ -125,6 +125,6 @@ TablePaginator.defaultProps = {
   onChangeRowsPerPage: null,
   page: null,
   rowsPerPage: 10,
-  rowsPerPageOptions: ROWS_PER_PAGE_OPTIONS,
+  rowsPerPageOptions: DEFAULT_ROWS_PER_PAGE_OPTIONS,
   isFetching: false,
 };