Merge pull request #1726 from topcoder-platform/chunk_size

Engagements v2 changes

Author: jmgasper

src/components/ApplicationsList/index.js

@@ -12,6 +12,7 @@ import DateInput from '../DateInput'
 import Handle from '../Handle'
 import styles from './ApplicationsList.module.scss'
 import { PROFILE_URL } from '../../config/constants'
+import { serializeTentativeAssignmentDate } from '../../util/assignmentDates'
 
 const STATUS_OPTIONS = [
   { label: 'All', value: 'all' },
@@ -99,6 +100,21 @@ const getApplicationName = (application) => {
   return fullName || application.name || application.email || null
 }
 
+const getApplicationMobileNumber = (application) => {
+  if (!application) {
+    return null
+  }
+
+  const value = [
+    application.mobileNumber,
+    application.mobile_number,
+    application.phoneNumber,
+    application.phone
+  ].find((phoneNumber) => phoneNumber != null && `${phoneNumber}`.trim() !== '')
+
+  return value ? `${value}`.trim() : null
+}
+
 const getApplicationRating = (application) => {
   if (!application) {
     return undefined
@@ -303,9 +319,11 @@ const ApplicationsList = ({
 
     setIsAccepting(true)
     try {
+      const startDate = serializeTentativeAssignmentDate(parsedStart)
+      const endDate = serializeTentativeAssignmentDate(parsedEnd)
       await onUpdateStatus(acceptApplication.id, 'SELECTED', {
-        startDate: parsedStart.toISOString(),
-        endDate: parsedEnd.toISOString(),
+        startDate,
+        endDate,
         agreementRate: normalizedRate,
         ...(normalizedOtherRemarks ? { otherRemarks: normalizedOtherRemarks } : {})
       })
@@ -500,7 +518,7 @@ const ApplicationsList = ({
               <th>Email</th>
               <th>Applied Date</th>
               <th>Years of Experience</th>
-              <th>Availability</th>
+              <th>Phone Number</th>
               <th>Status</th>
               <th>Actions</th>
             </tr>
@@ -541,7 +559,7 @@ const ApplicationsList = ({
                   <td>{application.email || '-'}</td>
                   <td>{formatDateTime(application.createdAt)}</td>
                   <td>{application.yearsOfExperience != null ? application.yearsOfExperience : '-'}</td>
-                  <td>{application.availability || '-'}</td>
+                  <td>{getApplicationMobileNumber(application) || '-'}</td>
                   <td>
                     <span className={`${styles.status} ${statusClass}`}>
                       {statusLabel}

src/components/EngagementEditor/EngagementEditor.module.scss

@@ -80,6 +80,18 @@
         }
       }
     }
+
+    .privateEngagementRow {
+      .field {
+        &.col2.privateEngagementField {
+          width: 100%;
+          max-width: none;
+          min-width: 0;
+          align-items: flex-start;
+          justify-content: flex-start;
+        }
+      }
+    }
   }
 }
 
@@ -227,6 +239,11 @@
   color: $tc-blue-40;
 }
 
+.privateEngagementCheckbox {
+  align-self: flex-start;
+  margin: 0;
+}
+
 .assignmentDetails {
   display: flex;
   flex-wrap: wrap;

src/components/EngagementEditor/index.js

@@ -15,6 +15,7 @@ import Handle from '../Handle'
 import { JOB_ROLE_OPTIONS, JOB_WORKLOAD_OPTIONS } from '../../config/constants'
 import { suggestProfiles } from '../../services/user'
 import { getCountableAssignments } from '../../util/engagements'
+import { serializeTentativeAssignmentDate } from '../../util/assignmentDates'
 import { formatTimeZoneLabel, formatTimeZoneList } from '../../util/timezones'
 import styles from './EngagementEditor.module.scss'
 
@@ -406,8 +407,8 @@ const EngagementEditor = ({
     nextAssignedMemberHandles[assignModal.index] = assignModal.handle
     nextAssignmentDetails[assignModal.index] = {
       memberHandle: assignModal.handle,
-      startDate: parsedStart.toISOString(),
-      endDate: parsedEnd.toISOString(),
+      startDate: serializeTentativeAssignmentDate(parsedStart),
+      endDate: serializeTentativeAssignmentDate(parsedEnd),
       agreementRate: normalizedRate,
       otherRemarks: normalizedOtherRemarks
     }
@@ -930,12 +931,13 @@ const EngagementEditor = ({
             )}
 
             {canEdit && (
-              <div className={styles.row}>
+              <div className={cn(styles.row, styles.privateEngagementRow)}>
                 <div className={cn(styles.field, styles.col1)}>
                   <label htmlFor='isPrivate'>Private Engagement :</label>
                 </div>
-                <div className={cn(styles.field, styles.col2)}>
+                <div className={cn(styles.field, styles.col2, styles.privateEngagementField)}>
                   <input
+                    className={styles.privateEngagementCheckbox}
                     id='isPrivate'
                     name='isPrivate'
                     type='checkbox'