Skip to content
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.

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

feat: added country disabling feature #1116

Merged
merged 2 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
41 changes: 39 additions & 2 deletions src/account-settings/AccountSettingsPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,15 @@
countryOptions: [{
value: '',
label: this.props.intl.formatMessage(messages['account.settings.field.country.options.empty']),
}].concat(getCountryList(locale).map(({ code, name }) => ({ value: code, label: name }))),
}].concat(
this.removeDisabledCountries(
getCountryList(locale).map(({ code, name }) => ({
value: code,
label: name,
disabled: this.isDisabledCountry(code),
})),
),
),
stateOptions: [{
value: '',
label: this.props.intl.formatMessage(messages['account.settings.field.state.options.empty']),
Expand All @@ -147,11 +155,30 @@
})),
}));

removeDisabledCountries = (countryList) => {
const { disabledCountries, committedValues } = this.props;

if (!disabledCountries.length) {
return countryList;
}

return countryList.filter(({ value }) => {
const isDisabled = this.isDisabledCountry(value);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no need to recalculate isDisabled here since we are already receiving disabled as a parameter in the countryList. as countryList.filter(({ value , disabled})

const isUserCountry = value === committedValues.country;

Check warning on line 167 in src/account-settings/AccountSettingsPage.jsx

View check run for this annotation

Codecov / codecov/patch

src/account-settings/AccountSettingsPage.jsx#L165-L167

Added lines #L165 - L167 were not covered by tests

return !isDisabled || isUserCountry;
});
};

handleEditableFieldChange = (name, value) => {
this.props.updateDraft(name, value);
};

handleSubmit = (formId, values) => {
if (formId === 'country' && this.isDisabledCountry(values)) {
return;

Check warning on line 179 in src/account-settings/AccountSettingsPage.jsx

View check run for this annotation

Codecov / codecov/patch

src/account-settings/AccountSettingsPage.jsx#L179

Added line #L179 was not covered by tests
}

const { formValues } = this.props;
let extendedProfileObject = {};

Expand Down Expand Up @@ -193,6 +220,11 @@
}
};

isDisabledCountry = (country) => {
const { disabledCountries } = this.props;
return disabledCountries.includes(country);
};

isEditable(fieldName) {
return !this.props.staticFields.includes(fieldName);
}
Expand Down Expand Up @@ -476,7 +508,8 @@
} = this.getLocalizedOptions(this.context.locale, this.props.formValues.country);

// Show State field only if the country is US (could include Canada later)
const showState = this.props.formValues.country === COUNTRY_WITH_STATES;
const { country } = this.props.formValues;
const showState = country === COUNTRY_WITH_STATES && !this.isDisabledCountry(country);
const { verifiedName } = this.props;

const hasWorkExperience = !!this.props.formValues?.extended_profile?.find(field => field.field_name === 'work_experience');
Expand Down Expand Up @@ -880,6 +913,7 @@
name: PropTypes.string,
useVerifiedNameForCerts: PropTypes.bool,
verified_name: PropTypes.string,
country: PropTypes.string,
}),
drafts: PropTypes.shape({}),
formErrors: PropTypes.shape({
Expand Down Expand Up @@ -938,6 +972,7 @@
),
navigate: PropTypes.func.isRequired,
location: PropTypes.string.isRequired,
disabledCountries: PropTypes.arrayOf(PropTypes.string),
};

AccountSettingsPage.defaultProps = {
Expand All @@ -947,6 +982,7 @@
committedValues: {
useVerifiedNameForCerts: false,
verified_name: null,
country: '',
},
drafts: {},
formErrors: {},
Expand All @@ -963,6 +999,7 @@
verifiedName: null,
mostRecentVerifiedName: {},
verifiedNameHistory: [],
disabledCountries: [],
};

export default withLocation(withNavigate(connect(accountSettingsPageSelector, {
Expand Down
3 changes: 2 additions & 1 deletion src/account-settings/EditableSelectField.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ const EditableSelectField = (props) => {
<option
value={subOption.value}
key={`${subOption.value}-${subOption.label}`}
disabled={subOption?.disabled}
>
{subOption.label}
</option>
Expand All @@ -115,7 +116,7 @@ const EditableSelectField = (props) => {
);
}
return (
<option value={option.value} key={`${option.value}-${option.label}`}>
<option value={option.value} key={`${option.value}-${option.label}`} disabled={option?.disabled}>
{option.label}
</option>
);
Expand Down
1 change: 1 addition & 0 deletions src/account-settings/data/reducers.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export const defaultState = {
verifiedName: null,
mostRecentVerifiedName: {},
verifiedNameHistory: {},
disabledCountries: ['RU'],
};

const reducer = (state = defaultState, action = {}) => {
Expand Down
8 changes: 8 additions & 0 deletions src/account-settings/data/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,11 @@ const activeAccountSelector = createSelector(
accountSettings => accountSettings.values.is_active,
);

const disabledCountriesSelector = createSelector(
accountSettingsSelector,
accountSettings => accountSettings.disabledCountries,
);

export const siteLanguageSelector = createSelector(
previousSiteLanguageSelector,
draftsSelector,
Expand Down Expand Up @@ -237,6 +242,7 @@ export const accountSettingsPageSelector = createSelector(
mostRecentApprovedVerifiedNameValueSelector,
mostRecentVerifiedNameSelector,
sortedVerifiedNameHistorySelector,
disabledCountriesSelector,
(
accountSettings,
siteLanguageOptions,
Expand All @@ -254,6 +260,7 @@ export const accountSettingsPageSelector = createSelector(
verifiedName,
mostRecentVerifiedName,
verifiedNameHistory,
disabledCountries,
) => ({
siteLanguageOptions,
siteLanguage,
Expand All @@ -274,6 +281,7 @@ export const accountSettingsPageSelector = createSelector(
verifiedName,
mostRecentVerifiedName,
verifiedNameHistory,
disabledCountries,
}),
);

Expand Down