Merge pull request #5252 from topcoder-platform/gig-work-updates

Gig work updates

Author: luizrrodrigues

src/shared/components/GUIKit/JobListCard/index.jsx

@@ -36,7 +36,7 @@ export default function JobListCard({
           <IconBlackLocation /> {job.country}
         </div>
         <div styleName="icon-val">
-          <IconBlackPayment /> ${job.min_annual_salary} - ${job.max_annual_salary} / {getSalaryType(job.salary_type)}
+          <IconBlackPayment /> ${job.min_annual_salary} - {job.max_annual_salary} (USD) / {getSalaryType(job.salary_type)}
         </div>
         <div styleName="icon-val">
           <IconBlackDuration /> {getCustomField(job.custom_fields, 'Duration')}

src/shared/components/Gigs/GigDetails/index.jsx

@@ -44,7 +44,7 @@ export default function GigDetails(props) {
   let skills = getCustomField(job.custom_fields, 'Technologies Required');
   if (skills !== 'n/a') skills = skills.split(',').join(', ');
   const hPerW = getCustomField(job.custom_fields, 'Hours per week');
-  const compens = job.min_annual_salary === job.max_annual_salary ? job.max_annual_salary : `${job.min_annual_salary} - ${job.max_annual_salary}`;
+  const compens = job.min_annual_salary === job.max_annual_salary ? job.max_annual_salary : `${job.min_annual_salary} - ${job.max_annual_salary} (USD)`;
 
   return (
     <div styleName="container">

src/shared/containers/Gigs/RecruitCRMJobs.jsx

@@ -31,7 +31,7 @@ class RecruitCRMJobsContainer extends React.Component {
       term: '',
       page: 0,
       sortBy: 'created_on',
-      location: 'Any Location',
+      location: 'All',
     };
     // binds
     this.onSearch = this.onSearch.bind(this);
@@ -121,13 +121,16 @@ class RecruitCRMJobsContainer extends React.Component {
     // build current locations dropdown based on all data
     // and filter by selected location
     jobsToDisplay = _.filter(jobs, (job) => {
+      const country = job.country === 'Anywhere' || job.country === 'Any' ? 'All' : job.country;
       // build dropdown
-      const found = _.find(locations, { label: job.country });
+      const found = _.find(locations, { label: country });
       if (!found) {
-        locations.push({ label: job.country, selected: location === job.country });
+        locations.push({
+          label: country, selected: location.toLowerCase() === country.toLowerCase(),
+        });
       }
       // filter
-      if (location === 'Anywhere' || location === 'Any' || location === 'Any Location') return true;
+      if (location === 'Anywhere' || location === 'Any' || location === 'All') return true;
       return location.toLowerCase() === job.country.toLowerCase();
     });
     // sort location dropdown