Updating packages and fixing deprecated for spacing

biocompute-objects · Jul 20, 2019 · 202314c · 202314c
1 parent a2fc4b7
commit 202314c
Show file tree

Hide file tree

Showing 43 changed files with 16,194 additions and 382 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,29 +24,29 @@
     ]
   },
   "dependencies": {
-    "@material-ui/core": "^4.0.0-beta.1",
-    "@material-ui/icons": "^4.0.0-beta.0",
-    "@material-ui/styles": "^4.0.0-beta.1",
-    "chart.js": "^2.7.3",
+    "@material-ui/core": "^4.2.1",
+    "@material-ui/icons": "^4.2.1",
+    "@material-ui/styles": "^4.2.1",
+    "chart.js": "^2.8.0",
     "classnames": "^2.2.6",
-    "history": "^4.7.2",
+    "history": "^4.9.0",
     "moment": "^2.24.0",
-    "node-sass": "^4.11.0",
-    "prop-types": "^15.7.1",
+    "node-sass": "^4.12.0",
+    "prop-types": "^15.7.2",
     "react": "^16.8.6",
-    "react-chartjs-2": "^2.7.4",
+    "react-chartjs-2": "^2.7.6",
     "react-dom": "^16.8.6",
-    "react-perfect-scrollbar": "^1.4.4",
-    "react-router-dom": "^5.0.0",
+    "react-perfect-scrollbar": "^1.5.3",
+    "react-router-dom": "^5.0.1",
     "react-scripts": "3.0.1",
     "recompose": "^0.30.0",
     "underscore": "^1.9.1",
-    "validate.js": "^0.12.0"
+    "validate.js": "^0.13.1"
   },
   "devDependencies": {
-    "eslint-plugin-prettier": "^3.0.1",
-    "eslint-plugin-react": "^7.12.4",
-    "prettier-eslint": "^8.8.2",
-    "prettier-eslint-cli": "^4.7.1"
+    "eslint-plugin-prettier": "^3.1.0",
+    "eslint-plugin-react": "^7.14.2",
+    "prettier-eslint": "^9.0.0",
+    "prettier-eslint-cli": "^5.0.0"
   }
-}
+}
diff --git a/src/components/DisplayMode/styles.jsx b/src/components/DisplayMode/styles.jsx
@@ -11,7 +11,7 @@ export default theme => ({
     cursor: 'pointer',
     display: 'flex',
     alignItems: 'center',
-    padding: theme.spacing.unit,
+    padding: theme.spacing(1),
     backgroundColor: theme.palette.common.white
   },
   optionSelected: {

diff --git a/src/components/PortletContent/index.jsx b/src/components/PortletContent/index.jsx
@@ -10,10 +10,10 @@ import { withStyles } from '@material-ui/core';
 // Component styles
 const styles = theme => ({
   root: {
-    paddingLeft: theme.spacing.unit * 3,
-    paddingRight: theme.spacing.unit * 3,
-    paddingTop: theme.spacing.unit * 2,
-    paddingBottom: theme.spacing.unit * 2,
+    paddingLeft: theme.spacing(3),
+    paddingRight: theme.spacing(3),
+    paddingTop: theme.spacing(2),
+    paddingBottom: theme.spacing(2),
     flexGrow: 1
   },
   noPadding: {
@@ -33,10 +33,7 @@ const PortletContent = props => {
   );
 
   return (
-    <div
-      {...rest}
-      className={rootClassName}
-    >
+    <div {...rest} className={rootClassName}>
       {children}
     </div>
   );

diff --git a/src/components/PortletFooter/index.jsx b/src/components/PortletFooter/index.jsx
@@ -10,10 +10,10 @@ import { withStyles } from '@material-ui/core';
 // Component styles
 const styles = theme => ({
   root: {
-    paddingBottom: theme.spacing.unit,
-    paddingTop: theme.spacing.unit,
-    paddingLeft: theme.spacing.unit * 2,
-    paddingRight: theme.spacing.unit * 2,
+    paddingBottom: theme.spacing(1),
+    paddingTop: theme.spacing(1),
+    paddingLeft: theme.spacing(2),
+    paddingRight: theme.spacing(2),
     borderTop: `1px solid ${theme.palette.border}`,
     borderBottomLeftRadius: '2px',
     borderBottomRightRadius: '2px'
@@ -35,10 +35,7 @@ const PortletFooter = props => {
   );
 
   return (
-    <div
-      {...rest}
-      className={rootClassName}
-    >
+    <div {...rest} className={rootClassName}>
       {children}
     </div>
   );

diff --git a/src/components/PortletHeader/index.jsx b/src/components/PortletHeader/index.jsx
@@ -17,8 +17,8 @@ const styles = theme => ({
     display: 'flex',
     height: '64px',
     justifyContent: 'space-between',
-    paddingLeft: theme.spacing.unit * 3,
-    paddingRight: theme.spacing.unit * 3,
+    paddingLeft: theme.spacing(3),
+    paddingRight: theme.spacing(3),
     position: 'relative'
   },
   noDivider: {
@@ -42,10 +42,7 @@ const PortletHeader = props => {
   );
 
   return (
-    <div
-      {...rest}
-      className={rootClassName}
-    >
+    <div {...rest} className={rootClassName}>
       {children}
     </div>
   );

diff --git a/src/components/PortletLabel/index.jsx b/src/components/PortletLabel/index.jsx
@@ -17,7 +17,7 @@ const styles = theme => ({
   },
   icon: {
     fontSize: '1.3rem',
-    marginRight: theme.spacing.unit,
+    marginRight: theme.spacing(1),
     color: theme.palette.text.secondary,
     alignItems: 'center',
     display: 'flex'
@@ -27,7 +27,7 @@ const styles = theme => ({
   },
   subtitle: {
     fontWeight: 400,
-    marginLeft: theme.spacing.unit,
+    marginLeft: theme.spacing(1),
     color: theme.palette.text.secondary
   }
 });
@@ -38,24 +38,15 @@ const PortletLabel = props => {
   const rootClassName = classNames(classes.root, className);
 
   return (
-    <div
-      {...rest}
-      className={rootClassName}
-    >
+    <div {...rest} className={rootClassName}>
       {icon && <span className={classes.icon}>{icon}</span>}
       {title && (
-        <Typography
-          className={classes.title}
-          variant="h5"
-        >
+        <Typography className={classes.title} variant="h5">
           {title}
         </Typography>
       )}
       {subtitle && (
-        <Typography
-          className={classes.subtitle}
-          variant="subtitle2"
-        >
+        <Typography className={classes.subtitle} variant="subtitle2">
           {subtitle}
         </Typography>
       )}

diff --git a/src/components/SearchInput/styles.jsx b/src/components/SearchInput/styles.jsx
@@ -6,13 +6,13 @@ export default theme => ({
     borderRadius: '4px',
     display: 'flex',
     flexBasis: '420px',
-    paddingBottom: theme.spacing.unit * 0.5,
-    paddingLeft: theme.spacing.unit,
-    paddingRight: theme.spacing.unit,
-    paddingTop: theme.spacing.unit * 0.5
+    paddingBottom: theme.spacing(0.5),
+    paddingLeft: theme.spacing(1),
+    paddingRight: theme.spacing(1),
+    paddingTop: theme.spacing(0.5)
   },
   icon: {
-    marginRight: theme.spacing.unit,
+    marginRight: theme.spacing(1),
     color: theme.palette.text.secondary
   },
   input: {

diff --git a/src/components/Status/index.jsx b/src/components/Status/index.jsx
@@ -15,16 +15,16 @@ const styles = theme => ({
     flexShrink: 0
   },
   sm: {
-    height: theme.spacing.unit,
-    width: theme.spacing.unit
+    height: theme.spacing(1),
+    width: theme.spacing(1)
   },
   md: {
-    height: theme.spacing.unit * 2,
-    width: theme.spacing.unit * 2
+    height: theme.spacing(2),
+    width: theme.spacing(2)
   },
   lg: {
-    height: theme.spacing.unit * 3,
-    width: theme.spacing.unit * 3
+    height: theme.spacing(3),
+    width: theme.spacing(3)
   },
   neutral: {
     backgroundColor: theme.palette.common.neutral

diff --git a/src/layouts/Dashboard/components/Footer/index.jsx b/src/layouts/Dashboard/components/Footer/index.jsx
@@ -13,11 +13,11 @@ import { Divider, Typography } from '@material-ui/core';
 // Component styles
 const styles = theme => ({
   root: {
-    padding: theme.spacing.unit * 4
+    padding: theme.spacing(4)
   },
   company: {
-    marginTop: theme.spacing.unit * 2,
-    marginBottom: theme.spacing.unit * 0.5
+    marginTop: theme.spacing(2),
+    marginBottom: theme.spacing(0.5)
   }
 });
 
@@ -30,10 +30,7 @@ class Footer extends Component {
     return (
       <div className={rootClassName}>
         <Divider />
-        <Typography
-          className={classes.company}
-          variant="body1"
-        >
+        <Typography className={classes.company} variant="body1">
           &copy; Devias Io. 2019
         </Typography>
         <Typography variant="caption">

diff --git a/src/layouts/Dashboard/components/Sidebar/ForwardNavLink.jsx b/src/layouts/Dashboard/components/Sidebar/ForwardNavLink.jsx
@@ -0,0 +1,9 @@
+/* eslint-disable react/display-name */
+import React from 'react';
+import { NavLink } from 'react-router-dom';
+
+const ForwardNavLink = React.forwardRef((props, ref) => (
+  <NavLink {...props} innerRef={ref} />
+));
+
+export default ForwardNavLink;