Added site countries

eea · Apr 21, 2021 · 92553b2 · 92553b2
1 parent ba7d585
commit 92553b2
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 11 deletions.
diff --git a/Files for web/About button.png b/Files for web/About button.png
diff --git a/Files for web/Analyse button.png b/Files for web/Analyse button.png
diff --git a/Files for web/Chemicals icon.png b/Files for web/Chemicals icon.png
diff --git a/Files for web/Download button.png b/Files for web/Download button.png
diff --git a/Files for web/EIEP mock up version 2.png b/Files for web/EIEP mock up version 2.png
diff --git a/Files for web/Elliptical image.png b/Files for web/Elliptical image.png
diff --git a/Files for web/Energy icon.png b/Files for web/Energy icon.png
diff --git a/Files for web/Explore full image.png b/Files for web/Explore full image.png
diff --git a/Files for web/Food and beverage icon.png b/Files for web/Food and beverage icon.png
diff --git a/Files for web/Metals icon.png b/Files for web/Metals icon.png
diff --git a/Files for web/Minerals icon.png b/Files for web/Minerals icon.png
diff --git a/Files for web/Other icon.png b/Files for web/Other icon.png
diff --git a/Files for web/Paper and wood icon.png b/Files for web/Paper and wood icon.png
diff --git a/Files for web/Waste and wastewater icon.png b/Files for web/Waste and wastewater icon.png
diff --git a/src/components/manage/Blocks/FiltersBlock/View.jsx b/src/components/manage/Blocks/FiltersBlock/View.jsx
@@ -440,6 +440,12 @@ const View = ({ content, ...props }) => {
             const filtersMeta = {
               ...state.filtersMeta,
             };
+            const newQueryParams = {
+              advancedFiltering: true,
+              filtersCounter: props.discodata_query.search['filtersCounter']
+                ? props.discodata_query.search['filtersCounter'] + 1
+                : 1,
+            };
             Object.entries(filtersMeta).forEach(([key, meta]) => {
               if (!meta.static) {
                 delete filtersMeta[key];
@@ -523,20 +529,23 @@ const View = ({ content, ...props }) => {
                     ?.map((item) => item.reportingYear)
                     ?.sort((a, b) => b - a) || [];
                 if (reportingYears.length) {
-                  props.setQueryParam({
-                    queryParam: {
-                      [metadata[index].queryToSet]: [reportingYears[0]],
-                      advancedFiltering: true,
-                      filtersCounter: props.discodata_query.search[
-                        'filtersCounter'
-                      ]
-                        ? props.discodata_query.search['filtersCounter'] + 1
-                        : 1,
-                    },
-                  });
+                  newQueryParams[metadata[index].queryToSet] = [
+                    reportingYears[0],
+                  ];
                 }
               }
+              if (metadata[index]?.key === 'countries') {
+                newQueryParams.siteCountryNames = res.data?.results || [];
+              }
             });
+            if (Object.keys(newQueryParams).length > 2) {
+              props.setQueryParam({
+                queryParam: {
+                  ...(newQueryParams || {}),
+                },
+              });
+            }
+
             setLoadingData(false);
             setState({
               ...state,