fix: first load bugs in a2f dataset & grant page

globalfund · Sep 16, 2024 · fe6cb32 · fe6cb32
1 parent a409573
commit fe6cb32
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/src/app/pages/datasets/access-to-funding/blocks/block-1/index.tsx b/src/app/pages/datasets/access-to-funding/blocks/block-1/index.tsx
@@ -27,7 +27,7 @@ export const AccessToFundingBlock1: React.FC<AccessToFundingBlock1Props> = (
   );
 
   const [eligibilityYear, setEligibilityYear] = React.useState(
-    eligibilityYears[0].value
+    eligibilityYears.length > 0 ? eligibilityYears[0].value : ""
   );
 
   const dataStats = useStoreState(
@@ -49,12 +49,20 @@ export const AccessToFundingBlock1: React.FC<AccessToFundingBlock1Props> = (
   };
 
   React.useEffect(() => {
-    fetchStats({
-      filterString: props.filterString,
-      routeParams: {
-        year: eligibilityYear,
-      },
-    });
+    if (eligibilityYears.length > 0 && eligibilityYear === "") {
+      setEligibilityYear(eligibilityYears[0].value);
+    }
+  }, [eligibilityYears]);
+
+  React.useEffect(() => {
+    if (eligibilityYears.length > 0) {
+      fetchStats({
+        filterString: props.filterString,
+        routeParams: {
+          year: eligibilityYear,
+        },
+      });
+    }
   }, [props.filterString, eligibilityYear]);
 
   return (

diff --git a/src/app/pages/grant/index.tsx b/src/app/pages/grant/index.tsx
@@ -163,6 +163,18 @@ export const Grant: React.FC = () => {
     );
   }, [params.ip]);
 
+  React.useEffect(() => {
+    if (!dropdownSelected && dataGrant.periods.length > 0) {
+      setDropdownSelected(
+        get(
+          dataGrant.periods,
+          `[${params.ip !== undefined ? parseInt(params.ip) - 1 : 0}]`,
+          null
+        )
+      );
+    }
+  }, [dataGrant.periods]);
+
   React.useEffect(() => {
     if (params.id && dropdownSelected) {
       fetchOverview({