dtable-statistic 4.2.1 → 4.3.0

package/es/calculator/workers/card-calculator-worker.js

@@ -2,20 +2,22 @@ import { isNumber, isNumericColumn, TableUtils, Views } from 'dtable-store';
 import { getSummaryResult } from '../../utils/common-utils';
 import { getCellValue } from '../../utils/row-utils';
 function calculateResult(chart, dtableValue, username, userId) {
-  var table_id = chart.table_id,
-    view_id = chart.view_id,
-    numeric_column = chart.numeric_column,
-    summary_method = chart.summary_method;
-  var selectedTable = TableUtils.getTableById(dtableValue.tables, table_id);
-  var selectedView = selectedTable && Views.getViewById(selectedTable.views, view_id);
-  var selectedColumn = TableUtils.getTableColumnByKey(selectedTable, numeric_column);
-  var _isNumericColumn = selectedColumn && isNumericColumn(selectedColumn);
-  var statRows = Views.getViewRows(selectedView, selectedTable, dtableValue, username, userId);
-  var formulaRows = _isNumericColumn ? Views.getTableFormulaResults(selectedTable, statRows, dtableValue) : {};
-  var numberList = [];
-  _isNumericColumn && statRows.forEach(function (row) {
-    var formulaRow = formulaRows[row._id];
-    var cellValue = getCellValue(row, formulaRow, selectedColumn);
+  const {
+    table_id,
+    view_id,
+    numeric_column,
+    summary_method
+  } = chart;
+  const selectedTable = TableUtils.getTableById(dtableValue.tables, table_id);
+  const selectedView = selectedTable && Views.getViewById(selectedTable.views, view_id);
+  const selectedColumn = TableUtils.getTableColumnByKey(selectedTable, numeric_column);
+  const _isNumericColumn = selectedColumn && isNumericColumn(selectedColumn);
+  const statRows = Views.getViewRows(selectedView, selectedTable, dtableValue, username, userId);
+  const formulaRows = _isNumericColumn ? Views.getTableFormulaResults(selectedTable, statRows, dtableValue) : {};
+  const numberList = [];
+  _isNumericColumn && statRows.forEach(row => {
+    const formulaRow = formulaRows[row._id];
+    const cellValue = getCellValue(row, formulaRow, selectedColumn);
     if (isNumber(cellValue)) {
       numberList.push(cellValue);
     }

package/es/calculator/workers/combination-calculator-worker.js

@@ -1,41 +1,41 @@
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { isNumber, TableUtils, Views } from 'dtable-store';
 import StatUtils from '../../utils/stat-utils';
 import { getSummaryResult, isArrayCellValue } from '../../utils/common-utils';
 import { LABEL_COLORS, SUMMARY_TYPE } from '../../constants';
 import { getCellValue, getFormattedLabel } from '../../utils/row-utils';
 export default function calculateResult(chart, value, username, userId) {
-  var table_id = chart.table_id,
-    view_id = chart.view_id,
-    x_axis_column_key = chart.x_axis_column_key,
-    x_axis_include_empty = chart.x_axis_include_empty,
-    groupby_date_granularity = chart.x_axis_date_granularity,
-    groupby_geolocation_granularity = chart.x_axis_geolocation_granularity,
-    y_axis_left_summary_column = chart.y_axis_left_summary_column,
-    y_axis_right_summary_column = chart.y_axis_right_summary_column,
-    y_axis_left_summary_type = chart.y_axis_left_summary_type,
-    y_axis_right_summary_type = chart.y_axis_right_summary_type,
-    y_axis_left_summary_method = chart.y_axis_left_summary_method,
-    y_axis_right_summary_method = chart.y_axis_right_summary_method,
-    y_axis_left_group_by_multiple_numeric_column = chart.y_axis_left_group_by_multiple_numeric_column,
-    y_axis_left_group_by_numeric_columns = chart.y_axis_left_group_by_numeric_columns;
-  var table = TableUtils.getTableById(value.tables, table_id);
-  var view = table && Views.getViewById(table.views, view_id);
+  const {
+    table_id,
+    view_id,
+    x_axis_column_key,
+    x_axis_include_empty,
+    x_axis_date_granularity: groupby_date_granularity,
+    x_axis_geolocation_granularity: groupby_geolocation_granularity,
+    y_axis_left_summary_column,
+    y_axis_right_summary_column,
+    y_axis_left_summary_type,
+    y_axis_right_summary_type,
+    y_axis_left_summary_method,
+    y_axis_right_summary_method,
+    y_axis_left_group_by_multiple_numeric_column,
+    y_axis_left_group_by_numeric_columns
+  } = chart;
+  const table = TableUtils.getTableById(value.tables, table_id);
+  const view = table && Views.getViewById(table.views, view_id);
   if (!view) {
     return [];
   }
-  var xAxisColumn = TableUtils.getTableColumnByKey(table, x_axis_column_key);
+  const xAxisColumn = TableUtils.getTableColumnByKey(table, x_axis_column_key);
   if (!xAxisColumn) return [];
-  var statRows = Views.getViewRows(view, table, value, username, userId);
-  var formulaRows = Views.getTableFormulaResults(table, statRows, value);
-  var column1 = TableUtils.getTableColumnByKey(table, y_axis_left_summary_column);
-  var column2 = TableUtils.getTableColumnByKey(table, y_axis_right_summary_column);
-  var leftResultMap = new Map();
-  var rightResultMap = new Map();
-  var isColumnDataAsAnArray = isArrayCellValue(xAxisColumn);
-  var leftSummaryColumn = {};
-  var leftSummaryColumnKeys = [];
+  const statRows = Views.getViewRows(view, table, value, username, userId);
+  const formulaRows = Views.getTableFormulaResults(table, statRows, value);
+  const column1 = TableUtils.getTableColumnByKey(table, y_axis_left_summary_column);
+  const column2 = TableUtils.getTableColumnByKey(table, y_axis_right_summary_column);
+  const leftResultMap = new Map();
+  const rightResultMap = new Map();
+  let isColumnDataAsAnArray = isArrayCellValue(xAxisColumn);
+  let leftSummaryColumn = {};
+  let leftSummaryColumnKeys = [];
   if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED) {
     if (column1) {
       leftSummaryColumn[y_axis_left_summary_column] = {
@@ -47,8 +47,8 @@ export default function calculateResult(chart, value, username, userId) {
       };
     }
     if (y_axis_left_group_by_multiple_numeric_column) {
-      y_axis_left_group_by_numeric_columns.forEach(function (item, index) {
-        var summaryColumn = TableUtils.getTableColumnByKey(table, item.column_key);
+      y_axis_left_group_by_numeric_columns.forEach((item, index) => {
+        const summaryColumn = TableUtils.getTableColumnByKey(table, item.column_key);
         if (summaryColumn) {
           leftSummaryColumn[item.column_key] = {
             method: item.summary_method,
@@ -62,30 +62,32 @@ export default function calculateResult(chart, value, username, userId) {
     }
     leftSummaryColumnKeys = Object.keys(leftSummaryColumn);
   }
-  statRows.forEach(function (row) {
-    var rowId = row._id;
-    var formulaRow = formulaRows[rowId];
-    var currentValue = row[xAxisColumn.key];
-    var label = StatUtils.getGroupLabel(currentValue, formulaRow, xAxisColumn, groupby_date_granularity, groupby_geolocation_granularity, value);
+  statRows.forEach(row => {
+    let {
+      _id: rowId
+    } = row;
+    let formulaRow = formulaRows[rowId];
+    const currentValue = row[xAxisColumn.key];
+    let label = StatUtils.getGroupLabel(currentValue, formulaRow, xAxisColumn, groupby_date_granularity, groupby_geolocation_granularity, value);
 
     // collect left y axis data
     if (y_axis_left_summary_type === SUMMARY_TYPE.COUNT) {
       if (isColumnDataAsAnArray) {
         if (label.length > 0) {
-          label.forEach(function (name) {
-            var currentValue = leftResultMap.get(name) || 0;
+          label.forEach(name => {
+            let currentValue = leftResultMap.get(name) || 0;
             currentValue = currentValue + 1;
             leftResultMap.set(name, currentValue);
           });
         }
         if (label.length === 0 && x_axis_include_empty) {
-          var _currentValue = leftResultMap.get(null) || 0;
-          _currentValue += 1;
-          leftResultMap.set(null, _currentValue);
+          let currentValue = leftResultMap.get(null) || 0;
+          currentValue += 1;
+          leftResultMap.set(null, currentValue);
         }
       } else {
         if (x_axis_include_empty || label) {
-          var currentLabelCount = leftResultMap.get(label) || 0;
+          let currentLabelCount = leftResultMap.get(label) || 0;
           currentLabelCount = currentLabelCount + 1;
           leftResultMap.set(label, currentLabelCount);
         }
@@ -94,13 +96,14 @@ export default function calculateResult(chart, value, username, userId) {
     if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED) {
       if (isColumnDataAsAnArray) {
         if (label.length > 0) {
-          label.forEach(function (name) {
-            var currentLabelMap = leftResultMap.get(name) || {};
-            leftSummaryColumnKeys.forEach(function (key) {
-              var cellValue = getCellValue(row, formulaRow, _objectSpread(_objectSpread({}, leftSummaryColumn[key]), {}, {
-                key: key
-              }));
-              var currentLabelList = currentLabelMap[key] || [];
+          label.forEach(name => {
+            const currentLabelMap = leftResultMap.get(name) || {};
+            leftSummaryColumnKeys.forEach(key => {
+              const cellValue = getCellValue(row, formulaRow, {
+                ...leftSummaryColumn[key],
+                key
+              });
+              const currentLabelList = currentLabelMap[key] || [];
               if (isNumber(cellValue)) {
                 currentLabelList.push(cellValue);
               }
@@ -110,33 +113,35 @@ export default function calculateResult(chart, value, username, userId) {
           });
         }
         if (label.length === 0 && x_axis_include_empty) {
-          var _currentValue2 = leftResultMap.get(null) || {};
-          leftSummaryColumnKeys.forEach(function (key) {
-            var cellValue = getCellValue(row, formulaRow, _objectSpread(_objectSpread({}, leftSummaryColumn[key]), {}, {
-              key: key
-            }));
-            var currentLabelList = _currentValue2[key] || [];
+          let currentValue = leftResultMap.get(null) || {};
+          leftSummaryColumnKeys.forEach(key => {
+            const cellValue = getCellValue(row, formulaRow, {
+              ...leftSummaryColumn[key],
+              key
+            });
+            const currentLabelList = currentValue[key] || [];
             if (isNumber(cellValue)) {
               currentLabelList.push(cellValue);
             }
-            _currentValue2[key] = currentLabelList;
+            currentValue[key] = currentLabelList;
           });
-          leftResultMap.set(null, _currentValue2);
+          leftResultMap.set(null, currentValue);
         }
       } else {
         if (x_axis_include_empty || label) {
-          var _currentValue3 = leftResultMap.get(label) || {};
-          leftSummaryColumnKeys.forEach(function (key) {
-            var cellValue = getCellValue(row, formulaRow, _objectSpread(_objectSpread({}, leftSummaryColumn[key]), {}, {
-              key: key
-            }));
-            var currentList = _currentValue3[key] || [];
+          const currentValue = leftResultMap.get(label) || {};
+          leftSummaryColumnKeys.forEach(key => {
+            const cellValue = getCellValue(row, formulaRow, {
+              ...leftSummaryColumn[key],
+              key
+            });
+            const currentList = currentValue[key] || [];
             if (isNumber(cellValue)) {
               currentList.push(cellValue);
             }
-            _currentValue3[key] = currentList;
+            currentValue[key] = currentList;
           });
-          leftResultMap.set(label, _currentValue3);
+          leftResultMap.set(label, currentValue);
         }
       }
     }
@@ -145,31 +150,31 @@ export default function calculateResult(chart, value, username, userId) {
     if (y_axis_right_summary_type === SUMMARY_TYPE.COUNT) {
       if (isColumnDataAsAnArray) {
         if (label.length > 0) {
-          label.forEach(function (name) {
-            var currentValue = rightResultMap.get(name) || 0;
+          label.forEach(name => {
+            let currentValue = rightResultMap.get(name) || 0;
             currentValue = currentValue + 1;
             rightResultMap.set(name, currentValue);
           });
         }
         if (label.length === 0 && x_axis_include_empty) {
-          var _currentValue4 = rightResultMap.get(null) || 0;
-          _currentValue4 += 1;
-          rightResultMap.set(null, _currentValue4);
+          let currentValue = rightResultMap.get(null) || 0;
+          currentValue += 1;
+          rightResultMap.set(null, currentValue);
         }
       } else {
         if (x_axis_include_empty || label) {
-          var _currentLabelCount = rightResultMap.get(label) || 0;
-          _currentLabelCount = _currentLabelCount + 1;
-          rightResultMap.set(label, _currentLabelCount);
+          let currentLabelCount = rightResultMap.get(label) || 0;
+          currentLabelCount = currentLabelCount + 1;
+          rightResultMap.set(label, currentLabelCount);
         }
       }
     }
     if (y_axis_right_summary_column && y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
-      var cellValue = getCellValue(row, formulaRow, column2);
+      const cellValue = getCellValue(row, formulaRow, column2);
       if (isColumnDataAsAnArray) {
         if (label.length > 0) {
-          label.forEach(function (name) {
-            var currentLabelList = rightResultMap.get(name) || [];
+          label.forEach(name => {
+            const currentLabelList = rightResultMap.get(name) || [];
             if (isNumber(cellValue)) {
               currentLabelList.push(cellValue);
             }
@@ -177,15 +182,15 @@ export default function calculateResult(chart, value, username, userId) {
           });
         }
         if (label.length === 0 && x_axis_include_empty) {
-          var _currentValue5 = rightResultMap.get(null) || [];
+          let currentValue = rightResultMap.get(null) || [];
           if (isNumber(cellValue)) {
-            _currentValue5.push(cellValue);
+            currentValue.push(cellValue);
           }
-          rightResultMap.set(null, _currentValue5);
+          rightResultMap.set(null, currentValue);
         }
       } else {
         if (x_axis_include_empty || label) {
-          var currentLabelList = rightResultMap.get(label) || [];
+          const currentLabelList = rightResultMap.get(label) || [];
           if (isNumber(cellValue)) {
             currentLabelList.push(cellValue);
           }
@@ -196,76 +201,64 @@ export default function calculateResult(chart, value, username, userId) {
   });
 
   // Summary collect data
-  var results = [];
-  var targetMap = leftResultMap;
+  let results = [];
+  let targetMap = leftResultMap;
   if (leftSummaryColumnKeys.length === 0 && y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED) {
     targetMap = rightResultMap;
   }
-  var _iterator = _createForOfIteratorHelper(targetMap),
-    _step;
-  try {
-    var _loop = function _loop() {
-      var item = _step.value;
-      var key = item[0];
-      var leftValue = item[1];
-      var value1 = 0;
-      var value2 = 0;
-      var formattedValueLeft = value1;
-      var formattedValueRight = value2;
-      var rightValue = rightResultMap.get(key);
-      if (y_axis_right_summary_type === SUMMARY_TYPE.COUNT) {
-        value2 = rightValue;
-        formattedValueRight = value2;
+  for (let item of targetMap) {
+    const key = item[0];
+    const leftValue = item[1];
+    let value1 = 0;
+    let value2 = 0;
+    let formattedValueLeft = value1;
+    let formattedValueRight = value2;
+    const rightValue = rightResultMap.get(key);
+    if (y_axis_right_summary_type === SUMMARY_TYPE.COUNT) {
+      value2 = rightValue;
+      formattedValueRight = value2;
+    }
+    if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
+      value2 = getSummaryResult(rightValue, y_axis_right_summary_method);
+      formattedValueRight = StatUtils.getFormattedValue(value2, column2, y_axis_right_summary_method);
+    }
+    if (!y_axis_left_group_by_multiple_numeric_column) {
+      if (y_axis_left_summary_type === SUMMARY_TYPE.COUNT) {
+        value1 = leftValue;
+        formattedValueLeft = value1;
       }
-      if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
-        value2 = getSummaryResult(rightValue, y_axis_right_summary_method);
-        formattedValueRight = StatUtils.getFormattedValue(value2, column2, y_axis_right_summary_method);
+      if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED) {
+        const list = leftValue[column1.key];
+        value1 = getSummaryResult(list, y_axis_left_summary_method);
+        formattedValueLeft = StatUtils.getFormattedValue(value1, column1, y_axis_left_summary_method);
       }
-      if (!y_axis_left_group_by_multiple_numeric_column) {
-        if (y_axis_left_summary_type === SUMMARY_TYPE.COUNT) {
-          value1 = leftValue;
-          formattedValueLeft = value1;
-        }
-        if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED) {
-          var list = leftValue[column1.key];
-          value1 = getSummaryResult(list, y_axis_left_summary_method);
-          formattedValueLeft = StatUtils.getFormattedValue(value1, column1, y_axis_left_summary_method);
-        }
+      results.push({
+        name: key,
+        value_left: value1,
+        value_right: value2,
+        formatted_value_left: formattedValueLeft,
+        formatted_value_right: formattedValueRight
+      });
+    } else {
+      leftSummaryColumnKeys.forEach(columnKey => {
+        const summaryColumn = leftSummaryColumn[columnKey];
+        const summaryMethod = summaryColumn.method;
+        const list = leftValue[columnKey];
+        const value = getSummaryResult(list, summaryMethod);
+        formattedValueLeft = StatUtils.getFormattedValue(value, summaryColumn, summaryMethod);
         results.push({
           name: key,
-          value_left: value1,
+          value_left: value,
+          color: leftSummaryColumn[columnKey].color,
           value_right: value2,
           formatted_value_left: formattedValueLeft,
           formatted_value_right: formattedValueRight
         });
-      } else {
-        leftSummaryColumnKeys.forEach(function (columnKey) {
-          var summaryColumn = leftSummaryColumn[columnKey];
-          var summaryMethod = summaryColumn.method;
-          var list = leftValue[columnKey];
-          var value = getSummaryResult(list, summaryMethod);
-          formattedValueLeft = StatUtils.getFormattedValue(value, summaryColumn, summaryMethod);
-          results.push({
-            name: key,
-            value_left: value,
-            color: leftSummaryColumn[columnKey].color,
-            value_right: value2,
-            formatted_value_left: formattedValueLeft,
-            formatted_value_right: formattedValueRight
-          });
-        });
-      }
-    };
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      _loop();
+      });
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
   }
   StatUtils.sortStatistics(results, xAxisColumn, 'name');
-  results.forEach(function (item) {
+  results.forEach(item => {
     item.name = getFormattedLabel(xAxisColumn, item.name, value.collaborators);
   });
   return results;

package/es/calculator/workers/compare-bar-chart-calculator-worker.js

@@ -1,145 +1,129 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import { TableUtils, Views } from 'dtable-store';
 import StatUtils from '../../utils/stat-utils';
 import { getSummaryResult } from '../../utils/common-utils';
 import { getCellValue } from '../../utils/row-utils';
 import { SUMMARY_TYPE } from '../../constants';
 function calculateChart(chart, value, username, userId) {
-  var table_id = chart.table_id,
-    view_id = chart.view_id,
-    x_axis_column_key = chart.x_axis_column_key,
-    y_axis_summary_type = chart.y_axis_summary_type,
-    y_axis_summary_method = chart.y_axis_summary_method,
-    y_axis_column_key = chart.y_axis_column_key,
-    x_axis_date_granularity = chart.x_axis_date_granularity,
-    x_axis_date_range_start = chart.x_axis_date_range_start,
-    x_axis_date_range_end = chart.x_axis_date_range_end,
-    x_axis_compared_date_range_start = chart.x_axis_compared_date_range_start,
-    x_axis_compared_date_range_end = chart.x_axis_compared_date_range_end,
-    display_increase = chart.display_increase;
-  var groupName1 = "".concat(x_axis_date_range_start, " - ").concat(x_axis_date_range_end);
-  var groupName2 = "".concat(x_axis_compared_date_range_start, " - ").concat(x_axis_compared_date_range_end);
-  var table = TableUtils.getTableById(value.tables, table_id);
-  var view = table && Views.getViewById(table.views, view_id);
+  const {
+    table_id,
+    view_id,
+    x_axis_column_key,
+    y_axis_summary_type,
+    y_axis_summary_method,
+    y_axis_column_key,
+    x_axis_date_granularity,
+    x_axis_date_range_start,
+    x_axis_date_range_end,
+    x_axis_compared_date_range_start,
+    x_axis_compared_date_range_end,
+    display_increase
+  } = chart;
+  const groupName1 = "".concat(x_axis_date_range_start, " - ").concat(x_axis_date_range_end);
+  const groupName2 = "".concat(x_axis_compared_date_range_start, " - ").concat(x_axis_compared_date_range_end);
+  const table = TableUtils.getTableById(value.tables, table_id);
+  const view = table && Views.getViewById(table.views, view_id);
   if (!view || !x_axis_column_key) {
     return [];
   }
-  var groupbyColumn = TableUtils.getTableColumnByKey(table, x_axis_column_key);
+  const groupbyColumn = TableUtils.getTableColumnByKey(table, x_axis_column_key);
   if (!groupbyColumn) {
     return [];
   }
-  var summaryColumn = TableUtils.getTableColumnByKey(table, y_axis_column_key) || {};
-  var statRows = Views.getViewRows(view, table, value, username, userId);
-  var formulaRows = Views.getTableFormulaResults(table, statRows, value);
-  var dateRangeResultMap = new Map();
-  var comparedDateRangeResultMap = new Map();
-  var isAdvance = y_axis_summary_type === SUMMARY_TYPE.ADVANCED;
-  statRows.forEach(function (row) {
-    var rowId = row._id;
-    var cellValue = row[groupbyColumn.key];
-    var formulaRow = formulaRows[rowId];
+  const summaryColumn = TableUtils.getTableColumnByKey(table, y_axis_column_key) || {};
+  const statRows = Views.getViewRows(view, table, value, username, userId);
+  const formulaRows = Views.getTableFormulaResults(table, statRows, value);
+  const dateRangeResultMap = new Map();
+  const comparedDateRangeResultMap = new Map();
+  const isAdvance = y_axis_summary_type === SUMMARY_TYPE.ADVANCED;
+  statRows.forEach(row => {
+    const {
+      _id: rowId
+    } = row;
+    const cellValue = row[groupbyColumn.key];
+    const formulaRow = formulaRows[rowId];
     if (!cellValue) return;
     if (cellValue >= x_axis_date_range_start && cellValue <= x_axis_date_range_end || cellValue >= x_axis_compared_date_range_start && cellValue <= x_axis_compared_date_range_end) {
-      var name = StatUtils.getGroupLabel(cellValue, formulaRow, groupbyColumn, x_axis_date_granularity, '', value);
+      const name = StatUtils.getGroupLabel(cellValue, formulaRow, groupbyColumn, x_axis_date_granularity, '', value);
       if (cellValue >= x_axis_date_range_start && cellValue <= x_axis_date_range_end) {
         if (isAdvance) {
-          var currentValue = dateRangeResultMap.get(name);
-          var _cellValue = getCellValue(row, formulaRow, summaryColumn);
+          const currentValue = dateRangeResultMap.get(name);
+          const _cellValue = getCellValue(row, formulaRow, summaryColumn);
           if (!currentValue) {
             dateRangeResultMap.set(name, [_cellValue]);
           } else {
             currentValue.push(_cellValue);
           }
         } else {
-          var _currentValue = dateRangeResultMap.get(name);
-          if (!_currentValue) {
+          const currentValue = dateRangeResultMap.get(name);
+          if (!currentValue) {
             dateRangeResultMap.set(name, 1);
           } else {
-            dateRangeResultMap.set(name, _currentValue + 1);
+            dateRangeResultMap.set(name, currentValue + 1);
           }
         }
       } else {
         if (isAdvance) {
-          var _currentValue2 = comparedDateRangeResultMap.get(name);
-          var _cellValue2 = getCellValue(row, formulaRow, summaryColumn);
-          if (!_currentValue2 && summaryColumn) {
-            comparedDateRangeResultMap.set(name, [_cellValue2]);
+          const currentValue = comparedDateRangeResultMap.get(name);
+          const _cellValue = getCellValue(row, formulaRow, summaryColumn);
+          if (!currentValue && summaryColumn) {
+            comparedDateRangeResultMap.set(name, [_cellValue]);
           } else {
-            _currentValue2.push(_cellValue2);
+            currentValue.push(_cellValue);
           }
         } else {
-          var _currentValue3 = comparedDateRangeResultMap.get(name);
-          if (!_currentValue3) {
+          const currentValue = comparedDateRangeResultMap.get(name);
+          if (!currentValue) {
             comparedDateRangeResultMap.set(name, 1);
           } else {
-            comparedDateRangeResultMap.set(name, _currentValue3 + 1);
+            comparedDateRangeResultMap.set(name, currentValue + 1);
           }
         }
       }
     }
   });
-  var dateRangeResult = [];
-  var comparedDateRangeResult = [];
-  var data = summaryColumn.data || {};
-  var _iterator = _createForOfIteratorHelper(dateRangeResultMap),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var item = _step.value;
-      var key = item[0];
-      var _value = item[1];
-      var formatted_value = _value;
-      if (isAdvance) {
-        _value = getSummaryResult(_value, y_axis_summary_method, data.precision);
-        formatted_value = StatUtils.getFormattedValue(_value, summaryColumn, y_axis_summary_method);
-      }
-      dateRangeResult.push({
-        name: key,
-        group_name: groupName1,
-        raw_name: key,
-        value: _value,
-        formatted_value: formatted_value
-      });
+  let dateRangeResult = [];
+  let comparedDateRangeResult = [];
+  const data = summaryColumn.data || {};
+  for (let item of dateRangeResultMap) {
+    const key = item[0];
+    let value = item[1];
+    let formatted_value = value;
+    if (isAdvance) {
+      value = getSummaryResult(value, y_axis_summary_method, data.precision);
+      formatted_value = StatUtils.getFormattedValue(value, summaryColumn, y_axis_summary_method);
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+    dateRangeResult.push({
+      name: key,
+      group_name: groupName1,
+      raw_name: key,
+      value,
+      formatted_value
+    });
   }
   StatUtils.sortStatistics(dateRangeResult, groupbyColumn, 'name');
-  var _iterator2 = _createForOfIteratorHelper(comparedDateRangeResultMap),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var _item = _step2.value;
-      var _key = _item[0];
-      var _value2 = _item[1];
-      var _formatted_value = _value2;
-      if (isAdvance) {
-        _value2 = getSummaryResult(_value2, y_axis_summary_method, data.precision);
-        _formatted_value = StatUtils.getFormattedValue(_value2, summaryColumn, y_axis_summary_method);
-      }
-      comparedDateRangeResult.push({
-        name: _key,
-        group_name: groupName2,
-        raw_name: _key,
-        value: _value2,
-        formatted_value: _formatted_value
-      });
+  for (let item of comparedDateRangeResultMap) {
+    const key = item[0];
+    let value = item[1];
+    let formatted_value = value;
+    if (isAdvance) {
+      value = getSummaryResult(value, y_axis_summary_method, data.precision);
+      formatted_value = StatUtils.getFormattedValue(value, summaryColumn, y_axis_summary_method);
     }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
+    comparedDateRangeResult.push({
+      name: key,
+      group_name: groupName2,
+      raw_name: key,
+      value,
+      formatted_value
+    });
   }
   StatUtils.sortStatistics(comparedDateRangeResult, groupbyColumn, 'name');
-  for (var i = 0; i < dateRangeResult.length; i++) {
+  for (let i = 0; i < dateRangeResult.length; i++) {
     if (!comparedDateRangeResult[i]) break;
     comparedDateRangeResult[i].name = dateRangeResult[i].name;
     if (display_increase) {
-      var value1 = dateRangeResult[i].value;
-      var value2 = comparedDateRangeResult[i].value || 0.001;
+      const value1 = dateRangeResult[i].value;
+      const value2 = comparedDateRangeResult[i].value || 0.001;
       if (!value2) {
         comparedDateRangeResult[i].increase_value = 1;
       } else {
@@ -150,6 +134,6 @@ function calculateChart(chart, value, username, userId) {
   if (comparedDateRangeResult.length > dateRangeResult.length) {
     comparedDateRangeResult = comparedDateRangeResult.slice(0, dateRangeResult.length);
   }
-  return [].concat(_toConsumableArray(comparedDateRangeResult), dateRangeResult);
+  return [...comparedDateRangeResult, ...dateRangeResult];
 }
 export default calculateChart;