Skip to content

Feature/form submit handlers #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
the-overengineer wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/form submit handlers #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d0c52c
Add submit handlers to ChangePasswordForm
Jan 31, 2017
fa180c3
Simplify code a bit
Jan 31, 2017
bd0d7db
Add error and success handlers to ResetPasswordForm
Jan 31, 2017
bd79f3b
Add success and error handlers to profile form
Jan 31, 2017
92eaeb0
Allow setting of custom errors
Feb 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 34 additions & 9 deletions src/components/ChangePasswordForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,29 @@ export default class ChangePasswordForm extends React.Component {
this.state.spToken = this.props.spToken;
}

_setErrorState(err) {
this.setState({
isFormProcessing: false,
errorMessage: err.message
});
}

onFormSubmit(e) {
e.preventDefault();
e.persist();

const {onSubmitError, onSubmitSuccess} = this.props;

var next = (err, data) => {
if (err) {
return this.setState({
isFormProcessing: false,
errorMessage: err.message
});
if (onSubmitError) {
return onSubmitError({
data: data,
error: err
}, (userError) => this._setErrorState(userError || err));
}

return this._setErrorState(err);
}

// If the user didn't specify any data,
Expand All @@ -97,16 +110,28 @@ export default class ChangePasswordForm extends React.Component {
err.message = 'The reset password token is not valid. Please try resetting your password again.';
}

return this.setState({
isFormProcessing: false,
errorMessage: err.message
});
if (onSubmitError) {
return onSubmitError({
data: data,
error: err
}, (userError) => this._setErrorState(userError || err));
}

return this._setErrorState(err);
}

this.setState({
const done = this.setState.bind(this, {
isFormProcessing: false,
isFormSent: true
});

if (onSubmitSuccess) {
return onSubmitSuccess({
data: data
}, done);
}

done();
});
};

Expand Down
4 changes: 2 additions & 2 deletions src/components/LoginForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export default class LoginForm extends React.Component {
return onSubmitError({
data: data,
error: err
}, setErrorState.bind(this, err));
}, (userError) => setErrorState(userError || err));
}

return setErrorState(err);
Expand All @@ -195,7 +195,7 @@ export default class LoginForm extends React.Component {
return onSubmitError({
data: data,
error: err
}, setErrorState.bind(this, err));
}, (userError) => setErrorState.bind(userError || err));
}

return setErrorState(err);
Expand Down
6 changes: 3 additions & 3 deletions src/components/RegistrationForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ export default class RegistrationForm extends React.Component {
return onSubmitError({
data: data,
error: err
}, setErrorState.bind(this, err));
}, (userError) => setErrorState(userError || err));
}

return setErrorState(err);
Expand All @@ -226,7 +226,7 @@ export default class RegistrationForm extends React.Component {
data: data,
result: result,
error: err
}, setErrorState.bind(this, err));
}, (userError) => setErrorState(userError || err));
}

setErrorState(err);
Expand All @@ -241,7 +241,7 @@ export default class RegistrationForm extends React.Component {
data: data,
result: result,
error: err
}, setErrorState.bind(this, err));
}, (userError) => setErrorState(userError || err));
}

return setErrorState(err);
Expand Down
53 changes: 39 additions & 14 deletions src/components/ResetPasswordForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,29 @@ export default class ResetPasswordForm extends React.Component {
isFormSent: false
};

_setErrorState(err) {
this.setState({
isFormProcessing: false,
errorMessage: err.message
});
}

onFormSubmit(e) {
e.preventDefault();
e.persist();

const {onSubmitError, onSubmitSuccess} = this.props;

var next = (err, data) => {
if (err) {
return this.setState({
isFormProcessing: false,
errorMessage: err.message
});
if (onSubmitError) {
return onSubmitError({
data: data,
error: err
}, (userError) => this._setErrorState(userError || err));
}

return this._setErrorState(err);
}

// If the user didn't specify any data,
Expand All @@ -71,17 +84,29 @@ export default class ResetPasswordForm extends React.Component {

UserActions.forgotPassword(data, (err) => {
if (err) {
this.setState({
isFormProcessing: false,
errorMessage: err.message
});
} else {
this.setState({
isFormSent: true,
isFormProcessing: false,
errorMessage: null
});
if (onSubmitError) {
return onSubmitError({
data: data,
error: err
}, (userError) => this._setErrorState(userError || err));
}

return this._setErrorState(err);
}

const done = this.setState.bind(this, {
isFormSent: true,
isFormProcessing: false,
errorMessage: null
});

if (onSubmitSuccess) {
return onSubmitSuccess({
data: data
}, done);
}

done();
});
};

Expand Down
43 changes: 32 additions & 11 deletions src/components/UserProfileForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,29 @@ export default class UserProfileForm extends React.Component {
}
};

_setErrorState(err) {
this.setState({
isFormProcessing: false,
isFormSuccessful: false,
errorMessage: err.message
});
}

_onFormSubmit(e) {
e.preventDefault();
e.persist();

const {onSubmitError, onSubmitSuccess} = this.props;

var next = (err, data) => {
if (err) {
return this.setState({
isFormProcessing: false,
isFormSuccessful: false,
errorMessage: err.message
});
if (onSubmitError) {
return onSubmitError({
data: data,
error: err
}, (userError) => this._setErrorState(userError || err));
}
return this._setErrorState(err);
}

// If the user didn't specify any data,
Expand All @@ -134,19 +146,28 @@ export default class UserProfileForm extends React.Component {

UserActions.updateProfile(data, (err) => {
if (err) {
return this.setState({
isFormProcessing: false,
isFormSuccessful: false,
errorMessage: err.message
});
if (onSubmitError) {
return onSubmitError({
data: data,
error: err
}, (userError) => this._setErrorState(userError || err));
}

return this._setErrorState(err);
}

this._updateSessionData(data, () => {
this.setState({
const done = this.setState.bind(this, {
isFormProcessing: false,
isFormSuccessful: true,
errorMessage: null
});

if (onSubmitSuccess) {
return onSubmitSuccess({
data: data
}, done);
}
});
});
};
Expand Down