Upgrade to new form binder

This commit is contained in:
John Lyon-Smith
2018-05-15 13:09:13 -07:00
parent 8fcfa26063
commit aa2da7d55d
26 changed files with 307 additions and 194 deletions

View File

@@ -14167,9 +14167,9 @@
}
},
"react-form-binder": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/react-form-binder/-/react-form-binder-2.0.1.tgz",
"integrity": "sha512-QOIO7dd6s+zvw6V3JdaWbuCKm6OwunOemuvR7ds98nnPoUXXZ3Fv4SLRGkt3GcI97a5PDlWvNAN/9qz571SHjA==",
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/react-form-binder/-/react-form-binder-3.0.0.tgz",
"integrity": "sha512-XPXw+OVxfko1rcN1WjLxaCt8FVZaWrjCI7XNaNx1Su8/QFDqeAh1dgWpySE31i73un2v3ig+0r0WL+lHaV9Y3Q==",
"requires": {
"eventemitter3": "^2.0.3",
"prop-types": "^15.5.10",

View File

@@ -12,7 +12,7 @@
"radium": "^0.22.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-form-binder": "^2.0.1",
"react-form-binder": "^3.0.0",
"react-router-dom": "^4.1.1",
"regexp-pattern": "^1.0.4",
"socket.io-client": "^2.0.3"

View File

@@ -43,7 +43,7 @@ export class ForgotPassword extends Component {
e.preventDefault()
e.stopPropagation()
const obj = this.state.binder.getModifiedFieldValues()
const obj = this.state.binder.getmodifiedBindingValues()
this.setState({ waitModal: { message: "Requesting Reset Email" } })

View File

@@ -65,7 +65,7 @@ export class Login extends Component {
return
}
let obj = this.state.binder.getModifiedFieldValues()
let obj = this.state.binder.getmodifiedBindingValues()
if (obj) {
this.setState({ waitModal: true })
@@ -102,7 +102,7 @@ export class Login extends Component {
this.setState({
messageModal: null,
binder: new FormBinder(
{ email: this.state.binder.getFieldValue("email") },
{ email: this.state.binder.getBindingValue("email") },
Login.bindings
),
})

View File

@@ -19,7 +19,7 @@ export class ResetPassword extends Component {
isValid: (r, v) => v.length >= 6,
},
reenteredNewPassword: {
isValid: (r, v) => v !== "" && v === r.getFieldValue("newPassword"),
isValid: (r, v) => v !== "" && v === r.getBindingValue("newPassword"),
},
submit: {
noValue: true,
@@ -73,7 +73,7 @@ export class ResetPassword extends Component {
e.preventDefault()
e.stopPropagation()
const obj = this.state.binder.getModifiedFieldValues()
const obj = this.state.binder.getmodifiedBindingValues()
const passwordToken = new URLSearchParams(
decodeURIComponent(window.location.search)
).get("password-token")

View File

@@ -1,16 +1,16 @@
import React from 'react'
import PropTypes from 'prop-types'
import autobind from 'autobind-decorator'
import { Modal, Button, Row, Column, BoundInput, BoundButton, Text } from 'ui'
import { regExpPattern } from 'regexp-pattern'
import { FormBinder } from 'react-form-binder'
import { sizeInfo } from 'ui/style'
import React from "react"
import PropTypes from "prop-types"
import autobind from "autobind-decorator"
import { Modal, Button, Row, Column, BoundInput, BoundButton, Text } from "ui"
import { regExpPattern } from "regexp-pattern"
import { FormBinder } from "react-form-binder"
import { sizeInfo } from "ui/style"
export class ChangeEmailModal extends React.Component {
static propTypes = {
open: PropTypes.bool,
oldEmail: PropTypes.string,
onDismiss: PropTypes.func
onDismiss: PropTypes.func,
}
static bindings = {
@@ -18,20 +18,26 @@ export class ChangeEmailModal extends React.Component {
noValue: true,
},
newEmail: {
isValid: (r, v) => (v !== '' && regExpPattern.email.test(v) && v !== r.getFieldValue('oldEmail'))
isValid: (r, v) =>
v !== "" &&
regExpPattern.email.test(v) &&
v !== r.getBindingValue("oldEmail"),
},
submit: {
isDisabled: (r) => (!r.allValid),
noValue: true
}
isDisabled: (r) => !r.allValid,
noValue: true,
},
}
constructor(props) {
super(props)
this.state = {
binder: new FormBinder({
oldEmail: props.oldEmail,
}, ChangeEmailModal.bindings)
binder: new FormBinder(
{
oldEmail: props.oldEmail,
},
ChangeEmailModal.bindings
),
}
}
@@ -48,7 +54,7 @@ export class ChangeEmailModal extends React.Component {
@autobind
handleSubmit(e) {
e.preventDefault()
let newEmail = this.state.binder.getFieldValue('newEmail')
let newEmail = this.state.binder.getBindingValue("newEmail")
this.close(newEmail)
}
@@ -62,7 +68,7 @@ export class ChangeEmailModal extends React.Component {
return (
<Modal open={this.props.open} width={sizeInfo.modalWidth}>
<form id='changeEmailForm' onSubmit={this.handleSubmit}>
<form id="changeEmailForm" onSubmit={this.handleSubmit}>
<Column>
<Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item>
@@ -71,8 +77,8 @@ export class ChangeEmailModal extends React.Component {
<Row.Item grow>
<Column>
<Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item color='black' icon='edit'>
<Text size='large'>Change Password</Text>
<Column.Item color="black" icon="edit">
<Text size="large">Change Password</Text>
</Column.Item>
<Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item>
@@ -80,20 +86,28 @@ export class ChangeEmailModal extends React.Component {
</Column.Item>
<Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item>
<BoundInput label='New Email' name='newEmail'
message='Your new email address, e.g. xyz@abc.com, cannot be blank'
binder={binder} />
<BoundInput
label="New Email"
name="newEmail"
message="Your new email address, e.g. xyz@abc.com, cannot be blank"
binder={binder}
/>
</Column.Item>
<Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item>
<Row>
<Row.Item grow />
<Row.Item>
<Button onClick={this.handleClick} text='Cancel' />
<Button onClick={this.handleClick} text="Cancel" />
</Row.Item>
<Row.Item width={sizeInfo.formRowSpacing} />
<Row.Item>
<BoundButton submit='changeEmailForm' name='submit' binder={binder} text='OK' />
<BoundButton
submit="changeEmailForm"
name="submit"
binder={binder}
text="OK"
/>
</Row.Item>
</Row>
</Column.Item>

View File

@@ -1,38 +1,38 @@
import React from 'react'
import PropTypes from 'prop-types'
import autobind from 'autobind-decorator'
import { Modal, Button, Column, Row, Text, BoundInput, BoundButton } from 'ui'
import { FormBinder } from 'react-form-binder'
import { sizeInfo } from 'ui/style'
import React from "react"
import PropTypes from "prop-types"
import autobind from "autobind-decorator"
import { Modal, Button, Column, Row, Text, BoundInput, BoundButton } from "ui"
import { FormBinder } from "react-form-binder"
import { sizeInfo } from "ui/style"
export class ChangePasswordModal extends React.Component {
static propTypes = {
open: PropTypes.bool,
onDismiss: PropTypes.func
onDismiss: PropTypes.func,
}
static bindings = {
oldPassword: {
alwaysGet: true,
isValid: (r, v) => (v !== '')
isValid: (r, v) => v !== "",
},
newPassword: {
alwaysGet: true,
isValid: (r, v) => (v !== '' && v !== r.fields.oldPassword.value)
isValid: (r, v) => v !== "" && v !== r.getBindingValue("oldPassword"),
},
reenteredNewPassword: {
isValid: (r, v) => (v !== '' && v === r.getFieldValue('newPassword')),
isValid: (r, v) => v !== "" && v === r.getBindingValue("newPassword"),
},
submit: {
isDisabled: (r) => (!r.allValid),
noValue: true
}
isDisabled: (r) => !r.allValid,
noValue: true,
},
}
constructor(props) {
super(props)
this.state = {
binder: new FormBinder({}, ChangePasswordModal.bindings)
binder: new FormBinder({}, ChangePasswordModal.bindings),
}
}
@@ -53,8 +53,8 @@ export class ChangePasswordModal extends React.Component {
const { binder } = this.state
if (binder.allValid) {
const oldPassword = binder.getFieldValue('oldPassword')
const newPassword = binder.getFieldValue('newPassword')
const oldPassword = binder.getBindingValue("oldPassword")
const newPassword = binder.getBindingValue("newPassword")
passwords = { oldPassword, newPassword }
}
this.close(passwords)
@@ -70,32 +70,44 @@ export class ChangePasswordModal extends React.Component {
return (
<Modal open={this.props.open} width={sizeInfo.modalWidth}>
<form id='changePasswordForm' onSubmit={this.handleSubmit}>
<form id="changePasswordForm" onSubmit={this.handleSubmit}>
<Row>
<Row.Item width={sizeInfo.formRowSpacing} />
<Row.Item grow>
<Column>
<Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item color='black' icon='edit'>
<Text size='large'>Change Password</Text>
<Column.Item color="black" icon="edit">
<Text size="large">Change Password</Text>
</Column.Item>
<Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item>
<Column>
<Column.Item>
<BoundInput label='Current Password' password name='oldPassword'
message='Your existing password, cannot be blank'
binder={binder} />
<BoundInput
label="Current Password"
password
name="oldPassword"
message="Your existing password, cannot be blank"
binder={binder}
/>
</Column.Item>
<Column.Item>
<BoundInput label='New Password' password name='newPassword'
message='A new password, cannot be blank or the same as your old password'
binder={binder} />
<BoundInput
label="New Password"
password
name="newPassword"
message="A new password, cannot be blank or the same as your old password"
binder={binder}
/>
</Column.Item>
<Column.Item>
<BoundInput label='Re-entered New Password' password name='reenteredNewPassword'
message='The new password again, must match and cannot be blank'
binder={binder} />
<BoundInput
label="Re-entered New Password"
password
name="reenteredNewPassword"
message="The new password again, must match and cannot be blank"
binder={binder}
/>
</Column.Item>
</Column>
</Column.Item>
@@ -104,11 +116,16 @@ export class ChangePasswordModal extends React.Component {
<Row>
<Row.Item grow />
<Row.Item>
<Button onClick={this.handleClick} text='Cancel' />
<Button onClick={this.handleClick} text="Cancel" />
</Row.Item>
<Row.Item width={sizeInfo.formRowSpacing} />
<Row.Item>
<BoundButton text='Submit' submit='changePasswordForm' name='submit' binder={binder} />
<BoundButton
text="Submit"
submit="changePasswordForm"
name="submit"
binder={binder}
/>
</Row.Item>
</Row>
</Column.Item>

View File

@@ -1,9 +1,9 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Column, Row, Box, Button, BoundInput, BoundButton } from 'ui'
import { sizeInfo, colorInfo } from 'ui/style'
import { FormBinder } from 'react-form-binder'
import autobind from 'autobind-decorator'
import React from "react"
import PropTypes from "prop-types"
import { Column, Row, Box, Button, BoundInput, BoundButton } from "ui"
import { sizeInfo, colorInfo } from "ui/style"
import { FormBinder } from "react-form-binder"
import autobind from "autobind-decorator"
export class ProfileForm extends React.Component {
static propTypes = {
@@ -11,31 +11,34 @@ export class ProfileForm extends React.Component {
onSaved: PropTypes.func.isRequired,
onModifiedChanged: PropTypes.func,
onChangePassword: PropTypes.func,
onChangeEmail: PropTypes.func
onChangeEmail: PropTypes.func,
}
static bindings = {
email: {
isValid: (r, v) => (v !== ''),
isDisabled: (r) => (!!r._id)
isValid: (r, v) => v !== "",
isDisabled: (r) => !!r._id,
},
firstName: {
isValid: (r, v) => (v !== '')
isValid: (r, v) => v !== "",
},
lastName: {
isValid: (r, v) => (v !== '')
isValid: (r, v) => v !== "",
},
save: {
noValue: true,
isDisabled: (r) => (!r.anyModified || !r.allValid)
}
isDisabled: (r) => !r.anyModified || !r.allValid,
},
}
constructor(props) {
super(props)
this.state = {
binder: new FormBinder(
this.props.user, ProfileForm.bindings, this.props.onModifiedChanged)
this.props.user,
ProfileForm.bindings,
this.props.onModifiedChanged
),
}
}
@@ -43,7 +46,10 @@ export class ProfileForm extends React.Component {
if (nextProps.user !== this.props.user) {
this.setState({
binder: new FormBinder(
nextProps.user, ProfileForm.bindings, nextProps.onModifiedChanged)
nextProps.user,
ProfileForm.bindings,
nextProps.onModifiedChanged
),
})
}
}
@@ -61,15 +67,19 @@ export class ProfileForm extends React.Component {
@autobind
handleChangeEmail() {
this.props.onChangeEmail(this.state.binder.getFieldValue('email'))
this.props.onChangeEmail(this.state.binder.getBindingValue("email"))
}
render() {
const { binder } = this.state
return (
<form onSubmit={this.handleSubmit} id='profileForm'>
<Box border={{ width: sizeInfo.headerBorderWidth, color: colorInfo.headerBorder }}
<form onSubmit={this.handleSubmit} id="profileForm">
<Box
border={{
width: sizeInfo.headerBorderWidth,
color: colorInfo.headerBorder,
}}
radius={sizeInfo.formBoxRadius}>
<Row>
<Row.Item width={sizeInfo.formRowSpacing} />
@@ -77,34 +87,58 @@ export class ProfileForm extends React.Component {
<Column>
<Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item>
<BoundInput label='First Name' name='firstName'
message='First name is required' binder={binder} />
<BoundInput
label="First Name"
name="firstName"
message="First name is required"
binder={binder}
/>
</Column.Item>
<Column.Item>
<BoundInput label='Last Name' name='lastName'
binder={binder} />
<BoundInput
label="Last Name"
name="lastName"
binder={binder}
/>
</Column.Item>
<Column.Item>
<BoundInput label='Email' name='email'
message='Required. Must be a valid email address.'
binder={binder} />
<BoundInput
label="Email"
name="email"
message="Required. Must be a valid email address."
binder={binder}
/>
</Column.Item>
<Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item height={sizeInfo.buttonHeight}>
<Row>
<Row.Item>
<Button text={'Change Email'} label='&nbsp;'
width={sizeInfo.buttonWideWidth} onClick={this.handleChangeEmail} />
<Button
text={"Change Email"}
label="&nbsp;"
width={sizeInfo.buttonWideWidth}
onClick={this.handleChangeEmail}
/>
</Row.Item>
<Row.Item width={sizeInfo.formRowSpacing} />
<Row.Item>
<Button text={'Change Password'} label='&nbsp;'
width={sizeInfo.buttonWideWidth} onClick={this.props.onChangePassword} />
<Button
text={"Change Password"}
label="&nbsp;"
width={sizeInfo.buttonWideWidth}
onClick={this.props.onChangePassword}
/>
</Row.Item>
<Row.Item grow />
<Row.Item>
<BoundButton submit='profileForm' size='medium' text='Save' label='&nbsp;' name='save'
binder={binder} />
<BoundButton
submit="profileForm"
size="medium"
text="Save"
label="&nbsp;"
name="save"
binder={binder}
/>
</Row.Item>
</Row>
</Column.Item>

View File

@@ -93,7 +93,7 @@ export class TeamForm extends React.Component {
handleSubmit(e) {
e.preventDefault()
let obj = this.state.binder.getModifiedFieldValues()
let obj = this.state.binder.getmodifiedBindingValues()
if (obj) {
this.props.onSave(obj)

View File

@@ -45,7 +45,7 @@ export class UserForm extends React.Component {
},
resendEmail: {
noValue: true,
isDisabled: (r) => !r._id || !!r.getFieldValue("emailValidated"),
isDisabled: (r) => !r._id || !!r.getBindingValue("emailValidated"),
},
firstName: {
isValid: (r, v) => v !== "",
@@ -128,7 +128,7 @@ export class UserForm extends React.Component {
handleSubmit(e) {
e.preventDefault()
let obj = this.state.binder.getModifiedFieldValues()
let obj = this.state.binder.getmodifiedBindingValues()
if (obj) {
this.props.onSave(obj)

View File

@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Button } from 'ui'
import autobind from 'autobind-decorator'
import React from "react"
import PropTypes from "prop-types"
import { Button } from "ui"
import autobind from "autobind-decorator"
export class BoundButton extends React.Component {
static propTypes = {
@@ -10,14 +10,14 @@ export class BoundButton extends React.Component {
binder: PropTypes.object.isRequired,
submit: PropTypes.string,
onClick: PropTypes.func,
width: PropTypes.oneOfType([ PropTypes.string, PropTypes.number ]),
width: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
}
constructor(props) {
super(props)
let { name, binder } = this.props
binder.addListener(name, this.updateValue)
this.state = binder.getFieldState(name)
this.state = binder.getBindingState(name)
}
@autobind
@@ -33,7 +33,7 @@ export class BoundButton extends React.Component {
if (nextProps.binder !== this.props.binder) {
this.props.binder.removeListener(this.props.name, this.updateValue)
nextProps.binder.addListener(nextProps.name, this.updateValue)
this.setState(nextProps.binder.getFieldState(nextProps.name))
this.setState(nextProps.binder.getBindingState(nextProps.name))
}
}
@@ -46,8 +46,14 @@ export class BoundButton extends React.Component {
}
return (
<Button disabled={disabled} submit={submit} onClick={onClick}
name={name} text={text} width={width} />
<Button
disabled={disabled}
submit={submit}
onClick={onClick}
name={name}
text={text}
width={width}
/>
)
}
}

View File

@@ -1,8 +1,8 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Checkbox } from 'ui'
import autobind from 'autobind-decorator'
import { fontInfo } from 'ui/style'
import React from "react"
import PropTypes from "prop-types"
import { Checkbox } from "ui"
import autobind from "autobind-decorator"
import { fontInfo } from "ui/style"
export class BoundCheckbox extends React.Component {
static propTypes = {
@@ -13,22 +13,22 @@ export class BoundCheckbox extends React.Component {
constructor(props) {
super(props)
this.state = props.binder.getFieldState(props.name)
this.state = props.binder.getBindingState(props.name)
}
@autobind
handleChange(e, data) {
const { binder, name } = this.props
const state = binder.getFieldState(name)
const state = binder.getBindingState(name)
if (!state.readOnly && !state.disabled) {
this.setState(binder.updateFieldValue(name, data.checked))
this.setState(binder.updateBindingValue(name, data.checked))
}
}
componentWillReceiveProps(nextProps) {
if (nextProps.binder !== this.props.binder) {
this.setState(nextProps.binder.getFieldState(nextProps.name))
this.setState(nextProps.binder.getBindingState(nextProps.name))
}
}
@@ -42,12 +42,17 @@ export class BoundCheckbox extends React.Component {
return (
<div>
<Checkbox id={name} disabled={disabled} value={value} onChange={this.handleChange} />
<Checkbox
id={name}
disabled={disabled}
value={value}
onChange={this.handleChange}
/>
<label
htmlFor={name}
style={{
marginLeft: 10,
verticalAlign: 'top',
verticalAlign: "top",
fontSize: fontInfo.size.medium,
fontFamily: fontInfo.family,
color: disabled ? fontInfo.color.dimmed : fontInfo.color.normal,

View File

@@ -1,36 +1,42 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Dropdown } from 'ui'
import autobind from 'autobind-decorator'
import { sizeInfo, fontInfo } from 'ui/style'
import React from "react"
import PropTypes from "prop-types"
import { Dropdown } from "ui"
import autobind from "autobind-decorator"
import { sizeInfo, fontInfo } from "ui/style"
export class BoundDropdown extends React.Component {
static propTypes = {
name: PropTypes.string.isRequired,
label: PropTypes.string,
binder: PropTypes.object.isRequired,
items: PropTypes.arrayOf(PropTypes.shape({ value: PropTypes.string, text: PropTypes.string, icon: PropTypes.string })),
items: PropTypes.arrayOf(
PropTypes.shape({
value: PropTypes.string,
text: PropTypes.string,
icon: PropTypes.string,
})
),
icon: PropTypes.string,
}
constructor(props) {
super(props)
this.state = props.binder.getFieldState(props.name)
this.state = props.binder.getBindingState(props.name)
}
@autobind
handleChange(item) {
const { binder, name } = this.props
const state = binder.getFieldState(name)
const state = binder.getBindingState(name)
if (!state.readOnly && !state.disabled) {
this.setState(binder.updateFieldValue(name, item.value))
this.setState(binder.updateBindingValue(name, item.value))
}
}
componentWillReceiveProps(nextProps) {
if (nextProps.binder !== this.props.binder) {
this.setState(nextProps.binder.getFieldState(nextProps.name))
this.setState(nextProps.binder.getBindingState(nextProps.name))
}
if (nextProps.items !== this.props.items) {
@@ -59,15 +65,19 @@ export class BoundDropdown extends React.Component {
<Dropdown
items={items}
value={value}
emptyItem={{ value: null, text: '', icon: 'team' }}
emptyItem={{ value: null, text: "", icon: "team" }}
icon={icon}
onChange={this.handleChange}
render={(item) => (
<Dropdown.Item key={item.value}>
<Dropdown.Icon name={item.icon} size={sizeInfo.dropdownIconSize} />
<Dropdown.Icon
name={item.icon}
size={sizeInfo.dropdownIconSize}
/>
<Dropdown.Text>{item.text}</Dropdown.Text>
</Dropdown.Item>
)} />
)}
/>
</label>
</div>
)

View File

@@ -11,12 +11,12 @@ export class BoundEmailIcon extends React.Component {
constructor(props) {
super(props)
this.state = props.binder.getFieldState(props.name)
this.state = props.binder.getBindingState(props.name)
}
componentWillReceiveProps(nextProps) {
if (nextProps.binder !== this.props.binder) {
this.setState(nextProps.binder.getFieldState(nextProps.name))
this.setState(nextProps.binder.getBindingState(nextProps.name))
}
}

View File

@@ -15,22 +15,22 @@ export class BoundInput extends React.Component {
constructor(props) {
super(props)
this.state = props.binder.getFieldState(props.name)
this.state = props.binder.getBindingState(props.name)
}
@autobind
handleChange(newValue) {
const { binder, name } = this.props
const state = binder.getFieldState(name)
const state = binder.getBindingState(name)
if (!state.readOnly && !state.disabled) {
this.setState(binder.updateFieldValue(name, newValue))
this.setState(binder.updateBindingValue(name, newValue))
}
}
componentWillReceiveProps(nextProps) {
if (nextProps.binder !== this.props.binder) {
this.setState(nextProps.binder.getFieldState(nextProps.name))
this.setState(nextProps.binder.getBindingState(nextProps.name))
}
}