Merge pull request #470 from arpitchaudhari/dev

#442

Author: nikolay83

src/routes/CreateNewTeam/components/SubmitContainer/index.jsx

@@ -112,9 +112,21 @@ function SubmitContainer({
       positions.push(position);
     }
     teamObject.positions = positions;
-
     setTeamDetailsOpen(false);
     setTeamObject(teamObject);
+
+    addedRoles.map((data) => {
+      if (_.has(formData, data.searchId)) {
+        const temp = {
+          ...data,
+          numberOfResources: formData[data.searchId].numberOfResources,
+          durationWeeks: formData[data.searchId].durationWeeks,
+          hoursPerWeek: formData[data.searchId].hoursPerWeek,
+        };
+        dispatch(editRoleAction({ ...temp, searchId: data.searchId }));
+      }
+    });
+
     requestTeam(teamObject);
   };
 

src/routes/CreateNewTeam/components/TeamDetailsModal/index.jsx

@@ -242,7 +242,7 @@ function TeamDetailsModal({ open, onClose, submitForm, addedRoles }) {
                       <td>
                         <Field
                           name={`${id}.hoursPerWeek`}
-                          initialValue={hoursPerWeek || 40}
+                          initialValue={hoursPerWeek || "40"}
                         >
                           {(props) => (
                             <Select

src/routes/CreateNewTeam/pages/CreateTaasPayment/index.jsx

@@ -20,9 +20,7 @@ const CreateTassPayment = () => {
   const [calculatedAmount, setCalculatedAmount] = useState(0);
   const [error, setError] = useState(false);
   const [value, setValue] = useState([]);
-  const { addedRoles, teamObject } = useSelector(
-    (state) => state.searchedRoles
-  );
+  const { addedRoles } = useSelector((state) => state.searchedRoles);
 
   useEffect(() => {
     const temp = [];
@@ -33,27 +31,32 @@ const CreateTassPayment = () => {
         imageUrl,
         name,
         rates: [rates],
+        numberOfResources = 1,
+        durationWeeks = 4,
+        hoursPerWeek = "40",
       } = role;
-      const { numberOfResources = 1, durationWeeks = 4, hoursPerWeek } =
-        _.find(
-          teamObject.positions,
-          (p) => p.roleSearchRequestId === role.searchId
-        ) || {};
+      
       let rate;
+      let availability;
 
-      if (hoursPerWeek) {
-        if (hoursPerWeek === 30) rate = rates.rate30Global;
-        else if (hoursPerWeek === 20) rate = rates.rate20Global;
-        else if (hoursPerWeek === 40) rate = rates.global;
-      } else rate = rates.global;
+      if (hoursPerWeek === "30") {
+        rate = rates.rate30Global;
+        availability = "Part-Time Availability";
+      } else if (hoursPerWeek === "20") {
+        rate = rates.rate20Global;
+        availability = "Part-Time Availability";
+      } else if (hoursPerWeek === "40") {
+        rate = rates.global;
+        availability = "Full-Time Availability";
+      }
 
       temp.push({
         imageUrl,
         name,
         rate,
         numberOfResources,
         durationWeeks,
-        hoursPerWeek,
+        availability,
       });
       amount.push({ rate, numberOfResources });
     });
@@ -110,11 +113,7 @@ const CreateTassPayment = () => {
                               {data.numberOfResources} x ${data.rate}/ Week
                             </li>
                             <li>{data.durationWeeks} Week Duration</li>
-                            <li>
-                              {data.hoursPerWeek === 40
-                                ? "Full-Time Availability"
-                                : "Part-Time Availability"}
-                            </li>
+                            <li>{data.availability}</li>
                           </ul>
                         </div>
                         <p styleName="amount">