Skip to content
Snippets Groups Projects
Commit 5fc84262 authored by Imre Toth's avatar Imre Toth
Browse files

Merge branch 'CE-2206_Fix_record_count_on_filtering' into 'develop'

CE-2206: Fix record count on tables when filtering

See merge request !406
parents 7e1f3ad3 ea52dda1
No related branches found
No related tags found
2 merge requests!407CE-2141: 3.0.0,!406CE-2206: Fix record count on tables when filtering
Pipeline #164868 passed
......@@ -92,7 +92,11 @@ export function RecordSearch({ iocName, rowType }) {
// update pagination whenever search result total pages change
useEffect(() => {
setTotalCount((prev) => {
if (prev === pagination.totalCount && prev > 0) {
if (
prev === pagination.totalCount &&
prev > 0 &&
prev === records?.totalCount
) {
return prev;
} else {
return records?.totalCount ?? 0;
......
......@@ -52,6 +52,8 @@ export function RecordListView() {
{ navigateMode: "replace" }
);
const [recordFilter, setRecordFilter] = useState(null);
// used to request record list again when tab is switched, but request it only once! (totalRecord is a random number that is generated by ChannelFinder)
const [tabSwitched, setTabSwitched] = useState(false);
const handleTabChange = useCallback(
(event, tab) => {
......@@ -74,6 +76,8 @@ export function RecordListView() {
} else if (tab === 2) {
setRecordFilter("INACTIVE");
}
setTabSwitched(true);
};
useEffect(() => {
......@@ -108,13 +112,13 @@ export function RecordListView() {
// update pagination whenever search result total pages change
useEffect(() => {
setTotalCount((prev) => {
if (prev === pagination.totalCount && prev > 0) {
if (prev === pagination.totalCount && prev > 0 && !tabSwitched) {
return prev;
} else {
return records?.totalCount ?? 0;
}
});
}, [pagination, records?.totalCount, setTotalCount]);
}, [pagination, records?.totalCount, setTotalCount, tabSwitched]);
// whenever url state changes, update pagination
useEffect(() => {
......@@ -133,6 +137,7 @@ export function RecordListView() {
requestParams.pv_status = recordFilter;
requestParams.record_name = deserialize(urlState.query);
getRecords(requestParams);
setTabSwitched(false);
return () => {
abort();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment