@aclymatepackages/modules 1.0.17 → 1.0.18

package/dist/components/CustomTooltipDisplayRow.js

@@ -6,17 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _material = require("@mui/material");
+var _atoms = require("@aclymatepackages/atoms");
 var _formatters = require("@aclymatepackages/formatters");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const CustomTooltipDisplayRow = _ref => {
   let {
     category,
-    Icon,
-    icon,
     customAvatar,
     color,
     name,
-    subtitle
+    subtitle,
+    viewMode,
+    subcategory,
+    scope
   } = _ref;
   return /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true,
@@ -26,16 +28,12 @@ const CustomTooltipDisplayRow = _ref => {
     alignItems: "center"
   }, /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true
-  }, customAvatar || /*#__PURE__*/_react.default.createElement(_material.Avatar, {
-    style: {
-      backgroundColor: color,
-      color: "white"
-    }
-  }, icon, Icon && /*#__PURE__*/_react.default.createElement(Icon, {
-    style: {
-      color: "inherit"
-    }
-  }))), /*#__PURE__*/_react.default.createElement(_material.Grid, {
+  }, customAvatar || /*#__PURE__*/_react.default.createElement(_atoms.CategoriesAvatar, {
+    viewMode: viewMode,
+    color: color,
+    subcategory: subcategory,
+    scope: scope
+  })), /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true,
     container: true,
     direction: "column",

package/dist/components/EmissionsChart.js

@@ -36,7 +36,8 @@ const findObjectValuesSum = object => Object.values(object).reduce((sum, value)
 const buildGroupedChartData = _ref => {
   let {
     groupedEmissions,
-    buildRealDataObj
+    buildRealDataObj,
+    viewMode
   } = _ref;
   return groupedEmissions.map((emissionsArray, idx) => {
     const subcategoriesObj = buildRealDataObj(emissionsArray, _subcategories.allSubcategoriesWithOther);
@@ -59,7 +60,8 @@ const buildGroupedChartData = _ref => {
       warning: buildWarningObj(),
       id: "emissions-chart-group-".concat(idx),
       emissionsSumTons: (0, _otherHelpers.sumTonsCo2e)(emissionsArray),
-      totalEmissionsSumTons: findObjectValuesSum(subcategoriesObj)
+      totalEmissionsSumTons: findObjectValuesSum(subcategoriesObj),
+      viewMode
     });
   });
 };
@@ -212,7 +214,8 @@ const EmissionsChart = _ref10 => {
   const buildChartData = () => {
     const preliminaryChartData = buildGroupedChartData({
       groupedEmissions,
-      buildRealDataObj
+      buildRealDataObj,
+      viewMode
     });
     const convertChartDataObject = (chartDataObj, converter) => Object.fromEntries(Object.entries(chartDataObj).map(_ref11 => {
       let [key, value] = _ref11;

package/dist/components/EmissionsCustomTooltip.js

@@ -82,13 +82,7 @@ const EmissionsCustomTooltip = _ref2 => {
     dataArray = [],
     displayUnitLabel
   } = _ref2;
-  const buildSubtitle = (realCarbonVolume, projectedCarbonVolume) => {
-    const baseSubtitle = "".concat((0, _formatters.formatDecimal)(realCarbonVolume), " ").concat(displayUnitLabel, " CO2");
-    if (!projectedCarbonVolume) {
-      return baseSubtitle;
-    }
-    return "".concat(baseSubtitle, " (").concat((0, _formatters.formatDecimal)(projectedCarbonVolume), " projected)");
-  };
+  const buildSubtitle = realCarbonVolume => "".concat((0, _formatters.formatDecimal)(realCarbonVolume), " ").concat(displayUnitLabel, " CO2");
   const columnDetails = payload === null || payload === void 0 || (_payload$ = payload[0]) === null || _payload$ === void 0 ? void 0 : _payload$.payload;
   const _ref3 = columnDetails || {},
     {
@@ -119,14 +113,11 @@ const EmissionsCustomTooltip = _ref2 => {
     return subcategory;
   }))];
   const subcategoryDisplayArray = uniqueSubcategories.map(subcategory => {
-    var _filteredFormattedGra, _filteredFormattedGra2;
-    const realValue = (_filteredFormattedGra = filteredFormattedGraphValuesArray.find(graphValue => graphValue.subcategory === subcategory && !graphValue.projected)) === null || _filteredFormattedGra === void 0 ? void 0 : _filteredFormattedGra.value;
-    const projectedValue = (_filteredFormattedGra2 = filteredFormattedGraphValuesArray.find(graphValue => graphValue.subcategory === subcategory && !!graphValue.projected)) === null || _filteredFormattedGra2 === void 0 ? void 0 : _filteredFormattedGra2.value;
+    var _filteredFormattedGra;
+    const realValue = (_filteredFormattedGra = filteredFormattedGraphValuesArray.find(graphValue => graphValue.subcategory === subcategory)) === null || _filteredFormattedGra === void 0 ? void 0 : _filteredFormattedGra.value;
     return {
       subcategory,
-      realValue,
-      projectedValue,
-      subtitle: buildSubtitle(realValue, projectedValue)
+      subtitle: buildSubtitle(realValue)
     };
   });
   const displayArrayWithIcons = subcategoryDisplayArray.map(_ref7 => {
@@ -135,15 +126,11 @@ const EmissionsCustomTooltip = _ref2 => {
       } = _ref7,
       otherProps = _objectWithoutProperties(_ref7, _excluded2);
     const {
-      Icon,
       color,
-      icon,
       name
     } = categoriesArray.find(categoryObj => categoryObj.subcategory === subcategory) || {};
     return _objectSpread({
       subcategory,
-      Icon,
-      icon,
       color,
       name
     }, otherProps);

package/dist/components/EmissionsPieChart.js

@@ -30,9 +30,10 @@ const PieChartCustomTooltip = _ref => {
   const {
     name,
     emissionPercentage,
-    color,
-    icon,
-    Icon
+    scope,
+    subcategory,
+    viewMode,
+    color
   } = payload;
   return /*#__PURE__*/_react.default.createElement(_atoms.DefaultPaper, null, /*#__PURE__*/_react.default.createElement(_material.Grid, {
     container: true,
@@ -40,16 +41,12 @@ const PieChartCustomTooltip = _ref => {
     alignItems: "center"
   }, /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true
-  }, /*#__PURE__*/_react.default.createElement(_material.Avatar, {
-    style: {
-      backgroundColor: color,
-      color: "white"
-    }
-  }, icon, Icon && /*#__PURE__*/_react.default.createElement(Icon, {
-    style: {
-      color: "inherit"
-    }
-  }))), /*#__PURE__*/_react.default.createElement(_material.Grid, {
+  }, /*#__PURE__*/_react.default.createElement(_atoms.CategoriesAvatar, {
+    scope: scope,
+    subcategory: subcategory,
+    viewMode: viewMode,
+    color: color
+  })), /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true
   }, /*#__PURE__*/_react.default.createElement(_material.Typography, {
     variant: "subtitle1",
@@ -92,6 +89,7 @@ const EmissionsPieChart = _ref2 => {
       const emissionsWithThisCategory = emissions.filter(filterFunction(subcategory));
       const categoryEmissionsSum = (0, _otherHelpers.sumTonsCo2e)(emissionsWithThisCategory);
       return _objectSpread(_objectSpread({}, subcategoryObj), {}, {
+        viewMode,
         emissionPercentage: categoryEmissionsSum / emissionsSum * 100
       });
     });

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@aclymatepackages/modules",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "Aclymate modules",
   "author": "William Loopesko",
   "main": "dist/index.js",
   "dependencies": {
     "@aclymatepackages/array-immutability-helpers": "^1.0.0",
-    "@aclymatepackages/atoms": "^1.0.10",
+    "@aclymatepackages/atoms": "^1.0.14",
     "@aclymatepackages/chart-helpers": "^1.0.10",
     "@aclymatepackages/converters": "^1.0.0",
     "@aclymatepackages/emissions-calcs": "^1.1.1",

package/src/components/CustomTooltipDisplayRow.js

@@ -1,25 +1,29 @@
 import React from "react";
 
-import { Grid, Typography, Avatar } from "@mui/material";
+import { Grid, Typography } from "@mui/material";
 
+import { CategoriesAvatar } from "@aclymatepackages/atoms";
 import { ucFirstLetters } from "@aclymatepackages/formatters";
 
 const CustomTooltipDisplayRow = ({
   category,
-  Icon,
-  icon,
   customAvatar,
   color,
   name,
   subtitle,
+  viewMode,
+  subcategory,
+  scope,
 }) => (
   <Grid item container spacing={1} wrap="nowrap" alignItems="center">
     <Grid item>
       {customAvatar || (
-        <Avatar style={{ backgroundColor: color, color: "white" }}>
-          {icon}
-          {Icon && <Icon style={{ color: "inherit" }} />}
-        </Avatar>
+        <CategoriesAvatar
+          viewMode={viewMode}
+          color={color}
+          subcategory={subcategory}
+          scope={scope}
+        />
       )}
     </Grid>
     <Grid item container direction="column" wrap="nowrap">

package/src/components/EmissionsChart.js

@@ -37,7 +37,11 @@ dayjs.extend(dayOfYear);
 const findObjectValuesSum = (object) =>
   Object.values(object).reduce((sum, value) => sum + value, 0);
 
-const buildGroupedChartData = ({ groupedEmissions, buildRealDataObj }) => {
+const buildGroupedChartData = ({
+  groupedEmissions,
+  buildRealDataObj,
+  viewMode,
+}) => {
   return groupedEmissions.map((emissionsArray, idx) => {
     const subcategoriesObj = buildRealDataObj(
       emissionsArray,
@@ -63,6 +67,7 @@ const buildGroupedChartData = ({ groupedEmissions, buildRealDataObj }) => {
       id: `emissions-chart-group-${idx}`,
       emissionsSumTons: sumTonsCo2e(emissionsArray),
       totalEmissionsSumTons: findObjectValuesSum(subcategoriesObj),
+      viewMode,
     };
   });
 };
@@ -214,6 +219,7 @@ const EmissionsChart = ({
     const preliminaryChartData = buildGroupedChartData({
       groupedEmissions,
       buildRealDataObj,
+      viewMode,
     });
 
     const convertChartDataObject = (chartDataObj, converter) =>

package/src/components/EmissionsCustomTooltip.js

@@ -50,19 +50,8 @@ const EmissionsCustomTooltip = ({
   dataArray = [],
   displayUnitLabel,
 }) => {
-  const buildSubtitle = (realCarbonVolume, projectedCarbonVolume) => {
-    const baseSubtitle = `${formatDecimal(
-      realCarbonVolume
-    )} ${displayUnitLabel} CO2`;
-
-    if (!projectedCarbonVolume) {
-      return baseSubtitle;
-    }
-
-    return `${baseSubtitle} (${formatDecimal(
-      projectedCarbonVolume
-    )} projected)`;
-  };
+  const buildSubtitle = (realCarbonVolume) =>
+    `${formatDecimal(realCarbonVolume)} ${displayUnitLabel} CO2`;
 
   const columnDetails = payload?.[0]?.payload;
   const {
@@ -90,30 +79,22 @@ const EmissionsCustomTooltip = ({
 
   const subcategoryDisplayArray = uniqueSubcategories.map((subcategory) => {
     const realValue = filteredFormattedGraphValuesArray.find(
-      (graphValue) =>
-        graphValue.subcategory === subcategory && !graphValue.projected
-    )?.value;
-
-    const projectedValue = filteredFormattedGraphValuesArray.find(
-      (graphValue) =>
-        graphValue.subcategory === subcategory && !!graphValue.projected
+      (graphValue) => graphValue.subcategory === subcategory
     )?.value;
 
     return {
       subcategory,
-      realValue,
-      projectedValue,
-      subtitle: buildSubtitle(realValue, projectedValue),
+      subtitle: buildSubtitle(realValue),
     };
   });
 
   const displayArrayWithIcons = subcategoryDisplayArray
     .map(({ subcategory, ...otherProps }) => {
-      const { Icon, color, icon, name } =
+      const { color, name } =
         categoriesArray.find(
           (categoryObj) => categoryObj.subcategory === subcategory
         ) || {};
-      return { subcategory, Icon, icon, color, name, ...otherProps };
+      return { subcategory, color, name, ...otherProps };
     })
     .filter(({ color }) => color);
 

package/src/components/EmissionsPieChart.js

@@ -8,9 +8,9 @@ import {
   Cell,
 } from "recharts";
 
-import { Typography, Grid, Avatar } from "@mui/material";
+import { Typography, Grid } from "@mui/material";
 
-import { DefaultPaper } from "@aclymatepackages/atoms";
+import { DefaultPaper, CategoriesAvatar } from "@aclymatepackages/atoms";
 import { formatDecimal } from "@aclymatepackages/formatters";
 import { sumTonsCo2e } from "@aclymatepackages/other-helpers";
 import {
@@ -21,16 +21,19 @@ import {
 const PieChartCustomTooltip = ({ payload: passedPayload }) => {
   const [payloadObj] = passedPayload;
   const { payload = {} } = payloadObj || [{}];
-  const { name, emissionPercentage, color, icon, Icon } = payload;
+  const { name, emissionPercentage, scope, subcategory, viewMode, color } =
+    payload;
 
   return (
     <DefaultPaper>
       <Grid container spacing={2} alignItems="center">
         <Grid item>
-          <Avatar style={{ backgroundColor: color, color: "white" }}>
-            {icon}
-            {Icon && <Icon style={{ color: "inherit" }} />}
-          </Avatar>
+          <CategoriesAvatar
+            scope={scope}
+            subcategory={subcategory}
+            viewMode={viewMode}
+            color={color}
+          />
         </Grid>
         <Grid item>
           <Typography variant="subtitle1" color="textPrimary">
@@ -84,6 +87,7 @@ const EmissionsPieChart = ({
 
       return {
         ...subcategoryObj,
+        viewMode,
         emissionPercentage: (categoryEmissionsSum / emissionsSum) * 100,
       };
     });