Merge pull request #1457 from ClimateWatch-Vizzuality/fix/ghg-bunker-…

…fuels-conflict Fix/ghg bunker fuels conflict
ClimateWatch-Vizzuality · Jun 3, 2021 · cbc5d94 · cbc5d94
2 parents cc41d9c + 9a1db44
commit cbc5d94
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v12
+v12.13.0
diff --git a/...app/components/ghg-emissions/ghg-emissions-selectors/ghg-emissions-selectors-conflicts.js b/...app/components/ghg-emissions/ghg-emissions-selectors/ghg-emissions-selectors-conflicts.js
@@ -102,7 +102,8 @@ export const getIncompatibleSectorConflicts = (
       'Energy',
       'Transportation'
     ]);
-    if (incompatibleSectors) {
+
+    if (incompatibleSectors.length) {
       return [
         `Bunker Fuels and ${incompatibleSectors.join(
           ', '

diff --git a/app/javascript/app/pages/ndc-country/ndc-country-component.jsx b/app/javascript/app/pages/ndc-country/ndc-country-component.jsx
@@ -35,7 +35,7 @@ function NDCCountry(props) {
     documentsOptions,
     documentSelected,
     handleDropDownChange,
-    handleDownload,
+    handleDownloadAnalytics,
     match
   } = props;
 
@@ -72,8 +72,10 @@ function NDCCountry(props) {
       onClick={() =>
         documentSelected &&
         documentSelected.url &&
-        handleDownload(documentSelected.url)
+        handleDownloadAnalytics(documentSelected)
       }
+      href={documentSelected && documentSelected.url}
+      target="_blank"
       className={styles.viewDocumentButton}
       disabled={!documentsOptions}
     >
@@ -200,7 +202,7 @@ NDCCountry.propTypes = {
   documentSelected: PropTypes.object,
   countriesOptions: PropTypes.array,
   handleDropDownChange: PropTypes.func,
-  handleDownload: PropTypes.func,
+  handleDownloadAnalytics: PropTypes.func,
   location: PropTypes.object,
   notSummary: PropTypes.bool
 };

diff --git a/app/javascript/app/pages/ndc-country/ndc-country.js b/app/javascript/app/pages/ndc-country/ndc-country.js
@@ -82,18 +82,16 @@ function NDCCountryContainer(props) {
     }
   };
 
-  const handleDownload = downloadUrl => {
-    handleAnalytics('NDC', 'Download document', 'Download original PDF');
-
-    window.location.assign(downloadUrl);
+  const handleDownloadAnalytics = documentSelected => {
+    handleAnalytics('NDC', 'Download document', documentSelected.value);
   };
 
   return createElement(NDCCountryComponent, {
     ...props,
     onSearchChange,
     handleCountryLink,
     handleDropDownChange,
-    handleDownload
+    handleDownloadAnalytics
   });
 }