From 02b176b3f33b7ab4d43f0e20c6fd5af91fff1c4f Mon Sep 17 00:00:00 2001 From: Samir Kamal <1954121+skamril@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:06:28 +0100 Subject: [PATCH] draft --- webapp/package-lock.json | 256 +++++++--------- webapp/package.json | 13 +- webapp/src/components/App/Api.tsx | 4 +- .../App/Data/DatasetCreationDialog.tsx | 1 - .../src/components/App/Settings/General.tsx | 40 ++- .../dialog/GroupFormDialog/GroupForm.tsx | 3 +- .../dialog/TokenFormDialog/TokenForm.tsx | 3 +- .../Users/dialog/UserFormDialog/UserForm.tsx | 3 +- .../CommandListItem/style.ts | 4 +- .../InformationView/Notes/DetailsList.tsx | 1 - .../HomeView/InformationView/Notes/utils.ts | 7 +- .../App/Singlestudy/NavHeader/Actions.tsx | 22 +- .../App/Singlestudy/NavHeader/index.tsx | 2 +- .../App/Singlestudy/UpgradeDialog.tsx | 8 +- .../explore/Configuration/General/Fields.tsx | 5 +- .../dialogs/ScenarioPlaylistDialog.tsx | 6 +- .../dialogs/ThematicTrimmingDialog/index.tsx | 1 - .../TimeSeriesManagement/Fields.tsx | 4 +- .../Singlestudy/explore/Debug/Data/Folder.tsx | 1 - .../Hydro/Allocation/AllocationField.tsx | 1 - .../Hydro/Correlation/CorrelationField.tsx | 1 - .../Areas/Hydro/InflowStructure/index.tsx | 1 - .../Areas/Hydro/ViewMatrixButton.tsx | 2 +- .../Modelization/Areas/Renewables/Form.tsx | 1 - .../Modelization/Areas/Storages/Form.tsx | 1 - .../Modelization/Areas/Thermal/Form.tsx | 1 - .../AddConstraintTermForm/index.tsx | 1 - .../BindingConstView/BindingConstForm.tsx | 1 - .../BindingConstView/ConstraintFields.tsx | 8 - .../ConstraintTerm/OptionsList.tsx | 2 - .../BindingConstView/ConstraintTerm/index.tsx | 4 - .../BindingConstView/Matrix.tsx | 2 +- .../BindingConstView/index.tsx | 1 - .../Modelization/Map/Areas/AreaConfig.tsx | 1 - .../Map/Areas/DeleteAreaDialog.tsx | 1 - .../Districts/UpdateDistrictDialog.tsx | 2 - .../Map/MapConfig/Districts/index.tsx | 2 - .../MapConfig/Layers/UpdateLayerDialog.tsx | 2 - .../Map/MapConfig/Layers/index.tsx | 2 - .../Modelization/Map/MapConfig/index.tsx | 1 - .../Modelization/Map/MapControlButtons.tsx | 16 +- .../explore/Modelization/Map/MapHeader.tsx | 1 - .../explore/Modelization/Map/Node.tsx | 2 - .../Results/ResultDetails/ResultFilters.tsx | 56 +--- .../explore/Results/ResultDetails/index.tsx | 1 - .../explore/TableModeList/index.tsx | 8 +- .../Xpansion/Candidates/CandidateForm.tsx | 8 +- .../Candidates/CreateCandidateDialog.tsx | 2 +- .../Xpansion/Candidates/XpansionPropsView.tsx | 6 +- .../Xpansion/Settings/SettingsForm.tsx | 10 +- .../Singlestudy/explore/Xpansion/index.tsx | 1 - .../explore/common/OutputFilters.tsx | 1 - .../ExportModal/ExportFilter/Filter/index.tsx | 2 - .../ExportFilter/TagSelect/index.tsx | 1 - .../components/App/Studies/FilterDrawer.tsx | 3 +- .../components/App/Studies/HeaderBottom.tsx | 6 - webapp/src/components/App/Studies/SideNav.tsx | 9 +- .../App/Studies/StudiesList/index.tsx | 122 ++------ .../App/Studies/StudyCard/index.tsx | 17 +- webapp/src/components/App/Tasks/index.tsx | 4 +- webapp/src/components/App/index.tsx | 196 ++++++------- webapp/src/components/App/theme.ts | 270 +++++++++++++++++ webapp/src/components/common/DataGrid.tsx | 7 +- webapp/src/components/common/DataGridForm.tsx | 5 +- .../common/DynamicDataTable/TableRowGroup.tsx | 2 +- .../common/DynamicDataTable/TableRowItem.tsx | 2 +- .../common/DynamicDataTable/index.tsx | 2 - webapp/src/components/common/DynamicList.tsx | 1 - webapp/src/components/common/Form/index.tsx | 5 +- .../cellRenderers/BooleanCell.tsx | 1 - .../common/GroupedDataTable/index.tsx | 3 - webapp/src/components/common/Handsontable.tsx | 2 +- .../Matrix/components/MatrixActions/index.tsx | 6 +- .../src/components/common/PropertiesView.tsx | 1 - webapp/src/components/common/SelectMulti.tsx | 7 +- .../components/common/buttons/SplitButton.tsx | 6 +- .../common/buttons/UploadFileButton.tsx | 1 - .../common/fieldEditors/CheckboxesTagsFE.tsx | 6 +- .../fieldEditors/ColorPickerFE/index.tsx | 6 - .../common/fieldEditors/ListFE/index.tsx | 5 +- .../common/fieldEditors/SelectFE.tsx | 7 +- .../components/common/loaders/AppLoader.tsx | 8 +- .../common/loaders/GlobalPageLoadingError.tsx | 8 +- .../src/components/wrappers/LoginWrapper.tsx | 4 - .../components/wrappers/MenuWrapper/index.tsx | 16 +- .../components/wrappers/MenuWrapper/styles.ts | 7 +- .../wrappers/ThemeWrapper}/index.css | 0 .../wrappers/ThemeWrapper/index.tsx | 64 ++++ .../components/wrappers/ThemeWrapper/theme.ts | 99 +++++++ webapp/src/index.tsx | 7 +- webapp/src/theme.ts | 273 ------------------ 91 files changed, 773 insertions(+), 952 deletions(-) create mode 100644 webapp/src/components/App/theme.ts rename webapp/src/{ => components/wrappers/ThemeWrapper}/index.css (100%) create mode 100644 webapp/src/components/wrappers/ThemeWrapper/index.tsx create mode 100644 webapp/src/components/wrappers/ThemeWrapper/theme.ts delete mode 100644 webapp/src/theme.ts diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 22d9671e83..b5b68d2628 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -8,14 +8,15 @@ "name": "antares-web", "version": "2.18.3", "dependencies": { - "@emotion/react": "11.13.3", - "@emotion/styled": "11.13.0", + "@emotion/react": "11.14.0", + "@emotion/styled": "11.14.0", + "@fontsource/roboto": "5.1.1", "@glideapps/glide-data-grid": "6.0.3", "@handsontable/react": "14.5.0", - "@mui/icons-material": "6.1.1", - "@mui/lab": "6.0.0-beta.10", - "@mui/material": "6.1.1", - "@mui/x-tree-view": "7.18.0", + "@mui/icons-material": "6.4.1", + "@mui/lab": "6.0.0-beta.24", + "@mui/material": "6.4.1", + "@mui/x-tree-view": "7.24.1", "@reduxjs/toolkit": "1.9.6", "axios": "1.7.7", "clsx": "2.1.1", @@ -679,17 +680,17 @@ "license": "MIT" }, "node_modules/@emotion/react": { - "version": "11.13.3", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.13.3.tgz", - "integrity": "sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg==", + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz", + "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.12.0", - "@emotion/cache": "^11.13.0", - "@emotion/serialize": "^1.3.1", - "@emotion/use-insertion-effect-with-fallbacks": "^1.1.0", - "@emotion/utils": "^1.4.0", + "@emotion/babel-plugin": "^11.13.5", + "@emotion/cache": "^11.14.0", + "@emotion/serialize": "^1.3.3", + "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0", + "@emotion/utils": "^1.4.2", "@emotion/weak-memoize": "^0.4.0", "hoist-non-react-statics": "^3.3.1" }, @@ -722,17 +723,17 @@ "license": "MIT" }, "node_modules/@emotion/styled": { - "version": "11.13.0", - "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.13.0.tgz", - "integrity": "sha512-tkzkY7nQhW/zC4hztlwucpT8QEZ6eUzpXDRhww/Eej4tFfO0FxQYWRyg/c5CCXa4d/f174kqeXYjuQRnhzf6dA==", + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.0.tgz", + "integrity": "sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.12.0", + "@emotion/babel-plugin": "^11.13.5", "@emotion/is-prop-valid": "^1.3.0", - "@emotion/serialize": "^1.3.0", - "@emotion/use-insertion-effect-with-fallbacks": "^1.1.0", - "@emotion/utils": "^1.4.0" + "@emotion/serialize": "^1.3.3", + "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0", + "@emotion/utils": "^1.4.2" }, "peerDependencies": { "@emotion/react": "^11.0.0-rc.0", @@ -1404,6 +1405,12 @@ "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==", "license": "MIT" }, + "node_modules/@fontsource/roboto": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.1.1.tgz", + "integrity": "sha512-XwVVXtERDQIM7HPUIbyDe0FP4SRovpjF7zMI8M7pbqFp3ahLJsJTd18h+E6pkar6UbV3btbwkKjYARr5M+SQow==", + "license": "Apache-2.0" + }, "node_modules/@glideapps/glide-data-grid": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/@glideapps/glide-data-grid/-/glide-data-grid-6.0.3.tgz", @@ -1789,15 +1796,16 @@ "license": "ISC" }, "node_modules/@mui/base": { - "version": "5.0.0-beta.58", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.58.tgz", - "integrity": "sha512-P0E7ZrxOuyYqBvVv9w8k7wm+Xzx/KRu+BGgFcR2htTsGCpJNQJCSUXNUZ50MUmSU9hzqhwbQWNXhV1MBTl6F7A==", + "version": "5.0.0-beta.69", + "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.69.tgz", + "integrity": "sha512-r2YyGUXpZxj8rLAlbjp1x2BnMERTZ/dMqd9cClKj2OJ7ALAuiv/9X5E9eHfRc9o/dGRuLSMq/WTjREktJVjxVA==", + "deprecated": "This package has been replaced by @base-ui-components/react", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.25.0", + "@babel/runtime": "^7.26.0", "@floating-ui/react-dom": "^2.1.1", - "@mui/types": "^7.2.15", - "@mui/utils": "6.0.0-rc.0", + "@mui/types": "^7.2.21", + "@mui/utils": "^6.4.1", "@popperjs/core": "^2.11.8", "clsx": "^2.1.1", "prop-types": "^15.8.1" @@ -1809,40 +1817,10 @@ "type": "opencollective", "url": "https://opencollective.com/mui-org" }, - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@mui/base/node_modules/@mui/utils": { - "version": "6.0.0-rc.0", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.0.0-rc.0.tgz", - "integrity": "sha512-tBp0ILEXDL0bbDDT8PnZOjCqSm5Dfk2N0Z45uzRw+wVl6fVvloC9zw8avl+OdX1Bg3ubs/ttKn8nRNv17bpM5A==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.25.0", - "@mui/types": "^7.2.15", - "@types/prop-types": "^15.7.12", - "clsx": "^2.1.1", - "prop-types": "^15.8.1", - "react-is": "^18.3.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, "peerDependencies": { "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + "react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -1851,9 +1829,9 @@ } }, "node_modules/@mui/core-downloads-tracker": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.3.1.tgz", - "integrity": "sha512-2OmnEyoHpj5//dJJpMuxOeLItCCHdf99pjMFfUFdBteCunAK9jW+PwEo4mtdGcLs7P+IgZ+85ypd52eY4AigoQ==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.1.tgz", + "integrity": "sha512-SfDLWMV5b5oXgDf3NTa2hCTPC1d2defhDH2WgFKmAiejC4mSfXYbyi+AFCLzpizauXhgBm8OaZy9BHKnrSpahQ==", "license": "MIT", "funding": { "type": "opencollective", @@ -1861,12 +1839,12 @@ } }, "node_modules/@mui/icons-material": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.1.1.tgz", - "integrity": "sha512-sy/YKwcLPW8VcacNP2uWMYR9xyWuwO9NN9FXuGEU90bRshBXj8pdKk+joe3TCW7oviVS3zXLHlc94wQ0jNsQRQ==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.4.1.tgz", + "integrity": "sha512-wsxFcUTQxt4s+7Bg4GgobqRjyaHLmZGNOs+HJpbwrwmLbT6mhIJxhpqsKzzWq9aDY8xIe7HCjhpH7XI5UD6teA==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.25.6" + "@babel/runtime": "^7.26.0" }, "engines": { "node": ">=14.0.0" @@ -1876,7 +1854,7 @@ "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "@mui/material": "^6.1.1", + "@mui/material": "^6.4.1", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, @@ -1887,16 +1865,16 @@ } }, "node_modules/@mui/lab": { - "version": "6.0.0-beta.10", - "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-6.0.0-beta.10.tgz", - "integrity": "sha512-eqCBz5SZS8Un9To3UcjH01AxkOOgvme/g0ZstFC8Nz1Kg5/EJMA0ByhKS5AvUMzUKrv0FXMdbuPqbBvF3bVrXg==", + "version": "6.0.0-beta.24", + "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-6.0.0-beta.24.tgz", + "integrity": "sha512-Off0rx2065TfGu5Z8E4OduNiVAqE9p9A8N1268hoXOcx7HzARxJsDFLRKvWgpPMqmGEvR8DVaHkcF2N90UB15A==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.25.6", - "@mui/base": "5.0.0-beta.58", - "@mui/system": "^6.1.1", - "@mui/types": "^7.2.17", - "@mui/utils": "^6.1.1", + "@babel/runtime": "^7.26.0", + "@mui/base": "5.0.0-beta.69", + "@mui/system": "^6.4.1", + "@mui/types": "^7.2.21", + "@mui/utils": "^6.4.1", "clsx": "^2.1.1", "prop-types": "^15.8.1" }, @@ -1910,8 +1888,8 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@mui/material": "^6.1.1", - "@mui/material-pigment-css": "^6.1.1", + "@mui/material": "^6.4.1", + "@mui/material-pigment-css": "^6.4.1", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" @@ -1932,22 +1910,22 @@ } }, "node_modules/@mui/material": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.1.1.tgz", - "integrity": "sha512-b+eULldTqtqTCbN++2BtBWCir/1LwEYw+2mIlOt2GiEUh1EBBw4/wIukGKKNt3xrCZqRA80yLLkV6tF61Lq3cA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.4.1.tgz", + "integrity": "sha512-MFBfia6UiKxyoLeGkAh8M15bkeDmfnsUTMRJd/vTQue6YQ8AQ6lw9HqDthyYghzDEWIvZO/lQQzLrZE8XwNJLA==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.25.6", - "@mui/core-downloads-tracker": "^6.1.1", - "@mui/system": "^6.1.1", - "@mui/types": "^7.2.17", - "@mui/utils": "^6.1.1", + "@babel/runtime": "^7.26.0", + "@mui/core-downloads-tracker": "^6.4.1", + "@mui/system": "^6.4.1", + "@mui/types": "^7.2.21", + "@mui/utils": "^6.4.1", "@popperjs/core": "^2.11.8", - "@types/react-transition-group": "^4.4.11", + "@types/react-transition-group": "^4.4.12", "clsx": "^2.1.1", "csstype": "^3.1.3", "prop-types": "^15.8.1", - "react-is": "^18.3.1", + "react-is": "^19.0.0", "react-transition-group": "^4.4.5" }, "engines": { @@ -1960,7 +1938,7 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@mui/material-pigment-css": "^6.1.1", + "@mui/material-pigment-css": "^6.4.1", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" @@ -1980,14 +1958,20 @@ } } }, + "node_modules/@mui/material/node_modules/react-is": { + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.0.0.tgz", + "integrity": "sha512-H91OHcwjZsbq3ClIDHMzBShc1rotbfACdWENsmEf0IFvZ3FgGPtdHMcsv45bQ1hAbgdfiA8SnxTKfDS+x/8m2g==", + "license": "MIT" + }, "node_modules/@mui/private-theming": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.3.1.tgz", - "integrity": "sha512-g0u7hIUkmXmmrmmf5gdDYv9zdAig0KoxhIQn1JN8IVqApzf/AyRhH3uDGx5mSvs8+a1zb4+0W6LC260SyTTtdQ==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.4.1.tgz", + "integrity": "sha512-DcT7mwK89owwgcEuiE7w458te4CIjHbYWW6Kn6PiR6eLtxBsoBYphA968uqsQAOBQDpbYxvkuFLwhgk4bxoN/Q==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.26.0", - "@mui/utils": "^6.3.1", + "@mui/utils": "^6.4.1", "prop-types": "^15.8.1" }, "engines": { @@ -2008,9 +1992,9 @@ } }, "node_modules/@mui/styled-engine": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.3.1.tgz", - "integrity": "sha512-/7CC0d2fIeiUxN5kCCwYu4AWUDd9cCTxWCyo0v/Rnv6s8uk6hWgJC3VLZBoDENBHf/KjqDZuYJ2CR+7hD6QYww==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.4.0.tgz", + "integrity": "sha512-ek/ZrDujrger12P6o4luQIfRd2IziH7jQod2WMbLqGE03Iy0zUwYmckRTVhRQTLPNccpD8KXGcALJF+uaUQlbg==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.26.0", @@ -2042,16 +2026,16 @@ } }, "node_modules/@mui/system": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.3.1.tgz", - "integrity": "sha512-AwqQ3EAIT2np85ki+N15fF0lFXX1iFPqenCzVOSl3QXKy2eifZeGd9dGtt7pGMoFw5dzW4dRGGzRpLAq9rkl7A==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.4.1.tgz", + "integrity": "sha512-rgQzgcsHCTtzF9MZ+sL0tOhf2ZBLazpjrujClcb4Siju5lTrK0xX4PsiropActzCemNfM+mOu+0jezAVnfRK8g==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.26.0", - "@mui/private-theming": "^6.3.1", - "@mui/styled-engine": "^6.3.1", + "@mui/private-theming": "^6.4.1", + "@mui/styled-engine": "^6.4.0", "@mui/types": "^7.2.21", - "@mui/utils": "^6.3.1", + "@mui/utils": "^6.4.1", "clsx": "^2.1.1", "csstype": "^3.1.3", "prop-types": "^15.8.1" @@ -2096,9 +2080,9 @@ } }, "node_modules/@mui/utils": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.3.1.tgz", - "integrity": "sha512-sjGjXAngoio6lniQZKJ5zGfjm+LD2wvLwco7FbKe1fu8A7VIFmz2SwkLb+MDPLNX1lE7IscvNNyh1pobtZg2tw==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.4.1.tgz", + "integrity": "sha512-iQUDUeYh87SvR4lVojaRaYnQix8BbRV51MxaV6MBmqthecQoxwSbS5e2wnbDJUeFxY2ppV505CiqPLtd0OWkqw==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.26.0", @@ -2220,14 +2204,14 @@ } }, "node_modules/@mui/x-tree-view": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@mui/x-tree-view/-/x-tree-view-7.18.0.tgz", - "integrity": "sha512-3UJAYtBquc0SzKxEEdM68XlKOuuCl70ktZPqqI3z4wTZ0HK445XXc32t/s0VPIL94kRxWQcGPpgWFauScDwhug==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@mui/x-tree-view/-/x-tree-view-7.24.1.tgz", + "integrity": "sha512-IR24GAw8e8NORlVxJzNf1RnJu/ThBLv6sNlHoh7sF82MQ89i3nUCErA2gqYnY4aZ4g3GfJSWnYikPP24OTEqRQ==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.25.6", - "@mui/utils": "^5.16.6", - "@mui/x-internals": "7.18.0", + "@babel/runtime": "^7.25.7", + "@mui/utils": "^5.16.6 || ^6.0.0", + "@mui/x-internals": "7.24.1", "@types/react-transition-group": "^4.4.11", "clsx": "^2.1.1", "prop-types": "^15.8.1", @@ -2245,8 +2229,8 @@ "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0", "@mui/system": "^5.15.14 || ^6.0.0", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" + "react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@emotion/react": { @@ -2257,44 +2241,14 @@ } } }, - "node_modules/@mui/x-tree-view/node_modules/@mui/utils": { - "version": "5.16.14", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.16.14.tgz", - "integrity": "sha512-wn1QZkRzSmeXD1IguBVvJJHV3s6rxJrfb6YuC9Kk6Noh9f8Fb54nUs5JRkKm+BOerRhj5fLg05Dhx/H3Ofb8Mg==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/types": "^7.2.15", - "@types/prop-types": "^15.7.12", - "clsx": "^2.1.1", - "prop-types": "^15.8.1", - "react-is": "^19.0.0" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react": "^17.0.0 || ^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@mui/x-tree-view/node_modules/@mui/x-internals": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.18.0.tgz", - "integrity": "sha512-lzCHOWIR0cAIY1bGrWSprYerahbnH5C31ql/2OWCEjcngL2NAV1M6oKI2Vp4HheqzJ822c60UyWyapvyjSzY/A==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.24.1.tgz", + "integrity": "sha512-9BvJzpLJnS9BDphvkiv6v0QOLxbnu8jhwcexFjtCQ2ZyxtVuVsWzGZ2npT9sGOil7+eaFDmWnJtea/tgrPvSwQ==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.25.6", - "@mui/utils": "^5.16.6" + "@babel/runtime": "^7.25.7", + "@mui/utils": "^5.16.6 || ^6.0.0" }, "engines": { "node": ">=14.0.0" @@ -2304,15 +2258,9 @@ "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "react": "^17.0.0 || ^18.0.0" + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" } }, - "node_modules/@mui/x-tree-view/node_modules/react-is": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.0.0.tgz", - "integrity": "sha512-H91OHcwjZsbq3ClIDHMzBShc1rotbfACdWENsmEf0IFvZ3FgGPtdHMcsv45bQ1hAbgdfiA8SnxTKfDS+x/8m2g==", - "license": "MIT" - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", diff --git a/webapp/package.json b/webapp/package.json index e0c90e5d68..c881982a2b 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -14,14 +14,15 @@ "test:ui": "vitest --ui" }, "dependencies": { - "@emotion/react": "11.13.3", - "@emotion/styled": "11.13.0", + "@emotion/react": "11.14.0", + "@emotion/styled": "11.14.0", + "@fontsource/roboto": "5.1.1", "@glideapps/glide-data-grid": "6.0.3", "@handsontable/react": "14.5.0", - "@mui/icons-material": "6.1.1", - "@mui/lab": "6.0.0-beta.10", - "@mui/material": "6.1.1", - "@mui/x-tree-view": "7.18.0", + "@mui/icons-material": "6.4.1", + "@mui/lab": "6.0.0-beta.24", + "@mui/material": "6.4.1", + "@mui/x-tree-view": "7.24.1", "@reduxjs/toolkit": "1.9.6", "axios": "1.7.7", "clsx": "2.1.1", diff --git a/webapp/src/components/App/Api.tsx b/webapp/src/components/App/Api.tsx index cca871bd54..89e90d0d83 100644 --- a/webapp/src/components/App/Api.tsx +++ b/webapp/src/components/App/Api.tsx @@ -29,9 +29,7 @@ function Api() { overflow="auto" sx={{ backgroundColor: "#eee" }} > - - - + ); } diff --git a/webapp/src/components/App/Data/DatasetCreationDialog.tsx b/webapp/src/components/App/Data/DatasetCreationDialog.tsx index 93cf20a68c..2802fc0594 100644 --- a/webapp/src/components/App/Data/DatasetCreationDialog.tsx +++ b/webapp/src/components/App/Data/DatasetCreationDialog.tsx @@ -168,7 +168,6 @@ function DatasetCreationDialog(props: PropTypes) { boxSizing: "border-box", m: 2, }} - size="small" value={name} onChange={(event) => setName(event.target.value as string)} label={t("data.matrixName")} diff --git a/webapp/src/components/App/Settings/General.tsx b/webapp/src/components/App/Settings/General.tsx index a60d0cb5cd..8a141a7564 100644 --- a/webapp/src/components/App/Settings/General.tsx +++ b/webapp/src/components/App/Settings/General.tsx @@ -17,37 +17,53 @@ import Fieldset from "@/components/common/Fieldset"; import Form from "@/components/common/Form"; import { SUPPORTED_LANGUAGES } from "@/i18n"; import { changeLanguage, getCurrentLanguage } from "@/utils/i18nUtils"; +import { useTheme } from "@mui/material"; import { useTranslation } from "react-i18next"; function General() { const { t } = useTranslation(); + const { palette, setThemeMode } = useTheme(); return (
{ + if (dirtyValues.themeMode) { + setThemeMode(dirtyValues.themeMode); + } + if (dirtyValues.lang) { return changeLanguage(dirtyValues.lang); } }} > {({ control }) => ( -
- ({ - label: t(`lang.${lang}`), - value: lang, - }))} - variant="outlined" - size="small" - /> -
+ <> +
+ ({ + label: t(`lang.${lang}`), + value: lang, + }))} + variant="outlined" + /> +
+
+ +
+ )}
); diff --git a/webapp/src/components/App/Settings/Groups/dialog/GroupFormDialog/GroupForm.tsx b/webapp/src/components/App/Settings/Groups/dialog/GroupFormDialog/GroupForm.tsx index 517f3c9021..91c049ff73 100644 --- a/webapp/src/components/App/Settings/Groups/dialog/GroupFormDialog/GroupForm.tsx +++ b/webapp/src/components/App/Settings/Groups/dialog/GroupFormDialog/GroupForm.tsx @@ -145,7 +145,7 @@ function GroupForm(props: UseFormReturnPlus) { {filteredAndSortedUsers.length > 0 && ( <> - + {t("global.user")} + diff --git a/webapp/src/components/common/buttons/UploadFileButton.tsx b/webapp/src/components/common/buttons/UploadFileButton.tsx index e43fc17c50..e6f755a961 100644 --- a/webapp/src/components/common/buttons/UploadFileButton.tsx +++ b/webapp/src/components/common/buttons/UploadFileButton.tsx @@ -117,7 +117,6 @@ function UploadFileButton(props: UploadFileButtonProps) { } loadingPosition="start" diff --git a/webapp/src/components/common/fieldEditors/CheckboxesTagsFE.tsx b/webapp/src/components/common/fieldEditors/CheckboxesTagsFE.tsx index bbd1f78017..bf2bfad038 100644 --- a/webapp/src/components/common/fieldEditors/CheckboxesTagsFE.tsx +++ b/webapp/src/components/common/fieldEditors/CheckboxesTagsFE.tsx @@ -88,8 +88,8 @@ function CheckboxesTagsFE< renderOption={(props, option, { selected }) => (
  • } - checkedIcon={} + icon={} + checkedIcon={} style={{ marginRight: 8 }} checked={selected} /> @@ -98,9 +98,7 @@ function CheckboxesTagsFE< )} renderInput={(params) => ( setIsPickerOpen(true)} - sx={{ - ".MuiInputAdornment-sizeMedium+.MuiOutlinedInput-input": { - paddingTop: "16.5px !important", - paddingBottom: "16.5px !important", - }, - }} /> {isPickerOpen && ( (props: ListFEProps) { setSelectedOption(value); }} autoHighlight - renderInput={(params) => ( - - )} + renderInput={(params) => } />