Merge pull request #1694 from topcoder-platform/v6

V6 -> develop

Author: kkartunov

.circleci/config.yml

@@ -37,10 +37,11 @@ install_test_dependency: &install_test_dependency
 install_deploysuite: &install_deploysuite
   name: Installation of install_deploysuite.
   command: |
-    git clone --branch v1.4.15 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+    git clone --branch v1.4.17 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
     cp ./../buildscript/master_deploy.sh .
     cp ./../buildscript/buildenv.sh .
     cp ./../buildscript/awsconfiguration.sh .
+    cp ../buildscript/psvar-processor.sh .
 
 restore_cache_settings_for_build: &restore_cache_settings_for_build
   key: docker-node-modules-28-10-2020-{{ checksum "package-lock.json" }}
@@ -59,22 +60,27 @@ builddeploy_steps: &builddeploy_steps
       name: "configuring environment"
       command: |
         ./awsconfiguration.sh $DEPLOY_ENV
-        ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
+        #./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
+        source awsenvconf
+        ./psvar-processor.sh -t appenv -p /config/${APPNAME}/buildvar
         echo awsenvconf >.dockerignore
-        echo buildenvvar >>.dockerignore
+        echo buildvar_env >>.dockerignore
   - run:
       name: "building image"
       command: |
-        source buildenvvar
+        source buildvar_env
         ./build.sh ${APPNAME}
   - deploy:
       name: Running MasterScript.
       command: |
         #./awsconfiguration.sh $DEPLOY_ENV
         source awsenvconf
-        ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
-        source buildenvvar
-        ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME} -p FARGATE
+        #./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
+        #source buildenvvar
+        ./psvar-processor.sh -t appenv -p /config/${APPNAME}/deployvar
+        source deployvar_env
+        #./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME} -p FARGATE
+        ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -j /config/common/global-appvar,/config/${APPNAME}/appvar -i ${APPNAME} -p FARGATE
         #curl --request POST \
         #--url https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline \
         #--header "Circle-Token: ${CIRCLE_TOKEN}" \
@@ -93,13 +99,15 @@ smoke_testing: &smoke_testing # Initialization.
       name: "configuring environment"
       command: |
         ./awsconfiguration.sh $DEPLOY_ENV
-        ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
+        #./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
+        ./psvar-processor.sh -t appenv -p /config/${APPNAME}/buildvar
   - run:
       name: "Run automation"
       no_output_timeout: 20m
       command: |
         source awsenvconf
-        source buildenvvar
+        #source buildenvvar
+        source buildvar_env
         ./test-automation/smoketest.sh
   - store_artifacts:
       path: ./test-automation/test-results
@@ -152,7 +160,7 @@ workflows:
           context: org-global
           filters: &filters-dev
             branches:
-              only: ["develop", "PM-803_wm-regression-fixes", "PM-902_show-all-projects-on-challenge-page", "pm-1365"]
+              only: ["v6", "develop", "pm-2531"]
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

.gitignore

@@ -27,6 +27,8 @@ yarn-error.log*
 *.env
 *.pem
 *.vscode
+*.pem
+*.vscode
 
 # e2e test case
 test-automation/temp

.local-ssl-proxy.pid

@@ -0,0 +1 @@
+127525

.nvmrc

@@ -1 +1 @@
-12.17.0
+22.19.0

README.md

@@ -20,7 +20,7 @@ This is the frontend application for creating and managing challenges.
 - [Resource ES Processor](https://github.com/topcoder-platform/resource-processor-es) - Updates resource data in Elasticsearch
 
 ## Prerequisites
--  [NodeJS](https://nodejs.org/en/) (v10.15+)
+-  [NodeJS](https://nodejs.org/en/) (v22+)
 -  [Docker](https://www.docker.com/)
 -  [Docker Compose](https://docs.docker.com/compose/)
 
@@ -31,10 +31,10 @@ Development configuration is in `config/constants/development.js`
 
 ## Local Deployment Instructions
 
-1. First install dependancies
+1. First install dependencies
 
 ```bash
-npm install
+pnpm install
 ```
 
 1. copy the environment file in docs/dev.env to /.env
@@ -45,10 +45,10 @@ npm install
 1. Run the app in development mode
 
 ```bash
-npm run dev
+pnpm run start:dev
 ```
 
-You can access the app from [http://localhost:3000/](http://localhost:3000/)
+You can access the app from [http://localhost:5000/](http://localhost:5000/)
 
 The page will reload if you make edits.
 
@@ -59,7 +59,7 @@ You will also see any lint errors in the console.
 To test the app for lint errors
 
 ```bash
-npm run lint
+pnpm run lint
 ```
 
 *Use the `--fix` flag to automatically fix errors.*
@@ -69,7 +69,7 @@ npm run lint
 To build the app for production
 
 ```bash
-npm run build
+pnpm run build
 ```
 
 Builds the app for production to the `build` folder.

build.sh

@@ -1,24 +1,49 @@
 #!/bin/bash
 set -eo pipefail
+
 APP_NAME=$1
-UPDATE_CACHE=""
+LOCK_FILE_LOCAL=""
+LOCK_FILE_NAME=""
+UPDATE_CACHE=0
+
 echo "NODE ENV: $NODE_ENV"
 echo "BABEL ENV: $BABEL_ENV"
-docker compose -f docker/docker-compose.yml build --build-arg NODE_ENV=$NODE_ENV --build-arg BABEL_ENV=$BABEL_ENV --build-arg FILE_PICKER_API_KEY=$FILE_PICKER_API_KEY --build-arg FORCE_DEV=$FORCE_DEV $APP_NAME
-docker create --name app  $APP_NAME:latest
 
-if [ -d node_modules ]
-then
-  mv package-lock.json old-package-lock.json
-  docker cp app:/$APP_NAME/package-lock.json package-lock.json
-  set +eo pipefail
-  UPDATE_CACHE=$(cmp package-lock.json old-package-lock.json)
-  set -eo pipefail
-else
+# Build the container image
+docker compose -f docker/docker-compose.yml build \
+  --build-arg NODE_ENV=$NODE_ENV \
+  --build-arg BABEL_ENV=$BABEL_ENV \
+  --build-arg FILE_PICKER_API_KEY=$FILE_PICKER_API_KEY \
+  --build-arg FORCE_DEV=$FORCE_DEV \
+  $APP_NAME
+
+# Create a throwaway container for copying artifacts
+docker create --name app $APP_NAME:latest >/dev/null
+
+# Determine which lockfile to compare (pnpm preferred, fallback to npm)
+if [ -f pnpm-lock.yaml ]; then
+  LOCK_FILE_NAME="pnpm-lock.yaml"
+elif [ -f package-lock.json ]; then
+  LOCK_FILE_NAME="package-lock.json"
+fi
+
+if [ -z "$LOCK_FILE_NAME" ] || [ ! -d node_modules ]; then
   UPDATE_CACHE=1
+else
+  # Compare lockfile from container with local copy
+  cp "$LOCK_FILE_NAME" ".old-$LOCK_FILE_NAME"
+  docker cp "app:/$APP_NAME/$LOCK_FILE_NAME" "$LOCK_FILE_NAME"
+  set +e
+  cmp "$LOCK_FILE_NAME" ".old-$LOCK_FILE_NAME" >/dev/null 2>&1
+  CMP_STATUS=$?
+  set -e
+  if [ $CMP_STATUS -ne 0 ]; then
+    UPDATE_CACHE=1
+  fi
 fi
 
-if [ "$UPDATE_CACHE" == 1 ]
-then
-  docker cp app:/$APP_NAME/node_modules .
-fi
+if [ "$UPDATE_CACHE" -eq 1 ]; then
+  echo "Lockfile changed or node_modules missing; refreshing local node_modules from container..."
+  rm -rf node_modules
+  docker cp "app:/$APP_NAME/node_modules" .
+fi

config/constants/development.js

@@ -2,35 +2,43 @@ const DOMAIN = 'topcoder-dev.com'
 const DEV_API_HOSTNAME = `https://api.${DOMAIN}`
 
 const API_V5 = `${DEV_API_HOSTNAME}/v5`
+const API_V6 = `${DEV_API_HOSTNAME}/v6`
 
 module.exports = {
   API_V2: `${DEV_API_HOSTNAME}/v2`,
   API_V3: `${DEV_API_HOSTNAME}/v3`,
   API_V4: `${DEV_API_HOSTNAME}/v4`,
   API_V5,
+  API_V6,
   ACCOUNTS_APP_CONNECTOR_URL: `https://accounts-auth0.${DOMAIN}`,
   ACCOUNTS_APP_LOGIN_URL: `https://accounts-auth0.${DOMAIN}`,
-  COMMUNITY_APP_URL: `https://www.${DOMAIN}`,
-  MEMBER_API_URL: `${DEV_API_HOSTNAME}/v5/members`,
-  CHALLENGE_API_URL: `${DEV_API_HOSTNAME}/v5/challenges`,
+  COMMUNITY_APP_URL: `https://www-v6.${DOMAIN}`,
+  MEMBER_API_URL: `${DEV_API_HOSTNAME}/v6/members`,
+  CHALLENGE_API_URL: `${DEV_API_HOSTNAME}/v6/challenges`,
+  CHALLENGE_DEFAULT_REVIEWERS_URL: `${DEV_API_HOSTNAME}/v6/challenge/default-reviewers`,
   CHALLENGE_API_VERSION: '1.1.0',
-  CHALLENGE_TIMELINE_TEMPLATES_URL: `${DEV_API_HOSTNAME}/v5/timeline-templates`,
-  CHALLENGE_TYPES_URL: `${DEV_API_HOSTNAME}/v5/challenge-types`,
-  CHALLENGE_TRACKS_URL: `${DEV_API_HOSTNAME}/v5/challenge-tracks`,
-  CHALLENGE_PHASES_URL: `${DEV_API_HOSTNAME}/v5/challenge-phases`,
-  CHALLENGE_TIMELINES_URL: `${DEV_API_HOSTNAME}/v5/challenge-timelines`,
+  CHALLENGE_TIMELINE_TEMPLATES_URL: `${DEV_API_HOSTNAME}/v6/timeline-templates`,
+  CHALLENGE_TYPES_URL: `${DEV_API_HOSTNAME}/v6/challenge-types`,
+  CHALLENGE_TRACKS_URL: `${DEV_API_HOSTNAME}/v6/challenge-tracks`,
+  CHALLENGE_PHASES_URL: `${DEV_API_HOSTNAME}/v6/challenge-phases`,
+  CHALLENGE_TIMELINES_URL: `${DEV_API_HOSTNAME}/v6/challenge-timelines`,
+  COPILOTS_URL: 'https://copilots-v6.topcoder-dev.com/copilots',
   PROJECT_API_URL: `${DEV_API_HOSTNAME}/v5/projects`,
-  GROUPS_API_URL: `${DEV_API_HOSTNAME}/v5/groups`,
+  GROUPS_API_URL: `${DEV_API_HOSTNAME}/v6/groups`,
   TERMS_API_URL: `${DEV_API_HOSTNAME}/v5/terms`,
-  RESOURCES_API_URL: `${DEV_API_HOSTNAME}/v5/resources`,
-  RESOURCE_ROLES_API_URL: `${DEV_API_HOSTNAME}/v5/resource-roles`,
-  SUBMISSIONS_API_URL: `${DEV_API_HOSTNAME}/v5/submissions`,
-  REVIEW_TYPE_API_URL: `${DEV_API_HOSTNAME}/v5/reviewTypes`,
+  RESOURCES_API_URL: `${DEV_API_HOSTNAME}/v6/resources`,
+  RESOURCE_ROLES_API_URL: `${DEV_API_HOSTNAME}/v6/resource-roles`,
+  SUBMISSIONS_API_URL: `${DEV_API_HOSTNAME}/v6/submissions`,
+  REVIEW_TYPE_API_URL: `${DEV_API_HOSTNAME}/v6/reviewTypes`,
+  REVIEWS_API_URL: `${DEV_API_HOSTNAME}/v6/reviews`,
+  SCORECARDS_API_URL: `${DEV_API_HOSTNAME}/v6/scorecards`,
+  WORKFLOWS_API_URL: `${DEV_API_HOSTNAME}/v6/workflows`,
   SUBMISSION_REVIEW_APP_URL: `https://submission-review.${DOMAIN}/challenges`,
   STUDIO_URL: `https://studio.${DOMAIN}`,
   CONNECT_APP_URL: `https://connect.${DOMAIN}`,
   DIRECT_PROJECT_URL: `https://www.${DOMAIN}/direct`,
   ONLINE_REVIEW_URL: `https://software.${DOMAIN}`,
+  REVIEW_APP_URL: `https://review.${DOMAIN}`,
   DEFAULT_TERM_UUID: '317cd8f9-d66c-4f2a-8774-63c612d99cd4', // Terms & Conditions of Use at TopCoder
   DEFAULT_NDA_UUID: 'e5811a7b-43d1-407a-a064-69e5015b4900', // NDA v3.0
   SUBMITTER_ROLE_UUID: '732339e7-8e30-49d7-9198-cccf9451e221',
@@ -49,10 +57,6 @@ module.exports = {
   FILE_PICKER_REGION: 'us-east-1',
   FILE_PICKER_CNAME: 'fs.topcoder.com',
   FILE_PICKER_LOCATION: 's3',
-  // if idle for this many minutes, show user a prompt saying they'll be logged out
-  IDLE_TIMEOUT_MINUTES: 10,
-  // duration to show the prompt saying user will be logged out, before actually logging out the user
-  IDLE_TIMEOUT_GRACE_MINUTES: 5,
   MULTI_ROUND_CHALLENGE_TEMPLATE_ID: 'd4201ca4-8437-4d63-9957-3f7708184b07',
   UNIVERSAL_NAV_URL: 'https://uni-nav.topcoder-dev.com/v1/tc-universal-nav.js',
   HEADER_AUTH_URLS_HREF: `https://accounts-auth0.${DOMAIN}?utm_source=community-app-main`,

config/constants/index.js

@@ -1,10 +1,18 @@
 module.exports = (() => {
   let env = process.env.NODE_ENV || 'development'
   if (process.env.FORCE_DEV) env = 'development'
-  // for security reason don't let to require any arbitrary file defined in process.env
+
+  // Only allow specific files to be required for security reasons
   if (env === 'production') {
     return require('./production')
   }
 
+  // Support explicit local environment (mirrors platform-ui local setup)
+  const hostEnv = process.env.HOST_ENV
+  if (env === 'local' || hostEnv === 'local') {
+    return require('./local')
+  }
+
+  // Default to development
   return require('./development')
 })()

config/constants/local.js

@@ -0,0 +1,97 @@
+const DOMAIN = 'topcoder-dev.com'
+
+// Keep generic API bases pointing to dev unless specifically overridden below
+const DEV_API_HOSTNAME = `https://api.${DOMAIN}`
+const API_V5 = `${DEV_API_HOSTNAME}/v5`
+
+// Local service endpoints mirror platform-ui local.env.ts overrides
+const LOCAL_CHALLENGE_API = 'http://localhost:3000/v6'
+const LOCAL_GROUPS_API = 'http://localhost:3001/v6'
+const LOCAL_IDENTITY_API = 'http://localhost:3002/v6'
+const LOCAL_MEMBER_API = 'http://localhost:3003/v6'
+const LOCAL_RESOURCE_API = 'http://localhost:3004/v6'
+const LOCAL_REVIEW_API = 'http://localhost:3005/v6'
+const LOCAL_SKILLS_API_V5 = 'http://localhost:3006/v5/standardized-skills'
+// Lookups API available on 3007 if needed in future
+// const LOCAL_LOOKUPS_API = 'http://localhost:3007/v6'
+
+module.exports = {
+  // Core API bases (leave on dev domain; individual services overridden below)
+  API_V2: `${DEV_API_HOSTNAME}/v2`,
+  API_V3: `${DEV_API_HOSTNAME}/v3`,
+  API_V4: `${DEV_API_HOSTNAME}/v4`,
+  API_V5,
+
+  // Auth and UI URLs (stay on dev domain)
+  ACCOUNTS_APP_CONNECTOR_URL: `https://accounts-auth0.${DOMAIN}`,
+  ACCOUNTS_APP_LOGIN_URL: `https://accounts-auth0.${DOMAIN}`,
+  COMMUNITY_APP_URL: `https://www-v6.${DOMAIN}`,
+
+  // Local service URLs
+  MEMBER_API_URL: `${LOCAL_MEMBER_API}/members`,
+  CHALLENGE_API_URL: `${LOCAL_CHALLENGE_API}/challenges`,
+  CHALLENGE_DEFAULT_REVIEWERS_URL: `${LOCAL_CHALLENGE_API.replace(/\/v6$/, '')}/v6/challenge/default-reviewers`,
+  CHALLENGE_API_VERSION: '1.1.0',
+  CHALLENGE_TIMELINE_TEMPLATES_URL: `${LOCAL_CHALLENGE_API}/timeline-templates`,
+  CHALLENGE_TYPES_URL: `${LOCAL_CHALLENGE_API}/challenge-types`,
+  CHALLENGE_TRACKS_URL: `${LOCAL_CHALLENGE_API}/challenge-tracks`,
+  CHALLENGE_PHASES_URL: `${LOCAL_CHALLENGE_API}/challenge-phases`,
+  CHALLENGE_TIMELINES_URL: `${LOCAL_CHALLENGE_API}/challenge-timelines`,
+
+  // Copilots and other apps remain on dev
+  COPILOTS_URL: 'https://copilots-v6.topcoder-dev.com/copilots',
+
+  // Projects API: keep dev unless you run projects locally
+  PROJECT_API_URL: `${DEV_API_HOSTNAME}/v5/projects`,
+
+  // Local groups/resources/review services
+  GROUPS_API_URL: `${LOCAL_GROUPS_API}/groups`,
+  TERMS_API_URL: `${DEV_API_HOSTNAME}/v5/terms`,
+  RESOURCES_API_URL: `${LOCAL_RESOURCE_API}/resources`,
+  RESOURCE_ROLES_API_URL: `${LOCAL_RESOURCE_API}/resource-roles`,
+  SUBMISSIONS_API_URL: `${LOCAL_REVIEW_API}/submissions`,
+  REVIEW_TYPE_API_URL: `${LOCAL_REVIEW_API}/reviewTypes`,
+  REVIEWS_API_URL: `${LOCAL_REVIEW_API}/reviews`,
+  SCORECARDS_API_URL: `${LOCAL_REVIEW_API}/scorecards`,
+  WORKFLOWS_API_URL: `${LOCAL_REVIEW_API}/workflows`,
+
+  SUBMISSION_REVIEW_APP_URL: `https://submission-review.${DOMAIN}/challenges`,
+  STUDIO_URL: `https://studio.${DOMAIN}`,
+  CONNECT_APP_URL: `https://connect.${DOMAIN}`,
+  DIRECT_PROJECT_URL: `https://www.${DOMAIN}/direct`,
+  ONLINE_REVIEW_URL: `https://software.${DOMAIN}`,
+  REVIEW_APP_URL: `https://review.${DOMAIN}`,
+
+  // IDs and static values (same as development)
+  DEFAULT_TERM_UUID: '317cd8f9-d66c-4f2a-8774-63c612d99cd4', // Terms & Conditions of Use at TopCoder
+  DEFAULT_NDA_UUID: 'e5811a7b-43d1-407a-a064-69e5015b4900', // NDA v3.0
+  SUBMITTER_ROLE_UUID: '732339e7-8e30-49d7-9198-cccf9451e221',
+  DEV_TRACK_ID: '9b6fc876-f4d9-4ccb-9dfd-419247628825',
+  DES_TRACK_ID: '5fa04185-041f-49a6-bfd1-fe82533cd6c8',
+  DS_TRACK_ID: 'c0f5d461-8219-4c14-878a-c3a3f356466d',
+  QA_TRACK_ID: '36e6a8d0-7e1e-4608-a673-64279d99c115',
+  CP_TRACK_ID: '9d6e0de8-df14-4c76-ba0a-a9a8cb03a4ea',
+  CHALLENGE_TYPE_ID: '927abff4-7af9-4145-8ba1-577c16e64e2e',
+  MARATHON_TYPE_ID: '929bc408-9cf2-4b3e-ba71-adfbf693046c',
+  SEGMENT_API_KEY: 'QBtLgV8vCiuRX1lDikbMjcoe9aCHkF6n',
+  CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c', 'ecd58c69-238f-43a4-a4bb-d172719b9f31', '78b37a69-92d5-4ad7-bf85-c79b65420c79', '929bc408-9cf2-4b3e-ba71-adfbf693046c'],
+
+  // Filestack (same defaults as development)
+  FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY,
+  FILE_PICKER_CONTAINER_NAME: 'tc-challenge-v5-dev',
+  FILE_PICKER_SUBMISSION_CONTAINER_NAME: process.env.FILE_PICKER_SUBMISSION_CONTAINER_NAME || 'submission-staging-dev',
+  FILE_PICKER_REGION: 'us-east-1',
+  FILE_PICKER_CNAME: 'fs.topcoder.com',
+  FILE_PICKER_LOCATION: 's3',
+  MULTI_ROUND_CHALLENGE_TEMPLATE_ID: 'd4201ca4-8437-4d63-9957-3f7708184b07',
+  UNIVERSAL_NAV_URL: 'https://uni-nav.topcoder-dev.com/v1/tc-universal-nav.js',
+  HEADER_AUTH_URLS_HREF: `https://accounts-auth0.${DOMAIN}?utm_source=community-app-main`,
+  HEADER_AUTH_URLS_LOCATION: `https://accounts-auth0.${DOMAIN}?retUrl=%S&utm_source=community-app-main`,
+
+  // Standardized skills API on local
+  SKILLS_V5_API_URL: `${LOCAL_SKILLS_API_V5}/skills/autocomplete`,
+  UPDATE_SKILLS_V5_API_URL: `${LOCAL_SKILLS_API_V5}/challenge-skills`,
+
+  SALESFORCE_BILLING_ACCOUNT_LINK: 'https://c.cs18.visual.force.com/apex/baredirect?id=',
+  PROFILE_URL: 'https://profiles.topcoder-dev.com/'
+}