Skip to content

[Bug] fix pagination in jobs route #2655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2023
Merged

[Bug] fix pagination in jobs route #2655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 50 additions & 45 deletions web/src/routes/jobs/Jobs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,14 @@ import React from 'react'

interface StateProps {
jobs: Job[]
totalCount: number
isJobsInit: boolean
isJobsLoading: boolean
selectedNamespace: Nullable<string>
totalCount: number
}

interface JobsState {
page: number
}

interface DispatchProps {
Expand All @@ -58,15 +62,16 @@ const Jobs: React.FC<JobsProps> = ({
fetchJobs,
resetJobs,
}) => {
const theme = createTheme(useTheme())

const [state, setState] = React.useState({
const defaultState = {
page: 0,
})

}
const [state, setState] = React.useState<JobsState>(defaultState)

const theme = createTheme(useTheme())

React.useEffect(() => {
if (selectedNamespace) {
fetchJobs(selectedNamespace, PAGE_SIZE, state.page)
fetchJobs(selectedNamespace, PAGE_SIZE, state.page * PAGE_SIZE)
}
}, [selectedNamespace, state.page])

Expand Down Expand Up @@ -167,55 +172,55 @@ const Jobs: React.FC<JobsProps> = ({
})}
</TableBody>
</Table>
</>
<Box display={'flex'} justifyContent={'flex-end'} alignItems={'center'} mb={2}>
<MqText subdued>
<>
{PAGE_SIZE * state.page + 1} -{' '}
{Math.min(PAGE_SIZE * (state.page + 1), totalCount)} of {totalCount}
</>
</MqText>
<Tooltip title={i18next.t('events_route.previous_page')}>
<span>
<IconButton
sx={{
marginLeft: theme.spacing(2),
}}
color='primary'
disabled={state.page === 0}
onClick={() => handleClickPage('prev')}
size='large'
>
<ChevronLeftRounded />
</IconButton>
</span>
</Tooltip>
<Tooltip title={i18next.t('events_route.next_page')}>
<span>
<IconButton
color='primary'
onClick={() => handleClickPage('next')}
size='large'
disabled={state.page === Math.ceil(totalCount / PAGE_SIZE) - 1}
>
<ChevronRightRounded />
</IconButton>
</span>
</Tooltip>
</Box>
</>
)}
<Box display={'flex'} justifyContent={'flex-end'} alignItems={'center'} mb={2}>
<MqText subdued>
<>
{PAGE_SIZE * state.page + 1} - {Math.min(PAGE_SIZE * (state.page + 1), totalCount)}{' '}
of {totalCount}
</>
</MqText>
<Tooltip title={i18next.t('events_route.previous_page')}>
<span>
<IconButton
sx={{
marginLeft: theme.spacing(2),
}}
color='primary'
disabled={state.page === 0}
onClick={() => handleClickPage('prev')}
size='large'
>
<ChevronLeftRounded />
</IconButton>
</span>
</Tooltip>
<Tooltip title={i18next.t('events_route.next_page')}>
<span>
<IconButton
color='primary'
onClick={() => handleClickPage('next')}
size='large'
disabled={state.page === Math.ceil(totalCount / PAGE_SIZE) - 1}
>
<ChevronRightRounded />
</IconButton>
</span>
</Tooltip>
</Box>
</>
</MqScreenLoad>
</Container>
)
}

const mapStateToProps = (state: IState) => ({
isJobsInit: state.jobs.init,
jobs: state.jobs.result,
totalCount: state.jobs.totalCount,
isJobsInit: state.jobs.init,
isJobsLoading: state.jobs.isLoading,
selectedNamespace: state.namespaces.selectedNamespace,
totalCount: state.jobs.totalCount,
})

const mapDispatchToProps = (dispatch: Redux.Dispatch) =>
Expand Down