Skip to content

Commit be386fb

Browse files
authored
Migrate to x-data-grid v7 (#5597)
1 parent 85f07ec commit be386fb

File tree

4 files changed

+41
-37
lines changed

4 files changed

+41
-37
lines changed

package-lock.json

+32-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"@loadable/component": "5.16.4",
8484
"@mui/icons-material": "5.15.17",
8585
"@mui/material": "5.15.17",
86-
"@mui/x-data-grid": "6.19.11",
86+
"@mui/x-data-grid": "7.5.1",
8787
"@react-hook/resize-observer": "2.0.1",
8888
"@tanstack/react-query": "5.40.0",
8989
"@tanstack/react-query-devtools": "5.40.0",

src/apps/dashboard/routes/activity.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const Activity = () => {
6060
field: 'User',
6161
headerName: globalize.translate('LabelUser'),
6262
width: 60,
63-
valueGetter: ({ row }) => users[row.UserId]?.Name,
63+
valueGetter: ( value, row ) => users[row.UserId]?.Name,
6464
renderCell: ({ row }) => (
6565
<IconButton
6666
size='large'
@@ -82,16 +82,16 @@ const Activity = () => {
8282
headerName: globalize.translate('LabelDate'),
8383
width: 90,
8484
type: 'date',
85-
valueGetter: ({ value }) => parseISO8601Date(value),
86-
valueFormatter: ({ value }) => toLocaleDateString(value)
85+
valueGetter: ( value ) => parseISO8601Date(value),
86+
valueFormatter: ( value ) => toLocaleDateString(value)
8787
},
8888
{
8989
field: 'Time',
9090
headerName: globalize.translate('LabelTime'),
9191
width: 100,
9292
type: 'dateTime',
93-
valueGetter: ({ row }) => parseISO8601Date(row.Date),
94-
valueFormatter: ({ value }) => toLocaleTimeString(value)
93+
valueGetter: ( value, row ) => parseISO8601Date(row.Date),
94+
valueFormatter: ( value ) => toLocaleTimeString(value)
9595
},
9696
{
9797
field: 'Severity',
@@ -113,7 +113,7 @@ const Activity = () => {
113113
field: 'Overview',
114114
headerName: globalize.translate('LabelOverview'),
115115
width: 200,
116-
valueGetter: ({ row }) => row.ShortOverview ?? row.Overview,
116+
valueGetter: ( value, row ) => row.ShortOverview ?? row.Overview,
117117
renderCell: ({ row }) => (
118118
<OverviewCell {...row} />
119119
)

webpack.common.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ const config = {
4242
'@mui/private-theming': '@mui/private-theming/legacy',
4343
'@mui/styled-engine': '@mui/styled-engine/legacy',
4444
'@mui/system': '@mui/system/legacy',
45-
'@mui/utils': '@mui/utils/legacy',
46-
'@mui/x-data-grid': '@mui/x-data-grid/legacy'
45+
'@mui/utils': '@mui/utils/legacy'
4746
}
4847
},
4948
plugins: [
@@ -176,6 +175,7 @@ const config = {
176175
include: [
177176
path.resolve(__dirname, 'node_modules/@jellyfin/libass-wasm'),
178177
path.resolve(__dirname, 'node_modules/@jellyfin/sdk'),
178+
path.resolve(__dirname, 'node_modules/@mui/x-data-grid'),
179179
path.resolve(__dirname, 'node_modules/@react-hook/latest'),
180180
path.resolve(__dirname, 'node_modules/@react-hook/passive-layout-effect'),
181181
path.resolve(__dirname, 'node_modules/@react-hook/resize-observer'),

0 commit comments

Comments
 (0)