Merge pull request #1606 from topcoder-platform/update-workload-field

PM-683 - update workload field

Author: vas3a

src/containers/TaaSProjectForm/index.js

@@ -31,7 +31,7 @@ const iconX = './x-gray.svg'
 const defaultJob = {
   title: '',
   role: JOB_ROLE_OPTIONS[0],
-  workload: JOB_WORKLOAD_OPTIONS[0],
+  workLoad: JOB_WORKLOAD_OPTIONS[0],
   skills: [],
   description: '',
   people: 0,
@@ -73,9 +73,9 @@ const TaaSProjectForm = ({
           value: item.role.value,
           title: item.role.label
         },
-        workload: {
-          value: item.workload.value,
-          title: item.workload.label
+        workLoad: {
+          value: item.workLoad.value,
+          title: item.workLoad.label
         }
       }))
       if (isCreateNewProject) {
@@ -164,9 +164,9 @@ const TaaSProjectForm = ({
             value: item.role.value,
             label: item.role.title
           },
-          workload: {
-            value: (item.workLoad || item.workload).value,
-            label: (item.workLoad || item.workload).title
+          workLoad: {
+            value: (item.workLoad || {}).value,
+            label: (item.workLoad || {}).title
           },
           skills: item.skills
         }))
@@ -375,19 +375,19 @@ const TaaSProjectForm = ({
                                     direction='vertical'
                                     title='WORKLOAD'
                                     errorMsg={getFormError(
-                                      `jobs[${index}].workload`
+                                      `jobs[${index}].workLoad`
                                     )}
                                     isRequired
                                     className={styles.blockField}
                                   >
                                     <Select
                                       options={JOB_WORKLOAD_OPTIONS}
                                       placeholder='Select Workload'
-                                      value={job.workload}
+                                      value={job.workLoad}
                                       isClearable={false}
                                       onChange={newValue => {
                                         updateFormField(
-                                          `jobs[${index}].workload`,
+                                          `jobs[${index}].workLoad`,
                                           newValue
                                         )
                                       }}

src/util/validation.js

@@ -34,11 +34,11 @@ export const taaSProjectFormValidationSchema = Yup.object({
         .test('number', 'Please choose at least one people', isValidNumber),
       role: Yup.object().test('role', 'Please choose role', isValidSelect),
       duration: Yup.number()
-        .min(4, 'Please choose at least 4 weeks')
+        .min(4, 'Please, choose at least 4 weeks')
         .test('number', 'Please choose at least 4 weeks', isValidNumber),
-      workload: Yup.object().test(
-        'workload',
-        'Please choose workload',
+      workLoad: Yup.object().test(
+        'workLoad',
+        'Please, choose workLoad',
         isValidSelect
       ),
       description: Yup.string().required('Please enter a job description'),