v1 for #5429

Author: kkartunov

src/shared/actions/recruitCRM.js

@@ -58,12 +58,11 @@ function normalizeRecruitPayload(job, payload) {
   const perJob = [
     `${job.name} ->`,
     `Pay Expectation: ${payload.payExpectation}`,
-    `Date Available: ${new Date(payload.availFrom).toDateString()}`,
-    `Heard About Gig: ${payload.reffereal}`,
     `Able to work during timezone? ${payload.timezoneConfirm.filter(s => s.value).map(() => getCustomField(job.custom_fields, 'Timezone')).join(',')}`,
-    `Am I ok to work the duration? ${payload.durationConfirm.filter(s => s.value).map(s => s.label).join(',')}`,
+    `Am I ok to work the duration? ${payload.durationConfirm.filter(s => s.value).map(() => getCustomField(job.custom_fields, 'Duration')).join(',')}`,
   ];
-  return {
+  const referral = _.find(payload.reffereal, { selected: true });
+  const normalized = {
     last_name: payload.lname,
     first_name: payload.fname,
     email: payload.email,
@@ -73,13 +72,9 @@ function normalizeRecruitPayload(job, payload) {
     salary_expectation: payload.payExpectation,
     skill: payload.skills.filter(s => s.selected).map(s => s.label).join(','),
     custom_fields: [
-      {
-        field_id: 13,
-        value: payload.reffereal || '',
-      },
       {
         field_id: 1,
-        value: payload.tcProfileLink || (payload.handle ? `topcoder.com/members/${payload.handle}` : ''),
+        value: payload.tcProfileLink || (payload.handle ? `https://topcoder.com/members/${payload.handle}` : ''),
       },
       {
         field_id: 2,
@@ -92,6 +87,14 @@ function normalizeRecruitPayload(job, payload) {
     ],
     resume: payload.fileCV,
   };
+  if (referral) {
+    normalized.custom_fields.push({
+      field_id: 13,
+      value: referral.label,
+    });
+  }
+
+  return normalized;
 }
 
 /**

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

@@ -27,7 +27,7 @@ export default function GigApply(props) {
   } = props;
   const retUrl = window.location.href;
 
-  console.log('GigApply', recruitProfile)
+  console.log('GigApply', recruitProfile, formErrors);
 
   return user ? (
     <div styleName="container">
@@ -94,8 +94,16 @@ export default function GigApply(props) {
             {
               !application && !applying ? (
                 <div styleName="form-wrap">
+                  {!_.isEmpty(recruitProfile)
+                  && (
+                  <p styleName="info-text">It looks like you have applied to a gig previously.
+                    Perfect! We have most of your information.
+                    Is there anything you would like to update to your Gig Work Profile?
+                  </p>
+                  )}
                   <h4>PERSONAL INFORMATION</h4>
-                  <p>Welcome to Topcoder Gigs! We’d like to get to know you.</p>
+                  {_.isEmpty(recruitProfile)
+                  && <p>Welcome to Topcoder Gigs! We’d like to get to know you.</p>}
                   <div styleName="form-section">
                     <div styleName="form-row">
                       <TextInput
@@ -153,7 +161,8 @@ export default function GigApply(props) {
                       />
                     </div>
                   </div>
-                  <h4>TOPCODER INFORMATION</h4>
+                  {_.isEmpty(recruitProfile) && <h4>TOPCODER INFORMATION</h4>}
+                  {_.isEmpty(recruitProfile) && (
                   <div styleName="form-section">
                     <div styleName="form-row">
                       <TextInput
@@ -174,8 +183,9 @@ export default function GigApply(props) {
                       />
                     </div>
                   </div>
+                  )}
                   <h4>SHARE YOUR EXPECTATIONS</h4>
-                  <p>Your Professional Work History</p>
+                  {_.isEmpty(recruitProfile) && <p>Your Professional Work History</p>}
                   <div styleName="form-section">
                     <div styleName="form-row">
                       <TextInput
@@ -214,6 +224,7 @@ export default function GigApply(props) {
                   <h4>FINAL QUESTIONS</h4>
                   <p>Please Complete the Following Questions</p>
                   <div styleName="form-section">
+                    {_.isEmpty(recruitProfile) && (
                     <Dropdown
                       placeholder="How did you find out about Topcoder Gig Work?"
                       label="How did you find out about Topcoder Gig Work?"
@@ -222,16 +233,17 @@ export default function GigApply(props) {
                       options={formData.reffereal}
                       required
                     />
+                    )}
                     <div styleName="input-bot-margin" />
-                    <p>Are you able to work during the specified timezone? (<strong>{`${getCustomField(job.custom_fields, 'Timezone')}`}</strong>)</p>
+                    <p>Are you able to work during the specified timezone? (<strong>{`${getCustomField(job.custom_fields, 'Timezone')}`}</strong>) *</p>
                     <RadioButton
                       onChange={val => onFormInputChange('timezoneConfirm', val)}
                       errorMsg={formErrors.timezoneConfirm}
                       options={formData.timezoneConfirm}
                       size="lg"
                     />
                     <div styleName="last-input">
-                      <p>Are you ok to work with the duration of the gig? (<strong>{`${getCustomField(job.custom_fields, 'Duration')}`}</strong>)</p>
+                      <p>Are you ok to work with the duration of the gig? (<strong>{`${getCustomField(job.custom_fields, 'Duration')}`}</strong>) *</p>
                       <RadioButton
                         onChange={val => onFormInputChange('durationConfirm', val)}
                         errorMsg={formErrors.durationConfirm}

src/shared/components/Gigs/GigApply/style.scss

@@ -148,6 +148,11 @@
         }
       }
 
+      .info-text {
+        font-size: 16px;
+        margin-top: 35px;
+      }
+
       .form-section {
         margin: 13px 0 50px;
 

src/shared/containers/Gigs/RecruitCRMJobApply.jsx

@@ -77,6 +77,7 @@ class RecruitCRMJobApplyContainer extends React.Component {
   validateForm(prop) {
     this.setState((state) => {
       const { formData, formErrors } = state;
+      const { recruitProfile } = this.props;
       // Form validation happens here
       const requiredTextFields = [
         'fname', 'lname', 'city', 'phone', 'email',
@@ -110,8 +111,10 @@ class RecruitCRMJobApplyContainer extends React.Component {
       }
       // check for selected reffereal
       if (!prop || prop === 'reffereal') {
-        if (!_.find(formData.reffereal, { selected: true })) formErrors.reffereal = 'Please, select your reffereal';
-        else delete formErrors.reffereal;
+        if (!recruitProfile) {
+          if (!_.find(formData.reffereal, { selected: true })) formErrors.reffereal = 'Please, select your reffereal';
+          else delete formErrors.reffereal;
+        }
       }
       // check payExpectation to be a number
       if (!prop || prop === 'payExpectation') {
@@ -154,13 +157,23 @@ class RecruitCRMJobApplyContainer extends React.Component {
           }
         }
       }
-      // timezone & duration
-      if (!prop || prop === 'timezoneConfirm' || prop === 'durationConfirm') {
+      // timezone
+      if (!prop || prop === 'timezoneConfirm') {
         const a = _.find(formData[prop], { value: true });
         if (a) {
           if (a.label === 'No') formErrors[prop] = 'Sorry, we are only looking for candidates that can work the hours and duration listed';
           else delete formErrors[prop];
-        }
+        } else if (prop) formErrors[prop] = 'Required field';
+        else if (!prop && !_.find(formData.timezoneConfirm, { value: true })) formErrors.timezoneConfirm = 'Required field';
+      }
+      // duration
+      if (!prop || prop === 'durationConfirm') {
+        const a = _.find(formData[prop], { value: true });
+        if (a) {
+          if (a.label === 'No') formErrors[prop] = 'Sorry, we are only looking for candidates that can work the hours and duration listed';
+          else delete formErrors[prop];
+        } else if (prop) formErrors[prop] = 'Required field';
+        else if (!prop && !_.find(formData.durationConfirm, { value: true })) formErrors.durationConfirm = 'Required field';
       }
       // updated state
       return {