diff --git a/docs/data/toolpad/studio/components/data-grid/DataGridPro.js b/docs/data/toolpad/studio/components/data-grid/DataGridPro.js index b0fad43924f..dc074cfb0d7 100644 --- a/docs/data/toolpad/studio/components/data-grid/DataGridPro.js +++ b/docs/data/toolpad/studio/components/data-grid/DataGridPro.js @@ -29,7 +29,16 @@ const COLUMNS = [ export default function DataGridPro() { return ( - + ); } diff --git a/docs/data/toolpad/studio/components/data-grid/data-grid.md b/docs/data/toolpad/studio/components/data-grid/data-grid.md index 24e6ccd823d..7a477b62c6d 100644 --- a/docs/data/toolpad/studio/components/data-grid/data-grid.md +++ b/docs/data/toolpad/studio/components/data-grid/data-grid.md @@ -31,6 +31,17 @@ From the `type` drop down you can also [customize a column](/toolpad/studio/how- Your browser does not support the video tag. +### Grouping and aggregating (Pro) + +When you use the Toolpad [pro plan](/toolpad/studio/getting-started/roadmap/#pro-plan), the DataGrid gains grouping and aggregating capabilities. You can turn this off for individual columns. + + + +{{"demo": "DataGridPro.js", "hideToolbar": true, "bg": "inline"}} + ### Id field Id field property is used to identify which column contains the id column. By default, the data grid looks for a property named `id` in the data set to get that identifier. If the row's identifier is not called `id`, then you need to use this prop to tell the data grid where it's located. @@ -73,12 +84,6 @@ This prop is used to show – or hide – the toolbar from the data grid. The fo {{"demo": "DataGridHideToolbar.js", "hideToolbar": true, "bg": "inline"}} -### Grouping and aggregating (PRO) - -When you use the [Toolpad pro plan](/), the DataGrid gains grouping and aggregating capabilities. You can turn this off for individual columns. - -{{"demo": "DataGridPro.js", "hideToolbar": true, "bg": "inline"}} - ## API See the documentation below for a complete reference to all props available to the datagrid component in Toolpad Studio. diff --git a/docs/data/toolpad/studio/getting-started/roadmap.md b/docs/data/toolpad/studio/getting-started/roadmap.md index 8ea11a5014c..a27df8d1ed3 100644 --- a/docs/data/toolpad/studio/getting-started/roadmap.md +++ b/docs/data/toolpad/studio/getting-started/roadmap.md @@ -19,7 +19,7 @@ The roadmap does not represent a commitment, obligation, or promise to deliver a To learn more about our plans for Material UI in general, visit the [global roadmap](/material-ui/discover-more/roadmap/). -## Paid Plan +## Pro Plan A few features in Toolpad Studio are proposed to be placed under a paid plan. These: @@ -32,6 +32,17 @@ The following features are currently planned to be included within this scope: Features allowing you to grant conditional access to pages based on user roles are part of this proposed paid plan. Read more about this feature on [authorization](/toolpad/studio/concepts/rbac/). +- ### Grouping and Aggregation + + Feature which allows you to configure grouping and aggregation features on the data grid through visual controls. Read more about this feature on the [data grid](/toolpad/studio/components/data-grid/#grouping-and-aggregating-pro) page. + +:::info +The following Pro features are included with an [X Premium license](https://mui.com/x/introduction/licensing/#premium-plan): + +- **Grouping and Aggregation** + + ::: + ## How to upgrade Currently, accessing these features requires you to add the following to your `application.yml`: diff --git a/docs/public/static/toolpad/docs/studio/components/datagrid/datagrid_grouping.mp4 b/docs/public/static/toolpad/docs/studio/components/datagrid/datagrid_grouping.mp4 new file mode 100644 index 00000000000..7fde9648135 Binary files /dev/null and b/docs/public/static/toolpad/docs/studio/components/datagrid/datagrid_grouping.mp4 differ diff --git a/packages/toolpad-studio/src/toolpad/propertyControls/GridColumns.tsx b/packages/toolpad-studio/src/toolpad/propertyControls/GridColumns.tsx index f76b33ed94d..5a6c4ea429b 100644 --- a/packages/toolpad-studio/src/toolpad/propertyControls/GridColumns.tsx +++ b/packages/toolpad-studio/src/toolpad/propertyControls/GridColumns.tsx @@ -347,7 +347,7 @@ function GridColumnEditor({ Grouping/aggregation )}