Skip to content
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.

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

feature(frontend): adding persistent page number for list #2372

Merged
merged 2 commits into from
Apr 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 19 additions & 6 deletions web/src/components/Pagination/Pagination.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {Pagination as PG} from 'antd';
import {ReactNode} from 'react';
import {IPagination} from '../../hooks/usePagination';
import {useNavigate} from 'react-router-dom';
import {ReactNode, useCallback, useEffect} from 'react';
import {IPagination} from 'hooks/usePagination';

import * as S from './Pagination.styled';

Expand All @@ -25,15 +26,27 @@ const Pagination = <T extends any>({
take,
loadPage,
}: IProps<T>) => {
const handleNextPage = () => {
const navigate = useNavigate();
const handleNextPage = useCallback(() => {
if (isLoading || !hasNext) return;
loadNext();
};
}, [hasNext, isLoading, loadNext]);

const handlePrevPage = () => {
const handlePrevPage = useCallback(() => {
if (isLoading || !hasPrev) return;
loadPrev();
};
}, [hasPrev, isLoading, loadPrev]);

useEffect(() => {
navigate(
{
search: `page=${page}`,
},
{
replace: true,
}
);
}, [navigate, page]);

return (
<>
Expand Down
10 changes: 5 additions & 5 deletions web/src/components/RunDetailLayout/HeaderLeft.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Link} from 'react-router-dom';
import {useNavigate} from 'react-router-dom';
import {useMemo} from 'react';
import {LinkOutlined} from '@ant-design/icons';

Expand All @@ -9,14 +9,14 @@ import * as S from './RunDetailLayout.styled';

interface IProps {
name: string;
testId: string;
triggerType: string;
}

const HeaderLeft = ({name, testId, triggerType}: IProps) => {
const HeaderLeft = ({name, triggerType}: IProps) => {
const {run: {createdAt, transactionId, transactionRunId, executionTime, trace, traceId, testVersion} = {}, run} =
useTestRun();
const createdTimeAgo = Date.getTimeAgo(createdAt ?? '');
const navigate = useNavigate();

const description = useMemo(() => {
return (
Expand All @@ -37,9 +37,9 @@ const HeaderLeft = ({name, testId, triggerType}: IProps) => {

return (
<S.Section $justifyContent="flex-start">
<Link data-cy="test-header-back-button" to={`/test/${testId}`}>
<a data-cy="test-header-back-button" onClick={() => navigate(-1)}>
<S.BackIcon />
</Link>
</a>
<S.InfoContainer>
<S.Row>
<S.Title data-cy="test-details-name">
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/RunDetailLayout/RunDetailLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const RunDetailLayout = ({test: {id, name, trigger, version = 1}, test}: IProps)

const tabBarExtraContent = useMemo(
() => ({
left: <HeaderLeft testId={id} name={name} triggerType={trigger.type.toUpperCase()} />,
left: <HeaderLeft name={name} triggerType={trigger.type.toUpperCase()} />,
right: <HeaderRight testId={id} testVersion={version} />,
}),
[id, name, trigger.type, version]
Expand Down
40 changes: 22 additions & 18 deletions web/src/components/TestHeader/TestHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ResourceCardActions from 'components/ResourceCard/ResourceCardActions';
import {Link} from 'react-router-dom';
import {useNavigate} from 'react-router-dom';
import * as S from './TestHeader.styled';

interface IProps {
Expand All @@ -12,22 +12,26 @@ interface IProps {
runButton: React.ReactElement;
}

const TestHeader = ({description, id, shouldEdit, onEdit, onDelete, title, runButton}: IProps) => (
<S.Container $isWhite>
<S.Section>
<Link to="/" data-cy="test-header-back-button">
<S.BackIcon />
</Link>
<div>
<S.Title data-cy="test-details-name">{title}</S.Title>
<S.Text>{description}</S.Text>
</div>
</S.Section>
<S.Section>
{runButton}
<ResourceCardActions id={id} onDelete={onDelete} onEdit={onEdit} shouldEdit={shouldEdit} />
</S.Section>
</S.Container>
);
const TestHeader = ({description, id, shouldEdit, onEdit, onDelete, title, runButton}: IProps) => {
const navigate = useNavigate();

return (
<S.Container $isWhite>
<S.Section>
<a onClick={() => navigate(-1)} data-cy="test-header-back-button">
<S.BackIcon />
</a>
<div>
<S.Title data-cy="test-details-name">{title}</S.Title>
<S.Text>{description}</S.Text>
</div>
</S.Section>
<S.Section>
{runButton}
<ResourceCardActions id={id} onDelete={onDelete} onEdit={onEdit} shouldEdit={shouldEdit} />
</S.Section>
</S.Container>
);
};

export default TestHeader;
7 changes: 4 additions & 3 deletions web/src/components/TransactionHeader/TransactionHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Button} from 'antd';
import {Link} from 'react-router-dom';
import {useNavigate} from 'react-router-dom';
import {useTransaction} from 'providers/Transaction/Transaction.provider';
import {TestState as TestStateEnum} from 'constants/TestRun.constants';
import Transaction from 'models/Transaction.model';
Expand All @@ -18,13 +18,14 @@ const TransactionHeader = ({
transactionRun: {state, id: runId},
}: IProps) => {
const {onRun} = useTransaction();
const navigate = useNavigate();

return (
<S.Container>
<S.Section>
<Link to={`/transaction/${transactionId}`} data-cy="transaction-header-back-button">
<a onClick={() => navigate(-1)} data-cy="transaction-header-back-button">
<S.BackIcon />
</Link>
</a>
<div>
<S.Title data-cy="transaction-details-name">
{name} (v{version})
Expand Down
5 changes: 4 additions & 1 deletion web/src/hooks/usePagination.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {UseQuery} from '@reduxjs/toolkit/dist/query/react/buildHooks';
import {useCallback, useState} from 'react';
import {useSearchParams} from 'react-router-dom';

type TParams<P> = P & {
take?: number;
Expand Down Expand Up @@ -35,7 +36,9 @@ const usePagination = <T, P>(
useGetDataListQuery: UseQuery<any>,
{take = 20, ...queryParams}: TParams<P>
): IPagination<T> => {
const [params, setParams] = useState<{page: number; query: string}>({page: 0, query: ''});
const [searchParams] = useSearchParams();
const defaultPage = searchParams.get('page') ? Number(searchParams.get('page')) - 1 : 0;
const [params, setParams] = useState<{page: number; query: string}>({page: defaultPage, query: ''});

const {data, isFetching, isLoading} = useGetDataListQuery({
skip: params.page * take,
Expand Down