From 444b9daa0e9a434b997af3ecdb7b817b94e201a7 Mon Sep 17 00:00:00 2001
From: Domonkos Gulyas <domonkos.gulyas@ess.eu>
Date: Wed, 11 Oct 2023 07:26:49 +0000
Subject: [PATCH] CE-2151: Make Record table links clickable
---
src/hooks/pagination.js | 3 ++-
src/views/records/RecordListView.js | 12 +++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/hooks/pagination.js b/src/hooks/pagination.js
index 7631f1df..e976fec5 100644
--- a/src/hooks/pagination.js
+++ b/src/hooks/pagination.js
@@ -52,6 +52,7 @@ export const usePagination = ({
return {
pagination,
- setPagination
+ setPagination,
+ setTotalCount
};
};
diff --git a/src/views/records/RecordListView.js b/src/views/records/RecordListView.js
index ac35ce4a..81f7db29 100644
--- a/src/views/records/RecordListView.js
+++ b/src/views/records/RecordListView.js
@@ -98,7 +98,7 @@ export function RecordListView() {
const rowsPerPage = [20, 50];
- const { pagination, setPagination } = usePagination({
+ const { pagination, setPagination, setTotalCount } = usePagination({
rowsPerPageOptions: rowsPerPage,
initLimit: urlPagination.rows ?? rowsPerPage[0],
initPage: urlPagination.page ?? 0
@@ -106,8 +106,14 @@ export function RecordListView() {
// update pagination whenever search result total pages change
useEffect(() => {
- setPagination({ totalCount: records?.totalCount ?? 0 });
- }, [setPagination, records?.totalCount]);
+ setTotalCount((prev) => {
+ if (prev === pagination.totalCount && prev > 0) {
+ return prev;
+ } else {
+ return records?.totalCount ?? 0;
+ }
+ });
+ }, [pagination, records?.totalCount, setTotalCount]);
// whenever url state changes, update pagination
useEffect(() => {
--
GitLab