sea-chart 2.0.43 → 2.0.45

package/dist/utils/chart-utils/index.js

@@ -1,71 +1,57 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BaseUtils", {
-  enumerable: true,
-  get: function () {
-    return _baseUtils.default;
-  }
-});
-exports.ChartUtils = void 0;
-var _lodash = require("lodash");
-var _context = _interopRequireDefault(require("../../context"));
-var _ = require("..");
-var _intl = _interopRequireDefault(require("../../intl"));
-var _concurrencyManager = _interopRequireDefault(require("../concurrency-manager"));
-var _baseUtils = _interopRequireDefault(require("./base-utils"));
-var _sqlStatisticsUtils = _interopRequireDefault(require("./sql-statistics-utils"));
-var _originalDataUtils = _interopRequireDefault(require("./original-data-utils"));
+import { uniqueId } from 'lodash';
+import context from '../../context';
+import { getErrorMessage } from '..';
+import intl from '../../intl';
+import concurrencyManager from '../concurrency-manager';
+import BaseUtils from './base-utils';
+import SQLStatisticsUtils from './sql-statistics-utils';
+import OriginalDataUtils from './original-data-utils';
 class ChartUtils {}
-exports.ChartUtils = ChartUtils;
 ChartUtils.calculateChart = async (chart, value, callback) => {
-  if (!_baseUtils.default.isValidExistChart(value.tables, chart)) {
-    const roleId = _context.default.getSetting('roleId');
-    const isEditAppPage = _context.default.getSetting('isEditAppPage');
+  if (!BaseUtils.isValidExistChart(value.tables, chart)) {
+    const roleId = context.getSetting('roleId');
+    const isEditAppPage = context.getSetting('isEditAppPage');
     const tip_message = !roleId && !isEditAppPage ? 'The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations' : 'Please_complete_the_chart_configuration_first';
     return callback && callback('', tip_message, null);
   }
-  const id = (0, _lodash.uniqueId)();
+  const id = uniqueId();
   const requestData = () => {
-    _context.default.queryChartResult({
+    context.queryChartResult({
       chart,
       tables: value.tables,
       isCalculateByView: value.isCalculateByView,
       onSuccess: async function (res) {
         var _res$data;
-        let dataSources = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _sqlStatisticsUtils.default.DATA_SOURCE;
+        let dataSources = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SQLStatisticsUtils.DATA_SOURCE;
         // reolve request and start next request
-        _concurrencyManager.default.removeRequest(id);
+        concurrencyManager.removeRequest(id);
         const {
           success,
           error_message
         } = res.data;
         if (!success) {
-          const errMsg = _intl.default.get(error_message);
+          const errMsg = intl.get(error_message);
           callback && callback(errMsg, '', null);
           return;
         }
-        if (dataSources === _originalDataUtils.default.DATA_SOURCE) {
-          _originalDataUtils.default.calculateChart(chart, value, callback);
+        if (dataSources === OriginalDataUtils.DATA_SOURCE) {
+          OriginalDataUtils.calculateChart(chart, value, callback);
           return;
         }
-        await _sqlStatisticsUtils.default.calculateChart(chart, value, callback, (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.results) || []);
+        await SQLStatisticsUtils.calculateChart(chart, value, callback, (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.results) || []);
       },
       onFail: err => {
-        _concurrencyManager.default.removeRequest(id);
-        let errorMessage = (0, _.getErrorMessage)(err);
+        concurrencyManager.removeRequest(id);
+        let errorMessage = getErrorMessage(err);
         callback && callback(errorMessage, '', null);
       }
     });
   };
   requestData.id = id;
-  _concurrencyManager.default.applyRequest(requestData);
+  concurrencyManager.applyRequest(requestData);
 };
 ChartUtils.calculateStaticChart = (chart, value, statisticalResult, callback) => {
-  if (!_baseUtils.default.isValidExistChart(value.tables, chart)) {
+  if (!BaseUtils.isValidExistChart(value.tables, chart)) {
     const tip_message = 'Please_complete_the_chart_configuration_first';
     return callback && callback('', tip_message, null);
   }
@@ -77,9 +63,10 @@ ChartUtils.calculateStaticChart = (chart, value, statisticalResult, callback) =>
     data_sources: dataSources,
     refreshCache
   } = statisticalResult;
-  if (dataSources === _originalDataUtils.default.DATA_SOURCE) {
-    _originalDataUtils.default.calculateChart(chart, value, callback, refreshCache);
+  if (dataSources === OriginalDataUtils.DATA_SOURCE) {
+    OriginalDataUtils.calculateChart(chart, value, callback, refreshCache);
   } else {
-    _sqlStatisticsUtils.default.calculateStaticChart(chart, value, statisticalResult, callback);
+    SQLStatisticsUtils.calculateStaticChart(chart, value, statisticalResult, callback);
   }
-};
+};
+export { BaseUtils, ChartUtils };

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

@@ -1,19 +1,12 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _dayjs = _interopRequireDefault(require("dayjs"));
-var _dtableUtils = require("dtable-utils");
-var _constants = require("../../../constants");
-var _columnUtils = require("../../column-utils");
-var _cellValueUtils = require("../../cell-value-utils");
-var _rowUtils = require("../../row-utils");
-var _map = require("../../map");
-var _baseUtils = _interopRequireDefault(require("../base-utils"));
-const MAP_CHART_TYPES = [_constants.CHART_TYPE.MAP, _constants.CHART_TYPE.WORLD_MAP, _constants.CHART_TYPE.MAP_BUBBLE, _constants.CHART_TYPE.WORLD_MAP_BUBBLE];
+import dayjs from 'dayjs';
+import { CellType, DATE_COLUMN_OPTIONS, FORMULA_COLUMN_TYPES_MAP, getTableById, getViewById, getTableColumnByKey, isEmpty } from 'dtable-utils';
+import { CHART_STYLE_COLORS, CHART_SUMMARY_TYPE, CHART_TYPE, Y_AXIS_TYPE_PREFIX } from '../../../constants';
+import { getColorFromSingleSelectColumn, isDateFormulaColumn } from '../../column-utils';
+import { isArrayCellValue } from '../../cell-value-utils';
+import { getFormattedLabel, isValidRow } from '../../row-utils';
+import { fixGeoGranularity } from '../../map';
+import BaseUtils from '../base-utils';
+const MAP_CHART_TYPES = [CHART_TYPE.MAP, CHART_TYPE.WORLD_MAP, CHART_TYPE.MAP_BUBBLE, CHART_TYPE.WORLD_MAP_BUBBLE];
 async function calculateBasicChart(chart, value, _ref) {
   let {
     getViewRows,
@@ -31,7 +24,7 @@ async function calculateBasicChart(chart, value, _ref) {
   let groupby_date_granularity;
   let include_empty;
   let groupby_geolocation_granularity;
-  if (chart.type === _constants.CHART_TYPE.PIE || chart.type === _constants.CHART_TYPE.RING || chart.type === _constants.CHART_TYPE.TREE_MAP) {
+  if (chart.type === CHART_TYPE.PIE || chart.type === CHART_TYPE.RING || chart.type === CHART_TYPE.TREE_MAP) {
     groupby_column_key = chart.groupby_column_key;
     summary_type = chart.summary_type;
     summary_method = chart.summary_method;
@@ -39,7 +32,7 @@ async function calculateBasicChart(chart, value, _ref) {
     groupby_date_granularity = chart.groupby_date_granularity;
     include_empty = chart.groupby_include_empty_cells;
     groupby_geolocation_granularity = chart.groupby_geolocation_granularity;
-  } else if ([_constants.CHART_TYPE.HORIZONTAL_BAR, _constants.CHART_TYPE.HORIZONTAL_GROUP_BAR].includes(chart.type)) {
+  } else if ([CHART_TYPE.HORIZONTAL_BAR, CHART_TYPE.HORIZONTAL_GROUP_BAR].includes(chart.type)) {
     groupby_column_key = chart.vertical_axis_column_key;
     summary_type = chart.horizontal_axis_summary_type;
     summary_method = chart.horizontal_axis_summary_method;
@@ -47,7 +40,7 @@ async function calculateBasicChart(chart, value, _ref) {
     groupby_date_granularity = chart.vertical_axis_date_granularity;
     groupby_geolocation_granularity = chart.vertical_axis_geolocation_granularity;
     include_empty = chart.vertical_axis_include_empty;
-  } else if ([_constants.CHART_TYPE.HEAT_MAP].includes(chart.type)) {
+  } else if ([CHART_TYPE.HEAT_MAP].includes(chart.type)) {
     groupby_column_key = chart.time_column_key;
     summary_type = chart.summary_type;
     summary_method = chart.summary_method;
@@ -61,43 +54,43 @@ async function calculateBasicChart(chart, value, _ref) {
     groupby_geolocation_granularity = chart.x_axis_geolocation_granularity;
     include_empty = chart.x_axis_include_empty_cells;
   }
-  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 = groupby_column_key && (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
+  const groupbyColumn = groupby_column_key && getTableColumnByKey(table, groupby_column_key);
   if (!groupbyColumn) {
     return;
   }
-  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key);
+  const summaryColumn = getTableColumnByKey(table, summary_column_key);
   const {
     type: groupby_column_type
   } = groupbyColumn;
-  if ((_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupby_column_type) || (0, _columnUtils.isDateFormulaColumn)(groupbyColumn)) && !groupby_date_granularity) {
-    groupby_date_granularity = _constants.CHART_SUMMARY_TYPE.MONTH;
-    if ([_constants.CHART_TYPE.HEAT_MAP].includes(chart.type)) {
-      groupby_date_granularity = _constants.CHART_SUMMARY_TYPE.DAY;
+  if ((DATE_COLUMN_OPTIONS.includes(groupby_column_type) || isDateFormulaColumn(groupbyColumn)) && !groupby_date_granularity) {
+    groupby_date_granularity = CHART_SUMMARY_TYPE.MONTH;
+    if ([CHART_TYPE.HEAT_MAP].includes(chart.type)) {
+      groupby_date_granularity = CHART_SUMMARY_TYPE.DAY;
     }
   }
-  if (groupby_column_type === _dtableUtils.CellType.GEOLOCATION && !groupby_geolocation_granularity) {
-    groupby_geolocation_granularity = _constants.CHART_SUMMARY_TYPE.PROVINCE;
+  if (groupby_column_type === CellType.GEOLOCATION && !groupby_geolocation_granularity) {
+    groupby_geolocation_granularity = CHART_SUMMARY_TYPE.PROVINCE;
   }
   const yAxisType = null;
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
-  const isGroupbyColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(groupbyColumn);
+  const isGroupbyColumnDataAsAnArray = isArrayCellValue(groupbyColumn);
   let results = getBasicChartResults(statRows, formulaRows, groupbyColumn, include_empty, isGroupbyColumnDataAsAnArray, groupby_date_granularity, groupby_geolocation_granularity, summaryColumn, summary_type, summary_method, yAxisType, value);
   if (sort_type) {
-    _baseUtils.default.sortChartData(results, sort_type); // sortby statistic value
+    BaseUtils.sortChartData(results, sort_type); // sortby statistic value
   } else {
-    _baseUtils.default.sortCharts(results, groupbyColumn, 'name'); // sortby statistic label
+    BaseUtils.sortCharts(results, groupbyColumn, 'name'); // sortby statistic label
   }
   results.forEach(item => {
     item.group_name = item.name;
-    item.name = (0, _rowUtils.getFormattedLabel)(groupbyColumn, item.name, value.collaborators);
+    item.name = getFormattedLabel(groupbyColumn, item.name, value.collaborators);
   });
-  if ([_constants.CHART_TYPE.HEAT_MAP].includes(chart.type)) {
+  if ([CHART_TYPE.HEAT_MAP].includes(chart.type)) {
     let data = [];
     let years = [];
     results.forEach(item => {
@@ -105,12 +98,12 @@ async function calculateBasicChart(chart, value, _ref) {
         data.push(item);
         return;
       }
-      const year = (0, _dayjs.default)(item.name).year();
+      const year = dayjs(item.name).year();
       data.push({
         ...item,
         year
       });
-      if (years.indexOf(year) < 0) {
+      if (!isNaN(year) && years.indexOf(year) < 0) {
         years.push(year);
       }
     });
@@ -119,6 +112,7 @@ async function calculateBasicChart(chart, value, _ref) {
       if (current.year < next.year) return 1;
       return 0;
     });
+    years.sort((current, next) => next - current);
     return {
       data,
       years
@@ -148,7 +142,7 @@ async function calculateGroupingChart(chart, value, _ref2) {
   let groupby_date_granularity = chart.x_axis_date_granularity;
   let groupby_geolocation_granularity = chart.x_axis_geolocation_granularity;
   let column_groupby_numeric_columns = chart.summary_columns || [];
-  if ([_constants.CHART_TYPE.HORIZONTAL_GROUP_BAR, _constants.CHART_TYPE.STACKED_HORIZONTAL_BAR].includes(chart.type)) {
+  if ([CHART_TYPE.HORIZONTAL_GROUP_BAR, CHART_TYPE.STACKED_HORIZONTAL_BAR].includes(chart.type)) {
     groupby_column_key = chart.vertical_axis_column_key;
     groupby_date_granularity = chart.vertical_axis_date_granularity;
     groupby_geolocation_granularity = chart.vertical_axis_geolocation_granularity;
@@ -157,56 +151,56 @@ async function calculateGroupingChart(chart, value, _ref2) {
     y_axis_summary_type = chart.horizontal_axis_summary_type;
     y_axis_summary_method = chart.horizontal_axis_summary_method;
   }
-  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 = groupby_column_key && (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
+  const groupbyColumn = groupby_column_key && getTableColumnByKey(table, groupby_column_key);
   if (!groupbyColumn) {
     return;
   }
   const {
     type: groupby_column_type
   } = groupbyColumn;
-  if ((_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupby_column_type) || (0, _columnUtils.isDateFormulaColumn)(groupbyColumn)) && !groupby_date_granularity) {
-    groupby_date_granularity = _constants.CHART_SUMMARY_TYPE.MONTH;
+  if ((DATE_COLUMN_OPTIONS.includes(groupby_column_type) || isDateFormulaColumn(groupbyColumn)) && !groupby_date_granularity) {
+    groupby_date_granularity = CHART_SUMMARY_TYPE.MONTH;
   }
-  if (groupby_column_type === _dtableUtils.CellType.GEOLOCATION && !groupby_geolocation_granularity) {
-    groupby_geolocation_granularity = _constants.CHART_SUMMARY_TYPE.PROVINCE;
+  if (groupby_column_type === CellType.GEOLOCATION && !groupby_geolocation_granularity) {
+    groupby_geolocation_granularity = CHART_SUMMARY_TYPE.PROVINCE;
   }
   const yAxisType = null;
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   let results = getGroupingChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty_cells, groupby_date_granularity, groupby_geolocation_granularity, column_groupby_column_key, column_groupby_date_granularity, column_groupby_geolocation_granularity, y_axis_summary_column_key, y_axis_summary_type, y_axis_summary_method, column_groupby_multiple_numeric_column, column_groupby_numeric_columns, yAxisType, table, value);
-  _baseUtils.default.sortCharts(results, groupbyColumn, 'name');
+  BaseUtils.sortCharts(results, groupbyColumn, 'name');
   results = results.map(result => {
     return {
       ...result,
-      group_color: result.color || _constants.CHART_STYLE_COLORS[0],
-      name: (0, _rowUtils.getFormattedLabel)(groupbyColumn, result.name, value.collaborators)
+      group_color: result.color || CHART_STYLE_COLORS[0],
+      name: getFormattedLabel(groupbyColumn, result.name, value.collaborators)
     };
   });
   return results;
 }
 function getGroupChartStatResult(table, value, groupbyColumn, groupColumnKey, statRows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType) {
-  let columnGroupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, groupColumnKey);
+  let columnGroupbyColumn = getTableColumnByKey(table, groupColumnKey);
   if (!columnGroupbyColumn) {
     return [];
   }
   let result = [];
-  let isGroupbyColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(groupbyColumn);
-  let isColumnGroupbyColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(columnGroupbyColumn);
+  let isGroupbyColumnDataAsAnArray = isArrayCellValue(groupbyColumn);
+  let isColumnGroupbyColumnDataAsAnArray = isArrayCellValue(columnGroupbyColumn);
   statRows.forEach(row => {
     let {
       _id: rowId
     } = row;
     let formulaRow = formulaRows[rowId];
-    if ((0, _rowUtils.isValidRow)(row, formulaRow, groupbyColumn, includeEmpty)) {
-      let name = _baseUtils.default.getGroupLabel(row[groupbyColumn.key], formulaRow, groupbyColumn, groupbyDateGranularity, groupbyGeolocationGranularity, value);
+    if (isValidRow(row, formulaRow, groupbyColumn, includeEmpty)) {
+      let name = BaseUtils.getGroupLabel(row[groupbyColumn.key], formulaRow, groupbyColumn, groupbyDateGranularity, groupbyGeolocationGranularity, value);
       let groupName = columnGroupbyColumn.name;
       if (!columnGroupbyMultipleNumericColumn) {
-        groupName = _baseUtils.default.getGroupLabel(row[columnGroupbyColumn.key], formulaRow, columnGroupbyColumn, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, value);
+        groupName = BaseUtils.getGroupLabel(row[columnGroupbyColumn.key], formulaRow, columnGroupbyColumn, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, value);
       }
       if (isGroupbyColumnDataAsAnArray) {
         if (name.length === 0 && includeEmpty) {
@@ -251,7 +245,7 @@ function groupChartRows(results, name, row, isColumnGroupbyColumnDataAsAnArray,
       });
     }
   } else {
-    if (!groupName && groupName !== 0 && !include_empty) {
+    if (isEmpty(groupName) && !include_empty) {
       return;
     }
     updateGroupingChartRows(results, name, groupName, row, yAxisType);
@@ -295,9 +289,9 @@ function updateChartValue(summaryColumn, summary_type, summary_method, formula_r
     let updated = {
       ...item
     };
-    const value = _baseUtils.default.getTotal(summaryColumnKey, summaryColumnType, summary_type, summary_method, rows, formula_rows);
+    const value = BaseUtils.getTotal(summaryColumnKey, summaryColumnType, summary_type, summary_method, rows, formula_rows);
     updated.value = value;
-    updated.formatted_value = _baseUtils.default.getFormattedValue(value, summaryColumn, summary_method);
+    updated.formatted_value = BaseUtils.getFormattedValue(value, summaryColumn, summary_method);
     results[index] = updated;
   });
 }
@@ -308,8 +302,8 @@ function getBasicChartResults(rows, formulaRows, groupbyColumn, includeEmpty, is
       _id: rowId
     } = row;
     const formulaRow = formulaRows[rowId];
-    if (!(0, _rowUtils.isValidRow)(row, formulaRow, groupbyColumn, includeEmpty)) return;
-    const name = _baseUtils.default.getGroupLabel(row[groupbyColumn.key], formulaRow, groupbyColumn, groupbyDateGranularity, groupbyGeolocationGranularity, value);
+    if (!isValidRow(row, formulaRow, groupbyColumn, includeEmpty)) return;
+    const name = BaseUtils.getGroupLabel(row[groupbyColumn.key], formulaRow, groupbyColumn, groupbyDateGranularity, groupbyGeolocationGranularity, value);
     if (isGroupbyColumnDataAsAnArray) {
       if (name.length === 0 && includeEmpty) {
         const nameIndex = results.findIndex(result => !result.name);
@@ -352,25 +346,25 @@ function getGroupingChartResults(rows, formulaRows, groupbyColumn, xAxisIncludeE
   return results;
 }
 function getGroupbyOneColumnChartResults(rows, formulaRows, groupbyColumn, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyColumnKey, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumnKey, summaryType, summaryMethod, yAxisType, table, value) {
-  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summaryColumnKey);
+  const summaryColumn = getTableColumnByKey(table, summaryColumnKey);
   const columnGroupbyMultipleNumericColumn = false;
   let results = getGroupChartStatResult(table, value, groupbyColumn, columnGroupbyColumnKey, rows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType);
-  const columnGroupByColumn = (0, _dtableUtils.getTableColumnByKey)(table, columnGroupbyColumnKey);
+  const columnGroupByColumn = getTableColumnByKey(table, columnGroupbyColumnKey);
   results = results.map(result => {
     const groupName = result.group_name;
     let formattedResult = {
       ...result
     };
-    if (columnGroupByColumn.type === _dtableUtils.CellType.SINGLE_SELECT) {
-      formattedResult.color = (0, _columnUtils.getColorFromSingleSelectColumn)(columnGroupByColumn, groupName);
+    if (columnGroupByColumn.type === CellType.SINGLE_SELECT) {
+      formattedResult.color = getColorFromSingleSelectColumn(columnGroupByColumn, groupName);
     }
-    formattedResult.group_name = (0, _rowUtils.getFormattedLabel)(columnGroupByColumn, groupName, value.collaborators);
+    formattedResult.group_name = getFormattedLabel(columnGroupByColumn, groupName, value.collaborators);
     return formattedResult;
   });
   return results;
 }
 function getGroupbyNumericColumnsChartResults(rows, formulaRows, groupbyColumn, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, numericSummaryColumnKey, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryType, summaryMethod, yAxisType, table, value) {
-  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, numericSummaryColumnKey);
+  const summaryColumn = getTableColumnByKey(table, numericSummaryColumnKey);
   const columnGroupbyMultipleNumericColumn = true;
   return getGroupChartStatResult(table, value, groupbyColumn, numericSummaryColumnKey, rows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType);
 }
@@ -388,22 +382,22 @@ async function calculateGeolocationBasicChart(chart, value, _ref3) {
     summary_column_key,
     summary_method
   } = 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 geoColumn = geo_column_key && (0, _dtableUtils.getTableColumnByKey)(table, geo_column_key);
+  const geoColumn = geo_column_key && getTableColumnByKey(table, geo_column_key);
   if (!geoColumn) {
     return;
   }
   let geolocationGranularity = null;
   if (type && type.includes('world')) {
-    geolocationGranularity = geoColumn.type === _dtableUtils.CellType.GEOLOCATION ? chart.geolocation_granularity : null;
+    geolocationGranularity = geoColumn.type === CellType.GEOLOCATION ? chart.geolocation_granularity : null;
   } else {
-    geolocationGranularity = (0, _map.fixGeoGranularity)(chart.map_level, chart.map_location);
+    geolocationGranularity = fixGeoGranularity(chart.map_level, chart.map_location);
   }
-  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key);
+  const summaryColumn = getTableColumnByKey(table, summary_column_key);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   const geoColumnType = geoColumn.type;
@@ -413,8 +407,8 @@ async function calculateGeolocationBasicChart(chart, value, _ref3) {
       _id: rowId
     } = row;
     const formulaRow = formulaRows[rowId];
-    if ((0, _rowUtils.isValidRow)(row, formulaRow, geoColumn, false)) {
-      if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[geoColumnType]) {
+    if (isValidRow(row, formulaRow, geoColumn, false)) {
+      if (FORMULA_COLUMN_TYPES_MAP[geoColumnType]) {
         const list = formulaRow[geoColumn.key];
         list.forEach(n => {
           const nameIndex = results.findIndex(r => {
@@ -457,12 +451,12 @@ async function calculateCustomBar(statItem, value, _ref4) {
     x_axis_include_empty_cells,
     y_axises
   } = statItem;
-  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 || !x_axis_column_key || !Array.isArray(y_axises) || y_axises.length === 0) {
     return [];
   }
-  const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key);
+  const groupbyColumn = getTableColumnByKey(table, x_axis_column_key);
   if (!groupbyColumn) {
     return [];
   }
@@ -471,11 +465,11 @@ async function calculateCustomBar(statItem, value, _ref4) {
   } = groupbyColumn;
   let groupbyDateGranularity = x_axis_date_granularity;
   let groupbyGeolocationGranularity = x_axis_geolocation_granularity;
-  if ((_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || (0, _columnUtils.isDateFormulaColumn)(groupbyColumn)) && !groupbyDateGranularity) {
-    groupbyDateGranularity = _constants.CHART_SUMMARY_TYPE.MONTH;
+  if ((DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || isDateFormulaColumn(groupbyColumn)) && !groupbyDateGranularity) {
+    groupbyDateGranularity = CHART_SUMMARY_TYPE.MONTH;
   }
-  if (groupbyColumnType === _dtableUtils.CellType.GEOLOCATION && !groupbyGeolocationGranularity) {
-    groupbyGeolocationGranularity = _constants.CHART_SUMMARY_TYPE.PROVINCE;
+  if (groupbyColumnType === CellType.GEOLOCATION && !groupbyGeolocationGranularity) {
+    groupbyGeolocationGranularity = CHART_SUMMARY_TYPE.PROVINCE;
   }
   const columnGroupbyDateGranularity = null;
   const columnGroupbyGeolocationGranularity = null;
@@ -487,27 +481,27 @@ async function calculateCustomBar(statItem, value, _ref4) {
       type: yAxisType,
       column_groupby_numeric_columns
     } = yAxis;
-    if (yAxisType === _constants.CHART_TYPE.BAR_STACK) {
+    if (yAxisType === CHART_TYPE.BAR_STACK) {
       // just support summary numeric columns.
       if (!Array.isArray(column_groupby_numeric_columns) || column_groupby_numeric_columns.length === 0) {
         return;
       }
-      const yAxisType = `${_constants.Y_AXIS_TYPE_PREFIX}${index}`;
+      const yAxisType = `${Y_AXIS_TYPE_PREFIX}${index}`;
       column_groupby_numeric_columns.forEach(numericSummaryColumn => {
         const {
           column_key: summary_column_key,
           summary_method
         } = numericSummaryColumn;
-        const currentResults = getGroupbyNumericColumnsChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty_cells, groupbyDateGranularity, groupbyGeolocationGranularity, summary_column_key, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, _constants.CHART_SUMMARY_TYPE.ADVANCED, summary_method, yAxisType, table, value);
+        const currentResults = getGroupbyNumericColumnsChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty_cells, groupbyDateGranularity, groupbyGeolocationGranularity, summary_column_key, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, CHART_SUMMARY_TYPE.ADVANCED, summary_method, yAxisType, table, value);
         results = results.concat(currentResults);
       });
     }
   });
-  _baseUtils.default.sortCharts(results, groupbyColumn, 'name');
+  BaseUtils.sortCharts(results, groupbyColumn, 'name');
   results = results.map(result => {
     return {
       ...result,
-      name: (0, _rowUtils.getFormattedLabel)(groupbyColumn, result.name, value.collaborators, type)
+      name: getFormattedLabel(groupbyColumn, result.name, value.collaborators, type)
     };
   });
   return results;
@@ -526,7 +520,7 @@ function calculator(chart, value, _ref5) {
       getTableFormulaResults
     });
   }
-  if (type === _constants.CHART_TYPE.BAR_CUSTOM) {
+  if (type === CHART_TYPE.BAR_CUSTOM) {
     return calculateCustomBar(chart, value, {
       getViewRows,
       getTableFormulaResults
@@ -548,4 +542,4 @@ function calculator(chart, value, _ref5) {
     getTableFormulaResults
   });
 }
-var _default = exports.default = calculator;
+export default calculator;

package/dist/utils/chart-utils/original-data-utils/card-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 { isNumber, isNumericColumn, 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, dtableValue, _ref) {
   let {
     getViewRows,
@@ -21,29 +14,29 @@ async function calculator(chart, dtableValue, _ref) {
     summary_method,
     summary_type
   } = chart;
-  const selectedTable = (0, _dtableUtils.getTableById)(dtableValue.tables, table_id);
-  const selectedView = selectedTable && (0, _dtableUtils.getViewById)(selectedTable.views, view_id);
-  const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, numeric_column_key);
-  const _isNumericColumn = selectedColumn && (0, _dtableUtils.isNumericColumn)(selectedColumn);
+  const selectedTable = getTableById(dtableValue.tables, table_id);
+  const selectedView = selectedTable && getViewById(selectedTable.views, view_id);
+  const selectedColumn = getTableColumnByKey(selectedTable, numeric_column_key);
+  const _isNumericColumn = selectedColumn && isNumericColumn(selectedColumn);
   const statRows = await getViewRows(selectedView, selectedTable);
   const formulaRows = _isNumericColumn ? await getTableFormulaResults(selectedTable, statRows) : {};
   const numberList = [];
   _isNumericColumn && statRows.forEach(row => {
     const formulaRow = formulaRows[row._id];
-    const cellValue = (0, _rowUtils.getCellValue)(row, formulaRow, selectedColumn);
-    if ((0, _dtableUtils.isNumber)(cellValue)) {
+    const cellValue = getCellValue(row, formulaRow, selectedColumn);
+    if (isNumber(cellValue)) {
       numberList.push(cellValue);
     }
   });
   let value;
-  if (summary_type === _constants.CHART_SUMMARY_TYPE.COUNT) {
+  if (summary_type === CHART_SUMMARY_TYPE.COUNT) {
     value = statRows.length;
   } else {
-    value = _baseUtils.default.getSummaryResult(numberList, summary_method);
+    value = BaseUtils.getSummaryResult(numberList, summary_method);
   }
   return {
     value,
     rows: statRows
   };
 }
-var _default = exports.default = calculator;
+export default calculator;