dtable-statistic 4.2.2 → 4.3.1

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

@@ -1,48 +1,51 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { FORMULA_COLUMN_TYPES_MAP, isNumber, TableUtils, Views } from 'dtable-store';
 import { isArrayCellValue } from '../../utils/common-utils';
 import { getCellValue, getFormattedLabel } from '../../utils/row-utils';
 import StatUtils from '../../utils/stat-utils';
 import { PIE_CHART_COLORS } from '../../constants';
 function calculateResult(chart, value, username, userId) {
-  var table_id = chart.table_id,
-    view_id = chart.view_id,
-    name_column = chart.name_column,
-    completed_column = chart.completed_column,
-    target_column = chart.target_column,
-    group_column = chart.group_column,
-    date_granularity = chart.date_granularity,
-    geolocation_granularity = chart.geolocation_granularity;
-  var table = TableUtils.getTableById(value.tables, table_id);
-  var view = table && Views.getViewById(table.views, view_id);
+  const {
+    table_id,
+    view_id,
+    name_column,
+    completed_column,
+    target_column,
+    group_column,
+    date_granularity,
+    geolocation_granularity
+  } = chart;
+  const table = TableUtils.getTableById(value.tables, table_id);
+  const view = table && Views.getViewById(table.views, view_id);
   if (!view) {
     return [];
   }
-  var nameColumn = TableUtils.getTableColumnByKey(table, name_column);
+  const nameColumn = TableUtils.getTableColumnByKey(table, name_column);
   if (!nameColumn) return [];
-  var statRows = Views.getViewRows(view, table, value, username, userId);
-  var formulaRows = Views.getTableFormulaResults(table, statRows, value);
-  var groupColumn = TableUtils.getTableColumnByKey(table, group_column);
-  var isColumnDataAsAnArray = isArrayCellValue(nameColumn);
-  var isGroupChart = !!groupColumn;
-  var result = [];
+  const statRows = Views.getViewRows(view, table, value, username, userId);
+  const formulaRows = Views.getTableFormulaResults(table, statRows, value);
+  const groupColumn = TableUtils.getTableColumnByKey(table, group_column);
+  const isColumnDataAsAnArray = isArrayCellValue(nameColumn);
+  const isGroupChart = !!groupColumn;
+  let result = [];
   if (!isGroupChart) {
-    var memo = new Map();
-    statRows.forEach(function (row) {
-      var rowId = row._id;
-      var formulaRow = formulaRows[rowId] || {};
-      var name = row[nameColumn.key];
+    const memo = new Map();
+    statRows.forEach(row => {
+      let {
+        _id: rowId
+      } = row;
+      let formulaRow = formulaRows[rowId] || {};
+      const name = row[nameColumn.key];
       if (name || Number.isFinite(name)) {
-        var label = StatUtils.getGroupLabel(name, formulaRow, nameColumn, '', '', value);
+        let label = StatUtils.getGroupLabel(name, formulaRow, nameColumn, '', '', value);
         if (isColumnDataAsAnArray) {
           label = label[0];
         }
         label = getFormattedLabel(nameColumn, label, value.collaborators);
         if (!memo.get(label)) {
-          var completedColumn = TableUtils.getTableColumnByKey(table, completed_column);
-          var targetColumn = TableUtils.getTableColumnByKey(table, target_column);
-          var currentValue = getCellValue(row, formulaRow, completedColumn);
-          var targetValue = getCellValue(row, formulaRow, targetColumn);
+          const completedColumn = TableUtils.getTableColumnByKey(table, completed_column);
+          const targetColumn = TableUtils.getTableColumnByKey(table, target_column);
+          let currentValue = getCellValue(row, formulaRow, completedColumn);
+          let targetValue = getCellValue(row, formulaRow, targetColumn);
           currentValue = isNumber(currentValue) ? currentValue : 0;
           targetValue = isNumber(targetValue) ? targetValue : 0;
           if (currentValue >= targetValue) {
@@ -73,18 +76,20 @@ function calculateResult(chart, value, username, userId) {
       }
     });
   } else {
-    var _memo = new Map();
-    var colorMap = {};
-    var colorIndex = 0;
-    var isFormulaType = FORMULA_COLUMN_TYPES_MAP[groupColumn.type];
-    var isGroupColumnDataAsAnArray = isArrayCellValue(groupColumn);
-    statRows.forEach(function (row) {
-      var rowId = row._id;
-      var formulaRow = formulaRows[rowId] || {};
-      var name = row[nameColumn.key],
+    const memo = new Map();
+    const colorMap = {};
+    let colorIndex = 0;
+    let isFormulaType = FORMULA_COLUMN_TYPES_MAP[groupColumn.type];
+    const isGroupColumnDataAsAnArray = isArrayCellValue(groupColumn);
+    statRows.forEach(row => {
+      let {
+        _id: rowId
+      } = row;
+      let formulaRow = formulaRows[rowId] || {};
+      const name = row[nameColumn.key],
         groupLabelName = !isFormulaType ? row[groupColumn.key] : formulaRow[rowId][groupColumn.key];
       if ((name || Number.isFinite(name)) && (groupLabelName || Number.isFinite(groupLabelName))) {
-        var label = StatUtils.getGroupLabel(name, formulaRow, nameColumn, '', '', value),
+        let label = StatUtils.getGroupLabel(name, formulaRow, nameColumn, '', '', value),
           groupLabel = StatUtils.getGroupLabel(groupLabelName, formulaRow, groupColumn, date_granularity, geolocation_granularity, value);
         if (isColumnDataAsAnArray) {
           label = label[0];
@@ -94,18 +99,18 @@ function calculateResult(chart, value, username, userId) {
         }
         label = getFormattedLabel(nameColumn, label, value.collaborators);
         groupLabel = getFormattedLabel(groupColumn, groupLabel, value.collaborators);
-        var color = colorMap[groupLabel];
+        let color = colorMap[groupLabel];
         if (!color) {
           color = PIE_CHART_COLORS[colorIndex % 12];
           colorMap[groupLabel] = color;
           colorIndex++;
         }
-        var cache = _memo.get(label);
+        let cache = memo.get(label);
         if (groupLabel && (!cache || !cache[groupLabel])) {
-          var completedColumn = TableUtils.getTableColumnByKey(table, completed_column);
-          var targetColumn = TableUtils.getTableColumnByKey(table, target_column);
-          var currentValue = getCellValue(row, formulaRow, completedColumn);
-          var targetValue = getCellValue(row, formulaRow, targetColumn);
+          const completedColumn = TableUtils.getTableColumnByKey(table, completed_column);
+          const targetColumn = TableUtils.getTableColumnByKey(table, target_column);
+          let currentValue = getCellValue(row, formulaRow, completedColumn);
+          let targetValue = getCellValue(row, formulaRow, targetColumn);
           currentValue = isNumber(currentValue) ? currentValue : 0;
           targetValue = isNumber(targetValue) ? targetValue : 0;
           if (currentValue >= targetValue) {
@@ -113,7 +118,7 @@ function calculateResult(chart, value, username, userId) {
               name: label,
               group_label: groupLabel,
               value: currentValue,
-              color: color,
+              color,
               type: 'completed',
               current_value: currentValue,
               target_value: targetValue
@@ -123,7 +128,7 @@ function calculateResult(chart, value, username, userId) {
               name: label,
               group_label: groupLabel,
               value: currentValue,
-              color: color,
+              color,
               type: 'completed',
               current_value: currentValue,
               target_value: targetValue
@@ -131,7 +136,7 @@ function calculateResult(chart, value, username, userId) {
               name: label,
               group_label: groupLabel,
               value: targetValue - currentValue,
-              color: color,
+              color,
               type: 'uncompleted',
               current_value: currentValue,
               target_value: targetValue
@@ -139,9 +144,11 @@ function calculateResult(chart, value, username, userId) {
           }
           if (cache) {
             cache[groupLabel] = 1;
-            _memo.set(label, cache);
+            memo.set(label, cache);
           } else {
-            _memo.set(label, _defineProperty({}, groupLabel, 1));
+            memo.set(label, {
+              [groupLabel]: 1
+            });
           }
         }
       }

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

@@ -2,37 +2,39 @@ import { isNumber, isNumericColumn, TableUtils, Views } from 'dtable-store';
 import { getSummaryResult } from '../../utils/common-utils';
 import { getCellValue } from '../../utils/row-utils';
 function calculateResult(chart, value, username, userId) {
-  var 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;
-  var selectedTable = TableUtils.getTableById(value.tables, table_id);
-  var selectedView = selectedTable && Views.getViewById(selectedTable.views, view_id);
-  var selectedColumn1 = TableUtils.getTableColumnByKey(selectedTable, target_value_column);
-  var selectedColumn2 = TableUtils.getTableColumnByKey(selectedTable, total_value_column);
-  var statRows = Views.getViewRows(selectedView, selectedTable, value, username, userId);
+  const {
+    table_id,
+    view_id,
+    target_value_column,
+    target_value_column_summary_method,
+    total_value_column,
+    total_value_column_summary_method
+  } = chart;
+  const selectedTable = TableUtils.getTableById(value.tables, table_id);
+  const selectedView = selectedTable && Views.getViewById(selectedTable.views, view_id);
+  const selectedColumn1 = TableUtils.getTableColumnByKey(selectedTable, target_value_column);
+  const selectedColumn2 = TableUtils.getTableColumnByKey(selectedTable, total_value_column);
+  const statRows = Views.getViewRows(selectedView, selectedTable, value, username, userId);
   if (statRows.length === 0) {
     return 0;
   }
-  var isNumericColumn1 = selectedColumn1 && isNumericColumn(selectedColumn1);
-  var isNumericColumn2 = selectedColumn2 && isNumericColumn(selectedColumn2);
-  var formulaRows = isNumericColumn1 || isNumericColumn2 ? Views.getTableFormulaResults(selectedTable, statRows, value) : {};
-  var result1;
-  var result2;
-  var numberList1 = [];
-  var numberList2 = [];
-  statRows.forEach(function (row) {
-    var formulaRow = formulaRows[row._id];
+  const isNumericColumn1 = selectedColumn1 && isNumericColumn(selectedColumn1);
+  const isNumericColumn2 = selectedColumn2 && isNumericColumn(selectedColumn2);
+  const formulaRows = isNumericColumn1 || isNumericColumn2 ? Views.getTableFormulaResults(selectedTable, statRows, value) : {};
+  let result1;
+  let result2;
+  let numberList1 = [];
+  let numberList2 = [];
+  statRows.forEach(row => {
+    const formulaRow = formulaRows[row._id];
     if (isNumericColumn1) {
-      var cellValue1 = getCellValue(row, formulaRow, selectedColumn1);
+      const cellValue1 = getCellValue(row, formulaRow, selectedColumn1);
       if (isNumber(cellValue1)) {
         numberList1.push(cellValue1);
       }
     }
     if (isNumericColumn2) {
-      var cellValue2 = getCellValue(row, formulaRow, selectedColumn2);
+      const cellValue2 = getCellValue(row, formulaRow, selectedColumn2);
       if (isNumber(cellValue2)) {
         numberList2.push(cellValue2);
       }

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

@@ -5,38 +5,40 @@ import { getCellValue } from '../../utils/row-utils';
 import { SUMMARY_TYPE } from '../../constants';
 import StatUtils from '../../utils/stat-utils';
 function calculateStatItem(chart, dtableValue, username, userId) {
-  var 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,
-    group_column = chart.group_column;
-  var table = TableUtils.getTableById(dtableValue.tables, table_id);
-  var view = table && Views.getViewById(table.views, view_id);
-  var columnItem = TableUtils.getTableColumnByKey(table, column);
-  var rows = Views.getViewRows(view, table, dtableValue, username, userId);
-  var formulaRows = Views.getTableFormulaResults(table, rows, dtableValue);
-  var groupColumn = TableUtils.getTableColumnByKey(table, group_column);
-  var numericColumn = summary_column && TableUtils.getTableColumnByKey(table, summary_column);
-  var groupItems = getGroupItems(rows, groupColumn);
+  const {
+    table_id,
+    view_id,
+    column,
+    summary_type,
+    summary_column,
+    summary_method,
+    group_column
+  } = chart;
+  const table = TableUtils.getTableById(dtableValue.tables, table_id);
+  const view = table && Views.getViewById(table.views, view_id);
+  const columnItem = TableUtils.getTableColumnByKey(table, column);
+  const rows = Views.getViewRows(view, table, dtableValue, username, userId);
+  const formulaRows = Views.getTableFormulaResults(table, rows, dtableValue);
+  const groupColumn = TableUtils.getTableColumnByKey(table, group_column);
+  const numericColumn = summary_column && TableUtils.getTableColumnByKey(table, summary_column);
+  const groupItems = getGroupItems(rows, groupColumn);
   if (groupColumn.length === 0) return;
-  var result = {};
-  groupItems.forEach(function (groupValue) {
+  let result = {};
+  groupItems.forEach(groupValue => {
     result[groupValue] = {};
   });
   if (summary_type === SUMMARY_TYPE.COUNT) {
-    groupItems.forEach(function (groupItem) {
-      rows.forEach(function (row) {
-        var value = getClientCellValueDisplayString(row, columnItem.type, columnItem.key, {
+    groupItems.forEach(groupItem => {
+      rows.forEach(row => {
+        let value = getClientCellValueDisplayString(row, columnItem.type, columnItem.key, {
           collaborators: dtableValue.collaborators,
           data: columnItem.data,
-          formulaRows: formulaRows
+          formulaRows
         });
         if (!value && value !== 0 || value.length === 0) value = null;
-        var groupValue = row[groupColumn.key];
+        const groupValue = row[groupColumn.key];
         if (groupItems.includes(groupValue)) {
-          var count = result[groupItem][value];
+          const count = result[groupItem][value];
           if (groupItem === groupValue) {
             if (count === undefined) {
               result[groupItem][value] = 1;
@@ -52,19 +54,19 @@ function calculateStatItem(chart, dtableValue, username, userId) {
       });
     });
   } else {
-    groupItems.forEach(function (groupItem) {
-      rows.forEach(function (row) {
-        var value = getClientCellValueDisplayString(row, columnItem.type, columnItem.key, {
+    groupItems.forEach(groupItem => {
+      rows.forEach(row => {
+        let value = getClientCellValueDisplayString(row, columnItem.type, columnItem.key, {
           collaborators: dtableValue.collaborators,
           data: columnItem.data,
-          formulaRows: formulaRows
+          formulaRows
         });
         if (!value && value !== 0 || value.length === 0) value = null;
-        var groupValue = row[groupColumn.key];
+        const groupValue = row[groupColumn.key];
         if (groupItems.includes(groupValue)) {
-          var list = result[groupItem][value];
-          var formulaRow = formulaRows[row._id];
-          var cellValue = getCellValue(row, formulaRow, numericColumn);
+          const list = result[groupItem][value];
+          const formulaRow = formulaRows[row._id];
+          let cellValue = getCellValue(row, formulaRow, numericColumn);
           cellValue = isNumber(cellValue) ? cellValue : 0;
           if (groupItem === groupValue) {
             if (!list) {
@@ -81,41 +83,39 @@ function calculateStatItem(chart, dtableValue, username, userId) {
       });
     });
     if (numericColumn) {
-      var data = numericColumn.data || {};
+      const data = numericColumn.data || {};
       result = summaryResult(result, summary_method, data.precision);
     }
   }
   return normalizeResult(result, groupColumn, numericColumn, summary_type, summary_method);
 }
 function summaryResult(result, summaryMethod, precision) {
-  var newResult = {};
-  Object.keys(result).forEach(function (groupId) {
+  const newResult = {};
+  Object.keys(result).forEach(groupId => {
     newResult[groupId] = {};
-    Object.keys(result[groupId]).forEach(function (key) {
-      var currentValue = result[groupId][key];
+    Object.keys(result[groupId]).forEach(key => {
+      const currentValue = result[groupId][key];
       newResult[groupId][key] = getSummaryResult(currentValue, summaryMethod, precision);
     });
   });
   return newResult;
 }
 function normalizeResult(result, groupColumn, summaryColumn, summaryType, summaryMethod) {
-  var data = [];
-  var colorSet = [];
-  Object.keys(result).forEach(function (groupId, index) {
-    var groupItem = groupColumn.data.options.find(function (option) {
-      return option.id === groupId;
-    });
+  const data = [];
+  const colorSet = [];
+  Object.keys(result).forEach((groupId, index) => {
+    const groupItem = groupColumn.data.options.find(option => option.id === groupId);
     if (!groupItem) return;
     colorSet[index] = groupItem.color;
-    Object.keys(result[groupId]).forEach(function (name) {
-      var value = result[groupId][name];
-      var formattedValue = value;
+    Object.keys(result[groupId]).forEach(name => {
+      const value = result[groupId][name];
+      let formattedValue = value;
       if (summaryType === SUMMARY_TYPE.ADVANCED) {
         formattedValue = StatUtils.getFormattedValue(value, summaryColumn, summaryMethod);
       }
       data.push({
-        name: name,
-        value: value,
+        name,
+        value,
         formatted_value: formattedValue,
         group_name: groupItem.name,
         color: groupItem.color
@@ -123,14 +123,14 @@ function normalizeResult(result, groupColumn, summaryColumn, summaryType, summar
     });
   });
   return {
-    data: data,
-    colorSet: colorSet
+    data,
+    colorSet
   };
 }
 function getGroupItems(rows, groupColumn) {
-  var items = [];
-  for (var index = 0; index < rows.length; index++) {
-    var value = rows[index][groupColumn.key];
+  const items = [];
+  for (let index = 0; index < rows.length; index++) {
+    const value = rows[index][groupColumn.key];
     if (value && !items.includes(value)) {
       items.push(value);
       if (items.length === 2) break;