From 34029a3fe8fbe97f1e272b3c4ec9912d84399f26 Mon Sep 17 00:00:00 2001 From: Ashar Fuadi Date: Sat, 14 Oct 2023 09:44:58 +0700 Subject: [PATCH] fix(client): don't add to browser history on first pagination render --- judgels-client/src/components/Pagination/Pagination.jsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/judgels-client/src/components/Pagination/Pagination.jsx b/judgels-client/src/components/Pagination/Pagination.jsx index b76cdfa11..98661c370 100644 --- a/judgels-client/src/components/Pagination/Pagination.jsx +++ b/judgels-client/src/components/Pagination/Pagination.jsx @@ -4,7 +4,7 @@ import { parse, stringify } from 'query-string'; import { PureComponent } from 'react'; import ReactPaginate from 'react-paginate'; import { connect } from 'react-redux'; -import { push } from 'connected-react-router'; +import { push, replace } from 'connected-react-router'; import { withRouter } from 'react-router'; import './Pagination.scss'; @@ -113,7 +113,12 @@ const mapDispatchToProps = { } else { query = stringify({ ...queries, page: undefined }); } - return push({ search: query }); + + if (!queries.page && nextPage === 1) { + return replace({ search: query }); + } else { + return push({ search: query }); + } }, }; export default withRouter(connect(undefined, mapDispatchToProps)(PaginationContainer));