Merge pull request #2672 from appirio-tech/support-profile-update-for-old-profiles

Support profile update for old profiles, fixes after final testing

Author: RishiRajSahu

src/routes/settings/actions/index.js

@@ -201,7 +201,13 @@ export const saveProfileSettings = (settings) => (dispatch, getState) => {
   const state = getState()
   const handle = _.get(state, 'loadUser.user.handle')
   const traits = _.get(state, 'settings.profile.traits')
-  const existentTraitIds = _.map(traits, 'traitId')
+  const existentTraitIds = _.map(
+    // some traits could have categoryName as null
+    // for such traits we have to use POST method instead of PUT or we will get
+    // error 404 for such traits
+    traits.filter((trait) => trait.categoryName), 
+    'traitId'
+  )
   const updatedTraits = applyProfileSettingsToTraits(traits, settings)
 
   // we will only update on server traits which can be updated on the settings page

src/routes/settings/helpers/settings.js

@@ -115,12 +115,14 @@ export const applyProfileSettingsToTraits = (traits, profileSettings) => {
       const updatedTrait = {...trait}
       const [firstName, lastName] = profileSettings.firstNLastName ? profileSettings.firstNLastName.split(/\s+/) : []
       const photoURL = profileSettings.photoUrl
+      const country = profileSettings.country
 
       // update only if new values are defined
       const updatedProps = _.omitBy({
         photoURL,
         firstName,
         lastName,
+        country,
       }, _.isUndefined)
 
       updatedTrait.traits = {