Skip to content

fix(web)/cases-in-progress-and-pagination-overflow #1332

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 4 commits into from
Nov 20, 2023
Merged

fix(web)/cases-in-progress-and-pagination-overflow #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5e59c8
fix(web): in progress cases fixed in court stats
kemuru Nov 16, 2023
9612770
fix(web): overflow pagination fix
kemuru Nov 16, 2023
53d7bf3
feat(web): show no cases found if user has not ever had a dispute
kemuru Nov 16, 2023
cdc324a
chore(web): adding usememo for performance
kemuru Nov 18, 2023
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
6 changes: 5 additions & 1 deletion web/src/pages/Cases/CasesFetcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ const CasesFetcher: React.FC = () => {
() => calculateStats(isCourtFilter, courtData?.court, counterData?.counter, decodedFilter),
[isCourtFilter, courtData?.court, counterData?.counter, decodedFilter]
);
const totalPages = useMemo(
() => (!isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1),
[totalCases, casesPerPage]
);

return (
<CasesDisplay
Expand All @@ -69,7 +73,7 @@ const CasesFetcher: React.FC = () => {
numberClosedDisputes={ruledCases}
currentPage={pageNumber}
setCurrentPage={(newPage: number) => navigate(`${location}/${newPage}/${order}/${filter}`)}
totalPages={!isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1}
totalPages={totalPages}
{...{ casesPerPage }}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Courts/CourtDetails/Stats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const stats: IStat[] = [
},
{
title: "In Progress",
getText: (data) => data?.numberDisputes,
getText: (data) => data?.numberDisputes - data?.numberClosedDisputes,
color: "orange",
icon: BalanceIcon,
},
Expand Down
11 changes: 8 additions & 3 deletions web/src/pages/Dashboard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React from "react";
import React, { useMemo } from "react";
import styled from "styled-components";
import { useNavigate, useParams } from "react-router-dom";
import { useAccount } from "wagmi";
import { OrderDirection } from "src/graphql/graphql";
import { DisputeDetailsFragment, useMyCasesQuery } from "queries/useCasesQuery";
import { useUserQuery } from "queries/useUser";
import { decodeURIFilter, useRootPath } from "utils/uri";
import { isUndefined } from "utils/index";
import CasesDisplay from "components/CasesDisplay";
import ConnectWallet from "components/ConnectWallet";
import JurorInfo from "./JurorInfo";
Expand Down Expand Up @@ -54,6 +55,10 @@ const Dashboard: React.FC = () => {
);
const { data: userData } = useUserQuery(address, decodedFilter);
const totalCases = userData?.user?.disputes.length;
const totalPages = useMemo(
() => (!isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1),
[totalCases, casesPerPage]
);

return (
<Container>
Expand All @@ -63,10 +68,10 @@ const Dashboard: React.FC = () => {
<Courts />
<StyledCasesDisplay
title="My Cases"
disputes={disputesData?.user?.disputes as DisputeDetailsFragment[]}
disputes={userData?.user !== null ? (disputesData?.user?.disputes as DisputeDetailsFragment[]) : []}
numberDisputes={totalCases}
numberClosedDisputes={0}
totalPages={10}
totalPages={totalPages}
currentPage={pageNumber}
setCurrentPage={(newPage: number) => navigate(`${location}/${newPage}/${order}/${filter}`)}
{...{ casesPerPage }}
Expand Down