fix loading app request for explorer (#3359)

gitcoinco · Apr 24, 2024 · e91e658 · e91e658
1 parent c3259de
commit e91e658
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 25 deletions.
diff --git a/packages/data-layer/src/data-layer.ts b/packages/data-layer/src/data-layer.ts
@@ -48,6 +48,7 @@ import {
   getRoundForExplorer,
   getRoundsQuery,
   getDonationsByDonorAddress,
+  getApplicationsForExplorer,
 } from "./queries";
 import { mergeCanonicalAndLinkedProjects } from "./utils";
 
@@ -370,6 +371,27 @@ export class DataLayer {
     return response.application ?? null;
   }
 
+  async getApplicationsForExplorer({
+    roundId,
+    chainId,
+  }: {
+    roundId: string;
+    chainId: number;
+  }): Promise<Application[]> {
+    const requestVariables = {
+      roundId,
+      chainId,
+    };
+
+    const response: { applications: Application[] } = await request(
+      this.gsIndexerEndpoint,
+      getApplicationsForExplorer,
+      requestVariables,
+    );
+
+    return response.applications ?? [];
+  }
+
   /**
    * Returns a list of applications identified by their chainId, roundId, and id.
    * @param expandedRefs

diff --git a/packages/data-layer/src/queries.ts b/packages/data-layer/src/queries.ts
@@ -281,6 +281,40 @@ export const getApplication = gql`
   }
 `;
 
+export const getApplicationsForExplorer = gql`
+  query Applications($chainId: Int!, $roundId: String!) {
+    applications(
+      first: 1000
+      condition: { chainId: $chainId, roundId: $roundId, status: APPROVED }
+    ) {
+      id
+      chainId
+      roundId
+      projectId
+      status
+      totalAmountDonatedInUsd
+      uniqueDonorsCount
+      totalDonationsCount
+      round {
+        strategyName
+        donationsStartTime
+        donationsEndTime
+        applicationsStartTime
+        applicationsEndTime
+        matchTokenAddress
+        roundMetadata
+      }
+      metadata
+      project: canonicalProject {
+        tags
+        id
+        metadata
+        anchorAddress
+      }
+    }
+  }
+`;
+
 export const getApplicationsByRoundIdAndProjectIds = gql`
   query Application(
     $chainId: Int!

diff --git a/packages/grant-explorer/src/features/projects/hooks/useRoundApplications.ts b/packages/grant-explorer/src/features/projects/hooks/useRoundApplications.ts
@@ -1,10 +1,9 @@
 import useSWR from "swr";
-import { Application, DataLayer } from "data-layer";
+import { DataLayer } from "data-layer";
 
 type Params = {
   chainId?: number;
   roundId?: string;
-  projectIds?: string[];
 };
 
 export function useRoundApprovedApplications(
@@ -15,24 +14,14 @@ export function useRoundApprovedApplications(
   return useSWR(
     shouldFetch ? ["allApprovedApplications", params] : null,
     async () => {
-      const validatedParams = (projectId: string) => {
-        return {
-          chainId: params.chainId as number,
-          roundId: params.roundId as string,
-          applicationId: projectId as string,
-        };
-      };
-      if (!params.projectIds) return;
+      if (params.chainId === undefined || params.roundId === undefined) {
+        return null;
+      }
 
-      const arr = params.projectIds?.map((projectId) => {
-        return dataLayer.getApplication(validatedParams(projectId));
+      return await dataLayer.getApplicationsForExplorer({
+        roundId: params.roundId,
+        chainId: params.chainId,
       });
-      return Promise.all(arr).then(
-        (applications) =>
-          applications.filter(
-            (application) => application?.status === "APPROVED"
-          ) as Application[] | undefined
-      );
     }
   );
 }
diff --git a/packages/grant-explorer/src/features/round/ViewRoundPage.tsx b/packages/grant-explorer/src/features/round/ViewRoundPage.tsx
@@ -612,16 +612,13 @@ const ProjectList = (props: {
   setCurrentProjectAddedToCart: React.Dispatch<React.SetStateAction<Project>>;
   setShowCartNotification: React.Dispatch<React.SetStateAction<boolean>>;
 }): JSX.Element => {
-  const { projects, roundRoutePath, round, chainId, roundId } = props;
+  const { projects, roundRoutePath, chainId, roundId } = props;
   const dataLayer = useDataLayer();
 
   const { data: applications } = useRoundApprovedApplications(
     {
       chainId,
       roundId,
-      projectIds: round.approvedProjects?.map(
-        (proj) => proj.grantApplicationId
-      ),
     },
     dataLayer
   );
@@ -882,9 +879,6 @@ const RoundStatsTabContent = ({
       {
         chainId,
         roundId,
-        projectIds: round.approvedProjects?.map(
-          (proj) => proj.grantApplicationId
-        ),
       },
       dataLayer
     );