Skip to content

revert required fields in profile settings form #3326

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

Merged
RishiRajSahu merged 1 commit into from
Sep 23, 2019
Merged

revert required fields in profile settings form #3326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions src/routes/settings/routes/profile/components/ProfileSettingsForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,16 @@ class ProfileSettingsForm extends Component {
}

onSubmit(data) {
// hardcoding company size for now as it's required in the backend
const defaultValues = {
companySize: '16-50'
}
// we have to use initial data as a base for updated data
// as form could update not all fields, thus they won't be included in `data`
// for example user avatar is not included in `data` thus will be removed if don't use
// this.props.values.settings as a base
const updatedData = {
...defaultValues,
...this.props.values.settings,
...data,
}
Expand Down Expand Up @@ -176,12 +181,13 @@ class ProfileSettingsForm extends Component {
uploadPhoto={this.props.uploadPhoto}
/>
</div>
{this.getField('First Name', 'firstName', false)}
{this.getField('Last Name', 'lastName', false)}
{this.getField('First Name', 'firstName', true)}
{this.getField('Last Name', 'lastName', true)}
{this.getField('Title', 'title', true)}
<div className="field">
<div className="label">
<span styleName="fieldLabelText">Business Phone</span>
<span styleName="fieldLabelText">Business Phone</span>&nbsp;
<sup styleName="requiredMarker">*</sup>
</div>
<div className="input-field">
<PhoneInput
Expand All @@ -194,6 +200,7 @@ class ProfileSettingsForm extends Component {
type="phone"
validationError="Invalid business phone"
showCheckMark
required
listCountry={ISOCountries}
forceCountry={this.state.countrySelected}
value={this.props.values.settings.businessPhone}
Expand All @@ -207,7 +214,7 @@ class ProfileSettingsForm extends Component {
}
</div>
</div>
{this.getField('Company name', 'companyName', false, (isCustomer || isCopilot) && !isManager)}
{this.getField('Company name', 'companyName', true, (isCustomer || isCopilot) && !isManager)}
<div className="field">
<div className="label">
<span styleName="fieldLabelText">Country</span>
Expand Down