refactor: code smell and some refactor

kleros · Sep 11, 2023 · 40ec2ca · 40ec2ca
1 parent a69b335
commit 40ec2ca
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 42 deletions.
diff --git a/web/src/components/CasesDisplay/CasesGrid.tsx b/web/src/components/CasesDisplay/CasesGrid.tsx
@@ -52,42 +52,21 @@ const calculatePages = (
 
   let totalPages = 0;
 
-  if ("counter" in data) {
-    const counterQueryData = data as CounterQuery;
-    const counter = counterQueryData.counter;
-    if (counter) {
-      switch (status) {
-        case 1:
-          totalPages = counter.cases - counter.casesRuled;
-          break;
-        case 2:
-          totalPages = counter.casesRuled;
-          break;
-        case 3:
-          totalPages = counter.casesAppealing;
-          break;
-        default:
-          totalPages = numberDisputes ?? 0;
-      }
-    }
-  } else {
-    const userQueryData = data as UserQuery;
-    const user = userQueryData.user;
-    if (user) {
-      switch (status) {
-        case 1:
-          totalPages = (user.totalDisputes ?? 0) - (user.totalResolvedDisputes ?? 0);
-          break;
-        case 2:
-          totalPages = user.totalResolvedDisputes ?? 0;
-          break;
-        case 3:
-          totalPages = myAppeals ?? 0;
-          break;
-        default:
-          totalPages = user.totalDisputes ?? 0;
-      }
-    }
+  switch (status) {
+    case 1:
+      totalPages =
+        "counter" in data
+          ? data?.counter?.cases - data?.counter?.casesRuled
+          : (data as UserQuery).user?.totalDisputes - (data as UserQuery).user?.totalResolvedDisputes;
+      break;
+    case 2:
+      totalPages = "counter" in data ? data?.counter?.casesRuled : (data as UserQuery).user?.totalResolvedDisputes;
+      break;
+    case 3:
+      totalPages = "counter" in data ? data?.counter?.casesAppealing : myAppeals ?? 0;
+      break;
+    default:
+      totalPages = "counter" in data ? numberDisputes ?? 0 : (data as UserQuery).user?.totalDisputes ?? 0;
   }
 
   return totalPages / casesPerPage;

diff --git a/web/src/components/CasesDisplay/Search.tsx b/web/src/components/CasesDisplay/Search.tsx
@@ -27,7 +27,12 @@ const Search: React.FC = () => {
   return (
     <div>
       <Container>
-        <StyledSearchbar type="text" value={search} onChange={(e) => setSearch(e.target.value)} />
+        <StyledSearchbar
+          type="text"
+          placeholder="Search By ID"
+          value={search}
+          onChange={(e) => setSearch(e.target.value)}
+        />
       </Container>
       <DropdownCascader
         placeholder={"Select Court"}

diff --git a/web/src/context/FilterProvider.tsx b/web/src/context/FilterProvider.tsx
@@ -96,22 +96,23 @@ export const FilterProvider: React.FC<{ children?: React.ReactNode }> = ({ child
   const { data } = useCasesQuery(disputeSkip, combinedQueryFilters, direction);
   const { data: dashboardData } = useMyCasesQuery(address, disputeSkip, combinedQueryFilters, direction);
 
-  const disputes = isDashboard
-    ? (dashboardData?.user?.disputes as DisputeDetailsFragment[])
-    : (data?.disputes as DisputeDetailsFragment[]);
-
   useEffect(() => {
     setCurrentPage(1);
   }, [statusFilter]);
 
   useEffect(() => {
+    const disputes = isDashboard
+      ? (dashboardData?.user?.disputes as DisputeDetailsFragment[])
+      : (data?.disputes as DisputeDetailsFragment[]);
+
     if (search !== "" || statusFilter !== 0 || courtFilter !== 0 || timeFilter !== 0) {
       setIsFilterApplied(true);
     } else {
       setIsFilterApplied(false);
     }
+
     setFilteredCases(disputes);
-  }, [debouncedSearch, data, timeFilter, courtFilter, statusFilter]);
+  }, [debouncedSearch, data, timeFilter, courtFilter, statusFilter, dashboardData]);
 
   const value = useMemo(
     () => ({