@widergy/utilitygo-smart-bill-web 3.0.4 → 3.2.0

package/dist/shared/utils/billCalculation.js

@@ -8,17 +8,16 @@ var _string = require("@widergy/web-utils/lib/string");
 var _periodicities = require("../constants/periodicities");
 var _periods = require("./periods");
 const titleMapper = (billData, texts) => {
-  var _currentPeriod$settle, _currentPeriod$settle2, _currentPeriod$settle3;
   const currentPeriod = (0, _periods.getCurrentPeriod)(billData);
-  const periodicity = currentPeriod === null || currentPeriod === void 0 || (_currentPeriod$settle = currentPeriod.settlements) === null || _currentPeriod$settle === void 0 ? void 0 : _currentPeriod$settle.periodicity;
-  const currentSettlement = (currentPeriod === null || currentPeriod === void 0 || (_currentPeriod$settle2 = currentPeriod.settlements) === null || _currentPeriod$settle2 === void 0 || (_currentPeriod$settle2 = _currentPeriod$settle2.current) === null || _currentPeriod$settle2 === void 0 ? void 0 : _currentPeriod$settle2.number) || '-';
-  const totalSettlements = (currentPeriod === null || currentPeriod === void 0 || (_currentPeriod$settle3 = currentPeriod.settlements) === null || _currentPeriod$settle3 === void 0 ? void 0 : _currentPeriod$settle3.total_settlements) || '-';
-  const periodYear = (currentPeriod === null || currentPeriod === void 0 ? void 0 : currentPeriod.year) || '-';
+  const periodicity = currentPeriod?.settlements?.periodicity;
+  const currentSettlement = currentPeriod?.settlements?.current?.number || '-';
+  const totalSettlements = currentPeriod?.settlements?.total_settlements || '-';
+  const periodYear = currentPeriod?.year || '-';
   return {
     periodicity: (0, _string.stringToCompareWithoutAccentsInclusive)(periodicity, _periodicities.PERIODICITY.BIMONTHLY) ? texts.Base.bimester : '-',
     currentSettlement,
     totalSettlements,
-    periodNumber: (currentPeriod === null || currentPeriod === void 0 ? void 0 : currentPeriod.number) || '-',
+    periodNumber: currentPeriod?.number || '-',
     periodYear
   };
 };

package/dist/shared/utils/consumptions.js

@@ -5,39 +5,28 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getTotalConsumption = exports.getRemainingConsumption = exports.getDailyConsumption = exports.getCurrentConsumption = exports.getConsumptionHistoryData = exports.consumptionDataMapper = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
-var _lodash = _interopRequireDefault(require("lodash"));
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _string = require("@widergy/web-utils/lib/string");
 var _consumptions = require("../constants/consumptions");
 var _periods = require("./periods");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const getCurrentConsumption = (period, energyType) => {
-  var _period$settlements;
-  return (period === null || period === void 0 || (_period$settlements = period.settlements) === null || _period$settlements === void 0 || (_period$settlements = _period$settlements.current) === null || _period$settlements === void 0 || (_period$settlements = _period$settlements.consumptions) === null || _period$settlements === void 0 ? void 0 : _period$settlements.find(consumption => (0, _string.stringToCompareWithoutAccentsInclusive)(consumption.magnitude, energyType))) || {};
-};
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const getCurrentConsumption = (period, energyType) => period?.settlements?.current?.consumptions?.find(consumption => (0, _string.stringToCompareWithoutAccentsInclusive)(consumption.magnitude, energyType)) || {};
 exports.getCurrentConsumption = getCurrentConsumption;
 const getRemainingConsumption = (period, energyType) => {
-  var _period$settlements2;
-  const remaining = (period === null || period === void 0 || (_period$settlements2 = period.settlements) === null || _period$settlements2 === void 0 || (_period$settlements2 = _period$settlements2.remaining) === null || _period$settlements2 === void 0 || (_period$settlements2 = _period$settlements2[0]) === null || _period$settlements2 === void 0 ? void 0 : _period$settlements2.consumptions) || [];
+  const remaining = period?.settlements?.remaining?.[0]?.consumptions || [];
   return remaining.find(item => (0, _string.stringToCompareWithoutAccentsInclusive)(item.magnitude, energyType)) || {};
 };
 exports.getRemainingConsumption = getRemainingConsumption;
-const getTotalConsumption = (period, energyOrPowerType) => {
-  var _period$consumptions;
-  return (period === null || period === void 0 || (_period$consumptions = period.consumptions) === null || _period$consumptions === void 0 ? void 0 : _period$consumptions.find(consumption => (0, _string.stringToCompareWithoutAccentsInclusive)(consumption.type, _consumptions.CONSUMPTION_TYPES.TOTAL) && (0, _string.stringToCompareWithoutAccentsInclusive)(consumption.magnitude, energyOrPowerType))) || {};
-};
+const getTotalConsumption = (period, energyOrPowerType) => period?.consumptions?.find(consumption => (0, _string.stringToCompareWithoutAccentsInclusive)(consumption.type, _consumptions.CONSUMPTION_TYPES.TOTAL) && (0, _string.stringToCompareWithoutAccentsInclusive)(consumption.magnitude, energyOrPowerType)) || {};
 exports.getTotalConsumption = getTotalConsumption;
-const getDailyConsumption = (period, energyType) => {
-  var _period$consumptions2;
-  return (period === null || period === void 0 || (_period$consumptions2 = period.consumptions) === null || _period$consumptions2 === void 0 ? void 0 : _period$consumptions2.find(consumption => (0, _string.stringToCompareWithoutAccentsInclusive)(consumption.type, _consumptions.CONSUMPTION_TYPES.DAILY) && (0, _string.stringToCompareWithoutAccentsInclusive)(consumption.magnitude, energyType))) || {};
-};
+const getDailyConsumption = (period, energyType) => period?.consumptions?.find(consumption => (0, _string.stringToCompareWithoutAccentsInclusive)(consumption.type, _consumptions.CONSUMPTION_TYPES.DAILY) && (0, _string.stringToCompareWithoutAccentsInclusive)(consumption.magnitude, energyType)) || {};
 exports.getDailyConsumption = getDailyConsumption;
-const formatPeriod = period => period.number && period.year && "".concat(period.number, "/").concat((0, _dayjs.default)(period.year, 'YYYY').format('YY'));
+const formatPeriod = period => period.number && period.year && `${period.number}/${(0, _dayjs.default)(period.year, 'YYYY').format('YY')}`;
 const getConsumptionHistoryData = (billDataParameter, energyType, showPeriodsInChronologicalOrder) => {
-  var _billData$periods;
-  const billData = _lodash.default.cloneDeep(billDataParameter);
+  const billData = (0, _cloneDeep.default)(billDataParameter);
   const currentPeriod = (0, _periods.getCurrentPeriod)(billData);
   const lastYearPeriod = (0, _periods.getLastYearPeriod)(billData);
-  const otherPeriods = billData === null || billData === void 0 || (_billData$periods = billData.periods) === null || _billData$periods === void 0 ? void 0 : _billData$periods.filter(period => !(0, _periods.areSamePeriods)(period, currentPeriod) && !(0, _periods.areSamePeriods)(period, lastYearPeriod) && period.consumptions).sort(_periods.comparePeriods);
+  const otherPeriods = billData?.periods?.filter(period => !(0, _periods.areSamePeriods)(period, currentPeriod) && !(0, _periods.areSamePeriods)(period, lastYearPeriod) && period.consumptions).sort(_periods.comparePeriods);
   const periods = [...(lastYearPeriod.consumptions && showPeriodsInChronologicalOrder ? [lastYearPeriod] : []), ...otherPeriods, ...(currentPeriod.consumptions ? [currentPeriod] : []), ...(lastYearPeriod.consumptions && !showPeriodsInChronologicalOrder ? [lastYearPeriod] : [])].filter(period => getTotalConsumption(period, energyType).value === 0 || getTotalConsumption(period, energyType).value).map(period => ({
     period: formatPeriod(period),
     consumption: getTotalConsumption(period, energyType).value,

package/dist/shared/utils/periods.js

@@ -9,7 +9,7 @@ const getCurrentPeriod = billData => (0, _seamlessImmutable.getIn)(billData, ['p
 exports.getCurrentPeriod = getCurrentPeriod;
 const getLastYearPeriod = billData => {
   const currentPeriod = getCurrentPeriod(billData);
-  const lastYear = "".concat(parseInt(currentPeriod.year, 10) - 1);
+  const lastYear = `${parseInt(currentPeriod.year, 10) - 1}`;
   return (0, _seamlessImmutable.getIn)(billData, ['periods'], []).find(period => period.number === currentPeriod.number && period.year === lastYear) || {};
 };
 exports.getLastYearPeriod = getLastYearPeriod;
@@ -35,8 +35,5 @@ const comparePeriods = (period1, period2) => {
   return 0;
 };
 exports.comparePeriods = comparePeriods;
-const getSavingsPercentage = period => {
-  var _period$additional_in;
-  return period === null || period === void 0 || (_period$additional_in = period.additional_information) === null || _period$additional_in === void 0 ? void 0 : _period$additional_in.savings_percentage;
-};
+const getSavingsPercentage = period => period?.additional_information?.savings_percentage;
 exports.getSavingsPercentage = getSavingsPercentage;

package/dist/utils.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.stringOrDash = exports.numberOrDash = exports.formatNumber = void 0;
 var _numeral = _interopRequireDefault(require("config/numeral"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const formatNumber = value => (0, _numeral.default)(value).format('0.[00]');
 exports.formatNumber = formatNumber;
 const numberOrDash = function (number) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widergy/utilitygo-smart-bill-web",
-  "version": "3.0.4",
+  "version": "3.2.0",
   "description": "UtilityGO SmartBill Web",
   "license": "MIT",
   "main": "dist/index.js",