sea-chart 2.0.37 → 2.0.38

package/dist/utils/chart-utils/original-data-utils/trend-calculator.js

@@ -1,18 +1,11 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _dayjs = _interopRequireDefault(require("dayjs"));
-var _quarterOfYear = _interopRequireDefault(require("dayjs/plugin/quarterOfYear"));
-var _dtableUtils = require("dtable-utils");
-var _constants = require("../../../constants");
-var _baseUtils = _interopRequireDefault(require("../base-utils"));
-var _rowUtils = require("../../row-utils");
-var _trendUtils = require("../../trend-utils");
-_dayjs.default.extend(_quarterOfYear.default);
+import dayjs from 'dayjs';
+import quarterOfYear from 'dayjs/plugin/quarterOfYear';
+import { FORMULA_COLUMN_TYPES_MAP, isNumber, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
+import { CHART_SUMMARY_TYPE, TREND_TYPES } from '../../../constants';
+import BaseUtils from '../base-utils';
+import { getCellValue } from '../../row-utils';
+import { getCompareDate, summaryDurationResult } from '../../trend-utils';
+dayjs.extend(quarterOfYear);
 async function calculator(chart, value, _ref) {
   let {
     getViewRows,
@@ -27,15 +20,16 @@ async function calculator(chart, value, _ref) {
     summary_type,
     summary_method
   } = chart;
-  const selectedTable = (0, _dtableUtils.getTableById)(value.tables, table_id);
-  const selectedView = selectedTable && (0, _dtableUtils.getViewById)(selectedTable.views, view_id);
-  const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, date_column_key);
+  const selectedTable = getTableById(value.tables, table_id);
+  const selectedView = selectedTable && getViewById(selectedTable.views, view_id);
+  const selectedColumn = getTableColumnByKey(selectedTable, date_column_key);
   const resultMap = new Map();
+  const rowsMap = new Map(); // Store rows for each time period
   let formulaRows = {};
   const rows = await getViewRows(selectedView, selectedTable);
-  const numericColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, summary_column_key);
-  if (summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
-    if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[numericColumn.type]) {
+  const numericColumn = getTableColumnByKey(selectedTable, summary_column_key);
+  if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
+    if (FORMULA_COLUMN_TYPES_MAP[numericColumn.type]) {
       formulaRows = await getTableFormulaResults(selectedTable, rows);
     }
   }
@@ -45,43 +39,62 @@ async function calculator(chart, value, _ref) {
   }
   rows.forEach(row => {
     const dateValue = row[selectedColumn.key];
-    const label = _baseUtils.default.getGroupLabel(dateValue, {}, selectedColumn, granularity, '', value);
+    const label = BaseUtils.getGroupLabel(dateValue, {}, selectedColumn, granularity, '', value);
     if (dateValue) {
-      if (summary_type === _constants.CHART_SUMMARY_TYPE.COUNT) {
+      // Store rows for each time period
+      const currentRows = rowsMap.get(label) || [];
+      currentRows.push(row);
+      rowsMap.set(label, currentRows);
+      if (summary_type === CHART_SUMMARY_TYPE.COUNT) {
         const currentCount = resultMap.get(label) || 0;
         resultMap.set(label, currentCount + 1);
       } else {
         const formulaRow = formulaRows[row._id];
-        const numericValue = (0, _rowUtils.getCellValue)(row, formulaRow, numericColumn);
+        const numericValue = getCellValue(row, formulaRow, numericColumn);
         const currentList = resultMap.get(label) || [];
-        if ((0, _dtableUtils.isNumber)(numericValue)) {
+        if (isNumber(numericValue)) {
           currentList.push(numericValue);
         }
         resultMap.set(label, currentList);
       }
     }
   });
-  let currentValues, previousValues;
+  let currentValues, previousValues, currentPeriodRows;
   if (date_granularity === 'days_30' || date_granularity === 'days_7') {
     const {
       compareValue: value1,
       comparedValue: value2
-    } = (0, _trendUtils.summaryDurationResult)(resultMap, date_granularity, summary_type, summary_method, false);
+    } = summaryDurationResult(resultMap, date_granularity, summary_type, summary_method, false);
     currentValues = value1;
     previousValues = value2;
+    // Collect rows for the current period (last 7 or 30 days)
+    currentPeriodRows = [];
+    const currentTime = dayjs();
+    const days = date_granularity === 'days_30' ? 30 : 7;
+    const formattedEndDate = currentTime.format('YYYY-MM-DD');
+    const formattedMiddleDate = currentTime.subtract(days, 'days').format('YYYY-MM-DD');
+    const endDate = dayjs(formattedEndDate);
+    const middleDate = dayjs(formattedMiddleDate);
+    rowsMap.forEach((periodRows, label) => {
+      const key = dayjs(label);
+      if (key.isValid() && key >= middleDate && key < endDate) {
+        currentPeriodRows = currentPeriodRows.concat(periodRows);
+      }
+    });
   } else {
     const {
       compareDate,
       comparedDate
-    } = (0, _trendUtils.getCompareDate)(date_granularity);
+    } = getCompareDate(date_granularity, 'base');
     currentValues = resultMap.get(compareDate);
     previousValues = resultMap.get(comparedDate);
-    if (summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
+    currentPeriodRows = rowsMap.get(compareDate) || [];
+    if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
       if (currentValues) {
-        currentValues = _baseUtils.default.getSummaryResult(currentValues, summary_method);
+        currentValues = BaseUtils.getSummaryResult(currentValues, summary_method);
       }
       if (previousValues) {
-        previousValues = _baseUtils.default.getSummaryResult(previousValues, summary_method);
+        previousValues = BaseUtils.getSummaryResult(previousValues, summary_method);
       }
     }
   }
@@ -103,11 +116,11 @@ async function calculator(chart, value, _ref) {
   }
   let type;
   if (currentValues > previousValues) {
-    type = _constants.TREND_TYPES.UP;
+    type = TREND_TYPES.UP;
   } else if (currentValues < previousValues) {
-    type = _constants.TREND_TYPES.DOWN;
+    type = TREND_TYPES.DOWN;
   } else if (currentValues === previousValues) {
-    type = _constants.TREND_TYPES.EQUAL;
+    type = TREND_TYPES.EQUAL;
   }
   if (currentValues === 0 && previousValues === 0) {
     result = '0%';
@@ -116,7 +129,8 @@ async function calculator(chart, value, _ref) {
     latest: currentValues,
     previous: previousValues,
     result,
-    type
+    type,
+    rows: currentPeriodRows
   };
 }
-var _default = exports.default = calculator;
+export default calculator;