-
-
{formatMessage(messages['progressive.profiling.page.heading'])}
-
-
- {showError ? (
-
- {formatMessage(messages['welcome.page.error.heading'])}
- {formatMessage(messages['welcome.page.error.message'])}
-
- ) : null}
-
+
+
+ {formatMessage(messages['progressive.profiling.page.title'],
+ { siteName: getConfig().SITE_NAME })}
+
+
+
+ {props.shouldRedirect ? (
+
+ ) : null}
+
+
+
{formatMessage(messages['progressive.profiling.page.heading'])}
-
-
+
+ {showError ? (
+
+ {formatMessage(messages['welcome.page.error.heading'])}
+ {formatMessage(messages['welcome.page.error.message'])}
+
+ ) : null}
+
+
);
};
ProgressiveProfiling.propTypes = {
formRenderState: PropTypes.string.isRequired,
location: PropTypes.shape({
- state: PropTypes.object,
+ state: PropTypes.shape({
+ registrationResult: PropTypes.shape({
+ redirectUrl: PropTypes.string,
+ }),
+ optionalFields: PropTypes.shape({
+ extended_profile: PropTypes.arrayOf(PropTypes.string),
+ fields: PropTypes.shape({}),
+ }),
+ }),
}),
saveUserProfile: PropTypes.func.isRequired,
showError: PropTypes.bool,
diff --git a/src/progressive-profiling/data/reducers.js b/src/progressive-profiling/data/reducers.js
index 4a5251c1..cfd968e6 100644
--- a/src/progressive-profiling/data/reducers.js
+++ b/src/progressive-profiling/data/reducers.js
@@ -12,7 +12,7 @@ export const defaultState = {
showError: false,
};
-const reducer = (state = defaultState, action) => {
+const reducer = (state = defaultState, action = {}) => {
switch (action.type) {
case SAVE_USER_PROFILE.BEGIN:
return {
diff --git a/src/progressive-profiling/tests/ProgressiveProfiling.test.jsx b/src/progressive-profiling/tests/ProgressiveProfiling.test.jsx
index 248ca28d..83134db0 100644
--- a/src/progressive-profiling/tests/ProgressiveProfiling.test.jsx
+++ b/src/progressive-profiling/tests/ProgressiveProfiling.test.jsx
@@ -77,7 +77,7 @@ describe('ProgressiveProfilingTests', () => {
));
await act(async () => {
await Promise.resolve(progressiveProfilingPage);
- await new Promise(resolve => setImmediate(resolve));
+ await new Promise(resolve => { setImmediate(resolve); });
progressiveProfilingPage.update();
});
diff --git a/src/recommendations/RecommendationsPage.jsx b/src/recommendations/RecommendationsPage.jsx
index ae109c39..fa610585 100644
--- a/src/recommendations/RecommendationsPage.jsx
+++ b/src/recommendations/RecommendationsPage.jsx
@@ -136,7 +136,13 @@ const RecommendationsPage = (props) => {
RecommendationsPage.propTypes = {
location: PropTypes.shape({
- state: PropTypes.object,
+ state: PropTypes.shape({
+ registrationResult: PropTypes.shape({
+ redirectUrl: PropTypes.string,
+ }),
+ userId: PropTypes.number,
+ educationLevel: PropTypes.string,
+ }),
}),
};
diff --git a/src/recommendations/index.js b/src/recommendations/index.js
index 1c17a099..e5f32869 100644
--- a/src/recommendations/index.js
+++ b/src/recommendations/index.js
@@ -1 +1,2 @@
-export { default } from './RecommendationsPage';
+/* eslint-disable import/prefer-default-export */
+export { default as RecommendationsPage } from './RecommendationsPage';
diff --git a/src/register/ConfigurableRegistrationForm.jsx b/src/register/ConfigurableRegistrationForm.jsx
index 49788281..71812cca 100644
--- a/src/register/ConfigurableRegistrationForm.jsx
+++ b/src/register/ConfigurableRegistrationForm.jsx
@@ -4,7 +4,7 @@ import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import PropTypes from 'prop-types';
-import FormFieldRenderer from '../field-renderer';
+import { FormFieldRenderer } from '../field-renderer';
import { FIELDS } from './data/constants';
import { validateCountryField } from './data/utils';
import messages from './messages';
@@ -199,7 +199,7 @@ const ConfigurableRegistrationForm = (props) => {
};
ConfigurableRegistrationForm.propTypes = {
- countryList: PropTypes.arrayOf(PropTypes.object).isRequired,
+ countryList: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
email: PropTypes.string.isRequired,
fieldDescriptions: PropTypes.shape({}),
fieldErrors: PropTypes.shape({
diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx
index 772721cb..4fbf6629 100644
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -268,9 +268,9 @@ const RegistrationPage = (props) => {
break;
case 'country':
if (flags.showConfigurableEdxFields || flags.showConfigurableRegistrationFields) {
- const { countryCode, displayValue, error } = validateCountryField(
- value.displayValue.trim(), countryList, formatMessage(messages['empty.country.field.error']),
- );
+ const {
+ countryCode, displayValue, error,
+ } = validateCountryField(value.displayValue.trim(), countryList, formatMessage(messages['empty.country.field.error']));
fieldError = error;
countryFieldCode = countryCode;
setConfigurableFormFields(prevState => ({ ...prevState, country: { countryCode, displayValue } }));
@@ -601,8 +601,8 @@ const mapStateToProps = state => {
backendCountryCode: registerPageState.backendCountryCode,
backendValidations: validationsSelector(state),
fieldDescriptions: fieldDescriptionSelector(state),
- registrationError: registerPageState.registrationError,
optionalFields: optionalFieldsSelector(state),
+ registrationError: registerPageState.registrationError,
registrationErrorCode: registrationErrorSelector(state),
registrationResult: registerPageState.registrationResult,
shouldBackupState: registerPageState.shouldBackupState,
@@ -632,6 +632,7 @@ RegistrationPage.propTypes = {
fieldDescriptions: PropTypes.shape({}),
institutionLogin: PropTypes.bool.isRequired,
optionalFields: PropTypes.shape({}),
+ registrationError: PropTypes.shape({}),
registrationErrorCode: PropTypes.string,
registrationResult: PropTypes.shape({
redirectUrl: PropTypes.string,
@@ -643,8 +644,12 @@ RegistrationPage.propTypes = {
thirdPartyAuthContext: PropTypes.shape({
currentProvider: PropTypes.string,
platformName: PropTypes.string,
- providers: PropTypes.array,
- secondaryProviders: PropTypes.array,
+ providers: PropTypes.arrayOf(
+ PropTypes.shape({}),
+ ),
+ secondaryProviders: PropTypes.arrayOf(
+ PropTypes.shape({}),
+ ),
finishAuthUrl: PropTypes.string,
countryCode: PropTypes.string,
pipelineUserDetails: PropTypes.shape({
@@ -660,6 +665,7 @@ RegistrationPage.propTypes = {
validationApiRateLimited: PropTypes.bool,
// Actions
backupFormState: PropTypes.func.isRequired,
+ clearBackendError: PropTypes.func.isRequired,
getRegistrationDataFromBackend: PropTypes.func.isRequired,
handleInstitutionLogin: PropTypes.func.isRequired,
registerNewUser: PropTypes.func.isRequired,
@@ -687,6 +693,7 @@ RegistrationPage.defaultProps = {
backendValidations: null,
fieldDescriptions: {},
optionalFields: {},
+ registrationError: {},
registrationErrorCode: '',
registrationResult: null,
shouldBackupState: false,
@@ -709,11 +716,11 @@ export default connect(
mapStateToProps,
{
backupFormState: backupRegistrationFormBegin,
+ clearBackendError: clearRegistertionBackendError,
getRegistrationDataFromBackend: getThirdPartyAuthContext,
resetUsernameSuggestions: clearUsernameSuggestions,
validateFromBackend: fetchRealtimeValidations,
registerNewUser,
setUserPipelineDetailsLoaded: setUserPipelineDataLoaded,
- clearBackendError: clearRegistertionBackendError,
},
)(RegistrationPage);
diff --git a/src/register/ThirdPartyAuth.jsx b/src/register/ThirdPartyAuth.jsx
index dd46d277..0368b6cf 100644
--- a/src/register/ThirdPartyAuth.jsx
+++ b/src/register/ThirdPartyAuth.jsx
@@ -65,8 +65,26 @@ ThirdPartyAuth.defaultProps = {
ThirdPartyAuth.propTypes = {
currentProvider: PropTypes.string,
handleInstitutionLogin: PropTypes.func.isRequired,
- providers: PropTypes.arrayOf(PropTypes.any),
- secondaryProviders: PropTypes.arrayOf(PropTypes.any),
+ providers: PropTypes.arrayOf(
+ PropTypes.shape({
+ id: PropTypes.string,
+ name: PropTypes.string,
+ iconClass: PropTypes.string,
+ iconImage: PropTypes.string,
+ loginUrl: PropTypes.string,
+ registerUrl: PropTypes.string,
+ }),
+ ),
+ secondaryProviders: PropTypes.arrayOf(
+ PropTypes.shape({
+ id: PropTypes.string,
+ name: PropTypes.string,
+ iconClass: PropTypes.string,
+ iconImage: PropTypes.string,
+ loginUrl: PropTypes.string,
+ registerUrl: PropTypes.string,
+ }),
+ ),
thirdPartyAuthApiStatus: PropTypes.string,
};
diff --git a/src/register/data/reducers.js b/src/register/data/reducers.js
index bbd3a7ea..ba4d51ea 100644
--- a/src/register/data/reducers.js
+++ b/src/register/data/reducers.js
@@ -37,7 +37,7 @@ export const defaultState = {
shouldBackupState: false,
};
-const reducer = (state = defaultState, action) => {
+const reducer = (state = defaultState, action = {}) => {
switch (action.type) {
case BACKUP_REGISTRATION_DATA.BASE:
return {
diff --git a/src/register/registrationFields/CountryField.jsx b/src/register/registrationFields/CountryField.jsx
index be1b43c7..34806067 100644
--- a/src/register/registrationFields/CountryField.jsx
+++ b/src/register/registrationFields/CountryField.jsx
@@ -175,7 +175,12 @@ const CountryField = (props) => {
};
CountryField.propTypes = {
- countryList: PropTypes.arrayOf(PropTypes.object).isRequired,
+ countryList: PropTypes.arrayOf(
+ PropTypes.shape({
+ code: PropTypes.string,
+ name: PropTypes.string,
+ }),
+ ).isRequired,
errorMessage: PropTypes.string,
onBlurHandler: PropTypes.func.isRequired,
onChangeHandler: PropTypes.func.isRequired,
diff --git a/src/register/registrationFields/UsernameField.jsx b/src/register/registrationFields/UsernameField.jsx
index f7ec4924..498886a6 100644
--- a/src/register/registrationFields/UsernameField.jsx
+++ b/src/register/registrationFields/UsernameField.jsx
@@ -14,8 +14,8 @@ const UsernameField = (props) => {
handleSuggestionClick, handleUsernameSuggestionClose, usernameSuggestions, errorMessage,
} = props;
let className = '';
- let suggestedUsernameDiv = <>;
- let iconButton = <>;
+ let suggestedUsernameDiv = null;
+ let iconButton = null;
const suggestedUsernames = () => (
{formatMessage(messages['registration.username.suggestion.label'])}
diff --git a/src/register/tests/RegistrationPage.test.jsx b/src/register/tests/RegistrationPage.test.jsx
index b88e0d3e..6f6ce6fc 100644
--- a/src/register/tests/RegistrationPage.test.jsx
+++ b/src/register/tests/RegistrationPage.test.jsx
@@ -351,9 +351,10 @@ describe('RegistrationPage', () => {
store.dispatch = jest.fn(store.dispatch);
const registrationPage = mount(reduxWrapper(
));
- registrationPage.find('input#email').simulate(
- 'change', { target: { value: 'john@gmail.mistake', name: 'email' } },
- );
+ registrationPage
+ .find('input#email')
+ .simulate('change', { target: { value: 'john@gmail.mistake', name: 'email' } });
+
registrationPage.find('input#email').simulate('blur');
expect(registrationPage.find('.alert-danger').text()).toEqual('Did you mean john@gmail.com?');
diff --git a/src/reset-password/ResetPasswordPage.jsx b/src/reset-password/ResetPasswordPage.jsx
index 6f758a19..2341a6d8 100644
--- a/src/reset-password/ResetPasswordPage.jsx
+++ b/src/reset-password/ResetPasswordPage.jsx
@@ -16,7 +16,7 @@ import PropTypes from 'prop-types';
import { Helmet } from 'react-helmet';
import { Redirect } from 'react-router-dom';
-import BaseComponent from '../base-component';
+import { BaseComponent } from '../base-component';
import { PasswordField } from '../common-components';
import {
LETTER_REGEX, LOGIN_PAGE, NUMBER_REGEX, RESET_PAGE,
@@ -159,8 +159,8 @@ const ResetPasswordPage = (props) => {
- {formatMessage(messages['reset.password.page.title'],
- { siteName: getConfig().SITE_NAME })}
+ <title>
+ {formatMessage(messages['reset.password.page.title'], { siteName: getConfig().SITE_NAME })}
setKey(k)}>
diff --git a/src/reset-password/index.js b/src/reset-password/index.js
index 2116170a..08626f3e 100644
--- a/src/reset-password/index.js
+++ b/src/reset-password/index.js
@@ -1,4 +1,4 @@
-export { default } from './ResetPasswordPage';
+export { default as ResetPasswordPage } from './ResetPasswordPage';
export { default as reducer } from './data/reducers';
export { RESET_PASSWORD } from './data/actions';
export { default as saga } from './data/sagas';
diff --git a/src/reset-password/tests/ResetPasswordPage.test.jsx b/src/reset-password/tests/ResetPasswordPage.test.jsx
index 2179b41f..d0926d41 100644
--- a/src/reset-password/tests/ResetPasswordPage.test.jsx
+++ b/src/reset-password/tests/ResetPasswordPage.test.jsx
@@ -85,9 +85,9 @@ describe('ResetPasswordPage', () => {
await resetPasswordPage.find('button.btn-brand').simulate('click');
});
- expect(store.dispatch).toHaveBeenCalledWith(resetPassword(
- { new_password1: password, new_password2: password }, props.token, {},
- ));
+ expect(store.dispatch).toHaveBeenCalledWith(
+ resetPassword({ new_password1: password, new_password2: password }, props.token, {}),
+ );
resetPasswordPage.unmount();
});
@@ -120,9 +120,10 @@ describe('ResetPasswordPage', () => {
},
});
const resetPasswordPage = mount(reduxWrapper());
- resetPasswordPage.find('input#confirmPassword').simulate(
- 'change', { target: { value: 'password-mismatch', name: 'confirmPassword' } },
- );
+ resetPasswordPage
+ .find('input#confirmPassword')
+ .simulate('change', { target: { value: 'password-mismatch', name: 'confirmPassword' } });
+
expect(resetPasswordPage.find('div[feedback-for="confirmPassword"]').text()).toContain('Passwords do not match');
});
diff --git a/src/setupTest.js b/src/setupTest.js
index b0edda09..01bff849 100755
--- a/src/setupTest.js
+++ b/src/setupTest.js
@@ -8,9 +8,9 @@ import Adapter from 'enzyme-adapter-react-16';
Enzyme.configure({ adapter: new Adapter() });
class MockLoggingService {
- logInfo = jest.fn();
+ logInfo = jest.fn();
- logError = jest.fn();
+ logError = jest.fn();
}
export default function initializeMockLogging() {