Implement pagination for members reports and update UI components
- Added a new `setPagination` action to manage pagination state in the members reports slice. - Updated the members reports page to display the total number of members in the header. - Enhanced the members reports table to handle pagination changes, ensuring data is fetched correctly based on the current page and page size.
This commit is contained in:
@@ -107,6 +107,10 @@ const membersReportsSlice = createSlice({
|
|||||||
setDateRange: (state, action) => {
|
setDateRange: (state, action) => {
|
||||||
state.dateRange = action.payload;
|
state.dateRange = action.payload;
|
||||||
},
|
},
|
||||||
|
setPagination: (state, action) => {
|
||||||
|
state.index = action.payload.index;
|
||||||
|
state.pageSize = action.payload.pageSize;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
extraReducers: builder => {
|
extraReducers: builder => {
|
||||||
builder
|
builder
|
||||||
@@ -139,5 +143,6 @@ export const {
|
|||||||
setOrder,
|
setOrder,
|
||||||
setDuration,
|
setDuration,
|
||||||
setDateRange,
|
setDateRange,
|
||||||
|
setPagination,
|
||||||
} = membersReportsSlice.actions;
|
} = membersReportsSlice.actions;
|
||||||
export default membersReportsSlice.reducer;
|
export default membersReportsSlice.reducer;
|
||||||
|
|||||||
@@ -6,9 +6,14 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
|
|||||||
import CustomTableTitle from '@/components/CustomTableTitle';
|
import CustomTableTitle from '@/components/CustomTableTitle';
|
||||||
import TasksProgressCell from './tablesCells/tasksProgressCell/TasksProgressCell';
|
import TasksProgressCell from './tablesCells/tasksProgressCell/TasksProgressCell';
|
||||||
import MemberCell from './tablesCells/memberCell/MemberCell';
|
import MemberCell from './tablesCells/memberCell/MemberCell';
|
||||||
import { fetchMembersData, toggleMembersReportsDrawer } from '@/features/reporting/membersReports/membersReportsSlice';
|
import {
|
||||||
|
fetchMembersData,
|
||||||
|
setPagination,
|
||||||
|
toggleMembersReportsDrawer,
|
||||||
|
} from '@/features/reporting/membersReports/membersReportsSlice';
|
||||||
import { useAppSelector } from '@/hooks/useAppSelector';
|
import { useAppSelector } from '@/hooks/useAppSelector';
|
||||||
import MembersReportsDrawer from '@/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer';
|
import MembersReportsDrawer from '@/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer';
|
||||||
|
import { PaginationConfig } from 'antd/es/pagination';
|
||||||
|
|
||||||
const MembersReportsTable = () => {
|
const MembersReportsTable = () => {
|
||||||
const { t } = useTranslation('reporting-members');
|
const { t } = useTranslation('reporting-members');
|
||||||
@@ -16,7 +21,9 @@ const MembersReportsTable = () => {
|
|||||||
|
|
||||||
const [selectedId, setSelectedId] = useState<string | null>(null);
|
const [selectedId, setSelectedId] = useState<string | null>(null);
|
||||||
const { duration, dateRange } = useAppSelector(state => state.reportingReducer);
|
const { duration, dateRange } = useAppSelector(state => state.reportingReducer);
|
||||||
const { membersList, isLoading, total, archived, searchQuery } = useAppSelector(state => state.membersReportsReducer);
|
const { membersList, isLoading, total, archived, searchQuery, index, pageSize } = useAppSelector(
|
||||||
|
state => state.membersReportsReducer
|
||||||
|
);
|
||||||
|
|
||||||
// function to handle drawer toggle
|
// function to handle drawer toggle
|
||||||
const handleDrawerOpen = (id: string) => {
|
const handleDrawerOpen = (id: string) => {
|
||||||
@@ -24,6 +31,10 @@ const MembersReportsTable = () => {
|
|||||||
dispatch(toggleMembersReportsDrawer());
|
dispatch(toggleMembersReportsDrawer());
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleOnChange = (pagination: any, filters: any, sorter: any, extra: any) => {
|
||||||
|
dispatch(setPagination({ index: pagination.current, pageSize: pagination.pageSize }));
|
||||||
|
};
|
||||||
|
|
||||||
const columns: TableColumnsType = [
|
const columns: TableColumnsType = [
|
||||||
{
|
{
|
||||||
key: 'member',
|
key: 'member',
|
||||||
@@ -40,7 +51,7 @@ const MembersReportsTable = () => {
|
|||||||
title: <CustomTableTitle title={t('tasksProgressColumn')} />,
|
title: <CustomTableTitle title={t('tasksProgressColumn')} />,
|
||||||
render: record => {
|
render: record => {
|
||||||
const { todo, doing, done } = record.tasks_stat;
|
const { todo, doing, done } = record.tasks_stat;
|
||||||
return (todo || doing || done) ? <TasksProgressCell tasksStat={record.tasks_stat} /> : '-';
|
return todo || doing || done ? <TasksProgressCell tasksStat={record.tasks_stat} /> : '-';
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -95,7 +106,7 @@ const MembersReportsTable = () => {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isLoading) dispatch(fetchMembersData({ duration, dateRange }));
|
if (!isLoading) dispatch(fetchMembersData({ duration, dateRange }));
|
||||||
}, [dispatch, archived, searchQuery, dateRange]);
|
}, [dispatch, archived, searchQuery, dateRange, index, pageSize]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ConfigProvider
|
<ConfigProvider
|
||||||
@@ -113,6 +124,7 @@ const MembersReportsTable = () => {
|
|||||||
dataSource={membersList}
|
dataSource={membersList}
|
||||||
rowKey={record => record.id}
|
rowKey={record => record.id}
|
||||||
pagination={{ showSizeChanger: true, defaultPageSize: 10, total: total }}
|
pagination={{ showSizeChanger: true, defaultPageSize: 10, total: total }}
|
||||||
|
onChange={(pagination, filters, sorter, extra) => handleOnChange(pagination, filters, sorter, extra)}
|
||||||
scroll={{ x: 'max-content' }}
|
scroll={{ x: 'max-content' }}
|
||||||
loading={isLoading}
|
loading={isLoading}
|
||||||
onRow={record => {
|
onRow={record => {
|
||||||
|
|||||||
@@ -25,9 +25,7 @@ const MembersReports = () => {
|
|||||||
useDocumentTitle('Reporting - Members');
|
useDocumentTitle('Reporting - Members');
|
||||||
const currentSession = useAuthService().getCurrentSession();
|
const currentSession = useAuthService().getCurrentSession();
|
||||||
|
|
||||||
const { archived, searchQuery } = useAppSelector(
|
const { archived, searchQuery, total } = useAppSelector(state => state.membersReportsReducer);
|
||||||
state => state.membersReportsReducer,
|
|
||||||
);
|
|
||||||
const { duration, dateRange } = useAppSelector(state => state.reportingReducer);
|
const { duration, dateRange } = useAppSelector(state => state.reportingReducer);
|
||||||
|
|
||||||
|
|
||||||
@@ -44,7 +42,7 @@ const MembersReports = () => {
|
|||||||
return (
|
return (
|
||||||
<Flex vertical>
|
<Flex vertical>
|
||||||
<CustomPageHeader
|
<CustomPageHeader
|
||||||
title={`Members`}
|
title={`Members (${total})`}
|
||||||
children={
|
children={
|
||||||
<Space>
|
<Space>
|
||||||
<Button>
|
<Button>
|
||||||
|
|||||||
Reference in New Issue
Block a user