Merge pull request #1724 from ClimateWatch-Vizzuality/master-deploy-3…

…-2-add-new-third-ndc-column Release "Compare All Targets" module changes
ClimateWatch-Vizzuality · Dec 11, 2024 · a1177ce · a1177ce
2 parents 9a5a4e6 + b25a35e
commit a1177ce
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/...javascript/app/components/previous-submission-icon/previous-submission-icon-component.jsx b/...javascript/app/components/previous-submission-icon/previous-submission-icon-component.jsx
@@ -53,9 +53,9 @@ const PreviousSubmissionIcon = ({
   tooltipId
 }) => {
   const iconValue =
-    submissionIconValue || value.startsWith('Yes')
+    submissionIconValue || (value.startsWith('Yes')
       ? 'Yes, enhancement in the revised submission'
-      : value;
+      : value);
 
   const icon = icons[white ? 'white' : 'color'][iconValue];
   if (!icon) return null;

diff --git a/app/javascript/app/data/country-documents.js b/app/javascript/app/data/country-documents.js
@@ -1,12 +1,13 @@
 export const DOCUMENT_COLUMNS_SLUGS = {
-  'Pre-2020 Pledge': 'pledges',
+  // 'Pre-2020 Pledge': 'pledges',
   INDC: 'indc',
   NDC: 'first_ndc',
   'Updated First NDC': 'revised_first_ndc',
   '2nd NDC': 'second_ndc',
-  LTS: 'lts',
-  'Climate Framework Laws or Policies': 'framework',
-  'Sectoral Laws or Policies': 'sectoral'
+  '3rd NDC': 'third_ndc',
+  LTS: 'lts'
+  // 'Climate Framework Laws or Policies': 'framework',
+  // 'Sectoral Laws or Policies': 'sectoral'
 };
 
 // Needed for sorting

diff --git a/...are-all-targets/ndc-compare-all-targets-table/ndc-compare-all-targets-table-component.jsx b/...are-all-targets/ndc-compare-all-targets-table/ndc-compare-all-targets-table-component.jsx
@@ -51,7 +51,7 @@ const cellRenderer = (
   }
 
   if (dataKey === 'Share of global GHG emissions') {
-    return cellData;
+    return <span className={styles.ghgEmissionsColumn}>{cellData}</span>;
   }
 
   switch (cellData) {
@@ -135,10 +135,10 @@ const CompareAllTable = ({
         <Table
           data={tableData}
           tableHeight={550}
-          tableWidthOffset={-100}
+          tableWidthOffset={-82}
           parseHtml
           titleLinks={titleLinks}
-          setColumnWidth={() => 115}
+          setColumnWidth={() => 144}
           setRowsHeight={() => 50}
           defaultColumns={columns}
           theme={compareTableTheme}

diff --git a/...mpare-all-targets/ndc-compare-all-targets-table/ndc-compare-all-targets-table-styles.scss b/...mpare-all-targets/ndc-compare-all-targets-table/ndc-compare-all-targets-table-styles.scss
@@ -31,3 +31,13 @@
   height: 30px;
   width: 30px;
 }
+
+.ghgEmissionsColumn {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-left: 6px;
+  padding-right: 48px;
+}