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

Jump to bottom

Migrate to x-data-grid v7 #5597

Merged
merged 11 commits into from
Jun 12, 2024
Merged

Migrate to x-data-grid v7 #5597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
abef380
Migrate to x-data-grid v7
LittleBigOwI May 24, 2024
da1fe80
Add x-data-grid to webpack transpile list
LittleBigOwI May 24, 2024
5ac7c55
Fix webpack transpile list
LittleBigOwI May 24, 2024
e895cab
Merge branch 'jellyfin:master' into master
LittleBigOwI May 24, 2024
5e08513
Add escheck ignore x-datag-rid
LittleBigOwI May 24, 2024
972e5c4
Merge branch 'master' into master
LittleBigOwI May 26, 2024
44f7e66
Merge branch 'master' into master
LittleBigOwI May 27, 2024
2633c46
Merge branch 'master' into master
LittleBigOwI May 27, 2024
f96a4bd
Fix typo
LittleBigOwI Jun 9, 2024
5bd12b7
Fix merge conflict
LittleBigOwI Jun 11, 2024
173baad
Remove escheckrc line
LittleBigOwI Jun 11, 2024
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
60 changes: 32 additions & 28 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"@loadable/component": "5.16.4",
"@mui/icons-material": "5.15.17",
"@mui/material": "5.15.17",
"@mui/x-data-grid": "6.19.11",
"@mui/x-data-grid": "7.5.1",
"@react-hook/resize-observer": "2.0.1",
"@tanstack/react-query": "5.40.0",
"@tanstack/react-query-devtools": "5.40.0",
Expand Down
12 changes: 6 additions & 6 deletions src/apps/dashboard/routes/activity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const Activity = () => {
field: 'User',
headerName: globalize.translate('LabelUser'),
width: 60,
valueGetter: ({ row }) => users[row.UserId]?.Name,
valueGetter: ( value, row ) => users[row.UserId]?.Name,
renderCell: ({ row }) => (
<IconButton
size='large'
Expand All @@ -82,16 +82,16 @@ const Activity = () => {
headerName: globalize.translate('LabelDate'),
width: 90,
type: 'date',
valueGetter: ({ value }) => parseISO8601Date(value),
valueFormatter: ({ value }) => toLocaleDateString(value)
valueGetter: ( value ) => parseISO8601Date(value),
valueFormatter: ( value ) => toLocaleDateString(value)
},
{
field: 'Time',
headerName: globalize.translate('LabelTime'),
width: 100,
type: 'dateTime',
valueGetter: ({ row }) => parseISO8601Date(row.Date),
valueFormatter: ({ value }) => toLocaleTimeString(value)
valueGetter: ( value, row ) => parseISO8601Date(row.Date),
valueFormatter: ( value ) => toLocaleTimeString(value)
},
{
field: 'Severity',
Expand All @@ -113,7 +113,7 @@ const Activity = () => {
field: 'Overview',
headerName: globalize.translate('LabelOverview'),
width: 200,
valueGetter: ({ row }) => row.ShortOverview ?? row.Overview,
valueGetter: ( value, row ) => row.ShortOverview ?? row.Overview,
renderCell: ({ row }) => (
<OverviewCell {...row} />
)
Expand Down
4 changes: 2 additions & 2 deletions webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ const config = {
'@mui/private-theming': '@mui/private-theming/legacy',
'@mui/styled-engine': '@mui/styled-engine/legacy',
'@mui/system': '@mui/system/legacy',
'@mui/utils': '@mui/utils/legacy',
'@mui/x-data-grid': '@mui/x-data-grid/legacy'
'@mui/utils': '@mui/utils/legacy'
}
},
plugins: [
Expand Down Expand Up @@ -176,6 +175,7 @@ const config = {
include: [
path.resolve(__dirname, 'node_modules/@jellyfin/libass-wasm'),
path.resolve(__dirname, 'node_modules/@jellyfin/sdk'),
path.resolve(__dirname, 'node_modules/@mui/x-data-grid'),
path.resolve(__dirname, 'node_modules/@react-hook/latest'),
path.resolve(__dirname, 'node_modules/@react-hook/passive-layout-effect'),
path.resolve(__dirname, 'node_modules/@react-hook/resize-observer'),
Expand Down
Loading