diff --git a/Files for web/About button.png b/Files for web/About button.png deleted file mode 100644 index e9778b59..00000000 Binary files a/Files for web/About button.png and /dev/null differ diff --git a/Files for web/Analyse button.png b/Files for web/Analyse button.png deleted file mode 100644 index edfab04e..00000000 Binary files a/Files for web/Analyse button.png and /dev/null differ diff --git a/Files for web/Chemicals icon.png b/Files for web/Chemicals icon.png deleted file mode 100644 index 4cd921f9..00000000 Binary files a/Files for web/Chemicals icon.png and /dev/null differ diff --git a/Files for web/Download button.png b/Files for web/Download button.png deleted file mode 100644 index 4e1b71b6..00000000 Binary files a/Files for web/Download button.png and /dev/null differ diff --git a/Files for web/EIEP mock up version 2.png b/Files for web/EIEP mock up version 2.png deleted file mode 100644 index 96ff67e6..00000000 Binary files a/Files for web/EIEP mock up version 2.png and /dev/null differ diff --git a/Files for web/Elliptical image.png b/Files for web/Elliptical image.png deleted file mode 100644 index 26b484e6..00000000 Binary files a/Files for web/Elliptical image.png and /dev/null differ diff --git a/Files for web/Energy icon.png b/Files for web/Energy icon.png deleted file mode 100644 index 298e3bf2..00000000 Binary files a/Files for web/Energy icon.png and /dev/null differ diff --git a/Files for web/Explore full image.png b/Files for web/Explore full image.png deleted file mode 100644 index 04732314..00000000 Binary files a/Files for web/Explore full image.png and /dev/null differ diff --git a/Files for web/Food and beverage icon.png b/Files for web/Food and beverage icon.png deleted file mode 100644 index b2716ed6..00000000 Binary files a/Files for web/Food and beverage icon.png and /dev/null differ diff --git a/Files for web/Metals icon.png b/Files for web/Metals icon.png deleted file mode 100644 index a1c8ba9b..00000000 Binary files a/Files for web/Metals icon.png and /dev/null differ diff --git a/Files for web/Minerals icon.png b/Files for web/Minerals icon.png deleted file mode 100644 index b807380e..00000000 Binary files a/Files for web/Minerals icon.png and /dev/null differ diff --git a/Files for web/Other icon.png b/Files for web/Other icon.png deleted file mode 100644 index 762da218..00000000 Binary files a/Files for web/Other icon.png and /dev/null differ diff --git a/Files for web/Paper and wood icon.png b/Files for web/Paper and wood icon.png deleted file mode 100644 index 4f6788fe..00000000 Binary files a/Files for web/Paper and wood icon.png and /dev/null differ diff --git a/Files for web/Waste and wastewater icon.png b/Files for web/Waste and wastewater icon.png deleted file mode 100644 index 53a49ae3..00000000 Binary files a/Files for web/Waste and wastewater icon.png and /dev/null differ diff --git a/src/components/manage/Blocks/FiltersBlock/View.jsx b/src/components/manage/Blocks/FiltersBlock/View.jsx index 2e516ab4..bf70c643 100644 --- 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,