dtable-statistic 4.2.2 → 4.3.1

package/es/calculator/dashboard-calculator.js

@@ -1,146 +1,77 @@
-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 { DTABLE_DB_SUMMARY_METHOD } from '../constants';
 import { getSummaryColumnMethod } from '../utils/common-utils';
 import BaseCalculator from './base-calculator';
-var DashboardCalculator = /*#__PURE__*/function (_BaseCalculator) {
-  _inherits(DashboardCalculator, _BaseCalculator);
-  var _super = _createSuper(DashboardCalculator);
-  function DashboardCalculator(_ref) {
-    var value = _ref.value,
-      statisticThreadManager = _ref.statisticThreadManager,
-      username = _ref.username,
-      userId = _ref.userId;
-    _classCallCheck(this, DashboardCalculator);
-    return _super.call(this, {
-      value: value,
-      statisticThreadManager: statisticThreadManager,
-      username: username,
-      userId: userId
+class DashboardCalculator extends BaseCalculator {
+  constructor(_ref) {
+    let {
+      value,
+      statisticThreadManager,
+      username,
+      userId
+    } = _ref;
+    super({
+      value,
+      statisticThreadManager,
+      username,
+      userId
     });
   }
-  _createClass(DashboardCalculator, [{
-    key: "isValidChart",
-    value: function isValidChart(chart) {
-      if (!this.validateBaseConfigs(chart)) {
-        return false;
-      }
-      var table_id = chart.table_id,
-        target_value_column = chart.target_value_column,
-        total_value_column = chart.total_value_column;
-      var table = this.getTableById(table_id);
-      var selectedColumn1 = TableUtils.getTableColumnByKey(table, target_value_column);
-      var selectedColumn2 = TableUtils.getTableColumnByKey(table, total_value_column);
-      if (!selectedColumn1 || !selectedColumn2) {
-        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) {
-        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", 0);
-              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:
-                _context.next = 8;
-                return this.calculateWithWorker(chart);
-              case 8:
-                return _context.abrupt("return", _context.sent);
-              case 9:
-              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, target_value_column, target_value_column_summary_method, total_value_column, total_value_column_summary_method, selectedTable, selectedView, selectedColumn1, selectedColumn2, sqlCondition, key1, key2, sqlString, result, data, result1, result2;
-        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, target_value_column = chart.target_value_column, target_value_column_summary_method = chart.target_value_column_summary_method, total_value_column = chart.total_value_column, total_value_column_summary_method = chart.total_value_column_summary_method;
-                selectedTable = this.getTableById(table_id);
-                selectedView = this.getViewById(view_id, selectedTable);
-                selectedColumn1 = TableUtils.getTableColumnByKey(selectedTable, target_value_column);
-                selectedColumn2 = TableUtils.getTableColumnByKey(selectedTable, total_value_column);
-                sqlCondition = filter2SqlCondition(selectedTable, selectedView);
-                key1 = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[target_value_column_summary_method], selectedColumn1.name);
-                key2 = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[total_value_column_summary_method], selectedColumn2.name);
-                sqlString = "select ".concat(key1, ", ").concat(key2, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " limit 5000");
-                _context2.next = 11;
-                return this.sqlQuery(sqlString);
-              case 11:
-                result = _context2.sent;
-                if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 22;
-                  break;
-                }
-                data = result.data.results;
-                if (data) {
-                  _context2.next = 16;
-                  break;
-                }
-                return _context2.abrupt("return", 0);
-              case 16:
-                if (!(data.length > 0)) {
-                  _context2.next = 22;
-                  break;
-                }
-                result1 = data[0][key1];
-                result2 = data[0][key2];
-                if (!(result2 === 0)) {
-                  _context2.next = 21;
-                  break;
-                }
-                return _context2.abrupt("return", 0);
-              case 21:
-                return _context2.abrupt("return", result1 / result2);
-              case 22:
-                return _context2.abrupt("return", 0);
-              case 23:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-      function queryDb(_x2) {
-        return _queryDb.apply(this, arguments);
+    const {
+      table_id,
+      target_value_column,
+      total_value_column
+    } = chart;
+    const table = this.getTableById(table_id);
+    const selectedColumn1 = TableUtils.getTableColumnByKey(table, target_value_column);
+    const selectedColumn2 = TableUtils.getTableColumnByKey(table, total_value_column);
+    if (!selectedColumn1 || !selectedColumn2) {
+      return false;
+    }
+    return true;
+  }
+  async calculate(chart) {
+    if (!this.isValidChart(chart)) return 0;
+    if (this.isCalcByQueryDB(chart)) {
+      return await this.queryDb(chart);
+    }
+    return await this.calculateWithWorker(chart);
+  }
+  async queryDb(chart) {
+    const {
+      table_id,
+      view_id,
+      target_value_column,
+      target_value_column_summary_method,
+      total_value_column,
+      total_value_column_summary_method
+    } = chart;
+    const selectedTable = this.getTableById(table_id);
+    const selectedView = this.getViewById(view_id, selectedTable);
+    const selectedColumn1 = TableUtils.getTableColumnByKey(selectedTable, target_value_column);
+    const selectedColumn2 = TableUtils.getTableColumnByKey(selectedTable, total_value_column);
+    const sqlCondition = filter2SqlCondition(selectedTable, selectedView);
+    const key1 = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[target_value_column_summary_method], selectedColumn1.name);
+    const key2 = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[total_value_column_summary_method], selectedColumn2.name);
+    const sqlString = "select ".concat(key1, ", ").concat(key2, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " limit 5000");
+    const result = await this.sqlQuery(sqlString);
+    if (result.status === 200 && result.data.success) {
+      const data = result.data.results;
+      if (!data) return 0;
+      if (data.length > 0) {
+        const result1 = data[0][key1];
+        const result2 = data[0][key2];
+        if (result2 === 0) {
+          return 0;
+        }
+        return result1 / result2;
       }
-      return queryDb;
-    }()
-  }]);
-  return DashboardCalculator;
-}(BaseCalculator);
+    }
+    return 0;
+  }
+}
 export default DashboardCalculator;

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

@@ -1,236 +1,155 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-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 dayjs from 'dayjs';
 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';
-var HeatMapCalculator = /*#__PURE__*/function (_BaseCalculator) {
-  _inherits(HeatMapCalculator, _BaseCalculator);
-  var _super = _createSuper(HeatMapCalculator);
-  function HeatMapCalculator(_ref) {
-    var value = _ref.value,
-      statisticThreadManager = _ref.statisticThreadManager,
-      username = _ref.username,
-      userId = _ref.userId;
-    _classCallCheck(this, HeatMapCalculator);
-    return _super.call(this, {
-      value: value,
-      statisticThreadManager: statisticThreadManager,
-      username: username,
-      userId: userId
+class HeatMapCalculator extends BaseCalculator {
+  constructor(_ref) {
+    let {
+      value,
+      statisticThreadManager,
+      username,
+      userId
+    } = _ref;
+    super({
+      value,
+      statisticThreadManager,
+      username,
+      userId
     });
   }
-  _createClass(HeatMapCalculator, [{
-    key: "isValidChart",
-    value: function isValidChart(chart) {
-      if (!this.validateBaseConfigs(chart)) {
-        return false;
+  isValidChart(chart) {
+    if (!this.validateBaseConfigs(chart)) {
+      return false;
+    }
+    const {
+      table_id,
+      time_column,
+      summary_column
+    } = chart;
+    const table = this.getTableById(table_id);
+    if (!TableUtils.getTableColumnByKey(table, time_column)) {
+      return false;
+    }
+    if (summary_column && !TableUtils.getTableColumnByKey(table, summary_column)) {
+      return false;
+    }
+    return true;
+  }
+  async calculate(chart) {
+    if (!this.isValidChart(chart)) return {
+      data: [],
+      years: []
+    };
+    const result = this.isCalcByQueryDB(chart) ? await this.queryDb(chart) : await this.calculateWithWorker(this.convertChart(chart));
+    let data = [];
+    let years = [];
+    result.forEach(item => {
+      if (!item.name) {
+        data.push(item);
+        return;
       }
-      var table_id = chart.table_id,
-        time_column = chart.time_column,
-        summary_column = chart.summary_column;
-      var table = this.getTableById(table_id);
-      if (!TableUtils.getTableColumnByKey(table, time_column)) {
-        return false;
+      const year = dayjs(item.name).year();
+      data.push({
+        ...item,
+        year
+      });
+      if (years.indexOf(year) < 0) {
+        years.push(year);
       }
-      if (summary_column && !TableUtils.getTableColumnByKey(table, summary_column)) {
-        return false;
+    });
+    this.sortDataByYear(data);
+    return {
+      data,
+      years
+    };
+  }
+  async queryDb(chart) {
+    const {
+      table_id,
+      view_id,
+      time_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, time_column);
+    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 true;
+      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");
     }
-  }, {
-    key: "calculate",
-    value: function () {
-      var _calculate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(chart) {
-        var result, data, years;
-        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", {
-                  data: [],
-                  years: []
-                });
-              case 2:
-                if (!this.isCalcByQueryDB(chart)) {
-                  _context.next = 8;
-                  break;
-                }
-                _context.next = 5;
-                return this.queryDb(chart);
-              case 5:
-                _context.t0 = _context.sent;
-                _context.next = 11;
-                break;
-              case 8:
-                _context.next = 10;
-                return this.calculateWithWorker(this.convertChart(chart));
-              case 10:
-                _context.t0 = _context.sent;
-              case 11:
-                result = _context.t0;
-                data = [];
-                years = [];
-                result.forEach(function (item) {
-                  if (!item.name) {
-                    data.push(item);
-                    return;
-                  }
-                  var year = dayjs(item.name).year();
-                  data.push(_objectSpread(_objectSpread({}, item), {}, {
-                    year: year
-                  }));
-                  if (years.indexOf(year) < 0) {
-                    years.push(year);
-                  }
-                });
-                this.sortDataByYear(data);
-                return _context.abrupt("return", {
-                  data: data,
-                  years: years
-                });
-              case 17:
-              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, time_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, time_column = chart.time_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, time_column);
-                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 = 19;
-                  break;
-                }
-                summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
-                if (summaryColumn) {
-                  _context2.next = 14;
-                  break;
-                }
-                return _context2.abrupt("return", []);
-              case 14:
-                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 = 20;
-                break;
-              case 19:
-                sqlString = "select `".concat(columnName, "`, ").concat(method, "(").concat(columnName, ") from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "` limit 5000");
-              case 20:
-                _context2.next = 22;
-                return this.sqlQuery(sqlString);
-              case 22:
-                result = _context2.sent;
-                if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 32;
-                  break;
-                }
-                data = result.data;
-                if (data.results) {
-                  _context2.next = 27;
-                  break;
-                }
-                return _context2.abrupt("return", []);
-              case 27:
-                newResult = [];
-                _summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
-                valueKey = isAdvanced ? "".concat(_summaryColumnMethod) : "".concat(method, "(").concat(columnName, ")");
-                data.results.forEach(function (item) {
-                  var currentValue = item[time_column];
-                  if (currentValue) {
-                    var value = item[valueKey];
-                    if (isAdvanced) {
-                      value = formatNumericValue(value, summaryColumn);
-                    }
-                    var name = typeof currentValue === 'string' ? currentValue : currentValue.country_region;
-                    newResult.push({
-                      name: dayjs(name).format('YYYY-MM-DD'),
-                      value: value
-                    });
-                  }
-                });
-                return _context2.abrupt("return", newResult);
-              case 32:
-                return _context2.abrupt("return", []);
-              case 33:
-              case "end":
-                return _context2.stop();
-            }
+    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[time_column];
+        if (currentValue) {
+          let value = item[valueKey];
+          if (isAdvanced) {
+            value = formatNumericValue(value, summaryColumn);
           }
-        }, _callee2, this);
-      }));
-      function queryDb(_x2) {
-        return _queryDb.apply(this, arguments);
-      }
-      return queryDb;
-    }()
-  }, {
-    key: "convertChart",
-    value: function convertChart(chart) {
-      var _id = chart._id,
-        table_id = chart.table_id,
-        view_id = chart.view_id,
-        time_column = chart.time_column,
-        summary_type = chart.summary_type,
-        summary_column = chart.summary_column,
-        summary_method = chart.summary_method;
-      return {
-        _id: _id,
-        table_id: table_id,
-        view_id: view_id,
-        x_axis_column_key: time_column,
-        y_axis_summary_type: summary_type,
-        y_axis_summary_method: summary_method,
-        y_axis_column_key: summary_column,
-        x_axis_date_granularity: 'day'
-      };
-    }
-  }, {
-    key: "sortDataByYear",
-    value: function sortDataByYear(data) {
-      data.sort(function (current, next) {
-        if (current.year > next.year) {
-          return -1;
-        } else if (current.year < next.year) {
-          return 1;
-        } else {
-          return 0;
+          const name = typeof currentValue === 'string' ? currentValue : currentValue.country_region;
+          newResult.push({
+            name: dayjs(name).format('YYYY-MM-DD'),
+            value
+          });
         }
       });
+      return newResult;
     }
-  }]);
-  return HeatMapCalculator;
-}(BaseCalculator);
+    return [];
+  }
+  convertChart(chart) {
+    const {
+      _id,
+      table_id,
+      view_id,
+      time_column,
+      summary_type,
+      summary_column,
+      summary_method
+    } = chart;
+    return {
+      _id,
+      table_id,
+      view_id,
+      x_axis_column_key: time_column,
+      y_axis_summary_type: summary_type,
+      y_axis_summary_method: summary_method,
+      y_axis_column_key: summary_column,
+      x_axis_date_granularity: 'day'
+    };
+  }
+  sortDataByYear(data) {
+    data.sort((current, next) => {
+      if (current.year > next.year) {
+        return -1;
+      } else if (current.year < next.year) {
+        return 1;
+      } else {
+        return 0;
+      }
+    });
+  }
+}
 export default HeatMapCalculator;