sea-chart 2.0.37 → 2.0.38

package/dist/utils/chart-utils/original-data-utils/combination-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 _constants = require("../../../constants");
-var _rowUtils = require("../../row-utils");
+import { isNumber, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
+import BaseUtils from '../base-utils';
+import { isArrayCellValue } from '../../cell-value-utils';
+import { CHART_SUMMARY_TYPE, STYLE_COLORS } from '../../../constants';
+import { getCellValue, getFormattedLabel } from '../../row-utils';
 async function calculator(chart, value, _ref) {
   let {
     getViewRows,
@@ -32,42 +25,42 @@ async function calculator(chart, value, _ref) {
     y_axis_left_group_by_numeric_columns,
     type
   } = 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 xAxisColumn = (0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key);
+  const xAxisColumn = getTableColumnByKey(table, x_axis_column_key);
   if (!xAxisColumn) return [];
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
-  const column1 = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_left_summary_column);
-  const column2 = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_right_summary_column);
+  const column1 = getTableColumnByKey(table, y_axis_left_summary_column);
+  const column2 = getTableColumnByKey(table, y_axis_right_summary_column);
   const leftResultMap = new Map();
   const rightResultMap = new Map();
-  let isColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(xAxisColumn);
+  let isColumnDataAsAnArray = isArrayCellValue(xAxisColumn);
   let leftSummaryColumn = {};
   let leftSummaryColumnKeys = [];
-  if (y_axis_left_summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
+  if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
     if (column1) {
       leftSummaryColumn[y_axis_left_summary_column] = {
         method: y_axis_left_summary_method,
         column_name: column1.name,
         type: column1.type,
         data: column1.data,
-        color: _constants.STYLE_COLORS[0].colors[0]
+        color: STYLE_COLORS[0].colors[0]
       };
     }
     if (y_axis_left_group_by_multiple_numeric_column) {
       y_axis_left_group_by_numeric_columns.forEach((item, index) => {
-        const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, item.column_key);
+        const summaryColumn = getTableColumnByKey(table, item.column_key);
         if (summaryColumn) {
           leftSummaryColumn[item.column_key] = {
             method: item.summary_method,
             column_name: summaryColumn.name,
             type: summaryColumn.type,
             data: summaryColumn.data,
-            color: _constants.STYLE_COLORS[0].colors[index % 12]
+            color: STYLE_COLORS[0].colors[index % 12]
           };
         }
       });
@@ -80,10 +73,10 @@ async function calculator(chart, value, _ref) {
     } = row;
     let formulaRow = formulaRows[rowId];
     const currentValue = row[xAxisColumn.key];
-    let label = _baseUtils.default.getGroupLabel(currentValue, formulaRow, xAxisColumn, groupby_date_granularity, groupby_geolocation_granularity, value);
+    let label = BaseUtils.getGroupLabel(currentValue, formulaRow, xAxisColumn, groupby_date_granularity, groupby_geolocation_granularity, value);
 
     // collect left y axis data
-    if (y_axis_left_summary_type === _constants.CHART_SUMMARY_TYPE.COUNT) {
+    if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.COUNT) {
       if (isColumnDataAsAnArray) {
         if (label.length > 0) {
           label.forEach(name => {
@@ -105,18 +98,18 @@ async function calculator(chart, value, _ref) {
         }
       }
     }
-    if (y_axis_left_summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
+    if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
       if (isColumnDataAsAnArray) {
         if (label.length > 0) {
           label.forEach(name => {
             const currentLabelMap = leftResultMap.get(name) || {};
             leftSummaryColumnKeys.forEach(key => {
-              const cellValue = (0, _rowUtils.getCellValue)(row, formulaRow, {
+              const cellValue = getCellValue(row, formulaRow, {
                 ...leftSummaryColumn[key],
                 key
               });
               const currentLabelList = currentLabelMap[key] || [];
-              if ((0, _dtableUtils.isNumber)(cellValue)) {
+              if (isNumber(cellValue)) {
                 currentLabelList.push(cellValue);
               }
               currentLabelMap[key] = currentLabelList;
@@ -127,12 +120,12 @@ async function calculator(chart, value, _ref) {
         if (label.length === 0 && x_axis_include_empty_cells) {
           let currentValue = leftResultMap.get(null) || {};
           leftSummaryColumnKeys.forEach(key => {
-            const cellValue = (0, _rowUtils.getCellValue)(row, formulaRow, {
+            const cellValue = getCellValue(row, formulaRow, {
               ...leftSummaryColumn[key],
               key
             });
             const currentLabelList = currentValue[key] || [];
-            if ((0, _dtableUtils.isNumber)(cellValue)) {
+            if (isNumber(cellValue)) {
               currentLabelList.push(cellValue);
             }
             currentValue[key] = currentLabelList;
@@ -143,12 +136,12 @@ async function calculator(chart, value, _ref) {
         if (x_axis_include_empty_cells || label) {
           const currentValue = leftResultMap.get(label) || {};
           leftSummaryColumnKeys.forEach(key => {
-            const cellValue = (0, _rowUtils.getCellValue)(row, formulaRow, {
+            const cellValue = getCellValue(row, formulaRow, {
               ...leftSummaryColumn[key],
               key
             });
             const currentList = currentValue[key] || [];
-            if ((0, _dtableUtils.isNumber)(cellValue)) {
+            if (isNumber(cellValue)) {
               currentList.push(cellValue);
             }
             currentValue[key] = currentList;
@@ -159,7 +152,7 @@ async function calculator(chart, value, _ref) {
     }
 
     // collect right y axis data
-    if (y_axis_right_summary_type === _constants.CHART_SUMMARY_TYPE.COUNT) {
+    if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.COUNT) {
       if (isColumnDataAsAnArray) {
         if (label.length > 0) {
           label.forEach(name => {
@@ -181,13 +174,13 @@ async function calculator(chart, value, _ref) {
         }
       }
     }
-    if (y_axis_right_summary_column && y_axis_right_summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
-      const cellValue = (0, _rowUtils.getCellValue)(row, formulaRow, column2);
+    if (y_axis_right_summary_column && y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
+      const cellValue = getCellValue(row, formulaRow, column2);
       if (isColumnDataAsAnArray) {
         if (label.length > 0) {
           label.forEach(name => {
             const currentLabelList = rightResultMap.get(name) || [];
-            if ((0, _dtableUtils.isNumber)(cellValue)) {
+            if (isNumber(cellValue)) {
               currentLabelList.push(cellValue);
             }
             rightResultMap.set(name, currentLabelList);
@@ -195,7 +188,7 @@ async function calculator(chart, value, _ref) {
         }
         if (label.length === 0 && x_axis_include_empty_cells) {
           let currentValue = rightResultMap.get(null) || [];
-          if ((0, _dtableUtils.isNumber)(cellValue)) {
+          if (isNumber(cellValue)) {
             currentValue.push(cellValue);
           }
           rightResultMap.set(null, currentValue);
@@ -203,7 +196,7 @@ async function calculator(chart, value, _ref) {
       } else {
         if (x_axis_include_empty_cells || label) {
           const currentLabelList = rightResultMap.get(label) || [];
-          if ((0, _dtableUtils.isNumber)(cellValue)) {
+          if (isNumber(cellValue)) {
             currentLabelList.push(cellValue);
           }
           rightResultMap.set(label, currentLabelList);
@@ -215,7 +208,7 @@ async function calculator(chart, value, _ref) {
   // Summary collect data
   let results = [];
   let targetMap = leftResultMap;
-  if (leftSummaryColumnKeys.length === 0 && y_axis_left_summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
+  if (leftSummaryColumnKeys.length === 0 && y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
     targetMap = rightResultMap;
   }
   for (let item of targetMap) {
@@ -226,23 +219,23 @@ async function calculator(chart, value, _ref) {
     let formattedValueLeft = value1;
     let formattedValueRight = value2;
     const rightValue = rightResultMap.get(key);
-    if (y_axis_right_summary_type === _constants.CHART_SUMMARY_TYPE.COUNT) {
+    if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.COUNT) {
       value2 = rightValue;
       formattedValueRight = value2;
     }
-    if (y_axis_right_summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
-      value2 = _baseUtils.default.getSummaryResult(rightValue, y_axis_right_summary_method);
-      formattedValueRight = _baseUtils.default.getFormattedValue(value2, column2, y_axis_right_summary_method);
+    if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
+      value2 = BaseUtils.getSummaryResult(rightValue, y_axis_right_summary_method);
+      formattedValueRight = BaseUtils.getFormattedValue(value2, column2, y_axis_right_summary_method);
     }
     if (!y_axis_left_group_by_multiple_numeric_column) {
-      if (y_axis_left_summary_type === _constants.CHART_SUMMARY_TYPE.COUNT) {
+      if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.COUNT) {
         value1 = leftValue;
         formattedValueLeft = value1;
       }
-      if (y_axis_left_summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
+      if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
         const list = leftValue[column1.key];
-        value1 = _baseUtils.default.getSummaryResult(list, y_axis_left_summary_method);
-        formattedValueLeft = _baseUtils.default.getFormattedValue(value1, column1, y_axis_left_summary_method);
+        value1 = BaseUtils.getSummaryResult(list, y_axis_left_summary_method);
+        formattedValueLeft = BaseUtils.getFormattedValue(value1, column1, y_axis_left_summary_method);
       }
       results.push({
         name: key,
@@ -256,14 +249,14 @@ async function calculator(chart, value, _ref) {
         const summaryColumn = leftSummaryColumn[columnKey];
         const summaryMethod = summaryColumn.method;
         const list = leftValue[columnKey];
-        const value = _baseUtils.default.getSummaryResult(list, summaryMethod);
-        formattedValueLeft = _baseUtils.default.getFormattedValue(value, summaryColumn, summaryMethod);
+        const value = BaseUtils.getSummaryResult(list, summaryMethod);
+        formattedValueLeft = BaseUtils.getFormattedValue(value, summaryColumn, summaryMethod);
         results.push({
           name: key,
           value_left: value,
           group_name: summaryColumn.column_name,
           // color: leftSummaryColumn[columnKey].color,
-          color: _constants.STYLE_COLORS[0].colors[index % 12],
+          color: STYLE_COLORS[0].colors[index % 12],
           value_right: value2,
           formatted_value_left: formattedValueLeft,
           formatted_value_right: formattedValueRight
@@ -271,10 +264,10 @@ async function calculator(chart, value, _ref) {
       });
     }
   }
-  _baseUtils.default.sortCharts(results, xAxisColumn, 'name');
+  BaseUtils.sortCharts(results, xAxisColumn, 'name');
   results.forEach(item => {
-    item.name = (0, _rowUtils.getFormattedLabel)(xAxisColumn, item.name, value.collaborators, type);
+    item.name = getFormattedLabel(xAxisColumn, item.name, value.collaborators, type);
   });
   return results;
 }
-var _default = exports.default = calculator;
+export default calculator;

package/dist/utils/chart-utils/original-data-utils/compare-bar-chart-calculator.js

@@ -1,14 +1,7 @@
-"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 _rowUtils = require("../../row-utils");
-var _constants = require("../../../constants");
+import { getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
+import BaseUtils from '../base-utils';
+import { getCellValue } from '../../row-utils';
+import { CHART_SUMMARY_TYPE } from '../../../constants';
 async function calculator(chart, value, _ref) {
   let {
     getViewRows,
@@ -28,25 +21,25 @@ async function calculator(chart, value, _ref) {
     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 = (0, _dtableUtils.getTableById)(value.tables, table_id);
-  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
+  const groupName1 = `${x_axis_date_range_start} - ${x_axis_date_range_end}`;
+  const groupName2 = `${x_axis_compared_date_range_start} - ${x_axis_compared_date_range_end}`;
+  const table = getTableById(value.tables, table_id);
+  const view = table && getViewById(table.views, view_id);
   if (!view || !x_axis_column_key) {
     return [];
   }
-  const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key);
+  const groupbyColumn = getTableColumnByKey(table, x_axis_column_key);
   if (!groupbyColumn) {
     return [];
   }
-  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_summary_column_key) || {};
+  const summaryColumn = getTableColumnByKey(table, y_axis_summary_column_key) || {};
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   const dateRangeResultMap = new Map();
   const comparedDateRangeResultMap = new Map();
   const dateRangeRowMap = new Map();
   const comparedDateRangeRowMap = new Map();
-  const isAdvance = y_axis_summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED;
+  const isAdvance = y_axis_summary_type === CHART_SUMMARY_TYPE.ADVANCED;
   statRows.forEach(row => {
     const {
       _id: rowId
@@ -55,11 +48,11 @@ async function calculator(chart, value, _ref) {
     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) {
-      const name = _baseUtils.default.getGroupLabel(cellValue, formulaRow, groupbyColumn, x_axis_date_granularity, '', value);
+      const name = BaseUtils.getGroupLabel(cellValue, formulaRow, groupbyColumn, x_axis_date_granularity, '', value);
       if (cellValue >= x_axis_date_range_start && cellValue <= x_axis_date_range_end) {
         if (isAdvance) {
           const currentValue = dateRangeResultMap.get(name);
-          const _cellValue = (0, _rowUtils.getCellValue)(row, formulaRow, summaryColumn);
+          const _cellValue = getCellValue(row, formulaRow, summaryColumn);
           if (!currentValue) {
             dateRangeResultMap.set(name, [_cellValue]);
             dateRangeRowMap.set(name, [row]);
@@ -79,7 +72,7 @@ async function calculator(chart, value, _ref) {
       } else {
         if (isAdvance) {
           const currentValue = comparedDateRangeResultMap.get(name);
-          const _cellValue = (0, _rowUtils.getCellValue)(row, formulaRow, summaryColumn);
+          const _cellValue = getCellValue(row, formulaRow, summaryColumn);
           if (!currentValue && summaryColumn) {
             comparedDateRangeResultMap.set(name, [_cellValue]);
             comparedDateRangeRowMap.set(name, [row]);
@@ -107,8 +100,8 @@ async function calculator(chart, value, _ref) {
     let value = item[1];
     let formatted_value = value;
     if (isAdvance) {
-      value = _baseUtils.default.getSummaryResult(value, y_axis_summary_method, data.precision);
-      formatted_value = _baseUtils.default.getFormattedValue(value, summaryColumn, y_axis_summary_method);
+      value = BaseUtils.getSummaryResult(value, y_axis_summary_method, data.precision);
+      formatted_value = BaseUtils.getFormattedValue(value, summaryColumn, y_axis_summary_method);
     }
     dateRangeResult.push({
       name: key,
@@ -119,14 +112,14 @@ async function calculator(chart, value, _ref) {
       rows: dateRangeRowMap.get(key)
     });
   }
-  _baseUtils.default.sortCharts(dateRangeResult, groupbyColumn, 'name');
+  BaseUtils.sortCharts(dateRangeResult, groupbyColumn, 'name');
   for (let item of comparedDateRangeResultMap) {
     const key = item[0];
     let value = item[1];
     let formatted_value = value;
     if (isAdvance) {
-      value = _baseUtils.default.getSummaryResult(value, y_axis_summary_method, data.precision);
-      formatted_value = _baseUtils.default.getFormattedValue(value, summaryColumn, y_axis_summary_method);
+      value = BaseUtils.getSummaryResult(value, y_axis_summary_method, data.precision);
+      formatted_value = BaseUtils.getFormattedValue(value, summaryColumn, y_axis_summary_method);
     }
     comparedDateRangeResult.push({
       name: key,
@@ -137,7 +130,7 @@ async function calculator(chart, value, _ref) {
       rows: comparedDateRangeRowMap.get(key)
     });
   }
-  _baseUtils.default.sortCharts(comparedDateRangeResult, groupbyColumn, 'name');
+  BaseUtils.sortCharts(comparedDateRangeResult, groupbyColumn, 'name');
   for (let i = 0; i < dateRangeResult.length; i++) {
     if (!comparedDateRangeResult[i]) break;
     comparedDateRangeResult[i].name = dateRangeResult[i].name;
@@ -156,4 +149,4 @@ async function calculator(chart, value, _ref) {
   }
   return [...comparedDateRangeResult, ...dateRangeResult];
 }
-var _default = exports.default = calculator;
+export default calculator;

package/dist/utils/chart-utils/original-data-utils/completeness-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 _cellValueUtils = require("../../cell-value-utils");
-var _rowUtils = require("../../row-utils");
-var _baseUtils = _interopRequireDefault(require("../base-utils"));
-var _constants = require("../../../constants");
+import { FORMULA_COLUMN_TYPES_MAP, isNumber, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
+import { isArrayCellValue } from '../../cell-value-utils';
+import { getCellValue, getFormattedLabel } from '../../row-utils';
+import BaseUtils from '../base-utils';
+import { PIE_CHART_COLORS } from '../../../constants';
 async function calculator(chart, value, _ref) {
   let {
     getViewRows,
@@ -25,22 +18,22 @@ async function calculator(chart, value, _ref) {
     date_granularity,
     geolocation_granularity
   } = 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 nameColumn = (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
+  const nameColumn = getTableColumnByKey(table, groupby_column_key);
   if (!nameColumn) return [];
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
-  const groupColumn = (0, _dtableUtils.getTableColumnByKey)(table, column_groupby_column_key);
-  const isColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(nameColumn);
+  const groupColumn = getTableColumnByKey(table, column_groupby_column_key);
+  const isColumnDataAsAnArray = isArrayCellValue(nameColumn);
   const isGroupChart = !!groupColumn;
   let result = [];
   if (!isGroupChart) {
-    const completedColumn = (0, _dtableUtils.getTableColumnByKey)(table, completed_column_key);
-    const targetColumn = (0, _dtableUtils.getTableColumnByKey)(table, target_column_key);
+    const completedColumn = getTableColumnByKey(table, completed_column_key);
+    const targetColumn = getTableColumnByKey(table, target_column_key);
     let labelCountMap = {};
     let labels = [];
     statRows.forEach(row => {
@@ -50,15 +43,15 @@ async function calculator(chart, value, _ref) {
       let formulaRow = formulaRows[rowId] || {};
       const name = row[nameColumn.key];
       if (name || Number.isFinite(name)) {
-        let label = _baseUtils.default.getGroupLabel(name, formulaRow, nameColumn, '', '', value);
+        let label = BaseUtils.getGroupLabel(name, formulaRow, nameColumn, '', '', value);
         if (isColumnDataAsAnArray) {
           label = label[0];
         }
-        label = (0, _rowUtils.getFormattedLabel)(nameColumn, label, value.collaborators);
-        let currentValue = (0, _rowUtils.getCellValue)(row, formulaRow, completedColumn);
-        let targetValue = (0, _rowUtils.getCellValue)(row, formulaRow, targetColumn);
-        currentValue = (0, _dtableUtils.isNumber)(currentValue) ? currentValue : 0;
-        targetValue = (0, _dtableUtils.isNumber)(targetValue) ? targetValue : 0;
+        label = getFormattedLabel(nameColumn, label, value.collaborators);
+        let currentValue = getCellValue(row, formulaRow, completedColumn);
+        let targetValue = getCellValue(row, formulaRow, targetColumn);
+        currentValue = isNumber(currentValue) ? currentValue : 0;
+        targetValue = isNumber(targetValue) ? targetValue : 0;
         if (labelCountMap[label]) {
           labelCountMap[label].currentValue = currentValue + labelCountMap[label].currentValue;
           labelCountMap[label].targetValue = targetValue + labelCountMap[label].targetValue;
@@ -107,14 +100,14 @@ async function calculator(chart, value, _ref) {
       }
     });
   } else {
-    const completedColumn = (0, _dtableUtils.getTableColumnByKey)(table, completed_column_key);
-    const targetColumn = (0, _dtableUtils.getTableColumnByKey)(table, target_column_key);
+    const completedColumn = getTableColumnByKey(table, completed_column_key);
+    const targetColumn = getTableColumnByKey(table, target_column_key);
     let labelCountMap = {};
     let colorMap = {};
     let labelGroups = [];
     let colorIndex = 0;
-    let isFormulaType = _dtableUtils.FORMULA_COLUMN_TYPES_MAP[groupColumn.type];
-    const isGroupColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(groupColumn);
+    let isFormulaType = FORMULA_COLUMN_TYPES_MAP[groupColumn.type];
+    const isGroupColumnDataAsAnArray = isArrayCellValue(groupColumn);
     statRows.forEach(row => {
       let {
         _id: rowId
@@ -123,28 +116,28 @@ async function calculator(chart, value, _ref) {
       const name = row[nameColumn.key],
         groupLabelName = !isFormulaType ? row[groupColumn.key] : formulaRow[rowId][groupColumn.key];
       if ((name || Number.isFinite(name)) && (groupLabelName || Number.isFinite(groupLabelName))) {
-        let label = _baseUtils.default.getGroupLabel(name, formulaRow, nameColumn, '', '', value),
-          groupLabel = _baseUtils.default.getGroupLabel(groupLabelName, formulaRow, groupColumn, date_granularity, geolocation_granularity, value);
+        let label = BaseUtils.getGroupLabel(name, formulaRow, nameColumn, '', '', value),
+          groupLabel = BaseUtils.getGroupLabel(groupLabelName, formulaRow, groupColumn, date_granularity, geolocation_granularity, value);
         if (isColumnDataAsAnArray) {
           label = label[0];
         }
         if (isGroupColumnDataAsAnArray) {
           groupLabel = groupLabel[0];
         }
-        label = (0, _rowUtils.getFormattedLabel)(nameColumn, label, value.collaborators);
-        groupLabel = (0, _rowUtils.getFormattedLabel)(groupColumn, groupLabel, value.collaborators);
+        label = getFormattedLabel(nameColumn, label, value.collaborators);
+        groupLabel = getFormattedLabel(groupColumn, groupLabel, value.collaborators);
         let color = colorMap[groupLabel];
         if (!color) {
-          color = _constants.PIE_CHART_COLORS[colorIndex % 12];
+          color = PIE_CHART_COLORS[colorIndex % 12];
           colorMap[groupLabel] = color;
           colorIndex++;
         }
         if (groupLabel) {
-          let currentValue = (0, _rowUtils.getCellValue)(row, formulaRow, completedColumn);
-          let targetValue = (0, _rowUtils.getCellValue)(row, formulaRow, targetColumn);
-          currentValue = (0, _dtableUtils.isNumber)(currentValue) ? currentValue : 0;
-          targetValue = (0, _dtableUtils.isNumber)(targetValue) ? targetValue : 0;
-          const concatLabel = "".concat(label, "_").concat(groupLabel);
+          let currentValue = getCellValue(row, formulaRow, completedColumn);
+          let targetValue = getCellValue(row, formulaRow, targetColumn);
+          currentValue = isNumber(currentValue) ? currentValue : 0;
+          targetValue = isNumber(targetValue) ? targetValue : 0;
+          const concatLabel = `${label}_${groupLabel}`;
           if (labelCountMap[concatLabel]) {
             labelCountMap[concatLabel].currentValue = currentValue + labelCountMap[concatLabel].currentValue;
             labelCountMap[concatLabel].targetValue = targetValue + labelCountMap[concatLabel].targetValue;
@@ -211,4 +204,4 @@ async function calculator(chart, value, _ref) {
   }
   return result;
 }
-var _default = exports.default = calculator;
+export default calculator;

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

@@ -1,13 +1,6 @@
-"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 _rowUtils = require("../../row-utils");
+import { isNumber, isNumericColumn, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
+import BaseUtils from '../base-utils';
+import { getCellValue } from '../../row-utils';
 async function calculator(chart, value, _ref) {
   let {
     getViewRows,
@@ -21,16 +14,19 @@ async function calculator(chart, value, _ref) {
     total_value_column_key,
     total_value_column_summary_method
   } = chart;
-  const selectedTable = (0, _dtableUtils.getTableById)(value.tables, table_id);
-  const selectedView = selectedTable && (0, _dtableUtils.getViewById)(selectedTable.views, view_id);
-  const selectedColumn1 = (0, _dtableUtils.getTableColumnByKey)(selectedTable, target_value_column_key);
-  const selectedColumn2 = (0, _dtableUtils.getTableColumnByKey)(selectedTable, total_value_column_key);
+  const selectedTable = getTableById(value.tables, table_id);
+  const selectedView = selectedTable && getViewById(selectedTable.views, view_id);
+  const selectedColumn1 = getTableColumnByKey(selectedTable, target_value_column_key);
+  const selectedColumn2 = getTableColumnByKey(selectedTable, total_value_column_key);
   const statRows = await getViewRows(selectedView, selectedTable);
   if (statRows.length === 0) {
-    return 0;
+    return {
+      value: 0,
+      rows: []
+    };
   }
-  const isNumericColumn1 = selectedColumn1 && (0, _dtableUtils.isNumericColumn)(selectedColumn1);
-  const isNumericColumn2 = selectedColumn2 && (0, _dtableUtils.isNumericColumn)(selectedColumn2);
+  const isNumericColumn1 = selectedColumn1 && isNumericColumn(selectedColumn1);
+  const isNumericColumn2 = selectedColumn2 && isNumericColumn(selectedColumn2);
   const formulaRows = isNumericColumn1 || isNumericColumn2 ? await getTableFormulaResults(selectedTable, statRows) : {};
   let result1;
   let result2;
@@ -39,14 +35,14 @@ async function calculator(chart, value, _ref) {
   statRows.forEach(row => {
     const formulaRow = formulaRows[row._id];
     if (isNumericColumn1) {
-      const cellValue1 = (0, _rowUtils.getCellValue)(row, formulaRow, selectedColumn1);
-      if ((0, _dtableUtils.isNumber)(cellValue1)) {
+      const cellValue1 = getCellValue(row, formulaRow, selectedColumn1);
+      if (isNumber(cellValue1)) {
         numberList1.push(cellValue1);
       }
     }
     if (isNumericColumn2) {
-      const cellValue2 = (0, _rowUtils.getCellValue)(row, formulaRow, selectedColumn2);
-      if ((0, _dtableUtils.isNumber)(cellValue2)) {
+      const cellValue2 = getCellValue(row, formulaRow, selectedColumn2);
+      if (isNumber(cellValue2)) {
         numberList2.push(cellValue2);
       }
     }
@@ -54,16 +50,22 @@ async function calculator(chart, value, _ref) {
   if (target_value_column_summary_method === 'Row_count') {
     result1 = statRows.length;
   } else {
-    result1 = _baseUtils.default.getSummaryResult(numberList1, target_value_column_summary_method);
+    result1 = BaseUtils.getSummaryResult(numberList1, target_value_column_summary_method);
   }
   if (total_value_column_summary_method === 'Row_count') {
     result2 = statRows.length;
   } else {
-    result2 = _baseUtils.default.getSummaryResult(numberList2, total_value_column_summary_method);
+    result2 = BaseUtils.getSummaryResult(numberList2, total_value_column_summary_method);
   }
   if (result2 === 0) {
-    return 0;
+    return {
+      value: 0,
+      rows: statRows
+    };
   }
-  return result1 / result2;
+  return {
+    value: result1 / result2,
+    rows: statRows
+  };
 }
-var _default = exports.default = calculator;
+export default calculator;