Merge pull request #1674 from ClimateWatch-Vizzuality/fix/ndc-parties…

…-inconsistency Fix/ndc parties inconsistency
ClimateWatch-Vizzuality · Aug 18, 2023 · 7a8c464 · 7a8c464
2 parents a4495c1 + 801446a
commit 7a8c464
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/app/javascript/app/components/ndcs/ndcs-explore-map/ndcs-explore-map-selectors.js b/app/javascript/app/components/ndcs/ndcs-explore-map/ndcs-explore-map-selectors.js
@@ -482,19 +482,20 @@ export const getVulnerabilityData = createSelector(
 );
 
 const getCountriesAndParties = submissions => {
+  const countriesSubmissions = submissions.filter(s => s !== europeSlug);
   const partiesNumber = submissions.length;
-  let countriesNumber = submissions.length;
+  let countriesNumber = countriesSubmissions.length;
 
-  if (!submissions.includes(europeGroupExplorerPagesSlug)) {
-    return { partiesNumber, countriesNumber };
+  if (submissions.includes(europeGroupExplorerPagesSlug)) {
+    const europeanCountriesWithSubmission = intersection(
+      europeanCountries,
+      countriesSubmissions
+    );
+
+    countriesNumber +=
+      europeanCountries.length - (europeanCountriesWithSubmission.length - 1);
   }
-  const europeanCountriesWithSubmission = intersection(
-    europeanCountries,
-    submissions
-  );
 
-  countriesNumber +=
-    europeanCountries.length - (europeanCountriesWithSubmission.length - 1) - 1; // Don't count the EUU
   return { partiesNumber, countriesNumber };
 };
 

diff --git a/app/javascript/app/components/ndcs/shared/selectors.js b/app/javascript/app/components/ndcs/shared/selectors.js
@@ -48,7 +48,13 @@ export const selectedCountriesFunction = (locations, regions, countries) => {
   if (!locations || !locations.length || !regions || !regions.length) {
     return countries;
   }
-  const PARTIES_MISSING_IN_WORLD_SECTION = [...NO_DOCUMENT_SUBMITTED_COUNTRIES];
+
+  const EUURegion = regions.find(r => r.iso_code3 === 'EUU');
+  // EUU as a country is not included in the WORLD section
+  const PARTIES_MISSING_IN_WORLD_SECTION = [
+    ...NO_DOCUMENT_SUBMITTED_COUNTRIES,
+    { iso: europeSlug, label: EUURegion?.label }
+  ];
   const selectedRegionsCountries = locations.reduce((acc, location) => {
     let members = acc;
     if (location.iso === 'TOP') {
@@ -82,9 +88,9 @@ export const selectedCountriesFunction = (locations, regions, countries) => {
         return false;
       });
     }
-
     return members;
   }, []);
+
   const selectedRegionsCountriesISOS = selectedRegionsCountries.map(
     c => c.iso_code3
   );