dtable-statistic 4.3.6 → 4.3.8

package/es/utils/stat-utils.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _utils = require("../utils");
 var _collaborator = require("./collaborator");
 var _constants = require("../constants");
-const SUPPORT_SORT_COLUMNS = [_dtableStore.CellType.TEXT, _dtableStore.CellType.NUMBER, _dtableStore.CellType.DATE, _dtableStore.CellType.SINGLE_SELECT, _dtableStore.CellType.FORMULA, _dtableStore.CellType.LINK_FORMULA, _dtableStore.CellType.CTIME, _dtableStore.CellType.MTIME, _dtableStore.CellType.RATE];
+const SUPPORT_SORT_COLUMNS = [_dtableUtils.CellType.TEXT, _dtableUtils.CellType.NUMBER, _dtableUtils.CellType.DATE, _dtableUtils.CellType.SINGLE_SELECT, _dtableUtils.CellType.FORMULA, _dtableUtils.CellType.LINK_FORMULA, _dtableUtils.CellType.CTIME, _dtableUtils.CellType.MTIME, _dtableUtils.CellType.RATE];
 class StatUtils {
   static getGroupLabel(cellValue, formulaRow, column, dateGranularity, geoGranularity, value) {
     let {
@@ -17,20 +17,20 @@ class StatUtils {
       data
     } = column;
     switch (type) {
-      case _dtableStore.CellType.TEXT:
+      case _dtableUtils.CellType.TEXT:
         {
           return cellValue || null;
         }
-      case _dtableStore.CellType.NUMBER:
+      case _dtableUtils.CellType.NUMBER:
         {
           if (!cellValue && cellValue !== 0) {
             return null;
           }
-          const number = (0, _dtableStore.getPrecisionNumber)(cellValue, data);
+          const number = (0, _dtableUtils.getPrecisionNumber)(cellValue, data);
           let valueNumber = parseFloat(number);
-          return (0, _dtableStore.isNumber)(valueNumber) ? (0, _dtableStore.getNumberDisplayString)(valueNumber, column.data) : valueNumber;
+          return (0, _dtableUtils.isNumber)(valueNumber) ? (0, _dtableUtils.getNumberDisplayString)(valueNumber, column.data) : valueNumber;
         }
-      case _dtableStore.CellType.SINGLE_SELECT:
+      case _dtableUtils.CellType.SINGLE_SELECT:
         {
           let isInvalidValue = data && data.options.findIndex(opt => opt.id === cellValue) < 0;
           if (isInvalidValue) {
@@ -38,20 +38,20 @@ class StatUtils {
           }
           return cellValue;
         }
-      case _dtableStore.CellType.DATE:
-      case _dtableStore.CellType.CTIME:
-      case _dtableStore.CellType.MTIME:
+      case _dtableUtils.CellType.DATE:
+      case _dtableUtils.CellType.CTIME:
+      case _dtableUtils.CellType.MTIME:
         {
           if (!dateGranularity) {
-            return (0, _dtableStore.getDateDisplayString)(cellValue);
+            return (0, _dtableUtils.getDateDisplayString)(cellValue);
           }
           if (dateGranularity.toUpperCase() === 'QUARTER') {
             // TODO: fix the unknown word 'QUARTAR'
-            return _dtableStore.DateUtils.getDateByGranularity(cellValue, 'QUARTAR');
+            return _dtableUtils.DateUtils.getDateByGranularity(cellValue, 'QUARTAR');
           }
-          return _dtableStore.DateUtils.getDateByGranularity(cellValue, dateGranularity);
+          return _dtableUtils.DateUtils.getDateByGranularity(cellValue, dateGranularity);
         }
-      case _dtableStore.CellType.MULTIPLE_SELECT:
+      case _dtableUtils.CellType.MULTIPLE_SELECT:
         {
           let options = data && data.options;
           if (!Array.isArray(cellValue)) {
@@ -59,45 +59,45 @@ class StatUtils {
           }
           return cellValue.filter(id => options.findIndex(o => o.id === id) > -1);
         }
-      case _dtableStore.CellType.COLLABORATOR:
+      case _dtableUtils.CellType.COLLABORATOR:
         {
           if (!Array.isArray(cellValue)) return [];
           return cellValue.filter(email => (0, _collaborator.isValidCollaboratorEmail)(email));
         }
-      case _dtableStore.CellType.CREATOR:
-      case _dtableStore.CellType.LAST_MODIFIER:
+      case _dtableUtils.CellType.CREATOR:
+      case _dtableUtils.CellType.LAST_MODIFIER:
         {
           return cellValue ? cellValue : null;
         }
-      case _dtableStore.CellType.LINK_FORMULA:
-      case _dtableStore.CellType.FORMULA:
+      case _dtableUtils.CellType.LINK_FORMULA:
+      case _dtableUtils.CellType.FORMULA:
         {
           if (!formulaRow) return '';
           let formulaCellValue = formulaRow[key];
           let {
             result_type
           } = data || {};
-          if (result_type === _dtableStore.FORMULA_RESULT_TYPE.ARRAY) {
-            return (0, _dtableStore.getFormulaDisplayString)(formulaCellValue, data, {
+          if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.ARRAY) {
+            return (0, _dtableUtils.getFormulaDisplayString)(formulaCellValue, data, {
               tables: value.tables
             }) || null;
           }
-          if (result_type === _dtableStore.FORMULA_RESULT_TYPE.NUMBER) {
-            return (0, _dtableStore.getPrecisionNumber)(formulaCellValue, data);
+          if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.NUMBER) {
+            return (0, _dtableUtils.getPrecisionNumber)(formulaCellValue, data);
           }
           return formulaCellValue ? formulaCellValue + '' : null;
         }
-      case _dtableStore.CellType.GEOLOCATION:
+      case _dtableUtils.CellType.GEOLOCATION:
         {
           const {
             geo_format
           } = data || {};
           if (geo_format === 'country_region' || geo_format === 'lng_lat' || !geoGranularity) {
-            return (0, _dtableStore.getGeolocationDisplayString)(cellValue, data);
+            return (0, _dtableUtils.getGeolocationDisplayString)(cellValue, data);
           }
           return cellValue ? cellValue[geoGranularity] : null;
         }
-      case _dtableStore.CellType.LINK:
+      case _dtableUtils.CellType.LINK:
         {
           const linkCellValue = formulaRow && formulaRow[key];
           if (!Array.isArray(linkCellValue)) {
@@ -105,11 +105,11 @@ class StatUtils {
           }
           return linkCellValue.map(linkVal => linkVal.display_value);
         }
-      case _dtableStore.CellType.CHECKBOX:
+      case _dtableUtils.CellType.CHECKBOX:
         {
           return String(!!cellValue);
         }
-      case _dtableStore.CellType.RATE:
+      case _dtableUtils.CellType.RATE:
         {
           if (!cellValue) return null;
           return cellValue + '';
@@ -127,7 +127,7 @@ class StatUtils {
     } = column;
     let sortType = 'up';
     let option_id_index_map = {};
-    if (column_type === _dtableStore.CellType.SINGLE_SELECT) {
+    if (column_type === _dtableUtils.CellType.SINGLE_SELECT) {
       const {
         options
       } = data || {};
@@ -150,7 +150,7 @@ class StatUtils {
       }
       if (SUPPORT_SORT_COLUMNS.includes(column_type)) {
         switch (column_type) {
-          case _dtableStore.CellType.NUMBER:
+          case _dtableUtils.CellType.NUMBER:
             {
               if (current) {
                 current = current - 0;
@@ -158,42 +158,42 @@ class StatUtils {
               if (next) {
                 next = next - 0;
               }
-              return (0, _dtableStore.sortNumber)(current, next, sortType);
+              return (0, _dtableUtils.sortNumber)(current, next, sortType);
             }
-          case _dtableStore.CellType.DATE:
-          case _dtableStore.CellType.CTIME:
-          case _dtableStore.CellType.MTIME:
+          case _dtableUtils.CellType.DATE:
+          case _dtableUtils.CellType.CTIME:
+          case _dtableUtils.CellType.MTIME:
             {
-              return (0, _dtableStore.sortDate)(current, next, sortType);
+              return (0, _dtableUtils.sortDate)(current, next, sortType);
             }
-          case _dtableStore.CellType.SINGLE_SELECT:
-          case _dtableStore.CellType.MULTIPLE_SELECT:
+          case _dtableUtils.CellType.SINGLE_SELECT:
+          case _dtableUtils.CellType.MULTIPLE_SELECT:
             {
-              return (0, _dtableStore.sortSingleSelect)(current, next, {
+              return (0, _dtableUtils.sortSingleSelect)(current, next, {
                 sort_type: sortType,
                 option_id_index_map
               });
             }
-          case _dtableStore.CellType.FORMULA:
-          case _dtableStore.CellType.LINK_FORMULA:
+          case _dtableUtils.CellType.FORMULA:
+          case _dtableUtils.CellType.LINK_FORMULA:
             {
               let {
                 result_type
               } = data || {};
-              if (result_type === _dtableStore.FORMULA_RESULT_TYPE.NUMBER) {
+              if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.NUMBER) {
                 if (current) {
                   current = current - 0;
                 }
                 if (next) {
                   next = next - 0;
                 }
-                return (0, _dtableStore.sortNumber)(current, next, sortType);
+                return (0, _dtableUtils.sortNumber)(current, next, sortType);
               }
-              return (0, _dtableStore.sortText)(result_type, current, next, sortType);
+              return (0, _dtableUtils.sortText)(current, next, sortType);
             }
           default:
             {
-              return (0, _dtableStore.sortText)(current, next, sortType);
+              return (0, _dtableUtils.sortText)(current, next, sortType);
             }
         }
       }
@@ -235,7 +235,7 @@ class StatUtils {
             let existMap = {};
             rows.forEach(r => {
               let num;
-              if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+              if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                 const formulaRow = formula_rows[r._id] || {};
                 num = formulaRow[summary_column_key];
                 num = Array.isArray(num) ? num[0] : num;
@@ -264,14 +264,14 @@ class StatUtils {
             let validNumbersCount = 0;
             rows.forEach(r => {
               let num;
-              if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+              if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                 let formulaRow = formula_rows[r._id] || {};
                 num = formulaRow[summary_column_key];
                 num = Array.isArray(num) ? num[0] : num;
               } else {
                 num = r[summary_column_key];
               }
-              if ((0, _dtableStore.isNumber)(num)) {
+              if ((0, _dtableUtils.isNumber)(num)) {
                 validNumbersCount++;
                 sum += num;
               }
@@ -289,7 +289,7 @@ class StatUtils {
             if (rowsLength > 0) {
               let result = rows.reduce((current, next) => {
                 let currentValue, nextValue;
-                if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+                if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                   let currentFormulaRow = formula_rows[current._id];
                   let nextFormulaRow = formula_rows[next._id];
                   currentValue = currentFormulaRow && currentFormulaRow[summary_column_key];
@@ -310,7 +310,7 @@ class StatUtils {
                   return isNextGreater ? next : current;
                 }
               });
-              if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+              if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                 let formulaRow = formula_rows[result._id];
                 total = formulaRow && formulaRow[summary_column_key];
                 total = Array.isArray(total) ? total[0] : total;
@@ -339,10 +339,10 @@ class StatUtils {
       type,
       data
     } = column;
-    if ((0, _dtableStore.isNumericColumn)(column)) {
-      return (0, _dtableStore.getNumberDisplayString)(value, data);
+    if ((0, _dtableUtils.isNumericColumn)(column)) {
+      return (0, _dtableUtils.getNumberDisplayString)(value, data);
     }
-    if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[type]) {
+    if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[type]) {
       return (0, _utils.getClientFormulaDisplayString)(value, data);
     }
     return value;

package/es/utils/trend-utils.js

@@ -103,6 +103,7 @@ function summaryDurationResult(result, duration, summaryType, summaryMethod, use
       }
     }
   } else {
+    // eslint-disable-next-line
     for (let item of result) {
       const key = item[0];
       if (key >= startDate && key < middleDate) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.3.6",
+  "version": "4.3.8",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -12,7 +12,7 @@
     "@seafile/seafile-calendar": "0.0.24",
     "comlink": "^4.3.1",
     "dayjs": "1.10.7",
-    "dtable-store": "4.3.6",
+    "dtable-utils": "4.3.3",
     "dtable-web-api": "4.3.5",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",
@@ -31,6 +31,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.15",
     "@babel/core": "^7.16.0",
+    "@babel/eslint-parser": "^7.16.3",
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
     "@babel/plugin-transform-runtime": "7.22.10",
     "@babel/runtime": "7.22.11",
@@ -39,8 +40,8 @@
     "@testing-library/jest-dom": "5.17.0",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "13.5.0",
+    "@types/jest": "^29.5.10",
     "autoprefixer": "10.4.5",
-    "babel-eslint": "10.0.1",
     "babel-jest": "^27.4.2",
     "babel-loader": "^8.2.3",
     "babel-plugin-import": "^1.13.6",
@@ -51,10 +52,12 @@
     "browserslist": "^4.18.1",
     "camelcase": "^6.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
+    "circular-dependency-plugin": "^5.2.2",
     "css-loader": "^6.5.1",
     "css-minimizer-webpack-plugin": "^3.2.0",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
+    "dtable-store": "4.3.6",
     "eslint": "^8.3.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-webpack-plugin": "^3.1.1",