Merge pull request #1728 from topcoder-platform/develop

[PROD RELEASE] - AI & V2 engagements & Fixes

Author: kkartunov

.circleci/config.yml

@@ -9,7 +9,7 @@ parameters:
 
 defaults: &defaults
   docker:
-    - image: cimg/python:3.11.11-browsers
+    - image: cimg/python:3.12.12-browsers
 
 test_defaults: &test_defaults
   docker:

.gitignore

@@ -12,6 +12,7 @@ node_modules
 
 # production
 /build
+/dist
 
 # misc
 .DS_Store
@@ -32,4 +33,6 @@ yarn-error.log*
 
 # e2e test case
 test-automation/temp
-test-automation/test-results
+test-automation/test-results
+
+dist

config/constants/development.js

@@ -20,6 +20,8 @@ module.exports = {
   ENGAGEMENTS_ROOT_API_URL: `${DEV_API_HOSTNAME}/v6/engagements`,
   APPLICATIONS_API_URL: `${DEV_API_HOSTNAME}/v6/engagements/applications`,
   TC_FINANCE_API_URL: process.env.TC_FINANCE_API_URL || `${API_V6}/finance`,
+  TC_AI_API_BASE_URL: process.env.TC_AI_API_BASE_URL || `${API_V6}/ai`,
+  TC_AI_SKILLS_EXTRACTION_WORKFLOW_ID: process.env.TC_AI_SKILLS_EXTRACTION_WORKFLOW_ID || 'skillExtractionWorkflow',
   CHALLENGE_DEFAULT_REVIEWERS_URL: `${DEV_API_HOSTNAME}/v6/challenge/default-reviewers`,
   CHALLENGE_API_VERSION: '1.1.0',
   CHALLENGE_TIMELINE_TEMPLATES_URL: `${DEV_API_HOSTNAME}/v6/timeline-templates`,

config/constants/production.js

@@ -19,6 +19,8 @@ module.exports = {
   ENGAGEMENTS_ROOT_API_URL: `${PROD_API_HOSTNAME}/v6/engagements`,
   APPLICATIONS_API_URL: `${PROD_API_HOSTNAME}/v6/engagements/applications`,
   TC_FINANCE_API_URL: process.env.TC_FINANCE_API_URL || `${API_V6}/finance`,
+  TC_AI_API_BASE_URL: process.env.TC_AI_API_BASE_URL || `${API_V6}/ai`,
+  TC_AI_SKILLS_EXTRACTION_WORKFLOW_ID: process.env.TC_AI_SKILLS_EXTRACTION_WORKFLOW_ID || 'skillExtractionWorkflow',
   CHALLENGE_DEFAULT_REVIEWERS_URL: `${PROD_API_HOSTNAME}/v6/challenge/default-reviewers`,
   CHALLENGE_API_VERSION: '1.1.0',
   CHALLENGE_TIMELINE_TEMPLATES_URL: `${PROD_API_HOSTNAME}/v6/timeline-templates`,

config/webpack.config.js

@@ -37,7 +37,6 @@ module.exports = function (webpackEnv) {
   const isEnvDevelopment = webpackEnv === 'development'
   const isEnvProduction = webpackEnv === 'production'
   const WM_DEBUG = /^(1|true|on|yes)$/i.test(String(process.env.WM_DEBUG || ''))
-  const reactDevUtilsContextRegExp = /[\\/]react-dev-utils[\\/]/
 
   // Webpack uses `publicPath` to determine where the app is being served from.
   // It requires a trailing slash, or the file assets will get an incorrect path.
@@ -150,7 +149,7 @@ module.exports = function (webpackEnv) {
       // require.resolve('webpack-dev-server/client') + '?/',
       // require.resolve('webpack/hot/dev-server'),
       isEnvDevelopment &&
-        require.resolve('react-dev-utils/webpackHotDevClient'),
+        path.resolve(__dirname, 'webpackHotDevClient'),
       // Finally, this is your app's code:
       paths.appIndexJs
       // We include the app code last so that if there is a runtime error during
@@ -485,13 +484,6 @@ module.exports = function (webpackEnv) {
       // This gives some necessary context to module not found errors, such as
       // the requesting resource.
       new ModuleNotFoundPlugin(paths.appPath),
-      // Ensure the dev client tolerates webpack 5 warning/error objects.
-      isEnvDevelopment &&
-        new webpack.NormalModuleReplacementPlugin(/\.\/formatWebpackMessages$/, (resource) => {
-          if (reactDevUtilsContextRegExp.test(resource.context || '')) {
-            resource.request = path.resolve(__dirname, 'formatWebpackMessages')
-          }
-        }),
       // (DefinePlugin already added above with merged env)
       // This is necessary to emit hot updates (currently CSS only):
       isEnvDevelopment && new webpack.HotModuleReplacementPlugin(),

config/webpackHotDevClient.js

@@ -0,0 +1,18 @@
+'use strict'
+
+var patchedFormatWebpackMessages = require('./formatWebpackMessages')
+var originalFormatWebpackMessages = require('react-dev-utils/formatWebpackMessages')
+
+// webpackHotDevClient requires react-dev-utils/formatWebpackMessages internally.
+// Replace that cached module export before loading the hot client so warnings
+// and errors can be normalized for webpack 5 object payloads.
+if (typeof __webpack_require__ === 'function' && __webpack_require__.c) {
+  Object.keys(__webpack_require__.c).forEach(function(id) {
+    var cachedModule = __webpack_require__.c[id]
+    if (cachedModule && cachedModule.exports === originalFormatWebpackMessages) {
+      cachedModule.exports = patchedFormatWebpackMessages
+    }
+  })
+}
+
+require('react-dev-utils/webpackHotDevClient')

docker/Dockerfile

@@ -1,5 +1,5 @@
 # Use Node.js 22 base image
-FROM node:22
+FROM node:22.22.0
 RUN useradd -m -s /bin/bash appuser
 ARG NODE_ENV
 ARG BABEL_ENV

docs/dev.env

@@ -7,6 +7,7 @@ import {
   patchEngagement,
   deleteEngagement as deleteEngagementAPI
 } from '../services/engagements'
+import { fetchProjectById } from '../services/projects'
 import { fetchSkillsByIds } from '../services/skills'
 import {
   normalizeEngagement,
@@ -33,6 +34,8 @@ import {
   DELETE_ENGAGEMENT_FAILURE
 } from '../config/constants'
 
+const projectNameCache = {}
+
 const getSkillId = (skill) => {
   if (!skill) {
     return null
@@ -93,6 +96,70 @@ const withSkillDetails = (engagement, skillsMap) => {
   }
 }
 
+const getProjectId = (engagement) => {
+  if (!engagement || !engagement.projectId) {
+    return null
+  }
+  return String(engagement.projectId)
+}
+
+const getProjectName = (project) => {
+  if (!project || typeof project !== 'object') {
+    return null
+  }
+  if (typeof project.name === 'string' && project.name.trim()) {
+    return project.name
+  }
+  if (typeof project.projectName === 'string' && project.projectName.trim()) {
+    return project.projectName
+  }
+  return null
+}
+
+const hydrateEngagementProjectNames = async (engagements = []) => {
+  if (!Array.isArray(engagements) || !engagements.length) {
+    return []
+  }
+
+  const projectIds = Array.from(new Set(
+    engagements
+      .map(getProjectId)
+      .filter(Boolean)
+  ))
+
+  if (!projectIds.length) {
+    return engagements
+  }
+
+  const uncachedProjectIds = projectIds.filter((projectId) => !projectNameCache[projectId])
+  if (uncachedProjectIds.length) {
+    const projectNameEntries = await Promise.all(
+      uncachedProjectIds.map(async (projectId) => {
+        try {
+          const project = await fetchProjectById(projectId)
+          return [projectId, getProjectName(project)]
+        } catch (error) {
+          return [projectId, null]
+        }
+      })
+    )
+
+    projectNameEntries.forEach(([projectId, projectName]) => {
+      if (projectName) {
+        projectNameCache[projectId] = projectName
+      }
+    })
+  }
+
+  return engagements.map((engagement) => {
+    const projectId = getProjectId(engagement)
+    return {
+      ...engagement,
+      projectName: (projectId && projectNameCache[projectId]) || engagement.projectName || null
+    }
+  })
+}
+
 const hydrateEngagementSkills = async (engagements = []) => {
   if (!Array.isArray(engagements) || !engagements.length) {
     return []
@@ -206,7 +273,8 @@ export function loadEngagements (projectId, status = 'all', filterName = '', inc
       } while (!totalPages || page <= totalPages)
 
       const hydratedEngagements = await hydrateEngagementSkills(engagements)
-      const normalizedEngagements = normalizeEngagements(hydratedEngagements)
+      const engagementsWithProjectNames = await hydrateEngagementProjectNames(hydratedEngagements)
+      const normalizedEngagements = normalizeEngagements(engagementsWithProjectNames)
       dispatch({
         type: LOAD_ENGAGEMENTS_SUCCESS,
         engagements: normalizedEngagements

src/actions/engagements.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 } : {})
       })
@@ -362,6 +380,7 @@ const ApplicationsList = ({
                   value={acceptStartDate}
                   dateFormat={INPUT_DATE_FORMAT}
                   timeFormat={INPUT_TIME_FORMAT}
+                  preventViewportOverflow
                   minDateTime={getMinStartDateTime}
                   isValidDate={isAcceptStartDateValid}
                   onChange={(value) => {
@@ -385,6 +404,7 @@ const ApplicationsList = ({
                   value={acceptEndDate}
                   dateFormat={INPUT_DATE_FORMAT}
                   timeFormat={INPUT_TIME_FORMAT}
+                  preventViewportOverflow
                   minDateTime={getMinEndDateTime}
                   isValidDate={isAcceptEndDateValid}
                   onChange={(value) => {
@@ -500,7 +520,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 +561,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}