OCT-1454: Cancelling requests while changing route from Metrics (#104)

golemfoundation · Apr 12, 2024 · d9da5c7 · d9da5c7
2 parents a8ac956 + 9cc6153
commit d9da5c7
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 22 deletions.
diff --git a/client/src/api/calls/epochAllocations.ts b/client/src/api/calls/epochAllocations.ts
@@ -1,3 +1,5 @@
+import { GenericAbortSignal } from 'axios';
+
 import env from 'env';
 import apiService from 'services/apiService';
 
@@ -9,6 +11,11 @@ export type Response = {
   }[];
 };
 
-export async function apiGetEpochAllocations(epoch: number): Promise<Response> {
-  return apiService.get(`${env.serverEndpoint}allocations/epoch/${epoch}`).then(({ data }) => data);
+export async function apiGetEpochAllocations(
+  epoch: number,
+  signal?: GenericAbortSignal,
+): Promise<Response> {
+  return apiService
+    .get(`${env.serverEndpoint}allocations/epoch/${epoch}`, { signal })
+    .then(({ data }) => data);
 }
diff --git a/client/src/api/calls/epochBudgets.ts b/client/src/api/calls/epochBudgets.ts
@@ -1,3 +1,5 @@
+import { GenericAbortSignal } from 'axios';
+
 import env from 'env';
 import apiService from 'services/apiService';
 
@@ -9,8 +11,11 @@ export type Response = {
   }[];
 };
 
-export async function apiGetEpochBudgets(epoch: number): Promise<Response> {
+export async function apiGetEpochBudgets(
+  epoch: number,
+  signal?: GenericAbortSignal,
+): Promise<Response> {
   return apiService
-    .get(`${env.serverEndpoint}rewards/budgets/epoch/${epoch}`)
+    .get(`${env.serverEndpoint}rewards/budgets/epoch/${epoch}`, { signal })
     .then(({ data }) => data);
 }
diff --git a/client/src/api/calls/epochInfo.ts b/client/src/api/calls/epochInfo.ts
@@ -1,3 +1,5 @@
+import { GenericAbortSignal } from 'axios';
+
 import env from 'env';
 import apiService from 'services/apiService';
 
@@ -15,6 +17,11 @@ export type Response = {
   totalWithdrawals: string | null;
 };
 
-export async function apiGetEpochInfo(epoch: number): Promise<Response> {
-  return apiService.get(`${env.serverEndpoint}epochs/info/${epoch}`).then(({ data }) => data);
+export async function apiGetEpochInfo(
+  epoch: number,
+  signal?: GenericAbortSignal,
+): Promise<Response> {
+  return apiService
+    .get(`${env.serverEndpoint}epochs/info/${epoch}`, { signal })
+    .then(({ data }) => data);
 }
diff --git a/client/src/api/calls/epochLeverage.ts b/client/src/api/calls/epochLeverage.ts
@@ -1,10 +1,17 @@
+import { GenericAbortSignal } from 'axios';
+
 import env from 'env';
 import apiService from 'services/apiService';
 
 export type Response = {
   leverage: number;
 };
 
-export async function apiGetEpochLeverage(epoch: number): Promise<Response> {
-  return apiService.get(`${env.serverEndpoint}rewards/leverage/${epoch}`).then(({ data }) => data);
+export async function apiGetEpochLeverage(
+  epoch: number,
+  signal?: GenericAbortSignal,
+): Promise<Response> {
+  return apiService
+    .get(`${env.serverEndpoint}rewards/leverage/${epoch}`, { signal })
+    .then(({ data }) => data);
 }
diff --git a/client/src/api/calls/epochPatrons.ts b/client/src/api/calls/epochPatrons.ts
@@ -1,10 +1,17 @@
+import { GenericAbortSignal } from 'axios';
+
 import env from 'env';
 import apiService from 'services/apiService';
 
 export type Response = {
   patrons: string[];
 };
 
-export async function apiGetEpochPatrons(epoch: number): Promise<Response> {
-  return apiService.get(`${env.serverEndpoint}user/patrons/${epoch}`).then(({ data }) => data);
+export async function apiGetEpochPatrons(
+  epoch: number,
+  signal?: GenericAbortSignal,
+): Promise<Response> {
+  return apiService
+    .get(`${env.serverEndpoint}user/patrons/${epoch}`, { signal })
+    .then(({ data }) => data);
 }
diff --git a/client/src/api/calls/epochUnusedRewards.ts b/client/src/api/calls/epochUnusedRewards.ts
@@ -1,3 +1,5 @@
+import { GenericAbortSignal } from 'axios';
+
 import env from 'env';
 import apiService from 'services/apiService';
 
@@ -6,6 +8,11 @@ export type Response = {
   value: string; // WEI
 };
 
-export async function apiGetEpochUnusedRewards(epoch: number): Promise<Response> {
-  return apiService.get(`${env.serverEndpoint}rewards/unused/${epoch}`).then(({ data }) => data);
+export async function apiGetEpochUnusedRewards(
+  epoch: number,
+  signal?: GenericAbortSignal,
+): Promise<Response> {
+  return apiService
+    .get(`${env.serverEndpoint}rewards/unused/${epoch}`, { signal })
+    .then(({ data }) => data);
 }
diff --git a/client/src/api/calls/projectThreshold.ts b/client/src/api/calls/projectThreshold.ts
@@ -1,3 +1,5 @@
+import { GenericAbortSignal } from 'axios';
+
 import env from 'env';
 import apiService from 'services/apiService';
 
@@ -6,6 +8,11 @@ export type Response = {
   threshold: string;
 };
 
-export async function apiGetProjectThreshold(epoch: number): Promise<Response> {
-  return apiService.get(`${env.serverEndpoint}rewards/threshold/${epoch}`).then(({ data }) => data);
+export async function apiGetProjectThreshold(
+  epoch: number,
+  signal?: GenericAbortSignal,
+): Promise<Response> {
+  return apiService
+    .get(`${env.serverEndpoint}rewards/threshold/${epoch}`, { signal })
+    .then(({ data }) => data);
 }
diff --git a/client/src/hooks/queries/useEpochAllocations.ts b/client/src/hooks/queries/useEpochAllocations.ts
@@ -16,7 +16,7 @@ export default function useEpochAllocations(
   options?: UseQueryOptions<Response, unknown, EpochAllocations, any>,
 ): UseQueryResult<EpochAllocations, unknown> {
   return useQuery({
-    queryFn: () => apiGetEpochAllocations(epoch),
+    queryFn: ({ signal }) => apiGetEpochAllocations(epoch, signal),
     queryKey: QUERY_KEYS.epochAllocations(epoch),
     select: response => {
       return response.allocations.reduce((acc, curr) => {

diff --git a/client/src/hooks/queries/useEpochBudgets.ts b/client/src/hooks/queries/useEpochBudgets.ts
@@ -17,7 +17,7 @@ export default function useEpochBudgets(
   options?: UseQueryOptions<Response, unknown, EpochBudgets, any>,
 ): UseQueryResult<EpochBudgets, unknown> {
   return useQuery({
-    queryFn: () => apiGetEpochBudgets(epoch),
+    queryFn: ({ signal }) => apiGetEpochBudgets(epoch, signal),
     queryKey: QUERY_KEYS.epochBudgets(epoch),
     select: response => {
       let budgetsSum = BigInt(0);

diff --git a/client/src/hooks/queries/useEpochInfo.ts b/client/src/hooks/queries/useEpochInfo.ts
@@ -43,7 +43,7 @@ export default function useEpochInfo(
   options?: UseQueryOptions<Response, unknown, EpochInfo, any>,
 ): UseQueryResult<EpochInfo, unknown> {
   return useQuery({
-    queryFn: () => apiGetEpochInfo(epoch),
+    queryFn: ({ signal }) => apiGetEpochInfo(epoch, signal),
     queryKey: QUERY_KEYS.epochInfo(epoch),
     select: response => ({
       communityFund: response.communityFund

diff --git a/client/src/hooks/queries/useEpochLeverage.ts b/client/src/hooks/queries/useEpochLeverage.ts
@@ -8,7 +8,7 @@ export default function useEpochLeverage(
   options?: UseQueryOptions<Response, unknown, number, any>,
 ): UseQueryResult<number, unknown> {
   return useQuery({
-    queryFn: () => apiGetEpochLeverage(epoch),
+    queryFn: ({ signal }) => apiGetEpochLeverage(epoch, signal),
     queryKey: QUERY_KEYS.epochLeverage(epoch),
     select: response => response.leverage,
     ...options,

diff --git a/client/src/hooks/queries/useEpochPatrons.ts b/client/src/hooks/queries/useEpochPatrons.ts
@@ -10,7 +10,7 @@ export default function useEpochPatrons(
   options?: UseQueryOptions<Response, unknown, UseEpochPatrons, any>,
 ): UseQueryResult<UseEpochPatrons, unknown> {
   return useQuery({
-    queryFn: () => apiGetEpochPatrons(epoch),
+    queryFn: ({ signal }) => apiGetEpochPatrons(epoch, signal),
     queryKey: QUERY_KEYS.epochPatrons(epoch),
     select: response => response.patrons,
     ...options,

diff --git a/client/src/hooks/queries/useEpochUnusedRewards.ts b/client/src/hooks/queries/useEpochUnusedRewards.ts
@@ -14,7 +14,7 @@ export default function useEpochUnusedRewards(
   options?: UseQueryOptions<Response, unknown, UseEpochUnusedRewards, any>,
 ): UseQueryResult<UseEpochUnusedRewards, unknown> {
   return useQuery({
-    queryFn: () => apiGetEpochUnusedRewards(epoch),
+    queryFn: ({ signal }) => apiGetEpochUnusedRewards(epoch, signal),
     queryKey: QUERY_KEYS.epochUnusedRewards(epoch),
     select: response => ({
       addresses: response.addresses,

diff --git a/client/src/hooks/queries/useProjectRewardsThreshold.ts b/client/src/hooks/queries/useProjectRewardsThreshold.ts
@@ -39,8 +39,11 @@ export default function useProjectRewardsThreshold(
       !!currentEpoch &&
       currentEpoch > 1 &&
       (isDecisionWindowOpen === true || (epoch !== undefined && epoch > 0)),
-    queryFn: () =>
-      apiGetProjectThreshold(epoch ?? (isDecisionWindowOpen ? currentEpoch! - 1 : currentEpoch!)),
+    queryFn: ({ signal }) =>
+      apiGetProjectThreshold(
+        epoch ?? (isDecisionWindowOpen ? currentEpoch! - 1 : currentEpoch!),
+        signal,
+      ),
     queryKey: QUERY_KEYS.projectRewardsThreshold(
       epoch ?? (isDecisionWindowOpen ? currentEpoch! - 1 : currentEpoch!),
     ),