Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DataGrid] Make base data source available in the Community plan #16359

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

[DataGrid] Make base data source available in the Community plan #16359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d916bde
[DataGrid] Make basic data source available for MIT users
MBilalShafi Jan 27, 2025
e64247a
Merge branch 'master' into make-data-source-MIT
MBilalShafi Jan 27, 2025
f88a01b
Run scripts
MBilalShafi Jan 27, 2025
9877398
Merge branch 'master' into make-data-source-MIT
MBilalShafi Jan 28, 2025
8c49c51
Merge master into 'make-data-source-MIT'
MBilalShafi Jan 30, 2025
464fcf5
Lint
MBilalShafi Jan 30, 2025
857e769
Merge master into 'make-data-source-MIT'
MBilalShafi Jan 30, 2025
17641f7
Merge branch 'master' into make-data-source-MIT
MBilalShafi Jan 31, 2025
f4664f6
Resolve a few comments
MBilalShafi Feb 6, 2025
78ae176
Simplify the selector
MBilalShafi Feb 6, 2025
007008e
Merge branch 'master' into make-data-source-MIT
MBilalShafi Feb 6, 2025
c06aa7a
Merge branch 'master' into make-data-source-MIT
MBilalShafi Feb 9, 2025
e11e639
Update
MBilalShafi Feb 9, 2025
d53e4d7
Lint
MBilalShafi Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions docs/data/data-grid/server-side-data/ServerSideDataGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { DataGridPro } from '@mui/x-data-grid-pro';
import { DataGrid } from '@mui/x-data-grid';
import { useMockServer } from '@mui/x-data-grid-generator';

export default function ServerSideDataGrid() {
Expand Down Expand Up @@ -28,24 +28,16 @@ export default function ServerSideDataGrid() {
[fetchRows],
);

const initialStateWithPagination = React.useMemo(
() => ({
...initialState,
pagination: {
paginationModel: { pageSize: 10, page: 0 },
rowCount: 0,
},
}),
[initialState],
);

return (
<div style={{ width: '100%', height: 400 }}>
<DataGridPro
<DataGrid
columns={columns}
unstable_dataSource={dataSource}
pagination
initialState={initialStateWithPagination}
initialState={{
...initialState,
pagination: { paginationModel: { pageSize: 10, page: 0 }, rowCount: 0 },
}}
pageSizeOptions={[10, 20, 50]}
/>
</div>
Expand Down
20 changes: 6 additions & 14 deletions docs/data/data-grid/server-side-data/ServerSideDataGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { DataGridPro, GridDataSource } from '@mui/x-data-grid-pro';
import { DataGrid, GridDataSource } from '@mui/x-data-grid';
import { useMockServer } from '@mui/x-data-grid-generator';

export default function ServerSideDataGrid() {
Expand Down Expand Up @@ -28,24 +28,16 @@ export default function ServerSideDataGrid() {
[fetchRows],
);

const initialStateWithPagination = React.useMemo(
() => ({
...initialState,
pagination: {
paginationModel: { pageSize: 10, page: 0 },
rowCount: 0,
},
}),
[initialState],
);

return (
<div style={{ width: '100%', height: 400 }}>
<DataGridPro
<DataGrid
columns={columns}
unstable_dataSource={dataSource}
pagination
initialState={initialStateWithPagination}
initialState={{
...initialState,
pagination: { paginationModel: { pageSize: 10, page: 0 }, rowCount: 0 },
}}
pageSizeOptions={[10, 20, 50]}
/>
</div>
Expand Down
7 changes: 5 additions & 2 deletions docs/data/data-grid/server-side-data/ServerSideDataGrid.tsx.preview
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<DataGridPro
<DataGrid
columns={columns}
unstable_dataSource={dataSource}
pagination
initialState={initialStateWithPagination}
initialState={{
...initialState,
pagination: { paginationModel: { pageSize: 10, page: 0 }, rowCount: 0 },
}}
pageSizeOptions={[10, 20, 50]}
/>
8 changes: 6 additions & 2 deletions docs/data/data-grid/server-side-data/ServerSideDataGridAggregation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import * as React from 'react';
import { DataGridPremium, GridDataSource } from '@mui/x-data-grid-premium';
import {
DataGridPremium,
GridDataSource,
GridGetRowsResponse,
} from '@mui/x-data-grid-premium';
import { useMockServer } from '@mui/x-data-grid-generator';

const aggregationFunctions = {
Expand All @@ -11,7 +15,7 @@ const aggregationFunctions = {
};

export default function ServerSideDataGridAggregation() {
const { columns, initialState, fetchRows } = useMockServer(
const { columns, initialState, fetchRows } = useMockServer<GridGetRowsResponse>(
{},
{ useCursorPagination: false },
);
Expand Down
31 changes: 11 additions & 20 deletions docs/data/data-grid/server-side-data/ServerSideDataGridAggregationLazyLoading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ const aggregationFunctions = {
};

export default function ServerSideDataGridAggregationLazyLoading() {
const {
columns,
initialState: initState,
fetchRows,
} = useMockServer({}, { useCursorPagination: false });
const { columns, initialState, fetchRows } = useMockServer(
{},
{ useCursorPagination: false },
);

const dataSource = React.useMemo(
() => ({
Expand Down Expand Up @@ -43,26 +42,18 @@ export default function ServerSideDataGridAggregationLazyLoading() {
[fetchRows],
);

const initialState = React.useMemo(
() => ({
...initState,
pagination: {
paginationModel: { pageSize: 10, page: 0 },
rowCount: 0,
},
aggregation: {
model: { commodity: 'size', quantity: 'sum' },
},
}),
[initState],
);

return (
<div style={{ width: '100%', height: 400 }}>
<DataGridPremium
columns={columns}
unstable_dataSource={dataSource}
initialState={initialState}
initialState={{
...initialState,
pagination: { paginationModel: { pageSize: 10, page: 0 }, rowCount: 0 },
aggregation: {
model: { commodity: 'size', quantity: 'sum' },
},
}}
unstable_lazyLoading
aggregationFunctions={aggregationFunctions}
/>
Expand Down
37 changes: 16 additions & 21 deletions docs/data/data-grid/server-side-data/ServerSideDataGridAggregationLazyLoading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import * as React from 'react';
import { DataGridPremium, GridDataSource } from '@mui/x-data-grid-premium';
import {
DataGridPremium,
GridDataSource,
GridGetRowsResponse,
} from '@mui/x-data-grid-premium';
import { useMockServer } from '@mui/x-data-grid-generator';

const aggregationFunctions = {
Expand All @@ -11,11 +15,10 @@ const aggregationFunctions = {
};

export default function ServerSideDataGridAggregationLazyLoading() {
const {
columns,
initialState: initState,
fetchRows,
} = useMockServer({}, { useCursorPagination: false });
const { columns, initialState, fetchRows } = useMockServer<GridGetRowsResponse>(
{},
{ useCursorPagination: false },
);

const dataSource: GridDataSource = React.useMemo(
() => ({
Expand Down Expand Up @@ -43,26 +46,18 @@ export default function ServerSideDataGridAggregationLazyLoading() {
[fetchRows],
);

const initialState = React.useMemo(
() => ({
...initState,
pagination: {
paginationModel: { pageSize: 10, page: 0 },
rowCount: 0,
},
aggregation: {
model: { commodity: 'size', quantity: 'sum' },
},
}),
[initState],
);

return (
<div style={{ width: '100%', height: 400 }}>
<DataGridPremium
columns={columns}
unstable_dataSource={dataSource}
initialState={initialState}
initialState={{
...initialState,
pagination: { paginationModel: { pageSize: 10, page: 0 }, rowCount: 0 },
aggregation: {
model: { commodity: 'size', quantity: 'sum' },
},
}}
unstable_lazyLoading
aggregationFunctions={aggregationFunctions}
/>
Expand Down
8 changes: 7 additions & 1 deletion docs/data/data-grid/server-side-data/ServerSideDataGridAggregationLazyLoading.tsx.preview
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<DataGridPremium
columns={columns}
unstable_dataSource={dataSource}
initialState={initialState}
initialState={{
...initialState,
pagination: { paginationModel: { pageSize: 10, page: 0 }, rowCount: 0 },
aggregation: {
model: { commodity: 'size', quantity: 'sum' },
},
}}
unstable_lazyLoading
aggregationFunctions={aggregationFunctions}
/>
17 changes: 6 additions & 11 deletions docs/data/data-grid/server-side-data/ServerSideDataGridAggregationRowGrouping.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@ const aggregationFunctions = {

export default function ServerSideDataGridAggregationRowGrouping() {
const apiRef = useGridApiRef();
const {
columns,
initialState: initState,
fetchRows,
} = useMockServer({ rowGrouping: true });
const { columns, initialState, fetchRows } = useMockServer({
rowGrouping: true,
});

const dataSource = React.useMemo(
() => ({
Expand Down Expand Up @@ -49,13 +47,10 @@ export default function ServerSideDataGridAggregationRowGrouping() {
[fetchRows],
);

const initialState = useKeepGroupedColumnsHidden({
const initialStateWithAggregation = useKeepGroupedColumnsHidden({
apiRef,
initialState: {
...initState,
rowGrouping: {
model: ['company', 'director'],
},
...initialState,
aggregation: {
model: { title: 'size', gross: 'sum', year: 'max' },
},
Expand All @@ -68,7 +63,7 @@ export default function ServerSideDataGridAggregationRowGrouping() {
apiRef={apiRef}
columns={columns}
unstable_dataSource={dataSource}
initialState={initialState}
initialState={initialStateWithAggregation}
aggregationFunctions={aggregationFunctions}
/>
</div>
Expand Down
18 changes: 7 additions & 11 deletions docs/data/data-grid/server-side-data/ServerSideDataGridAggregationRowGrouping.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
useKeepGroupedColumnsHidden,
useGridApiRef,
GridDataSource,
GridGetRowsResponse,
} from '@mui/x-data-grid-premium';
import { useMockServer } from '@mui/x-data-grid-generator';

Expand All @@ -17,11 +18,9 @@ const aggregationFunctions = {

export default function ServerSideDataGridAggregationRowGrouping() {
const apiRef = useGridApiRef();
const {
columns,
initialState: initState,
fetchRows,
} = useMockServer({ rowGrouping: true });
const { columns, initialState, fetchRows } = useMockServer<GridGetRowsResponse>({
rowGrouping: true,
});

const dataSource: GridDataSource = React.useMemo(
() => ({
Expand Down Expand Up @@ -50,13 +49,10 @@ export default function ServerSideDataGridAggregationRowGrouping() {
[fetchRows],
);

const initialState = useKeepGroupedColumnsHidden({
const initialStateWithAggregation = useKeepGroupedColumnsHidden({
apiRef,
initialState: {
...initState,
rowGrouping: {
model: ['company', 'director'],
},
...initialState,
aggregation: {
model: { title: 'size', gross: 'sum', year: 'max' },
},
Expand All @@ -69,7 +65,7 @@ export default function ServerSideDataGridAggregationRowGrouping() {
apiRef={apiRef}
columns={columns}
unstable_dataSource={dataSource}
initialState={initialState}
initialState={initialStateWithAggregation}
aggregationFunctions={aggregationFunctions}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/data/data-grid/server-side-data/ServerSideDataGridAggregationRowGrouping.tsx.preview
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
apiRef={apiRef}
columns={columns}
unstable_dataSource={dataSource}
initialState={initialState}
initialState={initialStateWithAggregation}
aggregationFunctions={aggregationFunctions}
/>
23 changes: 7 additions & 16 deletions docs/data/data-grid/server-side-data/ServerSideDataGridAggregationTreeData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,7 @@ const aggregationFunctions = {

export default function ServerSideDataGridAggregationTreeData() {
const apiRef = useGridApiRef();
const {
fetchRows,
columns,
initialState: initState,
} = useMockServer(dataSetOptions);

const initialState = React.useMemo(
() => ({
...initState,
aggregation: {
model: { rating: 'avg', website: 'size' },
},
}),
[initState],
);
const { fetchRows, columns, initialState } = useMockServer(dataSetOptions);

const dataSource = React.useMemo(
() => ({
Expand Down Expand Up @@ -67,7 +53,12 @@ export default function ServerSideDataGridAggregationTreeData() {
unstable_dataSource={dataSource}
treeData
apiRef={apiRef}
initialState={initialState}
initialState={{
...initialState,
aggregation: {
model: { rating: 'avg', website: 'size' },
},
}}
aggregationFunctions={aggregationFunctions}
/>
</div>
Expand Down
Loading