Merge pull request #1582 from ClimateWatch-Vizzuality/fix/custom-comp…

…are-same-country Fix/custom compare same country
ClimateWatch-Vizzuality · May 24, 2022 · 889d4e9 · 889d4e9
2 parents 67de4ab + 2899d7b
commit 889d4e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -239,7 +239,7 @@ GEM
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     nio4r (2.5.8)
-    nokogiri (1.13.5)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oj (3.6.8)

diff --git a/app/javascript/app/components/custom-compare-accordion/custom-compare-accordion-selectors.js b/app/javascript/app/components/custom-compare-accordion/custom-compare-accordion-selectors.js
@@ -128,16 +128,13 @@ export const getSectoralInformationData = createSelector(
                 ],
                 []
               );
-              const countries = uniq(
-                selectedTargets.map(({ country }) => country)
-              );
 
               Object.entries(groupBy(values, 'group_index')).forEach(
                 ([groupIndex, groupIndexValues]) => {
                   const descriptions = [];
-                  countries.forEach(country => {
+                  selectedTargets.forEach(({ country, document }) => {
                     const valueObject = groupIndexValues.find(
-                      v => v.country === country
+                      v => v.country === country && v.document_slug === document
                     );
                     const value =
                       (valueObject && valueObject.value) ||