diff --git a/package-lock.json b/package-lock.json index 275d81f76f..55391b62d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,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", @@ -1916,9 +1916,10 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", - "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==", + "version": "7.24.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz", + "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==", + "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -4310,13 +4311,15 @@ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" }, "node_modules/@mui/x-data-grid": { - "version": "6.19.11", - "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.19.11.tgz", - "integrity": "sha512-QsUp2cPkjUm8vyTR5gYWuCFqxspljOzElbCm412wzvMTJSKaB0kz7CEecFhxjlsMjQ8B7kY8oDF3LXjjucFcPQ==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.5.1.tgz", + "integrity": "sha512-5GuHg95UcphQ3O4LftUEFkNPP00YKUDZoSxmsNJ2+o6pwhHH4f8XIuuXEZJCyEMUiVYQk6/iYZwxJL6CpvbNCw==", + "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.2", - "@mui/utils": "^5.14.16", - "clsx": "^2.0.0", + "@babel/runtime": "^7.24.5", + "@mui/system": "^5.15.14", + "@mui/utils": "^5.15.14", + "clsx": "^2.1.1", "prop-types": "^15.8.1", "reselect": "^4.1.8" }, @@ -4325,11 +4328,10 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "@mui/material": "^5.4.1", - "@mui/system": "^5.4.1", + "@mui/material": "^5.15.14", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" } @@ -7153,9 +7155,10 @@ } }, "node_modules/clsx": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", - "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", "engines": { "node": ">=6" } @@ -25431,9 +25434,9 @@ "dev": true }, "@babel/runtime": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", - "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==", + "version": "7.24.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz", + "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==", "requires": { "regenerator-runtime": "^0.14.0" } @@ -26664,13 +26667,14 @@ } }, "@mui/x-data-grid": { - "version": "6.19.11", - "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.19.11.tgz", - "integrity": "sha512-QsUp2cPkjUm8vyTR5gYWuCFqxspljOzElbCm412wzvMTJSKaB0kz7CEecFhxjlsMjQ8B7kY8oDF3LXjjucFcPQ==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.5.1.tgz", + "integrity": "sha512-5GuHg95UcphQ3O4LftUEFkNPP00YKUDZoSxmsNJ2+o6pwhHH4f8XIuuXEZJCyEMUiVYQk6/iYZwxJL6CpvbNCw==", "requires": { - "@babel/runtime": "^7.23.2", - "@mui/utils": "^5.14.16", - "clsx": "^2.0.0", + "@babel/runtime": "^7.24.5", + "@mui/system": "^5.15.14", + "@mui/utils": "^5.15.14", + "clsx": "^2.1.1", "prop-types": "^15.8.1", "reselect": "^4.1.8" } @@ -28769,9 +28773,9 @@ } }, "clsx": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", - "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==" }, "collapse-white-space": { "version": "1.0.6", diff --git a/package.json b/package.json index 6d99defdad..762779deec 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/apps/dashboard/routes/activity.tsx b/src/apps/dashboard/routes/activity.tsx index 7da39a7f5b..e0fd4ccd8a 100644 --- a/src/apps/dashboard/routes/activity.tsx +++ b/src/apps/dashboard/routes/activity.tsx @@ -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 }) => ( { 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', @@ -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 }) => ( ) diff --git a/webpack.common.js b/webpack.common.js index 81e2e0e276..a8ceb61f91 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -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: [ @@ -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'),