ci:fixing countryCodes

Author: dengjun

config/default.js

@@ -12,7 +12,7 @@ module.exports = {
     COMMUNITY_APP: "https://community-app.topcoder-dev.com",
     PLATFORM_WEBSITE_URL: "https://platform.topcoder-dev.com",
   },
-  RECRUIT_API: process.env.RECRUIT_API || "https://www.topcoder-dev.com",
+  RECRUIT_API: "https://www.topcoder-dev.com",
   // the server api base path
   API_BASE_PATH: process.env.API_BASE_PATH || "/earn-app/api/my-gigs",
   // the log level, default is 'debug'

config/development.js

@@ -11,5 +11,5 @@ module.exports = {
     COMMUNITY_APP: "https://community-app.topcoder-dev.com",
     PLATFORM_WEBSITE_URL: "https://platform.topcoder-dev.com",
   },
-  RECRUIT_API: process.env.RECRUIT_API || "https://www.topcoder-dev.com",
+  RECRUIT_API: "https://www.topcoder-dev.com",
 };

config/production.js

@@ -11,5 +11,5 @@ module.exports = {
     COMMUNITY_APP: "https://community-app.topcoder.com",
     PLATFORM_WEBSITE_URL: "https://platform.topcoder.com",
   },
-  RECRUIT_API: process.env.RECRUIT_API || "https://www.topcoder.com",
+  RECRUIT_API: "https://www.topcoder.com",
 };

src/api/common/helper.js

@@ -435,6 +435,8 @@ async function updateRCRMProfile(currentUser, file, data) {
     .set("Accept", "application/json")
     .field("phone", data.phone)
     .field("availability", data.availability)
+    .field("city", data.city)
+    .field("countryName", data.countryName)
     .attach("resume", file.data, file.name);
   localLogger.debug({
     context: "updateRCRMProfile",

src/containers/MyGigs/index.jsx

@@ -24,13 +24,15 @@ const MyGigs = ({
   // getStatuses,
   updateProfile,
   updateProfileSuccess,
+  getAllCountries,
 }) => {
   const propsRef = useRef();
-  propsRef.current = { getMyGigs, getProfile };
+  propsRef.current = { getMyGigs, getProfile, getAllCountries};
 
   useEffect(() => {
     propsRef.current.getMyGigs();
     propsRef.current.getProfile();
+    propsRef.current.getAllCountries();
     // propsRef.current.getStatuses();
   }, []);
 
@@ -109,6 +111,7 @@ MyGigs.propTypes = {
   // getStatuses: PT.func,
   updateProfile: PT.func,
   updateProfileSuccess: PT.bool,
+  getAllCountries: PT.func
 };
 
 const mapStateToProps = (state) => ({
@@ -126,6 +129,7 @@ const mapDispatchToProps = {
   getProfile: actions.myGigs.getProfile,
   // getStatuses: actions.lookup.getGigStatuses,
   updateProfile: actions.myGigs.updateProfile,
+  getAllCountries: actions.lookup.getAllCountries,
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(MyGigs);

src/containers/MyGigs/modals/UpdateGigProfile/index.jsx

@@ -118,6 +118,12 @@ const UpdateGigProfile = ({
 
   const onSubmitProfile = () => {
     const update = varsRef.current.profileEdit;
+    if (!update.countryName) {
+      const selectedCountry = countries.find(
+        (country) => country.countryCode === update.country
+      );
+      update.countryName = selectedCountry.name;
+    }
     delete update.fileError;
     onSubmit(update);
   };
@@ -155,11 +161,10 @@ const UpdateGigProfile = ({
     const country = countries.find(
       (country) => selectedOption.label === country.name
     );
-
     setProfileEdit({
       ...varsRef.current.profileEdit,
-      country: selectedOption.label,
-      countryCode: country.countryCode,
+      country: country.countryCode,
+      countryName: country.name
     });
     setPristine(false);
   };

src/services/myGigs.js

@@ -130,8 +130,8 @@ async function getProfile() {
 async function updateProfile(profile) {
   const payload = {
     city: profile.city,
-    country: profile.countryCode,
-    countryName: profile.country,
+    country: profile.country,
+    countryName: profile.countryName,
     phone: profile.phone,
     availability: profile.status === GIG_STATUS.AVAILABLE ? true : false,
     resume: profile.file,