dtable-statistic 4.2.2 → 4.3.0

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

@@ -1,40 +1,41 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { isNumber, TableUtils, Views } from 'dtable-store';
 import StatUtils from '../../utils/stat-utils';
 import { isArrayCellValue } from '../../utils/common-utils';
 import { getCellValue, getFormattedLabel } from '../../utils/row-utils';
 import { DATE_GRANULARITY } from '../../constants';
 function calculateResult(chart, value, username, userId) {
-  var table_id = chart.table_id,
-    view_id = chart.view_id,
-    x_axis_column = chart.x_axis_column,
-    y_axis_column = chart.y_axis_column,
-    group_column = chart.group_column;
-  var table = TableUtils.getTableById(value.tables, table_id);
-  var view = table && Views.getViewById(table.views, view_id);
+  const {
+    table_id,
+    view_id,
+    x_axis_column,
+    y_axis_column,
+    group_column
+  } = chart;
+  const table = TableUtils.getTableById(value.tables, table_id);
+  const view = table && Views.getViewById(table.views, view_id);
   if (!view) {
     return [];
   }
-  var selectedXAxisColumn = TableUtils.getTableColumnByKey(table, x_axis_column);
-  var selectedYAxisColumn = TableUtils.getTableColumnByKey(table, y_axis_column);
-  var selectedGroupColumn = TableUtils.getTableColumnByKey(table, group_column);
-  var statRows = Views.getViewRows(view, table, value, username, userId);
-  var formulaRows = Views.getTableFormulaResults(table, statRows, value);
-  var data = [];
-  statRows.forEach(function (row) {
-    var rowId = row._id;
-    var formulaRow = formulaRows[rowId] || {};
-    var x_axis = getCellValue(row, formulaRow, selectedXAxisColumn);
-    var y_axis = getCellValue(row, formulaRow, selectedYAxisColumn);
+  const selectedXAxisColumn = TableUtils.getTableColumnByKey(table, x_axis_column);
+  const selectedYAxisColumn = TableUtils.getTableColumnByKey(table, y_axis_column);
+  const selectedGroupColumn = TableUtils.getTableColumnByKey(table, group_column);
+  const statRows = Views.getViewRows(view, table, value, username, userId);
+  const formulaRows = Views.getTableFormulaResults(table, statRows, value);
+  const data = [];
+  statRows.forEach(row => {
+    const {
+      _id: rowId
+    } = row;
+    const formulaRow = formulaRows[rowId] || {};
+    let x_axis = getCellValue(row, formulaRow, selectedXAxisColumn);
+    let y_axis = getCellValue(row, formulaRow, selectedYAxisColumn);
     x_axis = isNumber(x_axis) ? x_axis : 0;
     y_axis = isNumber(y_axis) ? y_axis : 0;
-    var name = getColumnValue(row, formulaRow, selectedGroupColumn, value);
-    var nameIndex = data.findIndex(function (r) {
-      return r.name === name && r.x_axis === x_axis && r.y_axis === y_axis;
-    });
-    var dataItem = {
-      x_axis: x_axis,
-      y_axis: y_axis,
+    const name = getColumnValue(row, formulaRow, selectedGroupColumn, value);
+    const nameIndex = data.findIndex(r => r.name === name && r.x_axis === x_axis && r.y_axis === y_axis);
+    const dataItem = {
+      x_axis,
+      y_axis,
       group_by: name
     };
     updateBasicChartRows(data, nameIndex, name, dataItem, row);
@@ -42,22 +43,23 @@ function calculateResult(chart, value, username, userId) {
   return data;
 }
 function updateBasicChartRows(results, index, name, dataItem, row) {
-  var updatedResult;
+  let updatedResult;
   if (index > -1) {
     updatedResult = results[index];
     updatedResult.rows.push(row);
     results[index] = updatedResult;
   } else {
-    updatedResult = _objectSpread(_objectSpread({}, dataItem), {}, {
-      name: name,
+    updatedResult = {
+      ...dataItem,
+      name,
       rows: [row]
-    });
+    };
     results.push(updatedResult);
   }
 }
 function getColumnValue(data, formulaRow, column, dtableValue) {
-  var tempValue = data[column.key];
-  var value = StatUtils.getGroupLabel(tempValue, formulaRow, column, DATE_GRANULARITY.DAY, '', dtableValue);
+  const tempValue = data[column.key];
+  let value = StatUtils.getGroupLabel(tempValue, formulaRow, column, DATE_GRANULARITY.DAY, '', dtableValue);
   if (isArrayCellValue(column)) {
     value = value[0];
   }

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

@@ -8,40 +8,42 @@ import { getSummaryResult } from '../../utils/common-utils';
 import { getCompareDate, summaryDurationResult } from '../../utils/trend-utils';
 dayjs.extend(quarterOfYear);
 function calculateStatItem(chart, value, username, userId) {
-  var table_id = chart.table_id,
-    view_id = chart.view_id,
-    date_column = chart.date_column,
-    date_granularity = chart.date_granularity,
-    summary_column = chart.summary_column,
-    summary_type = chart.summary_type,
-    summary_method = chart.summary_method;
-  var selectedTable = TableUtils.getTableById(value.tables, table_id);
-  var selectedView = selectedTable && Views.getViewById(selectedTable.views, view_id);
-  var selectedColumn = TableUtils.getTableColumnByKey(selectedTable, date_column);
-  var resultMap = new Map();
-  var formulaRows = {};
-  var rows = Views.getViewRows(selectedView, selectedTable, value, username, userId);
-  var numericColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
+  const {
+    table_id,
+    view_id,
+    date_column,
+    date_granularity,
+    summary_column,
+    summary_type,
+    summary_method
+  } = chart;
+  const selectedTable = TableUtils.getTableById(value.tables, table_id);
+  const selectedView = selectedTable && Views.getViewById(selectedTable.views, view_id);
+  const selectedColumn = TableUtils.getTableColumnByKey(selectedTable, date_column);
+  const resultMap = new Map();
+  let formulaRows = {};
+  const rows = Views.getViewRows(selectedView, selectedTable, value, username, userId);
+  const numericColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
   if (summary_type === SUMMARY_TYPE.ADVANCED) {
     if (FORMULA_COLUMN_TYPES_MAP[numericColumn.type]) {
       formulaRows = Views.getTableFormulaResults(selectedTable, rows, value);
     }
   }
-  var granularity = date_granularity;
+  let granularity = date_granularity;
   if (date_granularity === 'days_7' || date_granularity === 'days_30') {
     granularity = 'day';
   }
-  rows.forEach(function (row) {
-    var dateValue = row[selectedColumn.key];
-    var label = StatUtils.getGroupLabel(dateValue, {}, selectedColumn, granularity, '', value);
+  rows.forEach(row => {
+    const dateValue = row[selectedColumn.key];
+    const label = StatUtils.getGroupLabel(dateValue, {}, selectedColumn, granularity, '', value);
     if (dateValue) {
       if (summary_type === SUMMARY_TYPE.COUNT) {
-        var currentCount = resultMap.get(label) || 0;
+        const currentCount = resultMap.get(label) || 0;
         resultMap.set(label, currentCount + 1);
       } else {
-        var formulaRow = formulaRows[row._id];
-        var numericValue = getCellValue(row, formulaRow, numericColumn);
-        var currentList = resultMap.get(label) || [];
+        const formulaRow = formulaRows[row._id];
+        const numericValue = getCellValue(row, formulaRow, numericColumn);
+        const currentList = resultMap.get(label) || [];
         if (isNumber(numericValue)) {
           currentList.push(numericValue);
         }
@@ -49,17 +51,19 @@ function calculateStatItem(chart, value, username, userId) {
       }
     }
   });
-  var currentValues, previousValues;
+  let currentValues, previousValues;
   if (date_granularity === 'days_30' || date_granularity === 'days_7') {
-    var _summaryDurationResul = summaryDurationResult(resultMap, date_granularity, summary_type, summary_column, false),
-      value1 = _summaryDurationResul.compareValue,
-      value2 = _summaryDurationResul.comparedValue;
+    const {
+      compareValue: value1,
+      comparedValue: value2
+    } = summaryDurationResult(resultMap, date_granularity, summary_type, summary_column, false);
     currentValues = value1;
     previousValues = value2;
   } else {
-    var _getCompareDate = getCompareDate(date_granularity),
-      compareDate = _getCompareDate.compareDate,
-      comparedDate = _getCompareDate.comparedDate;
+    const {
+      compareDate,
+      comparedDate
+    } = getCompareDate(date_granularity);
     currentValues = resultMap.get(compareDate);
     previousValues = resultMap.get(comparedDate);
     if (summary_type === SUMMARY_TYPE.ADVANCED) {

package/es/calculator/world-map-calculator.js

@@ -1,208 +1,131 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import { filter2SqlCondition, TableUtils } from 'dtable-store';
 import BaseCalculator from './base-calculator';
 import { formatNumericValue, getSummaryColumnMethod } from '../utils/common-utils';
 import { DTABLE_DB_SUMMARY_METHOD } from '../constants';
 import StatUtils from '../utils/stat-utils';
-var WorldMapCalculator = /*#__PURE__*/function (_BaseCalculator) {
-  _inherits(WorldMapCalculator, _BaseCalculator);
-  var _super = _createSuper(WorldMapCalculator);
-  function WorldMapCalculator(_ref) {
-    var value = _ref.value,
-      statisticThreadManager = _ref.statisticThreadManager,
-      username = _ref.username,
-      userId = _ref.userId;
-    _classCallCheck(this, WorldMapCalculator);
-    return _super.call(this, {
-      value: value,
-      statisticThreadManager: statisticThreadManager,
-      username: username,
-      userId: userId
+class WorldMapCalculator extends BaseCalculator {
+  constructor(_ref) {
+    let {
+      value,
+      statisticThreadManager,
+      username,
+      userId
+    } = _ref;
+    super({
+      value,
+      statisticThreadManager,
+      username,
+      userId
     });
   }
-  _createClass(WorldMapCalculator, [{
-    key: "isValidChart",
-    value: function isValidChart(chart) {
-      if (!this.validateBaseConfigs(chart)) {
-        return false;
-      }
-      var table_id = chart.table_id,
-        column = chart.column,
-        summary_column = chart.summary_column;
-      var table = this.getTableById(table_id);
-      var selectedColumn = column && TableUtils.getTableColumnByKey(table, column);
-      if (column && !selectedColumn) {
-        return false;
-      }
-      if (summary_column && !TableUtils.getTableColumnByKey(table, summary_column)) {
-        return false;
-      }
-      return true;
+  isValidChart(chart) {
+    if (!this.validateBaseConfigs(chart)) {
+      return false;
     }
-  }, {
-    key: "calculate",
-    value: function () {
-      var _calculate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(chart) {
-        var convertedChart;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (this.isValidChart(chart)) {
-                  _context.next = 2;
-                  break;
-                }
-                return _context.abrupt("return", []);
-              case 2:
-                if (!this.isCalcByQueryDB(chart)) {
-                  _context.next = 6;
-                  break;
-                }
-                _context.next = 5;
-                return this.queryDb(chart);
-              case 5:
-                return _context.abrupt("return", _context.sent);
-              case 6:
-                convertedChart = this.convertChart(chart);
-                _context.next = 9;
-                return this.calculateWithWorker(convertedChart);
-              case 9:
-                return _context.abrupt("return", _context.sent);
-              case 10:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-      function calculate(_x) {
-        return _calculate.apply(this, arguments);
-      }
-      return calculate;
-    }()
-  }, {
-    key: "queryDb",
-    value: function () {
-      var _queryDb = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(chart) {
-        var table_id, view_id, column, summary_type, summary_method, summary_column, selectedTable, selectedView, selectedColumn, columnName, isAdvanced, method, sqlCondition, summaryColumnName, summaryColumn, sqlString, summaryColumnMethod, result, data, newResult, _summaryColumnMethod, valueKey;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                table_id = chart.table_id, view_id = chart.view_id, column = chart.column, summary_type = chart.summary_type, summary_method = chart.summary_method, summary_column = chart.summary_column;
-                selectedTable = this.getTableById(table_id);
-                selectedView = this.getViewById(view_id, selectedTable);
-                selectedColumn = TableUtils.getTableColumnByKey(selectedTable, column);
-                if (selectedColumn) {
-                  _context2.next = 6;
-                  break;
-                }
-                return _context2.abrupt("return", []);
-              case 6:
-                columnName = selectedColumn.name;
-                isAdvanced = summary_type === 'advanced';
-                method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
-                sqlCondition = filter2SqlCondition(selectedTable, selectedView);
-                summaryColumnName = '';
-                sqlString = '';
-                if (!isAdvanced) {
-                  _context2.next = 21;
-                  break;
-                }
-                summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
-                if (summaryColumn) {
-                  _context2.next = 16;
-                  break;
-                }
-                return _context2.abrupt("return", []);
-              case 16:
-                summaryColumnName = summaryColumn.name;
-                summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
-                sqlString = "select `".concat(columnName, "`, ").concat(summaryColumnMethod, " from ").concat(selectedTable.name, " ").concat(sqlCondition, " group by ").concat(columnName, " limit 5000");
-                _context2.next = 22;
-                break;
-              case 21:
-                sqlString = "select `".concat(columnName, "`, ").concat(method, "(").concat(columnName, ") from ").concat(selectedTable.name, " ").concat(sqlCondition, " group by ").concat(columnName, " limit 5000");
-              case 22:
-                _context2.next = 24;
-                return this.sqlQuery(sqlString);
-              case 24:
-                result = _context2.sent;
-                if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 34;
-                  break;
-                }
-                data = result.data;
-                if (data.results) {
-                  _context2.next = 29;
-                  break;
-                }
-                return _context2.abrupt("return", []);
-              case 29:
-                newResult = [];
-                _summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
-                valueKey = isAdvanced ? "".concat(_summaryColumnMethod) : "".concat(method, "(").concat(columnName, ")");
-                data.results.forEach(function (item) {
-                  var currentValue = item[column];
-                  var value = item[valueKey];
-                  var formatted_value = value;
-                  if (isAdvanced) {
-                    value = formatNumericValue(value, summaryColumn);
-                    formatted_value = StatUtils.getFormattedValue(value, summaryColumn, summary_method);
-                  }
-                  if (currentValue) {
-                    var name = typeof currentValue === 'string' ? currentValue : currentValue.country_region;
-                    newResult.push({
-                      name: name,
-                      value: value,
-                      formatted_value: formatted_value
-                    });
-                  }
-                });
-                return _context2.abrupt("return", newResult);
-              case 34:
-                return _context2.abrupt("return", []);
-              case 35:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-      function queryDb(_x2) {
-        return _queryDb.apply(this, arguments);
+    const {
+      table_id,
+      column,
+      summary_column
+    } = chart;
+    const table = this.getTableById(table_id);
+    const selectedColumn = column && TableUtils.getTableColumnByKey(table, column);
+    if (column && !selectedColumn) {
+      return false;
+    }
+    if (summary_column && !TableUtils.getTableColumnByKey(table, summary_column)) {
+      return false;
+    }
+    return true;
+  }
+  async calculate(chart) {
+    if (!this.isValidChart(chart)) return [];
+    if (this.isCalcByQueryDB(chart)) {
+      return await this.queryDb(chart);
+    }
+    const convertedChart = this.convertChart(chart);
+    return await this.calculateWithWorker(convertedChart);
+  }
+  async queryDb(chart) {
+    const {
+      table_id,
+      view_id,
+      column,
+      summary_type,
+      summary_method,
+      summary_column
+    } = chart;
+    const selectedTable = this.getTableById(table_id);
+    const selectedView = this.getViewById(view_id, selectedTable);
+    const selectedColumn = TableUtils.getTableColumnByKey(selectedTable, column);
+    if (!selectedColumn) return [];
+    const columnName = selectedColumn.name;
+    const isAdvanced = summary_type === 'advanced';
+    const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
+    const sqlCondition = filter2SqlCondition(selectedTable, selectedView);
+    let summaryColumnName = '';
+    let summaryColumn;
+    let sqlString = '';
+    if (isAdvanced) {
+      summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
+      if (!summaryColumn) {
+        return [];
       }
-      return queryDb;
-    }()
-  }, {
-    key: "convertChart",
-    value: function convertChart(chart) {
-      var _id = chart._id,
-        type = chart.type,
-        table_id = chart.table_id,
-        view_id = chart.view_id,
-        column = chart.column,
-        summary_type = chart.summary_type,
-        summary_column = chart.summary_column,
-        summary_method = chart.summary_method;
-      return {
-        _id: _id,
-        type: type,
-        table_id: table_id,
-        view_id: view_id,
-        geo_column: column,
-        summary_type: summary_type,
-        summary_method: summary_method,
-        summary_column: summary_column,
-        geolocation_granularity: 'country_region'
-      };
+      summaryColumnName = summaryColumn.name;
+      const summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
+      sqlString = "select `".concat(columnName, "`, ").concat(summaryColumnMethod, " from ").concat(selectedTable.name, " ").concat(sqlCondition, " group by ").concat(columnName, " limit 5000");
+    } else {
+      sqlString = "select `".concat(columnName, "`, ").concat(method, "(").concat(columnName, ") from ").concat(selectedTable.name, " ").concat(sqlCondition, " group by ").concat(columnName, " limit 5000");
     }
-  }]);
-  return WorldMapCalculator;
-}(BaseCalculator);
+    const result = await this.sqlQuery(sqlString);
+    if (result.status === 200 && result.data.success) {
+      const data = result.data;
+      if (!data.results) return [];
+      const newResult = [];
+      const summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
+      const valueKey = isAdvanced ? "".concat(summaryColumnMethod) : "".concat(method, "(").concat(columnName, ")");
+      data.results.forEach(item => {
+        const currentValue = item[column];
+        let value = item[valueKey];
+        let formatted_value = value;
+        if (isAdvanced) {
+          value = formatNumericValue(value, summaryColumn);
+          formatted_value = StatUtils.getFormattedValue(value, summaryColumn, summary_method);
+        }
+        if (currentValue) {
+          const name = typeof currentValue === 'string' ? currentValue : currentValue.country_region;
+          newResult.push({
+            name,
+            value,
+            formatted_value
+          });
+        }
+      });
+      return newResult;
+    }
+    return [];
+  }
+  convertChart(chart) {
+    const {
+      _id,
+      type,
+      table_id,
+      view_id,
+      column,
+      summary_type,
+      summary_column,
+      summary_method
+    } = chart;
+    return {
+      _id,
+      type,
+      table_id,
+      view_id,
+      geo_column: column,
+      summary_type,
+      summary_method,
+      summary_column,
+      geolocation_granularity: 'country_region'
+    };
+  }
+}
 export default WorldMapCalculator;

package/es/components/common-add-tool.js

@@ -1,12 +1,14 @@
 import React from 'react';
 function CommonAddTool(props) {
-  var callBack = props.callBack,
-    footerName = props.footerName,
-    className = props.className,
-    addIconClassName = props.addIconClassName;
+  const {
+    callBack,
+    footerName,
+    className,
+    addIconClassName
+  } = props;
   return /*#__PURE__*/React.createElement("div", {
     className: "add-item-btn ".concat(className ? className : ''),
-    onClick: function onClick(e) {
+    onClick: e => {
       callBack(e);
     }
   }, /*#__PURE__*/React.createElement("span", {