Skip to content

Commit 7a61b66

Browse files
authored
Merge pull request #2943 from bcgov/release-v1.1.0
Hotfix: paging null overlays, version update
2 parents 0b2c524 + e5b3a68 commit 7a61b66

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

frontend/src/components/BCDataGrid/components/StatusBar/BCPaginationActions.jsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ export function BCPaginationActions({
2020
const [currentPage, setCurrentPage] = useState(page + 1)
2121
// Reload grid
2222
const reloadGrid = useCallback(() => {
23-
gridRef?.current?.api.resetColumnState()
24-
gridRef?.current?.api.setFilterModel(null)
23+
gridRef?.current?.api?.resetColumnState()
24+
gridRef?.current?.api?.setFilterModel(null)
2525
// TODO: clear custom filters
2626
}, [gridRef])
2727

2828
const handleCopyData = useCallback(() => {
29-
const selectedRows = gridRef?.current?.api.getDataAsCsv({
29+
const selectedRows = gridRef?.current?.api?.getDataAsCsv({
3030
allColumns: true,
3131
onlySelected: true,
3232
skipColumnHeaders: true
@@ -36,12 +36,12 @@ export function BCPaginationActions({
3636

3737
const handleDownloadData = useCallback(() => {
3838
const rows = []
39-
gridRef?.current?.api.forEachNodeAfterFilterAndSort((node) => {
39+
gridRef?.current?.api?.forEachNodeAfterFilterAndSort((node) => {
4040
rows.push(node.data)
4141
})
4242

4343
// Get column definitions and create a mapping from field to headerName
44-
const columnDefs = gridRef?.current?.api.getColumnDefs()
44+
const columnDefs = gridRef?.current?.api?.getColumnDefs()
4545
const fieldToHeaderNameMap = columnDefs.reduce((map, colDef) => {
4646
map[colDef.field] = colDef.headerName
4747
return map
@@ -94,7 +94,7 @@ export function BCPaginationActions({
9494
return
9595
}
9696
setCurrentPage(newPage)
97-
gridRef?.current?.api.showLoadingOverlay()
97+
gridRef?.current?.api?.showLoadingOverlay()
9898
onPageChange(event, newPage - 1)
9999
})
100100

frontend/src/components/BCFooter/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import typography from '@/themes/base/typography'
77

88
function Footer({
99
repoDetails = {
10-
href: 'https://github.com/bcgov/lcfs/releases/tag/v1.0.7',
11-
name: 'v1.0.7',
10+
href: 'https://github.com/bcgov/lcfs/releases/tag/v1.1.0',
11+
name: 'v1.1.0',
1212
id: 'footer-about-version',
1313
label: 'LCFS repository changelog'
1414
},

frontend/src/components/Footer.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ const Footer = (props) => {
5353
)
5454
const repoDetails = useMemo(
5555
() => ({
56-
href: 'https://github.com/bcgov/lcfs/releases/tag/v1.0.7',
57-
name: 'v1.0.7',
56+
href: 'https://github.com/bcgov/lcfs/releases/tag/v1.1.0',
57+
name: 'v1.1.0',
5858
id: 'footer-about-version',
5959
label: 'LCFS repository changelog'
6060
}),

frontend/src/components/__tests__/BCFooter.test.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ describe('BCFooter', () => {
2424
]
2525
const repoDetails = {
2626
id: 'footer-about-version',
27-
href: 'https://github.com/bcgov/lcfs/releases/tag/v1.0.7',
28-
name: 'v1.0.7',
27+
href: 'https://github.com/bcgov/lcfs/releases/tag/v1.1.0',
28+
name: 'v1.1.0',
2929
label: 'LCFS repository changelog'
3030
}
3131

0 commit comments

Comments
 (0)