Merge pull request #2332 from nauhil/hot-fixes

The country value of Profile page get from lookup data

Author: ThomasKranitsas

__tests__/shared/components/ProfilePage/__snapshots__/index.jsx.snap

@@ -28,7 +28,7 @@ exports[`renders a full Profile correctly 1`] = `
           >
             <ProfileHeader
               copilot={true}
-              country="United States"
+              country=""
               info={
                 Object {
                   "competitionCountryCode": "USA",
@@ -631,7 +631,7 @@ exports[`renders an empty Profile correctly 1`] = `
           >
             <ProfileHeader
               copilot={false}
-              country="United States"
+              country=""
               info={
                 Object {
                   "competitionCountryCode": "USA",

src/shared/components/ProfilePage/index.jsx

@@ -112,12 +112,12 @@ class ProfilePage extends React.Component {
     const {
       achievements,
       copilot,
-      country,
       externalAccounts,
       externalLinks,
       info,
       skills: propSkills,
       stats,
+      lookupData,
     } = this.props;
 
     const {
@@ -126,6 +126,17 @@ class ProfilePage extends React.Component {
       skillsExpanded,
     } = this.state;
 
+    // get country
+    let country = '';
+    if (_.has(lookupData, 'countries') && lookupData.countries.length > 0) {
+      const countryCode = _.isEmpty(_.get(info, 'homeCountryCode'))
+        ? _.get(info, 'competitionCountryCode') : _.get(info, 'homeCountryCode');
+
+      const result = _.find(lookupData.countries,
+        c => c.countryCode === countryCode.toUpperCase());
+      country = _.isEmpty(result) ? '' : result.country;
+    }
+
     // Convert skills from object to an array for easier iteration
     let skills = propSkills ? _.map(propSkills, (skill, tagId) => ({ tagId, ...skill })) : [];
     const showMoreButton = skills.length > MAX_SKILLS;
@@ -286,12 +297,12 @@ ProfilePage.defaultProps = {
 ProfilePage.propTypes = {
   achievements: PT.arrayOf(PT.shape()),
   copilot: PT.bool.isRequired,
-  country: PT.string.isRequired,
   externalAccounts: PT.shape().isRequired,
   externalLinks: PT.arrayOf(PT.shape()).isRequired,
   info: PT.shape().isRequired,
   skills: PT.shape(),
   stats: PT.shape(),
+  lookupData: PT.shape().isRequired,
 };
 
 export default ProfilePage;

src/shared/containers/Profile.jsx

@@ -93,6 +93,7 @@ ProfileContainer.propTypes = {
   profileForHandle: PT.string,
   skills: PT.shape(),
   stats: PT.shape(),
+  lookupData: PT.shape().isRequired,
 };
 
 const mapStateToProps = (state, ownProps) => ({
@@ -107,10 +108,12 @@ const mapStateToProps = (state, ownProps) => ({
   profileForHandle: state.profile.profileForHandle,
   skills: state.profile.skills,
   stats: state.profile.stats,
+  lookupData: state.lookup,
 });
 
 function mapDispatchToProps(dispatch) {
   const a = actions.profile;
+  const lookupActions = actions.lookup;
   return {
     loadProfile: (handle) => {
       dispatch(a.clearProfile());
@@ -121,12 +124,14 @@ function mapDispatchToProps(dispatch) {
       dispatch(a.getInfoInit());
       dispatch(a.getSkillsInit());
       dispatch(a.getStatsInit());
+      dispatch(lookupActions.getCountriesInit());
       dispatch(a.getAchievementsV3Done(handle));
       dispatch(a.getExternalAccountsDone(handle));
       dispatch(a.getExternalLinksDone(handle));
       dispatch(a.getInfoDone(handle));
       dispatch(a.getSkillsDone(handle));
       dispatch(a.getStatsDone(handle));
+      dispatch(lookupActions.getCountriesDone());
     },
   };
 }