dtable-statistic 4.3.6 → 4.3.8

package/es/calculator/workers/basic-chart-calculator-worker.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _constants = require("../../constants");
 var _columnUtils = require("../../utils/column-utils");
 var _commonUtils = require("../../utils/common-utils");
@@ -13,26 +13,46 @@ var _rowUtils = require("../../utils/row-utils");
 var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
 var _map = require("../../utils/map");
 const MAP_CHART_TYPES = [_constants.STAT_TYPE.MAP, _constants.STAT_TYPE.WORLD_MAP, _constants.STAT_TYPE.MAP_BUBBLE, _constants.STAT_TYPE.WORLD_MAP_BUBBLE];
-function calculateChart(chart, value, username, userId) {
+function calculateChart(chart, value, _ref) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref;
   const {
     type
   } = chart;
   if (MAP_CHART_TYPES.includes(type)) {
-    return calculateGeolocationBasicChart(chart, value, username, userId);
+    return calculateGeolocationBasicChart(chart, value, {
+      getViewRows,
+      getTableFormulaResults
+    });
   }
   if (type === _constants.STAT_TYPE.CUSTOM_BAR) {
-    return calculateCustomBar(chart, value, username, userId);
+    return calculateCustomBar(chart, value, {
+      getViewRows,
+      getTableFormulaResults
+    });
   }
   const {
     column_groupby_column_key,
     column_groupby_multiple_numeric_column
   } = chart;
   if (!column_groupby_column_key && !column_groupby_multiple_numeric_column) {
-    return calculateBasicChart(chart, value, username, userId);
+    return calculateBasicChart(chart, value, {
+      getViewRows,
+      getTableFormulaResults
+    });
   }
-  return calculateGroupingChart(chart, value, username, userId);
+  return calculateGroupingChart(chart, value, {
+    getViewRows,
+    getTableFormulaResults
+  });
 }
-function calculateBasicChart(chart, value, username, userId) {
+async function calculateBasicChart(chart, value, _ref2) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref2;
   const {
     table_id,
     view_id,
@@ -62,28 +82,28 @@ function calculateBasicChart(chart, value, username, userId) {
     groupby_geolocation_granularity = chart.x_axis_geolocation_granularity;
     include_empty = chart.x_axis_include_empty;
   }
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
   if (!view) {
     return;
   }
-  const groupbyColumn = groupby_column_key && _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
+  const groupbyColumn = groupby_column_key && (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
   if (!groupbyColumn) {
     return;
   }
-  const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column_key);
+  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key);
   const {
     type: groupby_column_type
   } = groupbyColumn;
-  if (_dtableStore.DATE_COLUMN_OPTIONS.includes(groupby_column_type) && !groupby_date_granularity) {
+  if (_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupby_column_type) && !groupby_date_granularity) {
     groupby_date_granularity = _constants.STATISTICS_COUNT_TYPE.MONTH;
   }
-  if (groupby_column_type === _dtableStore.CellType.GEOLOCATION && !groupby_geolocation_granularity) {
+  if (groupby_column_type === _dtableUtils.CellType.GEOLOCATION && !groupby_geolocation_granularity) {
     groupby_geolocation_granularity = _constants.STATISTICS_COUNT_TYPE.PROVINCE;
   }
   const yAxisType = null;
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const statRows = await getViewRows(view, table);
+  const formulaRows = await getTableFormulaResults(table, statRows);
   const isGroupbyColumnDataAsAnArray = (0, _commonUtils.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) {
@@ -97,7 +117,11 @@ function calculateBasicChart(chart, value, username, userId) {
   });
   return results;
 }
-function calculateGroupingChart(chart, value, username, userId) {
+async function calculateGroupingChart(chart, value, _ref3) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref3;
   const {
     table_id,
     view_id,
@@ -115,27 +139,27 @@ function calculateGroupingChart(chart, value, username, userId) {
   let groupby_date_granularity = chart.x_axis_date_granularity;
   let groupby_geolocation_granularity = chart.x_axis_geolocation_granularity;
   let column_groupby_numeric_columns = chart.column_groupby_numeric_columns || [];
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
   if (!view) {
     return;
   }
-  const groupbyColumn = groupby_column_key && _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
+  const groupbyColumn = groupby_column_key && (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
   if (!groupbyColumn) {
     return;
   }
   const {
     type: groupby_column_type
   } = groupbyColumn;
-  if (_dtableStore.DATE_COLUMN_OPTIONS.includes(groupby_column_type) && !groupby_date_granularity) {
+  if (_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupby_column_type) && !groupby_date_granularity) {
     groupby_date_granularity = _constants.STATISTICS_COUNT_TYPE.MONTH;
   }
-  if (groupby_column_type === _dtableStore.CellType.GEOLOCATION && !groupby_geolocation_granularity) {
+  if (groupby_column_type === _dtableUtils.CellType.GEOLOCATION && !groupby_geolocation_granularity) {
     groupby_geolocation_granularity = _constants.STATISTICS_COUNT_TYPE.PROVINCE;
   }
   const yAxisType = null;
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const statRows = await getViewRows(view, table);
+  const formulaRows = await getTableFormulaResults(table, statRows);
   let results = getGroupingChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty, groupby_date_granularity, groupby_geolocation_granularity, column_groupby_column_key, column_groupby_date_granularity, column_groupby_geolocation_granularity, y_axis_column_key, y_axis_summary_type, y_axis_summary_method, column_groupby_multiple_numeric_column, column_groupby_numeric_columns, yAxisType, table, value);
   _statUtils.default.sortStatistics(results, groupbyColumn, 'name');
   results = results.map(result => {
@@ -147,7 +171,7 @@ function calculateGroupingChart(chart, value, username, userId) {
   return results;
 }
 function getGroupChartStatResult(table, value, groupbyColumn, groupColumnKey, statRows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyGateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType) {
-  let columnGroupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, groupColumnKey);
+  let columnGroupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, groupColumnKey);
   if (!columnGroupbyColumn) {
     return [];
   }
@@ -309,16 +333,16 @@ 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 = _dtableStore.TableUtils.getTableColumnByKey(table, summaryColumnKey);
+  const summaryColumn = (0, _dtableUtils.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 = _dtableStore.TableUtils.getTableColumnByKey(table, columnGroupbyColumnKey);
+  const columnGroupByColumn = (0, _dtableUtils.getTableColumnByKey)(table, columnGroupbyColumnKey);
   results = results.map(result => {
     const groupName = result.group_name;
     let formattedResult = {
       ...result
     };
-    if (columnGroupByColumn.type === _dtableStore.CellType.SINGLE_SELECT) {
+    if (columnGroupByColumn.type === _dtableUtils.CellType.SINGLE_SELECT) {
       formattedResult.color = (0, _columnUtils.getColorFromSingleSelectColumn)(columnGroupByColumn, groupName);
     }
     formattedResult.group_name = (0, _rowUtils.getFormattedLabel)(columnGroupByColumn, groupName, value.collaborators);
@@ -327,11 +351,15 @@ function getGroupbyOneColumnChartResults(rows, formulaRows, groupbyColumn, inclu
   return results;
 }
 function getGroupbyNumericColumnsChartResults(rows, formulaRows, groupbyColumn, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, numericSummaryColumnKey, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryType, summaryMethod, yAxisType, table, value) {
-  const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, numericSummaryColumnKey);
+  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, numericSummaryColumnKey);
   const columnGroupbyMultipleNumericColumn = true;
   return getGroupChartStatResult(table, value, groupbyColumn, numericSummaryColumnKey, rows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType);
 }
-function calculateGeolocationBasicChart(chart, value, username, userId) {
+async function calculateGeolocationBasicChart(chart, value, _ref4) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref4;
   const {
     type,
     table_id,
@@ -341,24 +369,24 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
     summary_column,
     summary_method
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
   if (!view) {
     return;
   }
-  const geoColumn = geo_column && _dtableStore.TableUtils.getTableColumnByKey(table, geo_column);
+  const geoColumn = geo_column && (0, _dtableUtils.getTableColumnByKey)(table, geo_column);
   if (!geoColumn) {
     return;
   }
   let geolocationGranularity = null;
   if (type && type.includes('world')) {
-    geolocationGranularity = geoColumn.type === _dtableStore.CellType.GEOLOCATION ? chart.geolocation_granularity : null;
+    geolocationGranularity = geoColumn.type === _dtableUtils.CellType.GEOLOCATION ? chart.geolocation_granularity : null;
   } else {
     geolocationGranularity = (0, _map.fixMapGeoGranularity)(chart);
   }
-  const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column);
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column);
+  const statRows = await getViewRows(view, table);
+  const formulaRows = await getTableFormulaResults(table, statRows);
   const geoColumnType = geoColumn.type;
   let results = [];
   statRows.forEach(row => {
@@ -367,7 +395,7 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
     } = row;
     const formulaRow = formulaRows[rowId];
     if ((0, _rowUtils.isValidRow)(row, formulaRow, geoColumn, false)) {
-      if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[geoColumnType]) {
+      if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[geoColumnType]) {
         const list = formulaRow[geoColumn.key];
         list.forEach(n => {
           const nameIndex = results.findIndex(r => {
@@ -395,7 +423,11 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
   updateChartValue(summaryColumn, summary_type, summary_method, formulaRows, results);
   return results;
 }
-function calculateCustomBar(statItem, value, username, userId) {
+async function calculateCustomBar(statItem, value, _ref5) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref5;
   const {
     table_id,
     view_id,
@@ -405,12 +437,12 @@ function calculateCustomBar(statItem, value, username, userId) {
     x_axis_include_empty,
     y_axises
   } = statItem;
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
   if (!view || !x_axis_column_key || !Array.isArray(y_axises) || y_axises.length === 0) {
     return [];
   }
-  const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column_key);
+  const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key);
   if (!groupbyColumn) {
     return [];
   }
@@ -419,16 +451,16 @@ function calculateCustomBar(statItem, value, username, userId) {
   } = groupbyColumn;
   let groupbyDateGranularity = x_axis_date_granularity;
   let groupbyGeolocationGranularity = x_axis_geolocation_granularity;
-  if (_dtableStore.DATE_COLUMN_OPTIONS.includes(groupbyColumnType) && !groupbyDateGranularity) {
+  if (_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupbyColumnType) && !groupbyDateGranularity) {
     groupbyDateGranularity = _constants.STATISTICS_COUNT_TYPE.MONTH;
   }
-  if (groupbyColumnType === _dtableStore.CellType.GEOLOCATION && !groupbyGeolocationGranularity) {
+  if (groupbyColumnType === _dtableUtils.CellType.GEOLOCATION && !groupbyGeolocationGranularity) {
     groupbyGeolocationGranularity = _constants.STATISTICS_COUNT_TYPE.PROVINCE;
   }
   const columnGroupbyDateGranularity = null;
   const columnGroupbyGeolocationGranularity = null;
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const statRows = await getViewRows(view, table);
+  const formulaRows = await getTableFormulaResults(table, statRows);
   let results = [];
   y_axises.forEach((yAxis, index) => {
     const {

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

@@ -33,9 +33,12 @@ const typeCalculatorWorkerMap = {
   [_constants.STAT_TYPE.TREND_CHART]: _trendCalculatorWorker.default,
   [_constants.STAT_TYPE.DASHBOARD]: _dashboardCalculatorWorker.default
 };
-function calculator(chart, value, username, userId) {
+function calculator(chart, value, getViewRows, getTableFormulaResults) {
   const type = chart.type;
   const calculatorWorker = typeCalculatorWorkerMap[type] || typeCalculatorWorkerMap[BASIC_CHART];
-  return calculatorWorker(chart, value, username, userId);
+  return calculatorWorker(chart, value, {
+    getViewRows,
+    getTableFormulaResults
+  });
 }
 (0, _comlink.expose)(calculator);

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

@@ -4,27 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _commonUtils = require("../../utils/common-utils");
 var _rowUtils = require("../../utils/row-utils");
-function calculateResult(chart, dtableValue, username, userId) {
+async function calculateResult(chart, dtableValue, _ref) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref;
   const {
     table_id,
     view_id,
     numeric_column,
     summary_method
   } = chart;
-  const selectedTable = _dtableStore.TableUtils.getTableById(dtableValue.tables, table_id);
-  const selectedView = selectedTable && _dtableStore.Views.getViewById(selectedTable.views, view_id);
-  const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, numeric_column);
-  const _isNumericColumn = selectedColumn && (0, _dtableStore.isNumericColumn)(selectedColumn);
-  const statRows = _dtableStore.Views.getViewRows(selectedView, selectedTable, dtableValue, username, userId);
-  const formulaRows = _isNumericColumn ? _dtableStore.Views.getTableFormulaResults(selectedTable, statRows, dtableValue) : {};
+  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);
+  const _isNumericColumn = selectedColumn && (0, _dtableUtils.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, _dtableStore.isNumber)(cellValue)) {
+    if ((0, _dtableUtils.isNumber)(cellValue)) {
       numberList.push(cellValue);
     }
   });

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

@@ -5,12 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = calculateResult;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
 var _commonUtils = require("../../utils/common-utils");
 var _constants = require("../../constants");
 var _rowUtils = require("../../utils/row-utils");
-function calculateResult(chart, value, username, userId) {
+async function calculateResult(chart, value, _ref) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref;
   const {
     table_id,
     view_id,
@@ -27,17 +31,17 @@ function calculateResult(chart, value, username, userId) {
     y_axis_left_group_by_multiple_numeric_column,
     y_axis_left_group_by_numeric_columns
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
   if (!view) {
     return [];
   }
-  const xAxisColumn = _dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column_key);
+  const xAxisColumn = (0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key);
   if (!xAxisColumn) return [];
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
-  const column1 = _dtableStore.TableUtils.getTableColumnByKey(table, y_axis_left_summary_column);
-  const column2 = _dtableStore.TableUtils.getTableColumnByKey(table, y_axis_right_summary_column);
+  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 leftResultMap = new Map();
   const rightResultMap = new Map();
   let isColumnDataAsAnArray = (0, _commonUtils.isArrayCellValue)(xAxisColumn);
@@ -55,7 +59,7 @@ function calculateResult(chart, value, username, userId) {
     }
     if (y_axis_left_group_by_multiple_numeric_column) {
       y_axis_left_group_by_numeric_columns.forEach((item, index) => {
-        const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, item.column_key);
+        const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, item.column_key);
         if (summaryColumn) {
           leftSummaryColumn[item.column_key] = {
             method: item.summary_method,
@@ -111,7 +115,7 @@ function calculateResult(chart, value, username, userId) {
                 key
               });
               const currentLabelList = currentLabelMap[key] || [];
-              if ((0, _dtableStore.isNumber)(cellValue)) {
+              if ((0, _dtableUtils.isNumber)(cellValue)) {
                 currentLabelList.push(cellValue);
               }
               currentLabelMap[key] = currentLabelList;
@@ -127,7 +131,7 @@ function calculateResult(chart, value, username, userId) {
               key
             });
             const currentLabelList = currentValue[key] || [];
-            if ((0, _dtableStore.isNumber)(cellValue)) {
+            if ((0, _dtableUtils.isNumber)(cellValue)) {
               currentLabelList.push(cellValue);
             }
             currentValue[key] = currentLabelList;
@@ -143,7 +147,7 @@ function calculateResult(chart, value, username, userId) {
               key
             });
             const currentList = currentValue[key] || [];
-            if ((0, _dtableStore.isNumber)(cellValue)) {
+            if ((0, _dtableUtils.isNumber)(cellValue)) {
               currentList.push(cellValue);
             }
             currentValue[key] = currentList;
@@ -182,7 +186,7 @@ function calculateResult(chart, value, username, userId) {
         if (label.length > 0) {
           label.forEach(name => {
             const currentLabelList = rightResultMap.get(name) || [];
-            if ((0, _dtableStore.isNumber)(cellValue)) {
+            if ((0, _dtableUtils.isNumber)(cellValue)) {
               currentLabelList.push(cellValue);
             }
             rightResultMap.set(name, currentLabelList);
@@ -190,7 +194,7 @@ function calculateResult(chart, value, username, userId) {
         }
         if (label.length === 0 && x_axis_include_empty) {
           let currentValue = rightResultMap.get(null) || [];
-          if ((0, _dtableStore.isNumber)(cellValue)) {
+          if ((0, _dtableUtils.isNumber)(cellValue)) {
             currentValue.push(cellValue);
           }
           rightResultMap.set(null, currentValue);
@@ -198,7 +202,7 @@ function calculateResult(chart, value, username, userId) {
       } else {
         if (x_axis_include_empty || label) {
           const currentLabelList = rightResultMap.get(label) || [];
-          if ((0, _dtableStore.isNumber)(cellValue)) {
+          if ((0, _dtableUtils.isNumber)(cellValue)) {
             currentLabelList.push(cellValue);
           }
           rightResultMap.set(label, currentLabelList);

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

@@ -5,12 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
 var _commonUtils = require("../../utils/common-utils");
 var _rowUtils = require("../../utils/row-utils");
 var _constants = require("../../constants");
-function calculateChart(chart, value, username, userId) {
+async function calculateChart(chart, value, _ref) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref;
   const {
     table_id,
     view_id,
@@ -27,18 +31,18 @@ function calculateChart(chart, value, username, userId) {
   } = 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 = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
   if (!view || !x_axis_column_key) {
     return [];
   }
-  const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column_key);
+  const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key);
   if (!groupbyColumn) {
     return [];
   }
-  const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, y_axis_column_key) || {};
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_column_key) || {};
+  const statRows = await getViewRows(view, table);
+  const formulaRows = await getTableFormulaResults(table, statRows);
   const dateRangeResultMap = new Map();
   const comparedDateRangeResultMap = new Map();
   const isAdvance = y_axis_summary_type === _constants.SUMMARY_TYPE.ADVANCED;

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

@@ -5,12 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _commonUtils = require("../../utils/common-utils");
 var _rowUtils = require("../../utils/row-utils");
 var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
 var _constants = require("../../constants");
-function calculateResult(chart, value, username, userId) {
+async function calculateResult(chart, value, _ref) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref;
   const {
     table_id,
     view_id,
@@ -21,16 +25,16 @@ function calculateResult(chart, value, username, userId) {
     date_granularity,
     geolocation_granularity
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
   if (!view) {
     return [];
   }
-  const nameColumn = _dtableStore.TableUtils.getTableColumnByKey(table, name_column);
+  const nameColumn = (0, _dtableUtils.getTableColumnByKey)(table, name_column);
   if (!nameColumn) return [];
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
-  const groupColumn = _dtableStore.TableUtils.getTableColumnByKey(table, group_column);
+  const statRows = await getViewRows(view, table);
+  const formulaRows = await getTableFormulaResults(table, statRows);
+  const groupColumn = (0, _dtableUtils.getTableColumnByKey)(table, group_column);
   const isColumnDataAsAnArray = (0, _commonUtils.isArrayCellValue)(nameColumn);
   const isGroupChart = !!groupColumn;
   let result = [];
@@ -49,12 +53,12 @@ function calculateResult(chart, value, username, userId) {
         }
         label = (0, _rowUtils.getFormattedLabel)(nameColumn, label, value.collaborators);
         if (!memo.get(label)) {
-          const completedColumn = _dtableStore.TableUtils.getTableColumnByKey(table, completed_column);
-          const targetColumn = _dtableStore.TableUtils.getTableColumnByKey(table, target_column);
+          const completedColumn = (0, _dtableUtils.getTableColumnByKey)(table, completed_column);
+          const targetColumn = (0, _dtableUtils.getTableColumnByKey)(table, target_column);
           let currentValue = (0, _rowUtils.getCellValue)(row, formulaRow, completedColumn);
           let targetValue = (0, _rowUtils.getCellValue)(row, formulaRow, targetColumn);
-          currentValue = (0, _dtableStore.isNumber)(currentValue) ? currentValue : 0;
-          targetValue = (0, _dtableStore.isNumber)(targetValue) ? targetValue : 0;
+          currentValue = (0, _dtableUtils.isNumber)(currentValue) ? currentValue : 0;
+          targetValue = (0, _dtableUtils.isNumber)(targetValue) ? targetValue : 0;
           if (currentValue >= targetValue) {
             result.unshift({
               name: label,
@@ -86,7 +90,7 @@ function calculateResult(chart, value, username, userId) {
     const memo = new Map();
     const colorMap = {};
     let colorIndex = 0;
-    let isFormulaType = _dtableStore.FORMULA_COLUMN_TYPES_MAP[groupColumn.type];
+    let isFormulaType = _dtableUtils.FORMULA_COLUMN_TYPES_MAP[groupColumn.type];
     const isGroupColumnDataAsAnArray = (0, _commonUtils.isArrayCellValue)(groupColumn);
     statRows.forEach(row => {
       let {
@@ -114,12 +118,12 @@ function calculateResult(chart, value, username, userId) {
         }
         let cache = memo.get(label);
         if (groupLabel && (!cache || !cache[groupLabel])) {
-          const completedColumn = _dtableStore.TableUtils.getTableColumnByKey(table, completed_column);
-          const targetColumn = _dtableStore.TableUtils.getTableColumnByKey(table, target_column);
+          const completedColumn = (0, _dtableUtils.getTableColumnByKey)(table, completed_column);
+          const targetColumn = (0, _dtableUtils.getTableColumnByKey)(table, target_column);
           let currentValue = (0, _rowUtils.getCellValue)(row, formulaRow, completedColumn);
           let targetValue = (0, _rowUtils.getCellValue)(row, formulaRow, targetColumn);
-          currentValue = (0, _dtableStore.isNumber)(currentValue) ? currentValue : 0;
-          targetValue = (0, _dtableStore.isNumber)(targetValue) ? targetValue : 0;
+          currentValue = (0, _dtableUtils.isNumber)(currentValue) ? currentValue : 0;
+          targetValue = (0, _dtableUtils.isNumber)(targetValue) ? targetValue : 0;
           if (currentValue >= targetValue) {
             result.unshift({
               name: label,

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

@@ -4,10 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _commonUtils = require("../../utils/common-utils");
 var _rowUtils = require("../../utils/row-utils");
-function calculateResult(chart, value, username, userId) {
+async function calculateResult(chart, value, _ref) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref;
   const {
     table_id,
     view_id,
@@ -16,17 +20,17 @@ function calculateResult(chart, value, username, userId) {
     total_value_column,
     total_value_column_summary_method
   } = chart;
-  const selectedTable = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const selectedView = selectedTable && _dtableStore.Views.getViewById(selectedTable.views, view_id);
-  const selectedColumn1 = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, target_value_column);
-  const selectedColumn2 = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, total_value_column);
-  const statRows = _dtableStore.Views.getViewRows(selectedView, selectedTable, value, username, userId);
+  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);
+  const selectedColumn2 = (0, _dtableUtils.getTableColumnByKey)(selectedTable, total_value_column);
+  const statRows = await getViewRows(selectedView, selectedTable);
   if (statRows.length === 0) {
     return 0;
   }
-  const isNumericColumn1 = selectedColumn1 && (0, _dtableStore.isNumericColumn)(selectedColumn1);
-  const isNumericColumn2 = selectedColumn2 && (0, _dtableStore.isNumericColumn)(selectedColumn2);
-  const formulaRows = isNumericColumn1 || isNumericColumn2 ? _dtableStore.Views.getTableFormulaResults(selectedTable, statRows, value) : {};
+  const isNumericColumn1 = selectedColumn1 && (0, _dtableUtils.isNumericColumn)(selectedColumn1);
+  const isNumericColumn2 = selectedColumn2 && (0, _dtableUtils.isNumericColumn)(selectedColumn2);
+  const formulaRows = isNumericColumn1 || isNumericColumn2 ? await getTableFormulaResults(selectedTable, statRows) : {};
   let result1;
   let result2;
   let numberList1 = [];
@@ -35,13 +39,13 @@ function calculateResult(chart, value, username, userId) {
     const formulaRow = formulaRows[row._id];
     if (isNumericColumn1) {
       const cellValue1 = (0, _rowUtils.getCellValue)(row, formulaRow, selectedColumn1);
-      if ((0, _dtableStore.isNumber)(cellValue1)) {
+      if ((0, _dtableUtils.isNumber)(cellValue1)) {
         numberList1.push(cellValue1);
       }
     }
     if (isNumericColumn2) {
       const cellValue2 = (0, _rowUtils.getCellValue)(row, formulaRow, selectedColumn2);
-      if ((0, _dtableStore.isNumber)(cellValue2)) {
+      if ((0, _dtableUtils.isNumber)(cellValue2)) {
         numberList2.push(cellValue2);
       }
     }