@mui/x-data-grid-generator 8.0.0-alpha.1 → 8.0.0-alpha.10

package/node/hooks/serverUtils.js

@@ -6,8 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.processTreeDataRows = exports.processRowGroupingRows = exports.loadServerRows = exports.disableDelay = exports.DEFAULT_SERVER_OPTIONS = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _xDataGridPro = require("@mui/x-data-grid-pro");
+var _xDataGridPremium = require("@mui/x-data-grid-premium");
 var _randomGenerator = require("../services/random-generator");
+const getAvailableAggregationFunctions = columnType => {
+  const availableAggregationFunctions = new Map();
+  Object.keys(_xDataGridPremium.GRID_AGGREGATION_FUNCTIONS).forEach(functionName => {
+    const columnTypes = _xDataGridPremium.GRID_AGGREGATION_FUNCTIONS[functionName].columnTypes;
+    if (!columnTypes || columnTypes.includes(columnType ?? 'string')) {
+      availableAggregationFunctions.set(functionName, _xDataGridPremium.GRID_AGGREGATION_FUNCTIONS[functionName]);
+    }
+  });
+  return availableAggregationFunctions;
+};
 const disableDelay = exports.disableDelay = typeof DISABLE_CHANCE_RANDOM !== 'undefined' && DISABLE_CHANCE_RANDOM;
 const DEFAULT_SERVER_OPTIONS = exports.DEFAULT_SERVER_OPTIONS = {
   minDelay: disableDelay ? 0 : 100,
@@ -117,7 +127,7 @@ const getQuicklyFilteredRows = (rows, filterModel, columnsWithDefaultColDef) =>
   if (isRowMatchingQuickFilter) {
     return rows.filter(row => {
       const result = isRowMatchingQuickFilter(row);
-      return filterModel.quickFilterLogicOperator === _xDataGridPro.GridLogicOperator.And ? Object.values(result).every(Boolean) : Object.values(result).some(Boolean);
+      return filterModel.quickFilterLogicOperator === _xDataGridPremium.GridLogicOperator.And ? Object.values(result).every(Boolean) : Object.values(result).some(Boolean);
     });
   }
   return rows;
@@ -151,7 +161,7 @@ const getFilteredRows = (rows, filterModel, columnsWithDefaultColDef) => {
       value: parsedValue
     }, colDef);
   });
-  if (filterModel.logicOperator === _xDataGridPro.GridLogicOperator.Or) {
+  if (filterModel.logicOperator === _xDataGridPremium.GridLogicOperator.Or) {
     return rows.filter(row => filterModel.items.some((_, index) => {
       const value = valueGetters[index](row);
       return filterFunctions[index] === null ? true : filterFunctions[index](value);
@@ -162,6 +172,36 @@ const getFilteredRows = (rows, filterModel, columnsWithDefaultColDef) => {
     return filterFunctions[index] === null ? true : filterFunctions[index](value);
   }));
 };
+const applyAggregation = (aggregationModel, colDefs, rows, groupId = 'root') => {
+  const columnsToAggregate = Object.keys(aggregationModel);
+  if (columnsToAggregate.length === 0) {
+    return {};
+  }
+  const aggregateValues = {};
+  columnsToAggregate.forEach(field => {
+    const type = colDefs.find(({
+      field: f
+    }) => f === field)?.type;
+    if (!type) {
+      return;
+    }
+    const availableAggregationFunctions = getAvailableAggregationFunctions(type);
+    if (!availableAggregationFunctions.has(aggregationModel[field])) {
+      return;
+    }
+    const aggregationFunction = availableAggregationFunctions.get(aggregationModel[field]);
+    if (!aggregationFunction) {
+      return;
+    }
+    const values = rows.map(row => row[field]);
+    aggregateValues[`${field}Aggregate`] = aggregationFunction.apply({
+      values,
+      field,
+      groupId
+    });
+  });
+  return aggregateValues;
+};
 
 /**
  * Simulates server data loading
@@ -179,7 +219,9 @@ const loadServerRows = (rows, queryOptions, serverOptions, columnsWithDefaultCol
   const {
     cursor,
     page = 0,
-    pageSize
+    pageSize,
+    start,
+    end
   } = queryOptions;
   let nextCursor;
   let firstRowIndex;
@@ -187,28 +229,37 @@ const loadServerRows = (rows, queryOptions, serverOptions, columnsWithDefaultCol
   let filteredRows = getFilteredRows(rows, queryOptions.filterModel, columnsWithDefaultColDef);
   const rowComparator = getRowComparator(queryOptions.sortModel, columnsWithDefaultColDef);
   filteredRows = [...filteredRows].sort(rowComparator);
+  let aggregateRow = {};
+  if (queryOptions.aggregationModel) {
+    aggregateRow = applyAggregation(queryOptions.aggregationModel, columnsWithDefaultColDef, filteredRows);
+  }
   const totalRowCount = filteredRows.length;
-  if (!pageSize) {
+  if (start !== undefined && end !== undefined) {
+    firstRowIndex = start;
+    lastRowIndex = end;
+  } else if (!pageSize) {
     firstRowIndex = 0;
-    lastRowIndex = filteredRows.length;
+    lastRowIndex = filteredRows.length - 1;
   } else if (useCursorPagination) {
     firstRowIndex = cursor ? filteredRows.findIndex(({
       id
     }) => id === cursor) : 0;
     firstRowIndex = Math.max(firstRowIndex, 0); // if cursor not found return 0
-    lastRowIndex = firstRowIndex + pageSize;
-    nextCursor = lastRowIndex >= filteredRows.length ? undefined : filteredRows[lastRowIndex].id;
+    lastRowIndex = firstRowIndex + pageSize - 1;
+    nextCursor = filteredRows[lastRowIndex + 1]?.id;
   } else {
     firstRowIndex = page * pageSize;
-    lastRowIndex = (page + 1) * pageSize;
+    lastRowIndex = (page + 1) * pageSize - 1;
   }
   const hasNextPage = lastRowIndex < filteredRows.length - 1;
-  const response = {
-    returnedRows: filteredRows.slice(firstRowIndex, lastRowIndex),
+  const response = (0, _extends2.default)({
+    returnedRows: filteredRows.slice(firstRowIndex, lastRowIndex + 1),
     hasNextPage,
     nextCursor,
     totalRowCount
-  };
+  }, queryOptions.aggregationModel ? {
+    aggregateRow
+  } : {});
   return new Promise(resolve => {
     setTimeout(() => {
       resolve(response);
@@ -319,6 +370,12 @@ const processTreeDataRows = (rows, queryOptions, serverOptions, columnsWithDefau
   let childRowsWithDescendantCounts = childRows.map(row => {
     const descendants = findTreeDataRowChildren(filteredRows, row[pathKey], pathKey, -1);
     const descendantCount = descendants.length;
+    if (descendantCount > 0 && queryOptions.aggregationModel) {
+      // Parent row, compute aggregation
+      return (0, _extends2.default)({}, row, {
+        descendantCount
+      }, applyAggregation(queryOptions.aggregationModel, columnsWithDefaultColDef, descendants, row.id));
+    }
     return (0, _extends2.default)({}, row, {
       descendantCount
     });
@@ -328,6 +385,10 @@ const processTreeDataRows = (rows, queryOptions, serverOptions, columnsWithDefau
     const rowComparator = getRowComparator(queryOptions.sortModel, columnsWithDefaultColDef);
     childRowsWithDescendantCounts = [...childRowsWithDescendantCounts].sort(rowComparator);
   }
+  let aggregateRow;
+  if (queryOptions.aggregationModel) {
+    aggregateRow = applyAggregation(queryOptions.aggregationModel, columnsWithDefaultColDef, filteredRows);
+  }
   if (queryOptions.paginationModel && queryOptions.groupKeys.length === 0) {
     // Only paginate root rows, grid should refetch root rows when `paginationModel` updates
     const {
@@ -342,7 +403,8 @@ const processTreeDataRows = (rows, queryOptions, serverOptions, columnsWithDefau
     setTimeout(() => {
       resolve({
         rows: childRowsWithDescendantCounts,
-        rootRowCount
+        rootRowCount,
+        aggregateRow
       });
     }, delay); // simulate network latency
   });
@@ -432,6 +494,12 @@ const processRowGroupingRows = (rows, queryOptions, serverOptions, columnsWithDe
       id
     }) => typeof id !== 'string' || !id.startsWith('auto-generated-parent-'));
     const descendantCount = descendants.length;
+    if (descendantCount > 0 && queryOptions.aggregationModel) {
+      // Parent row, compute aggregation
+      return (0, _extends2.default)({}, row, {
+        descendantCount
+      }, applyAggregation(queryOptions.aggregationModel, columnsWithDefaultColDef, descendants, row.id));
+    }
     return (0, _extends2.default)({}, row, {
       descendantCount
     });
@@ -442,6 +510,10 @@ const processRowGroupingRows = (rows, queryOptions, serverOptions, columnsWithDe
     const sortedChildRows = [...childRowsWithDescendantCounts].sort(rowComparator);
     childRowsWithDescendantCounts = [...sortedMissingGroups, ...sortedChildRows];
   }
+  let aggregateRow;
+  if (queryOptions.aggregationModel) {
+    aggregateRow = applyAggregation(queryOptions.aggregationModel, columnsWithDefaultColDef, filteredRows);
+  }
   if (queryOptions.paginationModel && queryOptions.groupKeys.length === 0) {
     // Only paginate root rows, grid should refetch root rows when `paginationModel` updates
     const {
@@ -456,7 +528,8 @@ const processRowGroupingRows = (rows, queryOptions, serverOptions, columnsWithDe
     setTimeout(() => {
       resolve({
         rows: childRowsWithDescendantCounts,
-        rootRowCount
+        rootRowCount,
+        aggregateRow
       });
     }, delay); // simulate network latency
   });

package/node/hooks/useDemoData.js

@@ -1,4 +1,5 @@
 "use strict";
+'use client';
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;

package/node/hooks/useMockServer.js

@@ -1,4 +1,5 @@
 "use strict";
+'use client';
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
@@ -9,7 +10,7 @@ exports.useMockServer = exports.BASE_URL = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
 var _lruCache = require("lru-cache");
-var _xDataGridPro = require("@mui/x-data-grid-pro");
+var _xDataGridPremium = require("@mui/x-data-grid-premium");
 var _useDemoData = require("./useDemoData");
 var _commodities = require("../columns/commodities.columns");
 var _employees = require("../columns/employees.columns");
@@ -82,7 +83,7 @@ const getInitialState = (columns, groupingField) => {
     }
   };
 };
-const defaultColDef = (0, _xDataGridPro.getGridDefaultColumnTypes)();
+const defaultColDef = (0, _xDataGridPremium.getGridDefaultColumnTypes)();
 function sendEmptyResponse() {
   return new Promise(resolve => {
     resolve({
@@ -208,38 +209,47 @@ const useMockServer = (dataSetOptions, serverOptions, shouldRequestsFail) => {
     if (isTreeData) {
       const {
         rows,
-        rootRowCount
+        rootRowCount,
+        aggregateRow
       } = await (0, _serverUtils.processTreeDataRows)(data?.rows ?? [], params, serverOptionsWithDefault, columnsWithDefaultColDef);
-      getRowsResponse = {
+      getRowsResponse = (0, _extends2.default)({
         rows: rows.slice().map(row => (0, _extends2.default)({}, row, {
           path: undefined
         })),
         rowCount: rootRowCount
-      };
+      }, aggregateRow ? {
+        aggregateRow
+      } : {});
     } else if (isRowGrouping) {
       const {
         rows,
-        rootRowCount
+        rootRowCount,
+        aggregateRow
       } = await (0, _serverUtils.processRowGroupingRows)(data?.rows ?? [], params, serverOptionsWithDefault, columnsWithDefaultColDef);
-      getRowsResponse = {
+      getRowsResponse = (0, _extends2.default)({
         rows: rows.slice().map(row => (0, _extends2.default)({}, row, {
           path: undefined
         })),
         rowCount: rootRowCount
-      };
+      }, aggregateRow ? {
+        aggregateRow
+      } : {});
     } else {
       const {
         returnedRows,
         nextCursor,
-        totalRowCount
+        totalRowCount,
+        aggregateRow
       } = await (0, _serverUtils.loadServerRows)(data?.rows ?? [], (0, _extends2.default)({}, params, params.paginationModel), serverOptionsWithDefault, columnsWithDefaultColDef);
-      getRowsResponse = {
+      getRowsResponse = (0, _extends2.default)({
         rows: returnedRows,
         rowCount: totalRowCount,
         pageInfo: {
           nextCursor
         }
-      };
+      }, aggregateRow ? {
+        aggregateRow
+      } : {});
     }
     return new Promise(resolve => {
       if (verbose) {
@@ -256,7 +266,8 @@ const useMockServer = (dataSetOptions, serverOptions, shouldRequestsFail) => {
     fetchRows,
     loadNewData: () => {
       setIndex(oldIndex => oldIndex + 1);
-    }
+    },
+    isReady: Boolean(data?.rows?.length)
   };
 };
 exports.useMockServer = useMockServer;

package/node/hooks/useQuery.js

@@ -1,4 +1,5 @@
 "use strict";
+'use client';
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-generator v8.0.0-alpha.1
+ * @mui/x-data-grid-generator v8.0.0-alpha.10
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/node/renderer/renderEditProgress.js

@@ -1,4 +1,5 @@
 "use strict";
+'use client';
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid-generator",
-  "version": "8.0.0-alpha.1",
+  "version": "8.0.0-alpha.10",
   "description": "Generate fake data for demo purposes only.",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -23,11 +23,11 @@
     "directory": "packages/x-data-grid-generator"
   },
   "dependencies": {
-    "@babel/runtime": "^7.26.0",
+    "@babel/runtime": "^7.26.7",
     "chance": "^1.1.12",
     "clsx": "^2.1.1",
     "lru-cache": "^11.0.2",
-    "@mui/x-data-grid-premium": "8.0.0-alpha.1"
+    "@mui/x-data-grid-premium": "8.0.0-alpha.10"
   },
   "peerDependencies": {
     "@emotion/react": "^11.9.0",

package/renderer/renderEditProgress.js

@@ -1,3 +1,5 @@
+'use client';
+
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import clsx from 'clsx';