From b5e59c81bf848234ea4ebcd8e16ddb890e9fc6c8 Mon Sep 17 00:00:00 2001 From: marino <102478601+kemuru@users.noreply.github.com> Date: Thu, 16 Nov 2023 12:43:09 +0100 Subject: [PATCH 1/4] fix(web): in progress cases fixed in court stats --- web/src/pages/Courts/CourtDetails/Stats.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/pages/Courts/CourtDetails/Stats.tsx b/web/src/pages/Courts/CourtDetails/Stats.tsx index e910bae51..532f8a1be 100644 --- a/web/src/pages/Courts/CourtDetails/Stats.tsx +++ b/web/src/pages/Courts/CourtDetails/Stats.tsx @@ -87,7 +87,7 @@ const stats: IStat[] = [ }, { title: "In Progress", - getText: (data) => data?.numberDisputes, + getText: (data) => data?.numberDisputes - data?.numberClosedDisputes, color: "orange", icon: BalanceIcon, }, From 96127707d653748146c90300018c47e65ef6e69b Mon Sep 17 00:00:00 2001 From: marino <102478601+kemuru@users.noreply.github.com> Date: Thu, 16 Nov 2023 14:23:13 +0100 Subject: [PATCH 2/4] fix(web): overflow pagination fix --- web/src/pages/Cases/CasesFetcher.tsx | 3 ++- web/src/pages/Dashboard/index.tsx | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/src/pages/Cases/CasesFetcher.tsx b/web/src/pages/Cases/CasesFetcher.tsx index 80f8cc762..f2794c951 100644 --- a/web/src/pages/Cases/CasesFetcher.tsx +++ b/web/src/pages/Cases/CasesFetcher.tsx @@ -61,6 +61,7 @@ const CasesFetcher: React.FC = () => { () => calculateStats(isCourtFilter, courtData?.court, counterData?.counter, decodedFilter), [isCourtFilter, courtData?.court, counterData?.counter, decodedFilter] ); + const totalPages = !isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1; return ( { numberClosedDisputes={ruledCases} currentPage={pageNumber} setCurrentPage={(newPage: number) => navigate(`${location}/${newPage}/${order}/${filter}`)} - totalPages={!isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1} + totalPages={totalPages} {...{ casesPerPage }} /> ); diff --git a/web/src/pages/Dashboard/index.tsx b/web/src/pages/Dashboard/index.tsx index 2684b38cc..fd88af76a 100644 --- a/web/src/pages/Dashboard/index.tsx +++ b/web/src/pages/Dashboard/index.tsx @@ -6,6 +6,7 @@ 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"; @@ -54,6 +55,7 @@ const Dashboard: React.FC = () => { ); const { data: userData } = useUserQuery(address, decodedFilter); const totalCases = userData?.user?.disputes.length; + const totalPages = !isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1; return ( @@ -66,7 +68,7 @@ const Dashboard: React.FC = () => { disputes={disputesData?.user?.disputes as DisputeDetailsFragment[]} numberDisputes={totalCases} numberClosedDisputes={0} - totalPages={10} + totalPages={totalPages} currentPage={pageNumber} setCurrentPage={(newPage: number) => navigate(`${location}/${newPage}/${order}/${filter}`)} {...{ casesPerPage }} From 53d7bf390394b2f28acae5b38d5c22227bba60a7 Mon Sep 17 00:00:00 2001 From: marino <102478601+kemuru@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:59:18 +0100 Subject: [PATCH 3/4] feat(web): show no cases found if user has not ever had a dispute --- web/src/pages/Dashboard/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/pages/Dashboard/index.tsx b/web/src/pages/Dashboard/index.tsx index fd88af76a..3efd9dae8 100644 --- a/web/src/pages/Dashboard/index.tsx +++ b/web/src/pages/Dashboard/index.tsx @@ -65,7 +65,7 @@ const Dashboard: React.FC = () => { Date: Sat, 18 Nov 2023 02:23:16 +0100 Subject: [PATCH 4/4] chore(web): adding usememo for performance --- web/src/pages/Cases/CasesFetcher.tsx | 5 ++++- web/src/pages/Dashboard/index.tsx | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/web/src/pages/Cases/CasesFetcher.tsx b/web/src/pages/Cases/CasesFetcher.tsx index f2794c951..693d87f02 100644 --- a/web/src/pages/Cases/CasesFetcher.tsx +++ b/web/src/pages/Cases/CasesFetcher.tsx @@ -61,7 +61,10 @@ const CasesFetcher: React.FC = () => { () => calculateStats(isCourtFilter, courtData?.court, counterData?.counter, decodedFilter), [isCourtFilter, courtData?.court, counterData?.counter, decodedFilter] ); - const totalPages = !isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1; + const totalPages = useMemo( + () => (!isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1), + [totalCases, casesPerPage] + ); return ( { ); const { data: userData } = useUserQuery(address, decodedFilter); const totalCases = userData?.user?.disputes.length; - const totalPages = !isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1; + const totalPages = useMemo( + () => (!isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1), + [totalCases, casesPerPage] + ); return (