Merge pull request #283 from akvo/develop

[#202] Fix explore studies page filter feature
akvo · Feb 14, 2024 · 2e97b7b · 2e97b7b
2 parents b94a08b + bb8c653
commit 2e97b7b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/frontend/src/pages/cases/visualizations/ChartMonetaryContribution.js b/frontend/src/pages/cases/visualizations/ChartMonetaryContribution.js
@@ -68,10 +68,10 @@ const ChartMonetaryContribution = ({
             replacedCurrentValues
           ) + data.total_current_diversified_income;
         const resValue = newTotalValue - data.total_current_income;
-        // CoP
-        if (d.toLowerCase().includes("cost")) {
-          return resValue * -1;
-        }
+        // CoP - multiplied by 1
+        // if (d.toLowerCase().includes("cost")) {
+        //   return resValue * -1;
+        // }
         return resValue;
       }
       return 0;

diff --git a/frontend/src/pages/explore-studies/ExploreStudiesPage.js b/frontend/src/pages/explore-studies/ExploreStudiesPage.js
@@ -331,12 +331,13 @@ const ExploreStudiesPage = () => {
       });
       fetchReferenceData(country, commodity, driver, source);
     } else {
-      setFilterInitialValues({});
-      fetchReferenceData();
+      const { country, commodity, driver, source } = filterInitialValues;
+      fetchReferenceData(country, commodity, driver, source);
     }
-  }, [fetchReferenceData, currentPage, location]);
+  }, [fetchReferenceData, currentPage, location, filterInitialValues]);
 
   const onFilter = (values) => {
+    setCurrentPage(1);
     const { country, commodity, driver, source } = values;
     if (countryId && commodityId && driverId) {
       setFilterInitialValues({});
@@ -349,11 +350,18 @@ const ExploreStudiesPage = () => {
         },
       });
     } else {
+      setFilterInitialValues({
+        country: country,
+        commodity: commodity,
+        driver: driver,
+        source: source,
+      });
       fetchReferenceData(country, commodity, driver, source);
     }
   };
 
   const handleClearFilter = () => {
+    setCurrentPage(1);
     form.resetFields();
     if (countryId && commodityId && driverId) {
       setFilterInitialValues({});