@aclymatepackages/modules 1.0.10 → 1.0.13

package/dist/components/EmissionsChart.js

@@ -348,7 +348,8 @@ const EmissionsChart = _ref13 => {
     showTooltip,
     startDate,
     convertCarbonUnits,
-    displayUnitLabel
+    displayUnitLabel,
+    scopes
   } = _ref13;
   const {
     chartLabelsArray,
@@ -357,7 +358,7 @@ const EmissionsChart = _ref13 => {
     subcategoriesArray,
     period,
     groupedEmissions
-  } = (0, _chartHelpers.buildEmissionGroupData)(emissions, graphPeriod, startDate);
+  } = (0, _chartHelpers.buildEmissionGroupData)(emissions, graphPeriod, startDate, scopes);
   const isDataProjected = findIsDataProjected(latestEmissionDate);
   const isFirstPeriodEstimated = findIsFirstPeriodEstimated(chartLabelsArray, graphPeriod);
   const buildProjectionObj = viewMode === "subcategories" ? buildSubcategoriesProjectionObj : buildScopesProjectionObj;

package/dist/components/EmissionsPieChart.js

@@ -63,10 +63,11 @@ const EmissionsPieChart = _ref2 => {
   let {
     dataArray: emissions,
     viewMode = "subcategories",
-    pieChartRef
+    pieChartRef,
+    scopes
   } = _ref2;
   const subcategoriesArray = (0, _subcategories.buildSubcategoriesArray)(emissions);
-  const scopesArray = (0, _subcategories.buildScopesArray)();
+  const scopesArray = scopes || (0, _subcategories.buildScopesArray)();
   const emissionsSum = (0, _otherHelpers.sumTonsCo2e)(emissions);
   const formatChartPieSlices = () => {
     const filterFunction = subcategory => emission => {

package/dist/components/ReportGraphContentLayout.js

@@ -7,7 +7,6 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _material = require("@mui/material");
 var _EmissionsChart = _interopRequireDefault(require("./EmissionsChart"));
-var _ReportContentTitle = _interopRequireDefault(require("./ReportContentTitle"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const ReportGraphContentLayout = _ref => {
   let {
@@ -18,7 +17,8 @@ const ReportGraphContentLayout = _ref => {
     emissions,
     interval = "quarter",
     isPercentageChart,
-    height
+    height,
+    scopes
   } = _ref;
   return /*#__PURE__*/_react.default.createElement(_material.Box, {
     p: 2,
@@ -36,9 +36,9 @@ const ReportGraphContentLayout = _ref => {
     spacing: 2
   }, /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true
-  }, /*#__PURE__*/_react.default.createElement(_ReportContentTitle.default, {
-    title: contentTitle
-  })), contentRows.map((row, idx) => /*#__PURE__*/_react.default.createElement(_material.Grid, {
+  }, /*#__PURE__*/_react.default.createElement(_material.Typography, {
+    variant: "subtitle1"
+  }, contentTitle)), contentRows.map((row, idx) => /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true,
     key: "content-row-".concat(idx)
   }, row))), /*#__PURE__*/_react.default.createElement(_material.Grid, {
@@ -53,7 +53,8 @@ const ReportGraphContentLayout = _ref => {
     unitConverter: tons => tons,
     aspect: 2,
     isPercentageChart: isPercentageChart,
-    showTooltip: false
+    showTooltip: false,
+    scopes: scopes
   }))));
 };
 var _default = exports.default = ReportGraphContentLayout;

package/dist/components/SummaryBlock.js

@@ -6,40 +6,30 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _material = require("@mui/material");
-var _formatters = require("@aclymatepackages/formatters");
-var _otherHelpers = require("@aclymatepackages/other-helpers");
 var _emissionsCalcs = require("@aclymatepackages/emissions-calcs");
+var _otherHelpers = require("@aclymatepackages/other-helpers");
 var _EmissionsPieChart = _interopRequireDefault(require("./EmissionsPieChart"));
 var _ReportContentTitle = _interopRequireDefault(require("./ReportContentTitle"));
 var _ReportGraphContentLayout = _interopRequireDefault(require("./ReportGraphContentLayout"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const EmissionsSummarySentence = _ref => {
-  let {
-    label,
-    emissions
-  } = _ref;
-  return /*#__PURE__*/_react.default.createElement(_material.Typography, {
-    variant: "body2"
-  }, label, ": ", (0, _formatters.formatDecimal)((0, _otherHelpers.sumTonsCo2e)(emissions)), " tons CO2e");
-};
-const SummaryBlock = _ref2 => {
+const SummaryBlock = _ref => {
   let {
     emissions,
     interval
-  } = _ref2;
+  } = _ref;
   return /*#__PURE__*/_react.default.createElement(_ReportGraphContentLayout.default, {
-    contentTitle: "Summary",
+    contentTitle: (0, _otherHelpers.buildEmissionsSummarySentence)({
+      label: "Total Emissions",
+      emissions
+    }),
     interval: interval,
     emissions: emissions,
     contentRows: [/*#__PURE__*/_react.default.createElement(_EmissionsPieChart.default, {
       dataArray: emissions,
       viewMode: "scopes"
-    }), /*#__PURE__*/_react.default.createElement(_ReportContentTitle.default, {
-      title: "Emissions Summary"
-    }), /*#__PURE__*/_react.default.createElement(EmissionsSummarySentence, {
-      label: "Total Emissions",
-      emissions: emissions
-    }), [1, 2, 3].map((scope, idx) => /*#__PURE__*/_react.default.createElement(EmissionsSummarySentence, {
+    }), /*#__PURE__*/_react.default.createElement(_material.Typography, {
+      variant: "subtitle1"
+    }, "Emissions Summary"), [1, 2, 3].map((scope, idx) => /*#__PURE__*/_react.default.createElement(EmissionsSummarySentence, {
       key: "summary-sentence-".concat(idx),
       label: "Total Scope ".concat(scope),
       emissions: (0, _emissionsCalcs.filterEmissionsByScope)(emissions, scope)

package/dist/index.js

@@ -51,12 +51,6 @@ Object.defineProperty(exports, "EmissionsReductionGraph", {
     return _EmissionsReductionGraph.default;
   }
 });
-Object.defineProperty(exports, "EmissionsSummarySentence", {
-  enumerable: true,
-  get: function get() {
-    return _EmissionsSummarySentence.default;
-  }
-});
 Object.defineProperty(exports, "EmissionsSummaryTable", {
   enumerable: true,
   get: function get() {
@@ -146,7 +140,6 @@ var _EmissionsCustomTooltip = _interopRequireDefault(require("./components/Emiss
 var _EmissionsPieChart = _interopRequireDefault(require("./components/EmissionsPieChart"));
 var _useChartWarningLabels = _interopRequireDefault(require("./components/useChartWarningLabels"));
 var _EmissionsSummaryTable = _interopRequireDefault(require("./components/EmissionsSummaryTable"));
-var _EmissionsSummarySentence = _interopRequireDefault(require("./components/EmissionsSummarySentence"));
 var _ReportContentTitle = _interopRequireDefault(require("./components/ReportContentTitle"));
 var _SummaryBlock = _interopRequireDefault(require("./components/SummaryBlock"));
 var _ReportGraphContentLayout = _interopRequireDefault(require("./components/ReportGraphContentLayout"));

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@aclymatepackages/modules",
-  "version": "1.0.10",
+  "version": "1.0.13",
   "description": "Aclymate modules",
   "author": "William Loopesko",
   "main": "dist/index.js",
   "dependencies": {
     "@aclymatepackages/array-immutability-helpers": "^1.0.0",
     "@aclymatepackages/atoms": "^1.0.0",
-    "@aclymatepackages/chart-helpers": "^1.0.3",
+    "@aclymatepackages/chart-helpers": "^1.0.6",
     "@aclymatepackages/constants": "^1.0.0",
     "@aclymatepackages/converters": "^1.0.0",
     "@aclymatepackages/date-helpers": "^1.0.0",

package/src/components/EmissionsChart.js

@@ -412,6 +412,7 @@ const EmissionsChart = ({
   startDate,
   convertCarbonUnits,
   displayUnitLabel,
+  scopes,
 }) => {
   const {
     chartLabelsArray,
@@ -420,7 +421,7 @@ const EmissionsChart = ({
     subcategoriesArray,
     period,
     groupedEmissions,
-  } = buildEmissionGroupData(emissions, graphPeriod, startDate);
+  } = buildEmissionGroupData(emissions, graphPeriod, startDate, scopes);
 
   const isDataProjected = findIsDataProjected(latestEmissionDate);
   const isFirstPeriodEstimated = findIsFirstPeriodEstimated(

package/src/components/EmissionsPieChart.js

@@ -49,9 +49,10 @@ const EmissionsPieChart = ({
   dataArray: emissions,
   viewMode = "subcategories",
   pieChartRef,
+  scopes,
 }) => {
   const subcategoriesArray = buildSubcategoriesArray(emissions);
-  const scopesArray = buildScopesArray();
+  const scopesArray = scopes || buildScopesArray();
 
   const emissionsSum = sumTonsCo2e(emissions);
 

package/src/components/ReportGraphContentLayout.js

@@ -1,9 +1,8 @@
 import React from "react";
 
-import { Box, Grid } from "@mui/material";
+import { Box, Grid, Typography } from "@mui/material";
 
 import EmissionsChart from "./EmissionsChart";
-import ReportContentTitle from "./ReportContentTitle";
 
 const ReportGraphContentLayout = ({
   contentTitle,
@@ -14,13 +13,14 @@ const ReportGraphContentLayout = ({
   interval = "quarter",
   isPercentageChart,
   height,
+  scopes,
 }) => {
   return (
     <Box p={2} style={{ height: height || "auto" }}>
       <Grid container spacing={2}>
         <Grid item sm={4} container direction="column" spacing={2}>
           <Grid item>
-            <ReportContentTitle title={contentTitle} />
+            <Typography variant="subtitle1">{contentTitle}</Typography>
           </Grid>
           {contentRows.map((row, idx) => (
             <Grid item key={`content-row-${idx}`}>
@@ -39,6 +39,7 @@ const ReportGraphContentLayout = ({
             aspect={2}
             isPercentageChart={isPercentageChart}
             showTooltip={false}
+            scopes={scopes}
           />
         </Grid>
       </Grid>

package/src/components/SummaryBlock.js

@@ -2,33 +2,25 @@ import React from "react";
 
 import { Typography } from "@mui/material";
 
-import { formatDecimal } from "@aclymatepackages/formatters";
-import { sumTonsCo2e } from "@aclymatepackages/other-helpers";
 import { filterEmissionsByScope } from "@aclymatepackages/emissions-calcs";
+import { buildEmissionsSummarySentence } from "@aclymatepackages/other-helpers";
 
 import EmissionsPieChart from "./EmissionsPieChart";
 import ReportContentTitle from "./ReportContentTitle";
 import ReportGraphContentLayout from "./ReportGraphContentLayout";
 
-const EmissionsSummarySentence = ({ label, emissions }) => (
-  <Typography variant="body2">
-    {label}: {formatDecimal(sumTonsCo2e(emissions))} tons CO2e
-  </Typography>
-);
-
 const SummaryBlock = ({ emissions, interval }) => {
   return (
     <ReportGraphContentLayout
-      contentTitle="Summary"
+      contentTitle={buildEmissionsSummarySentence({
+        label: "Total Emissions",
+        emissions,
+      })}
       interval={interval}
       emissions={emissions}
       contentRows={[
         <EmissionsPieChart dataArray={emissions} viewMode="scopes" />,
-        <ReportContentTitle title="Emissions Summary" />,
-        <EmissionsSummarySentence
-          label="Total Emissions"
-          emissions={emissions}
-        />,
+        <Typography variant="subtitle1">Emissions Summary</Typography>,
         [1, 2, 3].map((scope, idx) => (
           <EmissionsSummarySentence
             key={`summary-sentence-${idx}`}

package/src/index.js

@@ -15,7 +15,6 @@ import EmissionsCustomTooltip from "./components/EmissionsCustomTooltip";
 import EmissionsPieChart from "./components/EmissionsPieChart";
 import useChartWarningLabels from "./components/useChartWarningLabels";
 import EmissionsSummaryTable from "./components/EmissionsSummaryTable";
-import EmissionsSummarySentence from "./components/EmissionsSummarySentence";
 import ReportContentTitle from "./components/ReportContentTitle";
 import SummaryBlock from "./components/SummaryBlock";
 import ReportGraphContentLayout from "./components/ReportGraphContentLayout";
@@ -38,7 +37,6 @@ export {
   EmissionsPieChart,
   useChartWarningLabels,
   EmissionsSummaryTable,
-  EmissionsSummarySentence,
   ReportContentTitle,
   SummaryBlock,
   ReportGraphContentLayout,