sea-chart 2.0.37 → 2.0.38

package/dist/utils/chart-utils/original-data-utils/pivot-table-calculator.js

@@ -1,17 +1,11 @@
-"use strict";
+import { FORMULA_COLUMN_TYPES_MAP, isNumber, isDateColumn, isNumericColumn, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
+import { isObject } from 'lodash';
+import { CHART_SUMMARY_TYPE, TABLE_DIMENSIONS } from '../../../constants';
+import { isArrayCellValue } from '../../cell-value-utils';
+import { getFormattedLabel, isValidRow } from '../../row-utils';
+import BaseUtils from '../base-utils';
+import { summaryMethodColumn2SqlColumn } from '../../sql/column-2-sql-column';
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _dtableUtils = require("dtable-utils");
-var _lodash = require("lodash");
-var _constants = require("../../../constants");
-var _cellValueUtils = require("../../cell-value-utils");
-var _rowUtils = require("../../row-utils");
-var _baseUtils = _interopRequireDefault(require("../base-utils"));
-var _column2SqlColumn = require("../../sql/column-2-sql-column");
 // one
 async function calculateOneDimensionTable(chart, value, _ref) {
   let {
@@ -30,11 +24,11 @@ async function calculateOneDimensionTable(chart, value, _ref) {
     groupby_geolocation_granularity,
     summary_columns
   } = chart;
-  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
-  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
-  const column = (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
+  const table = getTableById(value.tables, table_id);
+  const view = table && getViewById(table.views, view_id);
+  const column = getTableColumnByKey(table, groupby_column_key);
   if (!column) return {};
-  const isColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(column);
+  const isColumnDataAsAnArray = isArrayCellValue(column);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   let pivot_rows = [];
@@ -43,8 +37,8 @@ async function calculateOneDimensionTable(chart, value, _ref) {
       _id: rowId
     } = row;
     const formulaRow = formulaRows[rowId];
-    if ((0, _rowUtils.isValidRow)(row, formulaRow, column, include_empty)) {
-      const name = _baseUtils.default.getGroupLabel(row[column.key], formulaRow, column, groupby_date_granularity, groupby_geolocation_granularity, value);
+    if (isValidRow(row, formulaRow, column, include_empty)) {
+      const name = BaseUtils.getGroupLabel(row[column.key], formulaRow, column, groupby_date_granularity, groupby_geolocation_granularity, value);
       let pivotRowIndex;
       if (isColumnDataAsAnArray) {
         if (name.length === 0 && include_empty) {
@@ -68,7 +62,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
   const statisticColumnKeys = [summary_column_key, ...summary_columns_option_keys];
   const validStatisticColumnKeys = statisticColumnKeys;
   let statisticColumns = validStatisticColumnKeys.map(key => {
-    const column = (0, _dtableUtils.getTableColumnByKey)(table, key);
+    const column = getTableColumnByKey(table, key);
     return column ? {
       ...column
     } : null;
@@ -84,23 +78,23 @@ async function calculateOneDimensionTable(chart, value, _ref) {
   const {
     pivot_columns_total
   } = getOneDimensionTotal(statisticColumns, summary_type, formulaRows, pivot_rows);
-  _baseUtils.default.sortCharts(pivot_rows, column, 'name');
-  const pivot_columns = summary_type === _constants.CHART_SUMMARY_TYPE.COUNT ? [] : statisticColumns.map(column => {
+  BaseUtils.sortCharts(pivot_rows, column, 'name');
+  const pivot_columns = summary_type === CHART_SUMMARY_TYPE.COUNT ? [] : statisticColumns.map(column => {
     return {
       key: column.key,
       method: column.method
     };
-  }).filter(item => (0, _dtableUtils.getTableColumnByKey)(table, item.key));
+  }).filter(item => getTableColumnByKey(table, item.key));
   pivot_rows.forEach(row => {
     row.original_name = row.name;
-    row.name = (0, _rowUtils.getFormattedLabel)(column, row.name, value.collaborators, chart.type);
+    row.name = getFormattedLabel(column, row.name, value.collaborators, chart.type);
   });
   return {
     pivot_columns_total,
     pivot_rows,
     pivot_columns,
     formulaRows,
-    dimensions: _constants.TABLE_DIMENSIONS.ONE
+    dimensions: TABLE_DIMENSIONS.ONE
   };
 }
 function updateOneDimensionRows(pivot_rows, index, name, row) {
@@ -123,7 +117,7 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
   let dateColumnsTotalArr = {};
   if (Array.isArray(columns) && columns.length > 0) {
     columns.forEach(column => {
-      if (column && (0, _dtableUtils.isDateColumn)(column)) {
+      if (column && isDateColumn(column)) {
         dateColumnsTotalArr[column.key] = [];
       }
     });
@@ -136,7 +130,7 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
       ...item
     };
     let totalMap = {};
-    if (summary_type === _constants.CHART_SUMMARY_TYPE.COUNT) {
+    if (summary_type === CHART_SUMMARY_TYPE.COUNT) {
       totalMap['total'] = rows.length;
       pivot_columns_total.total = (pivot_columns_total['total'] || 0) + rows.length;
     } else {
@@ -148,8 +142,8 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
             method
           } = summaryColumn;
           const total = getTotal(summaryColumn, summary_type, method, rows, formula_rows);
-          if (summaryColumn && (0, _dtableUtils.isDateColumn)(summaryColumn)) {
-            if (method === _constants.CHART_SUMMARY_TYPE.Distinct_values) {
+          if (summaryColumn && isDateColumn(summaryColumn)) {
+            if (method === CHART_SUMMARY_TYPE.Distinct_values) {
               totalMap['total'] = total;
             } else {
               totalMap['total'] = total === 0 ? 0 : total.date;
@@ -157,11 +151,11 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
                 dateColumnsTotalArr[key].push(total);
               }
             }
-            if (method === _constants.CHART_SUMMARY_TYPE.MAX) {
-              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], _constants.CHART_SUMMARY_TYPE.MAX).date;
-            } else if (method === _constants.CHART_SUMMARY_TYPE.MIN) {
-              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], _constants.CHART_SUMMARY_TYPE.MIN).date;
-            } else if (method === _constants.CHART_SUMMARY_TYPE.Distinct_values) {
+            if (method === CHART_SUMMARY_TYPE.MAX) {
+              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], CHART_SUMMARY_TYPE.MAX).date;
+            } else if (method === CHART_SUMMARY_TYPE.MIN) {
+              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], CHART_SUMMARY_TYPE.MIN).date;
+            } else if (method === CHART_SUMMARY_TYPE.Distinct_values) {
               const pivotColumnTotal = (pivot_columns_total['total'] ? pivot_columns_total['total'] - 0 : 0) + total;
               pivot_columns_total['total'] = Number.parseFloat(pivotColumnTotal.toFixed(8));
             }
@@ -179,8 +173,8 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
             } = column;
             const totalKey = key;
             const total = getTotal(column, summary_type, method, rows, formula_rows);
-            if (column && (0, _dtableUtils.isDateColumn)(column)) {
-              if (method === _constants.CHART_SUMMARY_TYPE.Distinct_values) {
+            if (column && isDateColumn(column)) {
+              if (method === CHART_SUMMARY_TYPE.Distinct_values) {
                 totalMap[totalKey] = total;
               } else {
                 totalMap[totalKey] = total === 0 ? 0 : total.date;
@@ -188,11 +182,11 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
                   dateColumnsTotalArr[key].push(total);
                 }
               }
-              if (method === _constants.CHART_SUMMARY_TYPE.MAX) {
-                pivot_columns_total[totalKey] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], _constants.CHART_SUMMARY_TYPE.MAX).date;
-              } else if (method === _constants.CHART_SUMMARY_TYPE.MIN) {
-                pivot_columns_total[totalKey] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], _constants.CHART_SUMMARY_TYPE.MIN).date;
-              } else if (method === _constants.CHART_SUMMARY_TYPE.Distinct_values) {
+              if (method === CHART_SUMMARY_TYPE.MAX) {
+                pivot_columns_total[totalKey] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], CHART_SUMMARY_TYPE.MAX).date;
+              } else if (method === CHART_SUMMARY_TYPE.MIN) {
+                pivot_columns_total[totalKey] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], CHART_SUMMARY_TYPE.MIN).date;
+              } else if (method === CHART_SUMMARY_TYPE.Distinct_values) {
                 const pivotColumnTotal = (pivot_columns_total[totalKey] ? pivot_columns_total[totalKey] - 0 : 0) + total;
                 pivot_columns_total[totalKey] = Number.parseFloat(pivotColumnTotal.toFixed(8));
               }
@@ -235,17 +229,20 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
     column_groupby_geolocation_granularity,
     summary_columns
   } = chart;
-  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
-  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
+  const table = getTableById(value.tables, table_id);
+  const view = table && getViewById(table.views, view_id);
   if (!view) return;
-  const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
+  const groupbyColumn = getTableColumnByKey(table, groupby_column_key);
   if (!groupbyColumn) return;
-  const isGroupbyColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(groupbyColumn);
-  const rowGroupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, column_groupby_column_key);
+  const isGroupbyColumnDataAsAnArray = isArrayCellValue(groupbyColumn);
+  const rowGroupbyColumn = getTableColumnByKey(table, column_groupby_column_key);
   if (!rowGroupbyColumn) {
-    return calculateOneDimensionTable(chart, value);
+    return calculateOneDimensionTable(chart, value, {
+      getViewRows,
+      getTableFormulaResults
+    });
   }
-  const isRowGroupbyColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(rowGroupbyColumn);
+  const isRowGroupbyColumnDataAsAnArray = isArrayCellValue(rowGroupbyColumn);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   let pivot_columns = [];
@@ -255,12 +252,12 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
       _id: rowId
     } = row;
     const formulaRow = formulaRows[rowId];
-    const cellValueForColumn = _baseUtils.default.getGroupLabel(row[rowGroupbyColumn.key], formulaRow, rowGroupbyColumn, column_groupby_date_granularity, column_groupby_geolocation_granularity, value);
-    if ((0, _rowUtils.isValidRow)(row, formulaRow, rowGroupbyColumn, include_empty)) {
+    const cellValueForColumn = BaseUtils.getGroupLabel(row[rowGroupbyColumn.key], formulaRow, rowGroupbyColumn, column_groupby_date_granularity, column_groupby_geolocation_granularity, value);
+    if (isValidRow(row, formulaRow, rowGroupbyColumn, include_empty)) {
       updateTwoDimensionColumns(value, pivot_columns, rowGroupbyColumn, row, formulaRow, include_empty, column_groupby_date_granularity, column_groupby_geolocation_granularity, isRowGroupbyColumnDataAsAnArray);
     }
-    if ((0, _rowUtils.isValidRow)(row, formulaRow, groupbyColumn, include_empty)) {
-      const name = _baseUtils.default.getGroupLabel(row[groupbyColumn.key], formulaRow, groupbyColumn, groupby_date_granularity, groupby_geolocation_granularity, value);
+    if (isValidRow(row, formulaRow, groupbyColumn, include_empty)) {
+      const name = BaseUtils.getGroupLabel(row[groupbyColumn.key], formulaRow, groupbyColumn, groupby_date_granularity, groupby_geolocation_granularity, value);
       let pivotRowIndex;
       if (isGroupbyColumnDataAsAnArray) {
         if (name.length === 0 && include_empty) {
@@ -282,7 +279,7 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
   });
   let summaryColumn = null;
   if (summary_column_key) {
-    summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key);
+    summaryColumn = getTableColumnByKey(table, summary_column_key);
   }
 
   // Single field
@@ -299,7 +296,7 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
           column_key,
           summary_method
         } = item;
-        const itemSummaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, column_key);
+        const itemSummaryColumn = getTableColumnByKey(table, column_key);
         const itemSummaryMethod = summary_method;
         if (itemSummaryColumn && itemSummaryMethod) {
           // The index of a single field is 0, so the index of a multiple-select field starts at 1.
@@ -318,18 +315,18 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
       }
     });
   }
-  _baseUtils.default.sortCharts(pivot_rows, groupbyColumn, 'name');
-  _baseUtils.default.sortCharts(pivot_columns, rowGroupbyColumn, 'key');
+  BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name');
+  BaseUtils.sortCharts(pivot_columns, rowGroupbyColumn, 'key');
 
   // format shown label(name)
   const map = {};
   pivot_columns.forEach(column => {
-    const name = (0, _rowUtils.getFormattedLabel)(rowGroupbyColumn, column.key, value.collaborators, chart.type);
+    const name = getFormattedLabel(rowGroupbyColumn, column.key, value.collaborators, chart.type);
     map[column.key] = name;
     column.key = name;
   });
   pivot_rows.forEach(row => {
-    row.name = (0, _rowUtils.getFormattedLabel)(groupbyColumn, row.name, value.collaborators, chart.type);
+    row.name = getFormattedLabel(groupbyColumn, row.name, value.collaborators, chart.type);
     const cells = {};
     Object.keys(row.cells).forEach(key => {
       cells[map[key]] = row.cells[key];
@@ -346,13 +343,13 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
     pivot_columns_total: new_pivot_columns_total,
     pivot_table_total,
     formulaRows,
-    dimensions: _constants.TABLE_DIMENSIONS.TWO,
+    dimensions: TABLE_DIMENSIONS.TWO,
     summary_columns: getAllSummaryColumns(summaryColumn, summary_columns, table),
     isSingleNumericColumn: !summary_columns.length ? 'true' : 'false'
   };
 }
 function updateTwoDimensionColumns(value, pivot_columns, column, row, formulaRow, isIncludeEmpty, dateGranularity, geolocationGranularity, isRowGroupbyColumnDataAsAnArray) {
-  let key = _baseUtils.default.getGroupLabel(row[column.key], formulaRow, column, dateGranularity, geolocationGranularity, value);
+  let key = BaseUtils.getGroupLabel(row[column.key], formulaRow, column, dateGranularity, geolocationGranularity, value);
   let pivotColumnIndex;
   if (isRowGroupbyColumnDataAsAnArray) {
     if (key.length === 0 && isIncludeEmpty) {
@@ -394,7 +391,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
     summary_column_key,
     summary_method
   } = chart;
-  const isCount = summary_type === _constants.CHART_SUMMARY_TYPE.COUNT;
+  const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
   let summarySQLColumnName2ColumnKey = {};
   let numericColumns = [];
   if (summary_column_key) {
@@ -409,11 +406,11 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
       summary_method: item_summary_method
     } = item;
     const summaryMethod = item_summary_method.toUpperCase();
-    const column = (0, _dtableUtils.getTableColumnByKey)(table, column_key);
-    if (column && (_baseUtils.default.isDateSummaryColumn(column) || _baseUtils.default.isNumericSummaryColumn(column))) {
+    const column = getTableColumnByKey(table, column_key);
+    if (column && (BaseUtils.isDateSummaryColumn(column) || BaseUtils.isNumericSummaryColumn(column))) {
       const {
         key: sqlNumericColumnKey
-      } = (0, _column2SqlColumn.summaryMethodColumn2SqlColumn)(summaryMethod, column);
+      } = summaryMethodColumn2SqlColumn(summaryMethod, column);
       const {
         key: summaryColumnKey
       } = column;
@@ -421,12 +418,12 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
     }
   });
   const summarySQLColumnKeys = Object.values(summarySQLColumnName2ColumnKey);
-  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key) || {};
+  const summaryColumn = getTableColumnByKey(table, summary_column_key) || {};
   const singleNumeriColumnWithMethod = {
     column: summaryColumn,
     summary_method
   };
-  const summaryColumnsWithMethod = _baseUtils.default.getSummaryColumnsWithMethod(table, {
+  const summaryColumnsWithMethod = BaseUtils.getSummaryColumnsWithMethod(table, {
     config: chart
   });
   const multipleNumericColumnsWithMethod = summaryColumnsWithMethod;
@@ -440,7 +437,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
       let {
         key
       } = c;
-      if (_baseUtils.default.isSameGroup(isColumnDataAsAnArray, cellValue, key)) {
+      if (BaseUtils.isSameGroup(isColumnDataAsAnArray, cellValue, key)) {
         if (cells[key]) {
           cells[key].rows.push(row);
           if (isCount) {
@@ -450,7 +447,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
               const current = all.find(item => item.column.key === columnKey);
               const nextValue = row[current === null || current === void 0 ? void 0 : current.column.key];
               const currentValue = Object.values(cells[key].total).find(item => item[2] === columnKey)[1];
-              const computedValue = _baseUtils.default.getSummaryValue({
+              const computedValue = BaseUtils.getSummaryValue({
                 summaryMethod: current.summary_method.toUpperCase(),
                 summaryColumn: current.column
               }, currentValue, nextValue, true);
@@ -489,7 +486,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
     } else {
       updatedPivotRow.total = Object.values(cells).reduce((acc, item) => {
         item.total.forEach(t => {
-          (0, _dtableUtils.isNumber)(t[1]) && (acc += t[1]);
+          isNumber(t[1]) && (acc += t[1]);
         });
         return acc;
       }, 0);
@@ -505,7 +502,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
     let {
       key
     } = c;
-    if (_baseUtils.default.isSameGroup(isColumnDataAsAnArray, cellValue, key)) {
+    if (BaseUtils.isSameGroup(isColumnDataAsAnArray, cellValue, key)) {
       let total;
       if (isCount) {
         total = row[groupbyColumn.key];
@@ -527,9 +524,9 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
   const cellList = Object.values(cells);
   total = cellList.reduce((acc, item) => {
     let num;
-    if ((0, _lodash.isObject)(item.total)) {
+    if (isObject(item.total)) {
       num = item.total.reduce((acc, item) => {
-        (0, _dtableUtils.isNumber)(item[1]) && (acc += item[1]);
+        isNumber(item[1]) && (acc += item[1]);
         return acc;
       }, 0);
     } else {
@@ -555,7 +552,7 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
   let {
     type: summary_column_type
   } = summaryColumn || {};
-  const isSummaryDateColumn = summaryColumn && (0, _dtableUtils.isDateColumn)(summaryColumn);
+  const isSummaryDateColumn = summaryColumn && isDateColumn(summaryColumn);
   let date_summary_column_format = isSummaryDateColumn ? summaryColumn.data.format : '';
   Array.isArray(pivot_rows) && pivot_rows.forEach(pivotRow => {
     let {
@@ -603,8 +600,8 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
       pivot_table_total += total;
     }
   });
-  if (summaryColumn && (0, _dtableUtils.isDateColumn)(summaryColumn)) {
-    if (summary_method === _constants.CHART_SUMMARY_TYPE.Distinct_values) {
+  if (summaryColumn && isDateColumn(summaryColumn)) {
+    if (summary_method === CHART_SUMMARY_TYPE.Distinct_values) {
       pivot_columns_total = Number.parseFloat(pivot_table_total.toFixed(8));
     } else {
       pivot_columns_total = showTwoDimensionDateColumnsAndRowsTotal(dateColumnsTotalArr, pivot_rows, date_summary_column_format, pivot_columns, summary_method);
@@ -625,7 +622,7 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
 
 // utils
 function isSameName(prevName, currName) {
-  if ((0, _dtableUtils.isNumber)(prevName) && (0, _dtableUtils.isNumber)(currName)) {
+  if (isNumber(prevName) && isNumber(currName)) {
     return prevName === currName;
   }
   if (!prevName && !currName) {
@@ -648,15 +645,15 @@ function getTotal(summary_column, summary_type, summary_method) {
   const summary_column_type = summary_column ? summary_column.type : '';
   const rowsLength = rows.length;
   let total;
-  if (summary_type === _constants.CHART_SUMMARY_TYPE.COUNT) {
+  if (summary_type === CHART_SUMMARY_TYPE.COUNT) {
     total = rowsLength;
-  } else if (summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
-    if (summary_method === _constants.CHART_SUMMARY_TYPE.Distinct_values || summary_method === 'Distinct_values') {
+  } else if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
+    if (summary_method === CHART_SUMMARY_TYPE.Distinct_values || summary_method === 'Distinct_values') {
       total = 0;
       let existMap = {};
       rows.forEach(row => {
         let num;
-        if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+        if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
           const formulaRow = formula_rows[row._id] || {};
           num = formulaRow[summary_column_key];
           num = Array.isArray(num) ? num[0] : num;
@@ -678,14 +675,14 @@ function getTotal(summary_column, summary_type, summary_method) {
       total = getTotalByType(oldTotal, total, index);
       return total;
     }
-    if (summary_column && (0, _dtableUtils.isDateColumn)(summary_column)) {
+    if (summary_column && isDateColumn(summary_column)) {
       if (rowsLength === 0) return;
       let dateArr = [];
       rows.forEach(r => {
         let formatDate = {};
         let formatDateData;
         let value = r[summary_column_key];
-        if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+        if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
           let formulaRow = formula_rows[r._id] || {};
           value = formulaRow[summary_column_key] || '';
           value = Array.isArray(value) && value.length !== 0 ? value[0] : '';
@@ -703,21 +700,21 @@ function getTotal(summary_column, summary_type, summary_method) {
         formatDate.value = Date.parse(formatDateData);
         dateArr.push(formatDate);
       });
-      if (summary_method === _constants.CHART_SUMMARY_TYPE.MAX) {
-        total = getDateMaxOrMinTotal(dateArr, _constants.CHART_SUMMARY_TYPE.MAX);
-      } else if (summary_method === _constants.CHART_SUMMARY_TYPE.MIN) {
-        total = getDateMaxOrMinTotal(dateArr, _constants.CHART_SUMMARY_TYPE.MIN);
+      if (summary_method === CHART_SUMMARY_TYPE.MAX) {
+        total = getDateMaxOrMinTotal(dateArr, CHART_SUMMARY_TYPE.MAX);
+      } else if (summary_method === CHART_SUMMARY_TYPE.MIN) {
+        total = getDateMaxOrMinTotal(dateArr, CHART_SUMMARY_TYPE.MIN);
       }
     } else {
       switch (summary_method) {
-        case _constants.CHART_SUMMARY_TYPE.SUM:
-        case _constants.CHART_SUMMARY_TYPE.MEAN:
+        case CHART_SUMMARY_TYPE.SUM:
+        case CHART_SUMMARY_TYPE.MEAN:
           {
             let sum = 0;
             let validNumbersCount = 0;
             rows.forEach(r => {
               let num;
-              if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+              if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                 let formulaRow = formula_rows[r._id] || {};
                 if (formulaRow[summary_column_key] && typeof formulaRow[summary_column_key] === 'object') {
                   num = formulaRow[summary_column_key][0];
@@ -727,7 +724,7 @@ function getTotal(summary_column, summary_type, summary_method) {
               } else {
                 num = r[summary_column_key];
               }
-              if ((0, _dtableUtils.isNumber)(num)) {
+              if (isNumber(num)) {
                 validNumbersCount++;
                 sum += num;
               }
@@ -740,13 +737,13 @@ function getTotal(summary_column, summary_type, summary_method) {
             }
             break;
           }
-        case _constants.CHART_SUMMARY_TYPE.MAX:
-        case _constants.CHART_SUMMARY_TYPE.MIN:
+        case CHART_SUMMARY_TYPE.MAX:
+        case CHART_SUMMARY_TYPE.MIN:
           {
             if (rowsLength > 0) {
               let result = rows.reduce((current, next) => {
                 let currentValue, nextValue;
-                if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+                if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                   let currentFormulaRow = formula_rows[current._id] || {};
                   let nextFormulaRow = formula_rows[next._id] || {};
                   currentValue = currentFormulaRow[summary_column_key];
@@ -765,7 +762,7 @@ function getTotal(summary_column, summary_type, summary_method) {
                   return isNextGreater ? next : current;
                 }
               });
-              if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+              if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                 let formulaRow = formula_rows[result._id];
                 if (formulaRow) {
                   if (formulaRow[summary_column_key] && typeof formulaRow[summary_column_key] === 'object') {
@@ -859,8 +856,8 @@ function getAllSummaryColumns(singleSummaryColumn, multipleSummaryColumns, table
     allSummaryColumns.push(singleSummaryColumn);
   }
   multipleSummaryColumns && multipleSummaryColumns.forEach(item => {
-    if (item !== null && item !== void 0 && item.column_key) {
-      allSummaryColumns.push((0, _dtableUtils.getTableColumnByKey)(table, item.column_key));
+    if (item === null || item === void 0 ? void 0 : item.column_key) {
+      allSummaryColumns.push(getTableColumnByKey(table, item.column_key));
     }
   });
   return allSummaryColumns;
@@ -890,4 +887,4 @@ function calculator(chart, value, _ref3) {
     getTableFormulaResults
   });
 }
-var _default = exports.default = calculator;
+export default calculator;

package/dist/utils/chart-utils/original-data-utils/scatter-calculator.js

@@ -1,15 +1,8 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _dtableUtils = require("dtable-utils");
-var _baseUtils = _interopRequireDefault(require("../base-utils"));
-var _cellValueUtils = require("../../cell-value-utils");
-var _rowUtils = require("../../row-utils");
-var _constants = require("../../../constants");
+import { isNumber, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
+import BaseUtils from '../base-utils';
+import { isArrayCellValue } from '../../cell-value-utils';
+import { getCellValue, getFormattedLabel } from '../../row-utils';
+import { CHART_SUMMARY_TYPE } from '../../../constants';
 function updateBasicChartRows(results, index, name, dataItem, row) {
   let updatedResult;
   if (index > -1) {
@@ -26,11 +19,11 @@ function updateBasicChartRows(results, index, name, dataItem, row) {
 }
 function getColumnValue(data, formulaRow, column, dtableValue) {
   const tempValue = data[column.key];
-  let value = _baseUtils.default.getGroupLabel(tempValue, formulaRow, column, _constants.CHART_SUMMARY_TYPE.DAY, '', dtableValue);
-  if ((0, _cellValueUtils.isArrayCellValue)(column)) {
+  let value = BaseUtils.getGroupLabel(tempValue, formulaRow, column, CHART_SUMMARY_TYPE.DAY, '', dtableValue);
+  if (isArrayCellValue(column)) {
     value = value[0];
   }
-  value = (0, _rowUtils.getFormattedLabel)(column, value, dtableValue.collaborators);
+  value = getFormattedLabel(column, value, dtableValue.collaborators);
   return value;
 }
 async function calculator(chart, value, _ref) {
@@ -45,14 +38,14 @@ async function calculator(chart, value, _ref) {
     y_axis_column_key,
     column_groupby_column_key
   } = chart;
-  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
-  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
+  const table = getTableById(value.tables, table_id);
+  const view = table && getViewById(table.views, view_id);
   if (!view) {
     return [];
   }
-  const selectedXAxisColumn = (0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key);
-  const selectedYAxisColumn = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_column_key);
-  const selectedGroupColumn = (0, _dtableUtils.getTableColumnByKey)(table, column_groupby_column_key);
+  const selectedXAxisColumn = getTableColumnByKey(table, x_axis_column_key);
+  const selectedYAxisColumn = getTableColumnByKey(table, y_axis_column_key);
+  const selectedGroupColumn = getTableColumnByKey(table, column_groupby_column_key);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   const data = [];
@@ -61,10 +54,10 @@ async function calculator(chart, value, _ref) {
       _id: rowId
     } = row;
     const formulaRow = formulaRows[rowId] || {};
-    let x_axis = (0, _rowUtils.getCellValue)(row, formulaRow, selectedXAxisColumn);
-    let y_axis = (0, _rowUtils.getCellValue)(row, formulaRow, selectedYAxisColumn);
-    x_axis = (0, _dtableUtils.isNumber)(x_axis) ? x_axis : 0;
-    y_axis = (0, _dtableUtils.isNumber)(y_axis) ? y_axis : 0;
+    let x_axis = getCellValue(row, formulaRow, selectedXAxisColumn);
+    let y_axis = getCellValue(row, formulaRow, selectedYAxisColumn);
+    x_axis = isNumber(x_axis) ? x_axis : 0;
+    y_axis = isNumber(y_axis) ? y_axis : 0;
     const name = getColumnValue(row, formulaRow, selectedGroupColumn, value);
     const nameIndex = data.findIndex(r => r.name === name && r.x_axis === x_axis && r.y_axis === y_axis);
     const dataItem = {
@@ -74,6 +67,7 @@ async function calculator(chart, value, _ref) {
     };
     updateBasicChartRows(data, nameIndex, name, dataItem, row);
   });
+  BaseUtils.sortCharts(data, selectedXAxisColumn, 'name');
   return data;
 }
-var _default = exports.default = calculator;
+export default calculator;