Merge f85bbf1 into 8dc5056

entaxy-project · Aug 29, 2019 · ae25a7a · ae25a7a
2 parents 8dc5056 + f85bbf1
commit ae25a7a
Show file tree

Hide file tree

Showing 96 changed files with 6,002 additions and 7,994 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,5 +1,5 @@
 {
-    "extends": "airbnb",
+    "extends": ["airbnb", "airbnb/hooks"],
     "parser": "babel-eslint",
     "plugins": [
         "import",
@@ -74,6 +74,9 @@
                     "invalidHref"
                 ]
             }
-        ]
+        ],
+        "react/jsx-curly-newline": "error",
+        "react/jsx-props-no-spreading": "off",
+        "react/state-in-constructor": "off"
     }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,15 +18,15 @@
         "deploy:test": "npm run build && aws s3 sync build/ s3://entaxy-test"
     },
     "dependencies": {
-        "@material-ui/core": "^4.2.1",
+        "@material-ui/core": "^4.3.2",
         "@material-ui/icons": "^4.2.1",
-        "@mdi/js": "^3.8.95",
+        "@mdi/js": "^4.2.95",
         "@mdi/react": "^1.2.1",
         "@vx/axis": "0.0.190",
         "@vx/curve": "0.0.189",
         "@vx/glyph": "0.0.190",
         "@vx/gradient": "0.0.189",
-        "@vx/grid": "0.0.189",
+        "@vx/grid": "0.0.190",
         "@vx/group": "0.0.190",
         "@vx/legend": "0.0.190",
         "@vx/pattern": "0.0.189",
@@ -36,38 +36,38 @@
         "@vx/shape": "0.0.190",
         "@vx/tooltip": "0.0.189",
         "big.js": "^5.2.2",
-        "blockstack": "^19.2.1",
+        "blockstack": "^19.2.5",
         "chroma-js": "^2.0.4",
         "classnames": "^2.2.6",
         "d3-array": "^2.2.0",
-        "date-fns": "^1.30.1",
+        "date-fns": "^2.0.1",
         "formik": "^1.5.8",
         "jsdom": "^15.1.1",
         "lodash": "^4.17.15",
-        "papaparse": "^5.0.0",
+        "papaparse": "^5.0.2",
         "pluralize": "^8.0.0",
         "prop-types": "^15.7.2",
-        "query-string": "^6.8.0",
-        "react": "^16.8.6",
+        "query-string": "^6.8.2",
+        "react": "^16.9.0",
         "react-confirm": "^0.1.18",
-        "react-dom": "^16.8.6",
-        "react-dropzone": "^10.1.5",
+        "react-dom": "^16.9.0",
+        "react-dropzone": "^10.1.8",
         "react-motion": "^0.5.2",
-        "react-number-format": "^4.0.8",
-        "react-redux": "^7.1.0",
+        "react-number-format": "^4.2.0",
+        "react-redux": "^7.1.1",
         "react-router-dom": "^5.0.1",
-        "react-scripts": "^3.0.1",
+        "react-scripts": "^3.1.1",
         "react-select": "^3.0.4",
         "react-virtualized": "^9.21.1",
         "react-window": "^1.8.5",
-        "recharts": "^1.6.2",
+        "recharts": "^1.7.1",
         "recompose": "^0.30.0",
         "redux": "^4.0.4",
         "redux-devtools-extension": "^2.13.8",
         "redux-logger": "^3.0.6",
         "redux-thunk": "^2.3.0",
         "reselect": "^4.0.0",
-        "uuid": "^3.3.2",
+        "uuid": "^3.3.3",
         "yup": "^0.27.0"
     },
     "eslintConfig": {
@@ -80,16 +80,23 @@
         "not op_mini all"
     ],
     "devDependencies": {
-        "coveralls": "^3.0.5",
+        "@testing-library/jest-dom": "^4.1.0",
+        "@testing-library/react": "^9.1.3",
+        "coveralls": "^3.0.6",
         "enzyme": "^3.10.0",
         "enzyme-adapter-react-16": "^1.14.0",
-        "eslint-config-airbnb": "^17.1.1",
-        "eslint-plugin-jest": "^22.12.0",
+        "eslint": "^6.2.2",
+        "eslint-config-airbnb": "^18.0.1",
+        "eslint-plugin-import": "^2.18.2",
+        "eslint-plugin-jest": "^22.15.2",
+        "eslint-plugin-jsx-a11y": "^6.2.3",
+        "eslint-plugin-react": "^7.14.3",
+        "eslint-plugin-react-hooks": "^2.0.1",
         "http-proxy-middleware": "^0.19.1",
-        "husky": "^3.0.1",
-        "jest-enzyme": "^7.0.2",
-        "lint-staged": "^9.2.0",
-        "react-test-renderer": "^16.8.6",
+        "husky": "^3.0.4",
+        "jest-enzyme": "^7.1.0",
+        "lint-staged": "^9.2.5",
+        "react-test-renderer": "^16.9.0",
         "redux-mock-store": "^1.5.3"
     },
     "husky": {
@@ -123,4 +130,4 @@
             }
         }
     }
-}
+}
diff --git a/src/common/AutoComplete/__tests__/__snapshots__/index.test.jsx.snap b/src/common/AutoComplete/__tests__/__snapshots__/index.test.jsx.snap
@@ -25,7 +25,7 @@ exports[`AutoComplete matches snapshot for async select 1`] = `
           Select...
         </div>
         <div
-          className="css-1g6gooi"
+          className="css-w8afj7-Input"
         >
           <div
             className=""
@@ -83,7 +83,7 @@ exports[`AutoComplete matches snapshot for async select 1`] = `
         </div>
       </div>
       <div
-        className=" css-1wy0on6"
+        className=" css-1g48xl4-IndicatorsContainer"
       >
         <span
           className=" css-1okebmr-indicatorSeparator"
@@ -96,7 +96,7 @@ exports[`AutoComplete matches snapshot for async select 1`] = `
         >
           <svg
             aria-hidden="true"
-            className="css-19bqh2r"
+            className="css-tj5bde-Svg"
             focusable="false"
             height={20}
             viewBox="0 0 20 20"
@@ -143,7 +143,7 @@ exports[`AutoComplete matches snapshot for creatable select 1`] = `
           Select...
         </div>
         <div
-          className="css-1g6gooi"
+          className="css-w8afj7-Input"
         >
           <div
             className=""
@@ -201,7 +201,7 @@ exports[`AutoComplete matches snapshot for creatable select 1`] = `
         </div>
       </div>
       <div
-        className=" css-1wy0on6"
+        className=" css-1g48xl4-IndicatorsContainer"
       >
         <span
           className=" css-1okebmr-indicatorSeparator"
@@ -214,7 +214,7 @@ exports[`AutoComplete matches snapshot for creatable select 1`] = `
         >
           <svg
             aria-hidden="true"
-            className="css-19bqh2r"
+            className="css-tj5bde-Svg"
             focusable="false"
             height={20}
             viewBox="0 0 20 20"
@@ -261,7 +261,7 @@ exports[`AutoComplete matches snapshot for simple select 1`] = `
           Select...
         </div>
         <div
-          className="css-1g6gooi"
+          className="css-w8afj7-Input"
         >
           <div
             className=""
@@ -319,7 +319,7 @@ exports[`AutoComplete matches snapshot for simple select 1`] = `
         </div>
       </div>
       <div
-        className=" css-1wy0on6"
+        className=" css-1g48xl4-IndicatorsContainer"
       >
         <span
           className=" css-1okebmr-indicatorSeparator"
@@ -332,7 +332,7 @@ exports[`AutoComplete matches snapshot for simple select 1`] = `
         >
           <svg
             aria-hidden="true"
-            className="css-19bqh2r"
+            className="css-tj5bde-Svg"
             focusable="false"
             height={20}
             viewBox="0 0 20 20"
@@ -379,7 +379,7 @@ exports[`AutoComplete matches snapshot with error 1`] = `
           Select...
         </div>
         <div
-          className="css-1g6gooi"
+          className="css-w8afj7-Input"
         >
           <div
             className=""
@@ -437,7 +437,7 @@ exports[`AutoComplete matches snapshot with error 1`] = `
         </div>
       </div>
       <div
-        className=" css-1wy0on6"
+        className=" css-1g48xl4-IndicatorsContainer"
       >
         <span
           className=" css-1okebmr-indicatorSeparator"
@@ -450,7 +450,7 @@ exports[`AutoComplete matches snapshot with error 1`] = `
         >
           <svg
             aria-hidden="true"
-            className="css-19bqh2r"
+            className="css-tj5bde-Svg"
             focusable="false"
             height={20}
             viewBox="0 0 20 20"

diff --git a/src/common/AutoComplete/index.jsx b/src/common/AutoComplete/index.jsx
@@ -7,7 +7,7 @@ import CreatableSelect from 'react-select/creatable'
 import Typography from '@material-ui/core/Typography'
 import FormHelperText from '@material-ui/core/FormHelperText'
 
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles((theme) => ({
 
   select: {
     marginTop: -theme.spacing(1)
@@ -52,7 +52,7 @@ const AutoComplete = ({
           defaultValue={value}
           options={options}
           inputProps={{ 'aria-label': label, required: true }}
-          onChange={selection => onChange(name, selection)}
+          onChange={(selection) => onChange(name, selection)}
           isClearable
           styles={styles}
         />
@@ -65,7 +65,7 @@ const AutoComplete = ({
           defaultValue={value}
           options={options}
           inputProps={{ 'aria-label': label, required: true }}
-          onChange={selection => onChange(name, selection)}
+          onChange={(selection) => onChange(name, selection)}
           isClearable
           styles={styles}
         />
@@ -79,7 +79,7 @@ const AutoComplete = ({
           defaultOptions
           loadOptions={loadOptions}
           inputProps={{ 'aria-label': label }}
-          onChange={selection => onChange(name, selection)}
+          onChange={(selection) => onChange(name, selection)}
           isClearable
           styles={styles}
         />

diff --git a/src/common/ConfirmDialog/__test__/__snapshots__/index.test.jsx.snap b/src/common/ConfirmDialog/__test__/__snapshots__/index.test.jsx.snap
@@ -5,10 +5,10 @@ exports[`ConfirmDialog matches snapshot 1`] = `
   <ConfirmDialog proceed={[Function: mockConstructor]} cancel={[Function: bound cancel]} dismiss={[Function: mockConstructor]} show={true} title=\\"Title\\" description=\\"Description\\">
     <WithStyles(ForwardRef(Dialog)) disableBackdropClick={true} disableEscapeKeyDown={true} maxWidth=\\"xs\\" aria-labelledby=\\"confirmation-dialog-title\\" open={true}>
       <ForwardRef(Dialog) classes={{...}} disableBackdropClick={true} disableEscapeKeyDown={true} maxWidth=\\"xs\\" aria-labelledby=\\"confirmation-dialog-title\\" open={true}>
-        <ForwardRef(Modal) className=\\"MuiDialog-root\\" BackdropComponent={{...}} BackdropProps={{...}} closeAfterTransition={true} disableBackdropClick={true} disableEscapeKeyDown={true} onEscapeKeyDown={[undefined]} onClose={[undefined]} open={true} role=\\"dialog\\" aria-labelledby=\\"confirmation-dialog-title\\">
-          <ForwardRef(Portal) container={[undefined]} disablePortal={false} onRendered={[Function]}>
+        <ForwardRef(Modal) className=\\"MuiDialog-root\\" BackdropComponent={{...}} BackdropProps={{...}} closeAfterTransition={true} disableBackdropClick={true} disableEscapeKeyDown={true} onEscapeKeyDown={[undefined]} onClose={[undefined]} open={true} aria-labelledby=\\"confirmation-dialog-title\\">
+          <ForwardRef(Portal) container={[undefined]} disablePortal={false}>
             <Portal containerInfo={{...}}>
-              <div onKeyDown={[Function: handleKeyDown]} role=\\"dialog\\" className=\\"MuiDialog-root\\" aria-labelledby=\\"confirmation-dialog-title\\" style={{...}}>
+              <div onKeyDown={[Function: handleKeyDown]} role=\\"presentation\\" className=\\"MuiDialog-root\\" aria-labelledby=\\"confirmation-dialog-title\\" style={{...}}>
                 <WithStyles(ForwardRef(Backdrop)) open={true} onClick={[Function: handleBackdropClick]} transitionDuration={{...}}>
                   <ForwardRef(Backdrop) classes={{...}} open={true} onClick={[Function: handleBackdropClick]} transitionDuration={{...}}>
                     <ForwardRef(Fade) in={true} timeout={{...}} onClick={[Function: handleBackdropClick]}>
@@ -22,15 +22,15 @@ exports[`ConfirmDialog matches snapshot 1`] = `
                   <div tabIndex={0} data-test=\\"sentinelStart\\" />
                   <ForwardRef(Fade) appear={true} in={true} timeout={{...}} onEnter={[Function: chainedFunction]} onEntering={[undefined]} onEntered={[undefined]} onExit={[undefined]} onExiting={[undefined]} onExited={[Function: chainedFunction]} role=\\"document\\" tabIndex=\\"-1\\">
                     <Transition appear={true} in={true} onEnter={[Function: handleEnter]} onExit={[Function: handleExit]} timeout={{...}} onEntering={[Function: noop]} onEntered={[Function: noop]} onExiting={[Function: noop]} onExited={[Function: chainedFunction]} role=\\"document\\" tabIndex=\\"-1\\" mountOnEnter={false} unmountOnExit={false} enter={true} exit={true}>
-                      <div className=\\"MuiDialog-container MuiDialog-scrollPaper\\" onClick={[Function: handleBackdropClick]} onMouseDown={[Function: handleMouseDown]} role=\\"document\\" style={{...}} tabIndex=\\"-1\\">
-                        <WithStyles(ForwardRef(Paper)) elevation={24} className=\\"MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs\\">
-                          <ForwardRef(Paper) classes={{...}} elevation={24} className=\\"MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs\\">
-                            <div className=\\"MuiPaper-root MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs MuiPaper-rounded\\">
+                      <div className=\\"MuiDialog-container MuiDialog-scrollPaper\\" onClick={[Function: handleBackdropClick]} onMouseDown={[Function: handleMouseDown]} style={{...}} role=\\"document\\" tabIndex=\\"-1\\">
+                        <WithStyles(ForwardRef(Paper)) elevation={24} role=\\"dialog\\" className=\\"MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs\\">
+                          <ForwardRef(Paper) classes={{...}} elevation={24} role=\\"dialog\\" className=\\"MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs\\">
+                            <div className=\\"MuiPaper-root MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs MuiPaper-rounded\\" role=\\"dialog\\">
                               <WithStyles(ForwardRef(DialogTitle)) id=\\"confirmation-dialog-title\\">
                                 <ForwardRef(DialogTitle) classes={{...}} id=\\"confirmation-dialog-title\\">
                                   <div className=\\"MuiDialogTitle-root\\" id=\\"confirmation-dialog-title\\">
                                     <WithStyles(ForwardRef(Typography)) component=\\"h2\\" variant=\\"h6\\">
-                                      <ForwardRef(Typography) classes={{...}} component=\\"h2\\" variant=\\"h6\\" theme={{...}}>
+                                      <ForwardRef(Typography) classes={{...}} component=\\"h2\\" variant=\\"h6\\">
                                         <h2 className=\\"MuiTypography-root MuiTypography-h6\\">
                                           Title
                                         </h2>

diff --git a/src/common/DescriptionCard/index.jsx b/src/common/DescriptionCard/index.jsx
@@ -6,7 +6,7 @@ import CardActions from '@material-ui/core/CardActions'
 import CardContent from '@material-ui/core/CardContent'
 import InfolIcon from '@material-ui/icons/Info'
 
-const styles = theme => ({
+const styles = (theme) => ({
   card: {
     backgroundColor: theme.palette.info.background
   },

diff --git a/src/common/Header/index.jsx b/src/common/Header/index.jsx
@@ -15,7 +15,7 @@ import Logo from '../Logo/index'
 import LoginButton from '../LoginButton'
 import LinkTo from '../LinkTo'
 
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles((theme) => ({
   root: {
     paddingTop: 70
   },

diff --git a/src/common/LinkTo/index.jsx b/src/common/LinkTo/index.jsx
@@ -2,7 +2,7 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
 
-export default to => (
+export default (to) => (
   React.forwardRef((itemProps, ref) => (
     <Link to={to} {...itemProps} innerRef={ref} />
   ))

diff --git a/src/common/LoginButton/index.jsx b/src/common/LoginButton/index.jsx
@@ -21,7 +21,7 @@ import Tooltip from '@material-ui/core/Tooltip'
 import LinkTo from '../LinkTo'
 import { userLogout } from '../../store/user/actions'
 
-const styles = theme => ({
+const styles = (theme) => ({
   root: {
     display: 'flex',
     minWidth: 135
@@ -38,7 +38,7 @@ const styles = theme => ({
 
 const mapStateToProps = ({ user }) => ({ user })
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   handleLogout: () => { dispatch(userLogout()) }
 })
 
@@ -50,7 +50,7 @@ export class LoginButtonComponent extends React.Component {
 
   handleClick = (event) => {
     const { currentTarget } = event
-    this.setState(state => ({
+    this.setState((state) => ({
       anchorEl: currentTarget,
       open: !state.open
     }))

diff --git a/src/common/SnackbarMessage/index.jsx b/src/common/SnackbarMessage/index.jsx
@@ -8,7 +8,7 @@ import CheckCircleIcon from '@material-ui/icons/CheckCircle'
 import { green } from '@material-ui/core/colors'
 import { hideSnackbar } from '../../store/settings/actions'
 
-const styles = theme => ({
+const styles = (theme) => ({
   message: {
     display: 'flex',
     alignItems: 'center'
@@ -27,7 +27,7 @@ const mapStateToProps = ({ settings }) => {
   return { settings }
 }
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   handleCloseSnackbar: () => { dispatch(hideSnackbar()) }
 })
 

diff --git a/src/common/SubmitButtonWithProgress/index.jsx b/src/common/SubmitButtonWithProgress/index.jsx
@@ -5,7 +5,7 @@ import Button from '@material-ui/core/Button'
 import CircularProgress from '@material-ui/core/CircularProgress'
 import green from '@material-ui/core/colors/green'
 
-const styles = theme => ({
+const styles = (theme) => ({
   wrapper: {
     margin: theme.spacing(1),
     position: 'relative'