@aclymatepackages/modules 1.0.26 → 1.0.28

package/dist/components/EmissionsChart.js

@@ -140,8 +140,6 @@ const ReferenceLineLabelChips = _ref8 => {
       top: y - CHIP_HEIGHT_PX / 2,
       left: x - chipWidth / 2,
       background: (0, _converters.hexToRgba)(palette.backgroundGray.main, 0.85)
-      // boxShadow:
-      //   "0px 2px 1px -1px rgba(0,0,0,0.2), 0px 1px 1px 0px rgba(0,0,0,0.14), 0px 1px 3px 0px rgba(0,0,0,0.12)",
     },
     size: "small"
   });
@@ -321,12 +319,11 @@ const EmissionsChart = _ref14 => {
     graphPeriod,
     showTrendline,
     displayUnit,
-    unitConverter,
     aspect,
     isPercentageChart,
     showTooltip = true,
     startDate,
-    convertCarbonUnits,
+    convertCarbonUnits = tons => tons,
     displayUnitLabel,
     branding,
     netZeroPercentage
@@ -384,7 +381,7 @@ const EmissionsChart = _ref14 => {
       });
       return labelChartData(percentageConvertedChartData);
     }
-    const unitConvertedChartData = preliminaryChartData.map(chartDataObj => convertChartDataObject(chartDataObj, value => unitConverter ? unitConverter(value) : convertCarbonUnits(value)));
+    const unitConvertedChartData = preliminaryChartData.map(chartDataObj => convertChartDataObject(chartDataObj, convertCarbonUnits));
     const labeledChartData = labelChartData(unitConvertedChartData);
     if (showTrendline) {
       return addTrendlineToChartData(labeledChartData);
@@ -403,14 +400,14 @@ const EmissionsChart = _ref14 => {
     const firstYearMonthlyEmissionsSum = firstYearMonthlyGroupedEmissions.map(emissions => ({
       tonsCo2e: (0, _otherHelpers.sumTonsCo2e)(emissions)
     }));
-    const monthlyBaseline = (0, _otherHelpers.sumTonsCo2e)(firstYearMonthlyEmissionsSum) / 12;
+    const monthlyBaselineTons = (0, _otherHelpers.sumTonsCo2e)(firstYearMonthlyEmissionsSum) / 12;
     if (graphPeriod === "year") {
-      return monthlyBaseline * 12;
+      return convertCarbonUnits(monthlyBaselineTons * 12);
     }
     if (graphPeriod === "quarter") {
-      return monthlyBaseline * 3;
+      return convertCarbonUnits(monthlyBaselineTons * 3);
     }
-    return monthlyBaseline;
+    return convertCarbonUnits(monthlyBaselineTons);
   };
   const chartArray = viewMode === "scopes" ? scopesArray : subcategoriesArray;
   return /*#__PURE__*/_react.default.createElement(_material.Grid, {

package/dist/components/ReportGraphContentLayout.js

@@ -52,7 +52,6 @@ const ReportGraphContentLayout = _ref => {
     viewMode: chartViewMode,
     graphPeriod: interval,
     displayUnit: "tons",
-    unitConverter: tons => tons,
     aspect: 2,
     isPercentageChart: isPercentageChart,
     showTooltip: showTooltip,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aclymatepackages/modules",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "Aclymate modules",
   "author": "William Loopesko",
   "main": "dist/index.js",

package/src/components/EmissionsChart.js

@@ -132,8 +132,6 @@ const ReferenceLineLabelChips = ({ x, y, label }) => {
         top: y - CHIP_HEIGHT_PX / 2,
         left: x - chipWidth / 2,
         background: hexToRgba(palette.backgroundGray.main, 0.85),
-        // boxShadow:
-        //   "0px 2px 1px -1px rgba(0,0,0,0.2), 0px 1px 1px 0px rgba(0,0,0,0.14), 0px 1px 3px 0px rgba(0,0,0,0.12)",
       }}
       size="small"
     />
@@ -336,12 +334,11 @@ const EmissionsChart = ({
   graphPeriod,
   showTrendline,
   displayUnit,
-  unitConverter,
   aspect,
   isPercentageChart,
   showTooltip = true,
   startDate,
-  convertCarbonUnits,
+  convertCarbonUnits = (tons) => tons,
   displayUnitLabel,
   branding,
   netZeroPercentage,
@@ -414,9 +411,7 @@ const EmissionsChart = ({
     }
 
     const unitConvertedChartData = preliminaryChartData.map((chartDataObj) =>
-      convertChartDataObject(chartDataObj, (value) =>
-        unitConverter ? unitConverter(value) : convertCarbonUnits(value)
-      )
+      convertChartDataObject(chartDataObj, convertCarbonUnits)
     );
 
     const labeledChartData = labelChartData(unitConvertedChartData);
@@ -444,17 +439,17 @@ const EmissionsChart = ({
     const firstYearMonthlyEmissionsSum = firstYearMonthlyGroupedEmissions.map(
       (emissions) => ({ tonsCo2e: sumTonsCo2e(emissions) })
     );
-    const monthlyBaseline = sumTonsCo2e(firstYearMonthlyEmissionsSum) / 12;
+    const monthlyBaselineTons = sumTonsCo2e(firstYearMonthlyEmissionsSum) / 12;
 
     if (graphPeriod === "year") {
-      return monthlyBaseline * 12;
+      return convertCarbonUnits(monthlyBaselineTons * 12);
     }
 
     if (graphPeriod === "quarter") {
-      return monthlyBaseline * 3;
+      return convertCarbonUnits(monthlyBaselineTons * 3);
     }
 
-    return monthlyBaseline;
+    return convertCarbonUnits(monthlyBaselineTons);
   };
 
   const chartArray = viewMode === "scopes" ? scopesArray : subcategoriesArray;

package/src/components/ReportGraphContentLayout.js

@@ -36,7 +36,6 @@ const ReportGraphContentLayout = ({
             viewMode={chartViewMode}
             graphPeriod={interval}
             displayUnit="tons"
-            unitConverter={(tons) => tons}
             aspect={2}
             isPercentageChart={isPercentageChart}
             showTooltip={showTooltip}