[APR] use getfilterdatafromparams when making a request (#334)

* Refactor getFilteredRoundApiUrl args * Apply getFilteredRoundApiUrl on remaining components
bleu · Sep 26, 2023 · 2bb2693 · 2bb2693
1 parent 49fdf22
commit 2bb2693
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/apps/balancer-tools/src/app/apr/(utils)/getFilteredApiUrl.ts b/apps/balancer-tools/src/app/apr/(utils)/getFilteredApiUrl.ts
@@ -48,15 +48,18 @@ function getFilterDataFromParams(searchParams: SearchParams) {
 }
 
 export default function getFilteredRoundApiUrl(
-  searchParams: SearchParams,
   startAt: Date,
   endAt: Date,
+  searchParams?: SearchParams | null,
+  poolId?: string,
 ) {
-  const filteredData = getFilterDataFromParams(searchParams);
+  const filteredData = getFilterDataFromParams(searchParams ?? {});
   const params = Object.entries(filteredData)
     .map(([key, value]) => (value !== undefined ? `${key}=${value}` : ""))
     .join("&");
   return `${BASE_URL}/apr/api?startAt=${formatDateToMMDDYYYY(
     startAt,
-  )}&endAt=${formatDateToMMDDYYYY(endAt)}&${params}`;
+  )}&endAt=${formatDateToMMDDYYYY(endAt)}${
+    poolId ? `&poolId=${poolId}` : ""
+  }&${params}`;
 }
diff --git a/apps/balancer-tools/src/app/apr/api/(utils)/computeAverages.ts b/apps/balancer-tools/src/app/apr/api/(utils)/computeAverages.ts
@@ -58,7 +58,7 @@ export const computeAverages = (formattedPoolData: {
   }
 
   // @ts-ignore  - Need help with this typing!
-  return { perDay: formattedPoolData, average: averages };
+  return averages;
 };
 
 function calculateAverageForObject(

diff --git a/apps/balancer-tools/src/app/apr/page.tsx b/apps/balancer-tools/src/app/apr/page.tsx
@@ -43,7 +43,7 @@ export default function Page({
     return redirect("/apr/");
   }
 
-  const url = getFilteredRoundApiUrl(searchParams, startAtDate, endAtDate);
+  const url = getFilteredRoundApiUrl(startAtDate, endAtDate, searchParams);
 
   return (
     <div className="flex flex-1 flex-col gap-y-3">

diff --git a/apps/balancer-tools/src/app/apr/pool/(components)/HistoricalCharts/index.tsx b/apps/balancer-tools/src/app/apr/pool/(components)/HistoricalCharts/index.tsx
@@ -1,5 +1,4 @@
-import { BASE_URL } from "#/app/apr/(utils)/types";
-import { formatDateToMMDDYYYY } from "#/app/apr/api/(utils)/date";
+import getFilteredRoundApiUrl from "#/app/apr/(utils)/getFilteredApiUrl";
 import { PoolStatsData, PoolStatsResults } from "#/app/apr/api/route";
 import { trimTrailingValues } from "#/lib/utils";
 import { fetcher } from "#/utils/fetcher";
@@ -16,9 +15,7 @@ export default async function HistoricalCharts({
   poolId?: string;
 }) {
   const results: PoolStatsResults = await fetcher(
-    `${BASE_URL}/apr/api/?poolId=${poolId}&startAt=${formatDateToMMDDYYYY(
-      startAt,
-    )}&endAt=${formatDateToMMDDYYYY(endAt)}`,
+    getFilteredRoundApiUrl(startAt, endAt, null, poolId),
   );
 
   return <HistoricalChart apiResult={results} />;

diff --git a/apps/balancer-tools/src/app/apr/pool/(components)/PoolOverviewCards.tsx b/apps/balancer-tools/src/app/apr/pool/(components)/PoolOverviewCards.tsx
@@ -4,7 +4,7 @@ import OverviewCards, {
   getDatesDetails,
 } from "../../(components)/OverviewCards";
 import { formatAPR, formatTVL } from "../../(utils)/formatPoolStats";
-import { BASE_URL } from "../../(utils)/types";
+import getFilteredRoundApiUrl from "../../(utils)/getFilteredApiUrl";
 import { PoolStatsResults } from "../../api/route";
 
 export default async function PoolOverviewCards({
@@ -22,9 +22,8 @@ export default async function PoolOverviewCards({
     tooltip?: string;
   }[] = [];
   const results: PoolStatsResults = await fetcher(
-    `${BASE_URL}/apr/api/?poolId=${poolId}&startAt${startAt}&endAt=${endAt}`,
+    getFilteredRoundApiUrl(startAt, endAt, null, poolId),
   );
-
   cardsDetails.push(
     ...[
       { title: "Avg. TVL", content: formatTVL(results.average.tvl) },

diff --git a/apps/balancer-tools/src/app/apr/round/(components)/PoolListTable.tsx b/apps/balancer-tools/src/app/apr/round/(components)/PoolListTable.tsx
@@ -75,7 +75,7 @@ export function PoolListTable({
     const params = Object.fromEntries(searchParams.entries());
     params["offset"] = (tableData.length + 1).toString();
 
-    const url = new URL(getFilteredRoundApiUrl(params, startAt, endAt));
+    const url = new URL(getFilteredRoundApiUrl(startAt, endAt, params));
     const aditionalPoolsData = await fetcher<PoolStatsResults>(
       url.pathname + url.search,
     );