@aclymatepackages/modules 2.3.1 → 2.4.0

package/dist/components/PdlCompanySelect.js

@@ -9,47 +9,21 @@ require("core-js/modules/es.promise.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireWildcard(require("react"));
 var _material = require("@mui/material");
-var _Check = _interopRequireDefault(require("@mui/icons-material/Check"));
 var _Search = _interopRequireDefault(require("@mui/icons-material/Search"));
 var _atoms = require("@aclymatepackages/atoms");
-var _themes = require("@aclymatepackages/themes");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const CompanySelectionChip = _ref => {
-  let {
-    id,
-    name,
-    isSelected,
-    setSelectedCompanyId
-  } = _ref;
-  return /*#__PURE__*/_react.default.createElement(_material.Grid, {
-    item: true
-  }, /*#__PURE__*/_react.default.createElement(_material.ThemeProvider, {
-    theme: _themes.mainTheme
-  }, /*#__PURE__*/_react.default.createElement(_material.Chip, {
-    label: name,
-    style: {
-      color: isSelected ? "white" : "inherit"
-    },
-    onClick: () => setSelectedCompanyId(currentId => currentId === id ? null : id),
-    icon: isSelected && /*#__PURE__*/_react.default.createElement(_Check.default, {
-      style: {
-        color: "white"
-      }
-    }),
-    color: isSelected ? "primary" : "default"
-  })));
-};
-const PdlCompanySelect = _ref2 => {
+const PdlCompanySelect = _ref => {
   let {
     onCompanyNotFound,
     onCompanySelected,
     onSelectClick = () => {},
     matchingFunction,
     label = "Enter your company's name",
-    actionLabel = "Please select your company from these options"
-  } = _ref2;
+    actionLabel = "Please select your company from these options",
+    helperText
+  } = _ref;
   const [inputValue, setInputValue] = (0, _react.useState)("");
   const [matchingCompanies, setMatchingCompanies] = (0, _react.useState)([]);
   const [inputComplete, setInputComplete] = (0, _react.useState)(false);
@@ -72,10 +46,10 @@ const PdlCompanySelect = _ref2 => {
     await onCompanySelected(companyId, name);
     return onSelectClick();
   };
-  const selectedCompany = matchingCompanies.find(_ref3 => {
+  const selectedCompany = matchingCompanies.find(_ref2 => {
     let {
       id
-    } = _ref3;
+    } = _ref2;
     return selectedCompanyId === id;
   });
   return /*#__PURE__*/_react.default.createElement(_material.Grid, {
@@ -89,14 +63,15 @@ const PdlCompanySelect = _ref2 => {
     label: label,
     value: inputValue,
     setValue: setInputValue,
-    onKeyPress: _ref4 => {
+    onKeyPress: _ref3 => {
       let {
         key
-      } = _ref4;
+      } = _ref3;
       if (key === "Enter") {
         return fetchMatchingCompanies();
       }
     },
+    helperText: helperText || "Press enter or click the search icon to search for matching companies",
     InputProps: {
       endAdornment: /*#__PURE__*/_react.default.createElement(_material.InputAdornment, null, /*#__PURE__*/_react.default.createElement(_material.IconButton, {
         disabled: pdlFetchLoading,
@@ -119,18 +94,10 @@ const PdlCompanySelect = _ref2 => {
     container: true,
     spacing: 2,
     justifyContent: "center"
-  }, matchingCompanies.map((_ref5, idx) => {
-    let {
-      name,
-      id
-    } = _ref5;
-    return /*#__PURE__*/_react.default.createElement(CompanySelectionChip, {
-      key: "company-list-item-".concat(idx),
-      name: name,
-      isSelected: selectedCompanyId === id,
-      setSelectedCompanyId: setSelectedCompanyId,
-      id: id
-    });
+  }, /*#__PURE__*/_react.default.createElement(_atoms.MatchingCompanyChips, {
+    matchingCompanies: matchingCompanies,
+    selectedCompanyId: selectedCompanyId,
+    setSelectedCompanyId: setSelectedCompanyId
   })), /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true,
     container: true,

package/dist/components/PlacesAutocomplete.js

@@ -43,8 +43,7 @@ const PlacesAutocomplete = _ref => {
     id,
     style,
     textFieldProps,
-    coordinates,
-    appCheckToken
+    coordinates
   } = _ref;
   const [inputValue, setInputValue] = (0, _react.useState)("");
   const [options, setOptions] = (0, _react.useState)([]);
@@ -67,7 +66,6 @@ const PlacesAutocomplete = _ref => {
       return data.predictions;
     };
     return await (0, _fetchAclymateApi.default)({
-      appCheckToken,
       path: "/google-maps/autocomplete/".concat(dataString),
       method: "GET",
       signal,

package/dist/components/ReportSummaryBlock.js

@@ -8,7 +8,6 @@ require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireDefault(require("react"));
 var _material = require("@mui/material");
 var _otherHelpers = require("@aclymatepackages/other-helpers");
-var _emissionsCalcs = require("@aclymatepackages/emissions-calcs");
 var _ReportGraphContentLayout = _interopRequireDefault(require("./ReportGraphContentLayout"));
 var _EmissionsPieChart = _interopRequireDefault(require("./EmissionsPieChart"));
 var _EmissionsSummarySentence = _interopRequireDefault(require("./EmissionsSummarySentence"));
@@ -30,7 +29,7 @@ const ReportSummaryBlock = _ref => {
     const {
       scope
     } = scopeObj;
-    const scopeEmissions = (0, _emissionsCalcs.filterEmissionsByScope)(emissions, scope);
+    const scopeEmissions = (0, _otherHelpers.filterEmissionsByScope)(emissions, scope);
     return _objectSpread(_objectSpread({}, scopeObj), {}, {
       emissions: scopeEmissions
     });

package/package.json

@@ -1,22 +1,21 @@
 {
   "name": "@aclymatepackages/modules",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "description": "Aclymate modules",
   "author": "William Loopesko",
   "main": "dist/index.js",
   "dependencies": {
     "@aclymatepackages/array-immutability-helpers": "^1.0.0",
-    "@aclymatepackages/atoms": "^3.1.14",
+    "@aclymatepackages/atoms": "^3.3.2",
     "@aclymatepackages/chart-helpers": "^2.0.8",
     "@aclymatepackages/converters": "^1.0.0",
-    "@aclymatepackages/emissions-calcs": "^1.1.1",
-    "@aclymatepackages/fetch-aclymate-api": "^2.1.8",
+    "@aclymatepackages/fetch-aclymate-api": "^1.0.0",
     "@aclymatepackages/formatters": "^1.0.0",
     "@aclymatepackages/lists": "^1.0.0",
     "@aclymatepackages/multi-part-form": "^2.0.1",
-    "@aclymatepackages/other-helpers": "^1.0.3",
+    "@aclymatepackages/other-helpers": "^1.0.9",
     "@aclymatepackages/reg-exp": "^1.0.0",
-    "@aclymatepackages/subcategories": "^3.1.14",
+    "@aclymatepackages/subcategories": "^3.2.1",
     "@aclymatepackages/themes": "^3.0.9",
     "@babel/preset-react": "^7.16.7",
     "@emotion/react": "^11.11.1",

package/src/components/PdlCompanySelect.js

@@ -2,39 +2,18 @@ import React, { useState } from "react";
 
 import {
   Grid,
-  Chip,
   InputAdornment,
   CircularProgress,
   IconButton,
   Typography,
-  ThemeProvider,
 } from "@mui/material";
-import CheckIcon from "@mui/icons-material/Check";
 import SearchIcon from "@mui/icons-material/Search";
 
-import { TextField, LoadingButton } from "@aclymatepackages/atoms";
-import { mainTheme } from "@aclymatepackages/themes";
-
-const CompanySelectionChip = ({
-  id,
-  name,
-  isSelected,
-  setSelectedCompanyId,
-}) => (
-  <Grid item>
-    <ThemeProvider theme={mainTheme}>
-      <Chip
-        label={name}
-        style={{ color: isSelected ? "white" : "inherit" }}
-        onClick={() =>
-          setSelectedCompanyId((currentId) => (currentId === id ? null : id))
-        }
-        icon={isSelected && <CheckIcon style={{ color: "white" }} />}
-        color={isSelected ? "primary" : "default"}
-      />
-    </ThemeProvider>
-  </Grid>
-);
+import {
+  TextField,
+  LoadingButton,
+  MatchingCompanyChips,
+} from "@aclymatepackages/atoms";
 
 const PdlCompanySelect = ({
   onCompanyNotFound,
@@ -43,6 +22,7 @@ const PdlCompanySelect = ({
   matchingFunction,
   label = "Enter your company's name",
   actionLabel = "Please select your company from these options",
+  helperText,
 }) => {
   const [inputValue, setInputValue] = useState("");
   const [matchingCompanies, setMatchingCompanies] = useState([]);
@@ -89,6 +69,10 @@ const PdlCompanySelect = ({
               return fetchMatchingCompanies();
             }
           }}
+          helperText={
+            helperText ||
+            "Press enter or click the search icon to search for matching companies"
+          }
           InputProps={{
             endAdornment: (
               <InputAdornment>
@@ -116,15 +100,11 @@ const PdlCompanySelect = ({
             </Typography>
           </Grid>
           <Grid item container spacing={2} justifyContent="center">
-            {matchingCompanies.map(({ name, id }, idx) => (
-              <CompanySelectionChip
-                key={`company-list-item-${idx}`}
-                name={name}
-                isSelected={selectedCompanyId === id}
-                setSelectedCompanyId={setSelectedCompanyId}
-                id={id}
-              />
-            ))}
+            <MatchingCompanyChips
+              matchingCompanies={matchingCompanies}
+              selectedCompanyId={selectedCompanyId}
+              setSelectedCompanyId={setSelectedCompanyId}
+            />
           </Grid>
           <Grid item container spacing={2} justifyContent="center">
             <Grid item>

package/src/components/PlacesAutocomplete.js

@@ -23,7 +23,6 @@ const PlacesAutocomplete = ({
   style,
   textFieldProps,
   coordinates,
-  appCheckToken,
 }) => {
   const [inputValue, setInputValue] = useState("");
   const [options, setOptions] = useState([]);
@@ -45,7 +44,6 @@ const PlacesAutocomplete = ({
       };
 
       return await fetchAclymateApi({
-        appCheckToken,
         path: `/google-maps/autocomplete/${dataString}`,
         method: "GET",
         signal,

package/src/components/ReportSummaryBlock.js

@@ -3,7 +3,7 @@ import React from "react";
 import { Typography } from "@mui/material";
 
 import { buildEmissionsSummarySentence } from "@aclymatepackages/other-helpers";
-import { filterEmissionsByScope } from "@aclymatepackages/emissions-calcs";
+import { filterEmissionsByScope } from "@aclymatepackages/other-helpers";
 
 import ReportGraphContentLayout from "./ReportGraphContentLayout";
 import EmissionsPieChart from "./EmissionsPieChart";