diff --git a/package.json b/package.json index b594db3a5c..c0223d5dfd 100644 --- a/package.json +++ b/package.json @@ -31,56 +31,56 @@ "dotenv": "^6.0.0", "express": "^4.17.1", "express-busboy": "^7.0.1", - "express-fileupload": "^1.1.5", + "express-fileupload": "^1.1.6", "express-graphql": "^0.7.1", "express-validation": "^1.0.3", "file-loader": "^1.1.11", "flat": "^5.0.0", "graphql": "^14.5.8", - "graphql-tools": "^4.0.5", - "http-status": "^1.3.2", + "graphql-tools": "^4.0.6", + "http-status": "^1.4.2", "ignore-styles": "^5.0.1", "image-size": "^0.7.5", "jest": "^24.9.0", "joi": "^14.3.1", "jsonwebtoken": "^8.5.1", "jwt-decode": "^2.2.0", - "merge-graphql-schemas": "^1.7.0", + "merge-graphql-schemas": "^1.7.6", "method-override": "^3.0.0", "mkdirp": "^0.5.1", - "mongoose": "^5.7.1", - "mongoose-autopopulate": "^0.10.0", + "mongoose": "^5.8.9", + "mongoose-autopopulate": "^0.11.0", "mongoose-hidden": "^1.8.1", "mongoose-paginate-v2": "^1.3.6", - "nodemailer": "^6.3.0", - "passport": "^0.4.0", + "nodemailer": "^6.4.2", + "passport": "^0.4.1", "passport-anonymous": "^1.0.1", "passport-jwt": "^4.0.0", "passport-local": "^1.0.0", "passport-local-mongoose": "^5.0.1", "postcss-preset-env": "6.0.6", "prop-types": "^15.7.2", - "qs": "^6.9.0", - "react": "^16.9.0", + "qs": "^6.9.1", + "react": "^16.12.0", "react-document-meta": "^3.0.0-beta.2", - "react-dom": "^16.9.0", + "react-dom": "^16.12.0", "react-router-dom": "^5.1.2", "react-select": "^3.0.8", "sharp": "^0.22.1", "universal-cookie": "^3.1.0", "url-loader": "^1.0.1", - "webpack": "^4.41.0", + "webpack": "^4.41.5", "webpack-dev-middleware": "^3.7.2", "webpack-hot-middleware": "^2.25.0" }, "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/plugin-proposal-class-properties": "^7.5.5", - "@babel/plugin-transform-runtime": "^7.6.2", - "@babel/preset-env": "^7.6.2", - "@babel/preset-react": "^7.0.0", - "@babel/runtime": "^7.6.2", - "autoprefixer": "^9.6.1", + "@babel/core": "^7.8.3", + "@babel/plugin-proposal-class-properties": "^7.8.3", + "@babel/plugin-transform-runtime": "^7.8.3", + "@babel/preset-env": "^7.8.3", + "@babel/preset-react": "^7.8.3", + "@babel/runtime": "^7.8.3", + "autoprefixer": "^9.7.4", "axios": "^0.18.1", "babel-core": "^7.0.0-bridge.0", "babel-eslint": "^10.0.1", @@ -89,17 +89,17 @@ "css-loader": "^1.0.0", "eslint": "^6.8.0", "eslint-config-airbnb": "^17.1.0", - "eslint-plugin-import": "^2.17.2", + "eslint-plugin-import": "^2.20.0", "eslint-plugin-jsx-a11y": "^6.2.1", - "eslint-plugin-react": "^7.12.4", + "eslint-plugin-react": "^7.18.0", "eslint-plugin-react-hooks": "^2.3.0", "extract-text-webpack-plugin": "^4.0.0-beta.0", "faker": "^4.1.0", "html-webpack-plugin": "^3.2.0", "jest-mock-express": "^0.1.1", - "node-sass": "^4.12.0", - "node-sass-chokidar": "^1.3.5", - "nodemon": "^1.19.2", + "node-sass": "^4.13.1", + "node-sass-chokidar": "^1.4.0", + "nodemon": "^1.19.4", "optimize-css-assets-webpack-plugin": "^5.0.3", "postcss-flexbugs-fixes": "^3.3.1", "postcss-loader": "^2.1.6", diff --git a/src/client/components/forms/field-types/Email/index.js b/src/client/components/forms/field-types/Email/index.js index 512f9c2c1d..bea336db5a 100644 --- a/src/client/components/forms/field-types/Email/index.js +++ b/src/client/components/forms/field-types/Email/index.js @@ -14,7 +14,6 @@ const Email = (props) => { name, required, defaultValue, - valueOverride, validate, style, width, @@ -32,7 +31,6 @@ const Email = (props) => { name, required, defaultValue, - valueOverride, validate, }); @@ -72,7 +70,6 @@ Email.defaultProps = { label: null, required: false, defaultValue: null, - valueOverride: null, placeholder: undefined, validate: defaultValidate, errorMessage: defaultError, @@ -85,7 +82,6 @@ Email.propTypes = { required: PropTypes.bool, placeholder: PropTypes.string, defaultValue: PropTypes.string, - valueOverride: PropTypes.string, validate: PropTypes.func, errorMessage: PropTypes.string, width: PropTypes.number, diff --git a/src/client/components/forms/field-types/HiddenInput/index.js b/src/client/components/forms/field-types/HiddenInput/index.js index cbdc7afaa7..db080b25a5 100644 --- a/src/client/components/forms/field-types/HiddenInput/index.js +++ b/src/client/components/forms/field-types/HiddenInput/index.js @@ -7,14 +7,12 @@ const HiddenInput = (props) => { name, required, defaultValue, - valueOverride, } = props; const { value, onChange } = useFieldType({ name, required, defaultValue, - valueOverride, }); return ( @@ -31,14 +29,12 @@ const HiddenInput = (props) => { HiddenInput.defaultProps = { required: false, defaultValue: null, - valueOverride: null, }; HiddenInput.propTypes = { name: PropTypes.string.isRequired, required: PropTypes.bool, defaultValue: PropTypes.string, - valueOverride: PropTypes.string, }; export default HiddenInput; diff --git a/src/client/components/forms/field-types/Password/index.js b/src/client/components/forms/field-types/Password/index.js index c1dce9a71a..69d7b6acbd 100644 --- a/src/client/components/forms/field-types/Password/index.js +++ b/src/client/components/forms/field-types/Password/index.js @@ -14,13 +14,11 @@ const Password = (props) => { name, required, defaultValue, - valueOverride, validate, style, width, errorMessage, label, - placeholder, } = props; const { @@ -32,49 +30,58 @@ const Password = (props) => { name, required, defaultValue, - valueOverride, validate, }); + const fieldWidth = width ? `${width}%` : null; + return ( -