From 14088a40b9260604acefd8b497dbbee4069c54a4 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Tue, 18 Jan 2022 09:15:18 +0200
Subject: [PATCH] Remove Material-UI v4
---
package-lock.json | 324 ------------------
package.json | 3 -
src/client/components/facet_bar/DateFacet.js | 8 +-
src/client/components/facet_bar/FacetBar.js | 4 +-
.../components/main_layout/InfoHeader.js | 9 +-
src/client/containers/SemanticPortal.js | 4 +-
src/client/helpers/HTMLParser.js | 4 +-
src/client/index.js | 7 +-
8 files changed, 18 insertions(+), 345 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 132ac32e..3a6a5745 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,9 +12,6 @@
"@date-io/moment": "^1.3.11",
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
- "@material-ui/core": "^4.12.3",
- "@material-ui/icons": "^4.11.2",
- "@material-ui/pickers": "^3.3.10",
"@mui/icons-material": "^5.2.5",
"@mui/lab": "^5.0.0-alpha.64",
"@mui/material": "^5.2.8",
@@ -2780,182 +2777,6 @@
"node": ">=6.0.0"
}
},
- "node_modules/@material-ui/core": {
- "version": "4.12.3",
- "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.3.tgz",
- "integrity": "sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw==",
- "dependencies": {
- "@babel/runtime": "^7.4.4",
- "@material-ui/styles": "^4.11.4",
- "@material-ui/system": "^4.12.1",
- "@material-ui/types": "5.1.0",
- "@material-ui/utils": "^4.11.2",
- "@types/react-transition-group": "^4.2.0",
- "clsx": "^1.0.4",
- "hoist-non-react-statics": "^3.3.2",
- "popper.js": "1.16.1-lts",
- "prop-types": "^15.7.2",
- "react-is": "^16.8.0 || ^17.0.0",
- "react-transition-group": "^4.4.0"
- },
- "engines": {
- "node": ">=8.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/material-ui"
- },
- "peerDependencies": {
- "@types/react": "^16.8.6 || ^17.0.0",
- "react": "^16.8.0 || ^17.0.0",
- "react-dom": "^16.8.0 || ^17.0.0"
- },
- "peerDependenciesMeta": {
- "@types/react": {
- "optional": true
- }
- }
- },
- "node_modules/@material-ui/icons": {
- "version": "4.11.2",
- "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.2.tgz",
- "integrity": "sha512-fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ==",
- "dependencies": {
- "@babel/runtime": "^7.4.4"
- },
- "engines": {
- "node": ">=8.0.0"
- },
- "peerDependencies": {
- "@material-ui/core": "^4.0.0",
- "@types/react": "^16.8.6 || ^17.0.0",
- "react": "^16.8.0 || ^17.0.0",
- "react-dom": "^16.8.0 || ^17.0.0"
- },
- "peerDependenciesMeta": {
- "@types/react": {
- "optional": true
- }
- }
- },
- "node_modules/@material-ui/pickers": {
- "version": "3.3.10",
- "resolved": "https://registry.npmjs.org/@material-ui/pickers/-/pickers-3.3.10.tgz",
- "integrity": "sha512-hS4pxwn1ZGXVkmgD4tpFpaumUaAg2ZzbTrxltfC5yPw4BJV+mGkfnQOB4VpWEYZw2jv65Z0wLwDE/piQiPPZ3w==",
- "dependencies": {
- "@babel/runtime": "^7.6.0",
- "@date-io/core": "1.x",
- "@types/styled-jsx": "^2.2.8",
- "clsx": "^1.0.2",
- "react-transition-group": "^4.0.0",
- "rifm": "^0.7.0"
- },
- "peerDependencies": {
- "@date-io/core": "^1.3.6",
- "@material-ui/core": "^4.0.0",
- "prop-types": "^15.6.0",
- "react": "^16.8.0 || ^17.0.0",
- "react-dom": "^16.8.0 || ^17.0.0"
- }
- },
- "node_modules/@material-ui/styles": {
- "version": "4.11.4",
- "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.4.tgz",
- "integrity": "sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew==",
- "dependencies": {
- "@babel/runtime": "^7.4.4",
- "@emotion/hash": "^0.8.0",
- "@material-ui/types": "5.1.0",
- "@material-ui/utils": "^4.11.2",
- "clsx": "^1.0.4",
- "csstype": "^2.5.2",
- "hoist-non-react-statics": "^3.3.2",
- "jss": "^10.5.1",
- "jss-plugin-camel-case": "^10.5.1",
- "jss-plugin-default-unit": "^10.5.1",
- "jss-plugin-global": "^10.5.1",
- "jss-plugin-nested": "^10.5.1",
- "jss-plugin-props-sort": "^10.5.1",
- "jss-plugin-rule-value-function": "^10.5.1",
- "jss-plugin-vendor-prefixer": "^10.5.1",
- "prop-types": "^15.7.2"
- },
- "engines": {
- "node": ">=8.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/material-ui"
- },
- "peerDependencies": {
- "@types/react": "^16.8.6 || ^17.0.0",
- "react": "^16.8.0 || ^17.0.0",
- "react-dom": "^16.8.0 || ^17.0.0"
- },
- "peerDependenciesMeta": {
- "@types/react": {
- "optional": true
- }
- }
- },
- "node_modules/@material-ui/system": {
- "version": "4.12.1",
- "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.12.1.tgz",
- "integrity": "sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw==",
- "dependencies": {
- "@babel/runtime": "^7.4.4",
- "@material-ui/utils": "^4.11.2",
- "csstype": "^2.5.2",
- "prop-types": "^15.7.2"
- },
- "engines": {
- "node": ">=8.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/material-ui"
- },
- "peerDependencies": {
- "@types/react": "^16.8.6 || ^17.0.0",
- "react": "^16.8.0 || ^17.0.0",
- "react-dom": "^16.8.0 || ^17.0.0"
- },
- "peerDependenciesMeta": {
- "@types/react": {
- "optional": true
- }
- }
- },
- "node_modules/@material-ui/types": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz",
- "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==",
- "peerDependencies": {
- "@types/react": "*"
- },
- "peerDependenciesMeta": {
- "@types/react": {
- "optional": true
- }
- }
- },
- "node_modules/@material-ui/utils": {
- "version": "4.11.2",
- "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.2.tgz",
- "integrity": "sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==",
- "dependencies": {
- "@babel/runtime": "^7.4.4",
- "prop-types": "^15.7.2",
- "react-is": "^16.8.0 || ^17.0.0"
- },
- "engines": {
- "node": ">=8.0.0"
- },
- "peerDependencies": {
- "react": "^16.8.0 || ^17.0.0",
- "react-dom": "^16.8.0 || ^17.0.0"
- }
- },
"node_modules/@math.gl/core": {
"version": "3.5.6",
"resolved": "https://registry.npmjs.org/@math.gl/core/-/core-3.5.6.tgz",
@@ -4158,14 +3979,6 @@
"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
"dev": true
},
- "node_modules/@types/styled-jsx": {
- "version": "2.2.9",
- "resolved": "https://registry.npmjs.org/@types/styled-jsx/-/styled-jsx-2.2.9.tgz",
- "integrity": "sha512-W/iTlIkGEyTBGTEvZCey8EgQlQ5l0DwMqi3iOXlLs2kyBwYTXHKEiU6IZ5EwoRwngL8/dGYuzezSup89ttVHLw==",
- "dependencies": {
- "@types/react": "*"
- }
- },
"node_modules/@types/svg-arc-to-cubic-bezier": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/@types/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz",
@@ -6438,11 +6251,6 @@
"node": ">=4"
}
},
- "node_modules/csstype": {
- "version": "2.6.18",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz",
- "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ=="
- },
"node_modules/cytoscape": {
"version": "3.20.0",
"resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.20.0.tgz",
@@ -12086,11 +11894,6 @@
"tslib": "^2.1.0"
}
},
- "node_modules/popper.js": {
- "version": "1.16.1-lts",
- "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
- "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="
- },
"node_modules/portfinder": {
"version": "1.0.28",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -13337,17 +13140,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/rifm": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/rifm/-/rifm-0.7.0.tgz",
- "integrity": "sha512-DSOJTWHD67860I5ojetXdEQRIBvF6YcpNe53j0vn1vp9EUb9N80EiZTxgP+FkDKorWC8PZw052kTF4C1GOivCQ==",
- "dependencies": {
- "@babel/runtime": "^7.3.1"
- },
- "peerDependencies": {
- "react": ">=16.8"
- }
- },
"node_modules/rimraf": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -18307,96 +18099,6 @@
"resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="
},
- "@material-ui/core": {
- "version": "4.12.3",
- "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.3.tgz",
- "integrity": "sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw==",
- "requires": {
- "@babel/runtime": "^7.4.4",
- "@material-ui/styles": "^4.11.4",
- "@material-ui/system": "^4.12.1",
- "@material-ui/types": "5.1.0",
- "@material-ui/utils": "^4.11.2",
- "@types/react-transition-group": "^4.2.0",
- "clsx": "^1.0.4",
- "hoist-non-react-statics": "^3.3.2",
- "popper.js": "1.16.1-lts",
- "prop-types": "^15.7.2",
- "react-is": "^16.8.0 || ^17.0.0",
- "react-transition-group": "^4.4.0"
- }
- },
- "@material-ui/icons": {
- "version": "4.11.2",
- "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.2.tgz",
- "integrity": "sha512-fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ==",
- "requires": {
- "@babel/runtime": "^7.4.4"
- }
- },
- "@material-ui/pickers": {
- "version": "3.3.10",
- "resolved": "https://registry.npmjs.org/@material-ui/pickers/-/pickers-3.3.10.tgz",
- "integrity": "sha512-hS4pxwn1ZGXVkmgD4tpFpaumUaAg2ZzbTrxltfC5yPw4BJV+mGkfnQOB4VpWEYZw2jv65Z0wLwDE/piQiPPZ3w==",
- "requires": {
- "@babel/runtime": "^7.6.0",
- "@date-io/core": "1.x",
- "@types/styled-jsx": "^2.2.8",
- "clsx": "^1.0.2",
- "react-transition-group": "^4.0.0",
- "rifm": "^0.7.0"
- }
- },
- "@material-ui/styles": {
- "version": "4.11.4",
- "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.4.tgz",
- "integrity": "sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew==",
- "requires": {
- "@babel/runtime": "^7.4.4",
- "@emotion/hash": "^0.8.0",
- "@material-ui/types": "5.1.0",
- "@material-ui/utils": "^4.11.2",
- "clsx": "^1.0.4",
- "csstype": "^2.5.2",
- "hoist-non-react-statics": "^3.3.2",
- "jss": "^10.5.1",
- "jss-plugin-camel-case": "^10.5.1",
- "jss-plugin-default-unit": "^10.5.1",
- "jss-plugin-global": "^10.5.1",
- "jss-plugin-nested": "^10.5.1",
- "jss-plugin-props-sort": "^10.5.1",
- "jss-plugin-rule-value-function": "^10.5.1",
- "jss-plugin-vendor-prefixer": "^10.5.1",
- "prop-types": "^15.7.2"
- }
- },
- "@material-ui/system": {
- "version": "4.12.1",
- "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.12.1.tgz",
- "integrity": "sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw==",
- "requires": {
- "@babel/runtime": "^7.4.4",
- "@material-ui/utils": "^4.11.2",
- "csstype": "^2.5.2",
- "prop-types": "^15.7.2"
- }
- },
- "@material-ui/types": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz",
- "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==",
- "requires": {}
- },
- "@material-ui/utils": {
- "version": "4.11.2",
- "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.2.tgz",
- "integrity": "sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==",
- "requires": {
- "@babel/runtime": "^7.4.4",
- "prop-types": "^15.7.2",
- "react-is": "^16.8.0 || ^17.0.0"
- }
- },
"@math.gl/core": {
"version": "3.5.6",
"resolved": "https://registry.npmjs.org/@math.gl/core/-/core-3.5.6.tgz",
@@ -19380,14 +19082,6 @@
"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
"dev": true
},
- "@types/styled-jsx": {
- "version": "2.2.9",
- "resolved": "https://registry.npmjs.org/@types/styled-jsx/-/styled-jsx-2.2.9.tgz",
- "integrity": "sha512-W/iTlIkGEyTBGTEvZCey8EgQlQ5l0DwMqi3iOXlLs2kyBwYTXHKEiU6IZ5EwoRwngL8/dGYuzezSup89ttVHLw==",
- "requires": {
- "@types/react": "*"
- }
- },
"@types/svg-arc-to-cubic-bezier": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/@types/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz",
@@ -21173,11 +20867,6 @@
"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
"dev": true
},
- "csstype": {
- "version": "2.6.18",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz",
- "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ=="
- },
"cytoscape": {
"version": "3.20.0",
"resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.20.0.tgz",
@@ -25692,11 +25381,6 @@
"tslib": "^2.1.0"
}
},
- "popper.js": {
- "version": "1.16.1-lts",
- "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
- "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="
- },
"portfinder": {
"version": "1.0.28",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -26660,14 +26344,6 @@
"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
"dev": true
},
- "rifm": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/rifm/-/rifm-0.7.0.tgz",
- "integrity": "sha512-DSOJTWHD67860I5ojetXdEQRIBvF6YcpNe53j0vn1vp9EUb9N80EiZTxgP+FkDKorWC8PZw052kTF4C1GOivCQ==",
- "requires": {
- "@babel/runtime": "^7.3.1"
- }
- },
"rimraf": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
diff --git a/package.json b/package.json
index fb9c1cc1..ec671845 100644
--- a/package.json
+++ b/package.json
@@ -27,9 +27,6 @@
"@date-io/moment": "^1.3.11",
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
- "@material-ui/core": "^4.12.3",
- "@material-ui/icons": "^4.11.2",
- "@material-ui/pickers": "^3.3.10",
"@mui/icons-material": "^5.2.5",
"@mui/lab": "^5.0.0-alpha.64",
"@mui/material": "^5.2.8",
diff --git a/src/client/components/facet_bar/DateFacet.js b/src/client/components/facet_bar/DateFacet.js
index 7036902d..472e9eb2 100644
--- a/src/client/components/facet_bar/DateFacet.js
+++ b/src/client/components/facet_bar/DateFacet.js
@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
-import withStyles from '@mui/styles/withStyles';
-import { KeyboardDatePicker } from '@material-ui/pickers'
+import withStyles from '@mui/styles/withStyles'
+import DatePicker from '@mui/lab/DatePicker'
import moment from 'moment'
import intl from 'react-intl-universal'
import FormHelperText from '@mui/material/FormHelperText'
@@ -83,7 +83,7 @@ class DateFacet extends React.Component {
!from.isSameOrBefore(to)
return (
<div>
- <KeyboardDatePicker
+ <DatePicker
className={classNames(classes.datePicker, classes.from)}
label={intl.get('facets.dateFacet.fromLabel')}
placeholder={moment(min).format('DD.MM.YYYY')}
@@ -99,7 +99,7 @@ class DateFacet extends React.Component {
shouldDisableDate={date => date.isAfter(to)}
disabled={someFacetIsFetching}
/>
- <KeyboardDatePicker
+ <DatePicker
className={classes.datePicker}
label={intl.get('facets.dateFacet.toLabel')}
placeholder={moment(max).format('DD.MM.YYYY')}
diff --git a/src/client/components/facet_bar/FacetBar.js b/src/client/components/facet_bar/FacetBar.js
index 1399e23e..a08c3b15 100644
--- a/src/client/components/facet_bar/FacetBar.js
+++ b/src/client/components/facet_bar/FacetBar.js
@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import intl from 'react-intl-universal'
-import withStyles from '@mui/styles/withStyles';
+import withStyles from '@mui/styles/withStyles'
import HierarchicalFacet from './HierarchicalFacet'
import TextFacet from './TextFacet'
import SliderFacet from './SliderFacet'
@@ -257,7 +257,7 @@ class FacetBar extends React.Component {
content: classes.accordionSummaryContent
}}
expandIcon={<ExpandMoreIcon />}
- IconButtonProps={{ onClick: this.handleExpandButtonOnClick(facetID) }}
+ // IconButtonProps={{ onClick: this.handleExpandButtonOnClick(facetID) }}
aria-controls={`${facetID}-content`}
id={`${facetID}-header`}
>
diff --git a/src/client/components/main_layout/InfoHeader.js b/src/client/components/main_layout/InfoHeader.js
index 40254da6..99fac18f 100644
--- a/src/client/components/main_layout/InfoHeader.js
+++ b/src/client/components/main_layout/InfoHeader.js
@@ -1,6 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
-import makeStyles from '@mui/styles/makeStyles';
+import makeStyles from '@mui/styles/makeStyles'
import Accordion from '@mui/material/Accordion'
import AccordionSummary from '@mui/material/AccordionSummary'
import AccordionDetails from '@mui/material/AccordionDetails'
@@ -125,7 +125,7 @@ const InfoHeader = props => {
expandIcon={<ExpandMoreIcon />}
aria-controls='infoheader-content'
id='infoheader-header'
- IconButtonProps={{ onClick: handleExpandButtonOnClick }}
+ // IconButtonProps={{ onClick: handleExpandButtonOnClick }}
>
<div className={classes.headingContainer}>
<Typography component='h1' variant={getHeadingVariant()} className={classes.heading}>
@@ -137,7 +137,8 @@ const InfoHeader = props => {
aria-label='toggle instructions'
className={classes.infoIconButton}
onClick={handleExpandButtonOnClick}
- size="large">
+ size='large'
+ >
<InfoIcon className={classes.infoIcon} />
</IconButton>
</Tooltip>
@@ -157,7 +158,7 @@ const InfoHeader = props => {
</AccordionDetails>
</Accordion>
</div>
- );
+ )
}
InfoHeader.propTypes = {
diff --git a/src/client/containers/SemanticPortal.js b/src/client/containers/SemanticPortal.js
index 069ab294..166c4a22 100644
--- a/src/client/containers/SemanticPortal.js
+++ b/src/client/containers/SemanticPortal.js
@@ -3,12 +3,12 @@ import PropTypes from 'prop-types'
import intl from 'react-intl-universal'
import { has } from 'lodash'
import { connect } from 'react-redux'
-import { makeStyles } from '@material-ui/core/styles'
+import makeStyles from '@mui/styles/makeStyles'
import { withRouter, Route, Redirect, Switch } from 'react-router-dom'
import { compose } from '@shakacode/recompose'
import { useTheme } from '@mui/material/styles'
import useMediaQuery from '@mui/material/useMediaQuery'
-import Grid from '@material-ui/core/Grid'
+import Grid from '@mui/material/Grid'
import {
fetchResultCount,
fetchPaginatedResults,
diff --git a/src/client/helpers/HTMLParser.js b/src/client/helpers/HTMLParser.js
index 82ad506c..fbc19681 100644
--- a/src/client/helpers/HTMLParser.js
+++ b/src/client/helpers/HTMLParser.js
@@ -1,7 +1,7 @@
import React from 'react'
import ReactHtmlParser from 'react-html-parser'
import { Link } from 'react-router-dom'
-import Tooltip from '@material-ui/core/Tooltip'
+import Tooltip from '@mui/material/Tooltip'
import { arrayToObject } from './helpers'
export default class HTMLParser {
@@ -50,7 +50,7 @@ export default class HTMLParser {
if (linkStr.includes(',')) {
const uris = linkStr.split(',')
const listItemsJSX = []
- uris.map((uri, index) => {
+ uris.forEach((uri, index) => {
listItemsJSX.push(
<li key={index}>
<ul>
diff --git a/src/client/index.js b/src/client/index.js
index 35be674e..f6440270 100644
--- a/src/client/index.js
+++ b/src/client/index.js
@@ -9,8 +9,7 @@ import App from './components/App'
import { availableLocales } from './epics/index.js'
import { loadLocales } from './actions'
import { updateLocaleToPathname } from './helpers/helpers'
-import CircularProgress from '@material-ui/core/CircularProgress'
-import purple from '@material-ui/core/colors/purple'
+import CircularProgress from '@mui/material/CircularProgress'
import './index.css'
import '@nosferatu500/react-sortable-tree/style.css'
import 'react-redux-toastr/lib/css/react-redux-toastr.min.css'
@@ -21,8 +20,8 @@ const { localeConfig } = portalConfig
const store = configureStore()
// init locale
-const localeFromUrl = window.location.pathname.substr(1, 2)
let locale
+const localeFromUrl = window.location.pathname.substr(1, 2)
// check if a valid locale was given in url
if (Object.prototype.hasOwnProperty.call(availableLocales, localeFromUrl)) {
locale = localeFromUrl
@@ -55,7 +54,7 @@ render(
justifyContent: 'center'
}}
>
- <CircularProgress style={{ color: purple[500] }} thickness={5} />
+ <CircularProgress color='primary' />
</div>
}
>
--
GitLab